From patchwork Mon Sep 21 22:47:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prodyut Hazarika X-Patchwork-Id: 34022 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 9EF9BB7B9C for ; Tue, 22 Sep 2009 08:57:16 +1000 (EST) X-Greylist: delayed 574 seconds by postgrey-1.32 at bilbo; Tue, 22 Sep 2009 08:57:09 EST Received: from sdcmail02.amcc.com (sdcmail02.amcc.com [198.137.200.90]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "Messaging Gateway Appliance Demo Cert", Issuer "Messaging Gateway Appliance Demo Cert" (not verified)) by ozlabs.org (Postfix) with ESMTPS id C1994B70B3 for ; Tue, 22 Sep 2009 08:57:09 +1000 (EST) X-IronPort-AV: E=Sophos;i="4.44,426,1249282800"; d="scan'208";a="6392254" Received: from sdcexch01.amcc.com (HELO sdcexchange01.amcc.com) ([10.64.18.50]) by sdcmail02-int1.amcc.com with ESMTP; 21 Sep 2009 15:47:40 -0700 thread-index: Aco7DYXCHkYnLajDTFKtsosmxxChOg== Content-Class: urn:content-classes:message Importance: normal Priority: normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.3790.4325 Received: from amcc.com ([10.66.12.74]) by sdcexchange01.amcc.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 21 Sep 2009 15:47:39 -0700 Received: (from phazarik@localhost) by amcc.com (8.13.8/8.12.2/Submit) id n8LMld0t001930; Mon, 21 Sep 2009 15:47:39 -0700 From: "Prodyut Hazarika" To: Subject: [PATCH 2/2] ibm_newemac: MAL Coalescing in Canyonlands/Kilauea/Glacier dts Date: Mon, 21 Sep 2009 15:47:38 -0700 Message-ID: <1253573258-1900-1-git-send-email-phazarika@amcc.com> X-Mailer: git-send-email 1.6.5.rc1.19.g8426 X-OriginalArrivalTime: 21 Sep 2009 22:47:39.0711 (UTC) FILETIME=[85B1B4F0:01CA3B0D] Cc: Victor Gallardo , Feng Kan , lada.podivin@gmail.com, Loc Ho , Prodyut Hazarika , bhutchings@solarflare.com, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Support for MAL interrupt coalescing in Canyonlands, Kilauea & Glacier dts. MAL driver falls back to EOB IRQ if Coalescing IRQ mapping missing in dts Signed-off-by: Prodyut Hazarika Acked-by: Victor Gallardo Acked-by: Feng Kan --- arch/powerpc/boot/dts/canyonlands.dts | 6 +++++- arch/powerpc/boot/dts/glacier.dts | 10 +++++++++- arch/powerpc/boot/dts/kilauea.dts | 8 ++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index c920170..5803a5b 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts @@ -146,7 +146,11 @@ /*RXEOB*/ 0x7 0x4 /*SERR*/ 0x3 0x4 /*TXDE*/ 0x4 0x4 - /*RXDE*/ 0x5 0x4>; + /*RXDE*/ 0x5 0x4 + /*TX0 COAL*/ 0x8 0x2 + /*TX1 COAL*/ 0x9 0x2 + /*RX0 COAL*/ 0xc 0x2 + /*RX1 COAL*/ 0xd 0x2 >; }; USB0: ehci@bffd0400 { diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts index f3787a2..9af473f 100644 --- a/arch/powerpc/boot/dts/glacier.dts +++ b/arch/powerpc/boot/dts/glacier.dts @@ -130,7 +130,15 @@ /*RXEOB*/ 0x7 0x4 /*SERR*/ 0x3 0x4 /*TXDE*/ 0x4 0x4 - /*RXDE*/ 0x5 0x4>; + /*RXDE*/ 0x5 0x4 + /*TX0 COAL*/ 0x8 0x2 + /*TX1 COAL*/ 0x9 0x2 + /*TX2 COAL*/ 0xa 0x2 + /*TX3 COAL*/ 0xb 0x2 + /*RX0 COAL*/ 0xc 0x2 + /*RX1 COAL*/ 0xd 0x2 + /*RX2 COAL*/ 0xe 0x2 + /*RX3 COAL*/ 0xf 0x2 >; desc-base-addr-high = <0x8>; }; diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index c465614..14057a2 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts @@ -110,7 +110,7 @@ num-tx-chans = <2>; num-rx-chans = <2>; interrupt-parent = <&MAL0>; - interrupts = <0x0 0x1 0x2 0x3 0x4>; + interrupts = <0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8>; #interrupt-cells = <1>; #address-cells = <0>; #size-cells = <0>; @@ -118,7 +118,11 @@ /*RXEOB*/ 0x1 &UIC0 0xb 0x4 /*SERR*/ 0x2 &UIC1 0x0 0x4 /*TXDE*/ 0x3 &UIC1 0x1 0x4 - /*RXDE*/ 0x4 &UIC1 0x2 0x4>; + /*RXDE*/ 0x4 &UIC1 0x2 0x4 + /*TX0 COAL*/ 0x5 &UIC2 0x7 0x2 + /*TX1 COAL*/ 0x6 &UIC2 0x8 0x2 + /*RX0 COAL*/ 0x7 &UIC2 0x9 0x2 + /*RX1 COAL*/ 0x8 &UIC2 0xa 0x2 >; interrupt-map-mask = <0xffffffff>; };