From patchwork Mon Feb 16 15:46:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Medve X-Patchwork-Id: 440244 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D6FFE140216 for ; Tue, 17 Feb 2015 03:00:30 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id AF6631A2213 for ; Tue, 17 Feb 2015 03:00:30 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bn0103.outbound.protection.outlook.com [157.56.110.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 7416D1A0F58 for ; Tue, 17 Feb 2015 02:51:35 +1100 (AEDT) Received: from BN3PR0301CA0075.namprd03.prod.outlook.com (25.160.152.171) by DM2PR0301MB1200.namprd03.prod.outlook.com (25.160.217.15) with Microsoft SMTP Server (TLS) id 15.1.87.18; Mon, 16 Feb 2015 15:51:21 +0000 Received: from BY2FFO11FD034.protection.gbl (2a01:111:f400:7c0c::124) by BN3PR0301CA0075.outlook.office365.com (2a01:111:e400:401e::43) with Microsoft SMTP Server (TLS) id 15.1.87.13 via Frontend Transport; Mon, 16 Feb 2015 15:51:21 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD034.mail.protection.outlook.com (10.1.14.219) with Microsoft SMTP Server (TLS) id 15.1.99.6 via Frontend Transport; Mon, 16 Feb 2015 15:51:20 +0000 Received: from right.am.freescale.net (right.am.freescale.net [10.81.116.70]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t1GFpIF5026808; Mon, 16 Feb 2015 08:51:19 -0700 From: Emil Medve To: , Subject: [RFC v2 04/10] powerpc/mpc85xx: Add platform support for the Freescale DPAA QMan Date: Mon, 16 Feb 2015 09:46:15 -0600 Message-ID: <1424101581-22109-5-git-send-email-Emilian.Medve@Freescale.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1424101581-22109-1-git-send-email-Emilian.Medve@Freescale.com> References: <1424101581-22109-1-git-send-email-Emilian.Medve@Freescale.com> X-EOPAttributedMessage: 0 Received-SPF: Fail (protection.outlook.com: domain of Freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Emilian.Medve@Freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(92566002)(50226001)(62966003)(19580405001)(19580395003)(105606002)(2950100001)(104016003)(77156002)(106466001)(76176999)(6806004)(50986999)(50466002)(87936001)(85426001)(47776003)(36756003)(46102003)(86362001)(77096005)(229853001)(48376002)(2101003); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1200; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1200; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:DM2PR0301MB1200; X-Forefront-PRVS: 0489CFBAC9 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1200; X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2015 15:51:20.6882 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1200 Cc: Geoff Thorpe X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Geoff Thorpe Change-Id: I59de17c040cdd304f86306336fcf89f130f7db2d Signed-off-by: Geoff Thorpe --- arch/powerpc/platforms/85xx/corenet_generic.c | 8 +++++++- arch/powerpc/platforms/85xx/p1023_rdb.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 74faab7..20b8f9a 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -198,15 +198,21 @@ static int __init corenet_generic_probe(void) } /* Early setup is required for large chunks of contiguous (and coarsely-aligned) - * memory. The following shoe-horns Bman "init_early" calls into the + * memory. The following shoe-horns Q/Bman "init_early" calls into the * platform setup to let them parse their CCSR nodes early on. */ +#ifdef CONFIG_FSL_QMAN_CONFIG +void __init qman_init_early(void); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG void __init bman_init_early(void); #endif __init void corenet_ds_init_early(void) { +#ifdef CONFIG_FSL_QMAN_CONFIG + qman_init_early(); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG bman_init_early(); #endif diff --git a/arch/powerpc/platforms/85xx/p1023_rdb.c b/arch/powerpc/platforms/85xx/p1023_rdb.c index 624d3d6..dc69801 100644 --- a/arch/powerpc/platforms/85xx/p1023_rdb.c +++ b/arch/powerpc/platforms/85xx/p1023_rdb.c @@ -106,14 +106,20 @@ static int __init p1023_rdb_probe(void) } /* Early setup is required for large chunks of contiguous (and coarsely-aligned) - * memory. The following shoe-horns Bman "init_early" calls into the + * memory. The following shoe-horns Q/Bman "init_early" calls into the * platform setup to let them parse their CCSR nodes early on. */ +#ifdef CONFIG_FSL_QMAN_CONFIG +void __init qman_init_early(void); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG void __init bman_init_early(void); #endif static __init void p1023_rdb_init_early(void) { +#ifdef CONFIG_FSL_QMAN_CONFIG + qman_init_early(); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG bman_init_early(); #endif