From patchwork Mon May 1 21:30:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Pledge X-Patchwork-Id: 757323 X-Patchwork-Delegate: scottwood@freescale.com 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wGyZY69NKz9sMN for ; Tue, 2 May 2017 07:42:45 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wGyZY3F07zDqJs for ; Tue, 2 May 2017 07:42:45 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0080.outbound.protection.outlook.com [104.47.36.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wGyJP4035zDq5W for ; Tue, 2 May 2017 07:30:29 +1000 (AEST) Received: from BN6PR03CA0008.namprd03.prod.outlook.com (10.168.230.146) by DM2PR0301MB0910.namprd03.prod.outlook.com (10.160.217.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Mon, 1 May 2017 21:30:24 +0000 Received: from BN1AFFO11FD048.protection.gbl (2a01:111:f400:7c10::141) by BN6PR03CA0008.outlook.office365.com (2603:10b6:404:23::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12 via Frontend Transport; Mon, 1 May 2017 21:30:24 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD048.mail.protection.outlook.com (10.58.53.63) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1047.9 via Frontend Transport; Mon, 1 May 2017 21:30:24 +0000 Received: from otc-sw1.am.freescale.net (otc-sw1.am.freescale.net [10.29.200.182]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v41LUGrd009537; Mon, 1 May 2017 14:30:22 -0700 From: Roy Pledge To: , , , , Subject: [PATCH v3 07/11] soc/fsl/qbman: Rework ioremap() calls for ARM/PPC Date: Mon, 1 May 2017 17:30:09 -0400 Message-ID: <1493674213-963-8-git-send-email-roy.pledge@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493674213-963-1-git-send-email-roy.pledge@nxp.com> References: <1493674213-963-1-git-send-email-roy.pledge@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131381478243747193; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39410400002)(39860400002)(39400400002)(39450400003)(39840400002)(39850400002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(3450700001)(8656002)(53936002)(86362001)(4326008)(106466001)(50226002)(38730400002)(2201001)(105606002)(43066003)(33646002)(77096006)(2950100002)(8676002)(6666003)(104016004)(54906002)(47776003)(2906002)(5660300001)(36756003)(305945005)(8936002)(189998001)(81166006)(50986999)(76176999)(498600001)(356003)(81156014)(48376002)(50466002)(85426001)(5003940100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0910; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD048; 1:pdTBWXrLAVZukQFWqh2lRrul5kwxOb3LcQ23Jj8HSjuS72uL+nts5Gaa5YQ00a7aQ6gyO+WgR8xvzYnwd/vLOpeS62J7fd0h07dow2WZqcVrGjpMNIIyka4lydqev7pwAWAhbHo40jbtsCuaagcW01K/o3+CZI4GkdXRdTOY1FVLCWRDYOThK9IseIu2VGv812LytDoWUCmcNM+rjEX/Gse0m82R3dLydelyO8dwMllK6w0S3GcVdJvhsq6xR8F+QqZp4xSp8yVip7aqTJcdRyBHkahuaTj3Z9SgIWy2xFLEZO0hGaN/F6qP6o3MfLq6SP6Og3hOWgXEaw7xRlWmeFP6mzGCZe7/5HVYgFPxXTQFsdeTCo1pJ8XqCd67NFk1r8Bad3DrkMm4WeeQ7PgPMzUpp1uzQFS0r8XJ2KTbzTTE23MlrhTgOjkVqoAQM3rx+EKGWswNlyAgY1NH3uagRiamc3EAfqYAznFzFO6VwmBYRCFwpiv/tlWjhIpfTPv4upcrakYZXPeaW8NOD68f1BIYzY0aR0ijG1qDg4SntHufR6befhVJPlzi9Tu3NOS/ydANOVUFRgVnkgsbg38WNa9cfC/l1HsUXdlreLry1YhJKQlACHqMqFmzWgjIX376o1O6tdREwH06Ceb9Zoc55GOmH1ku+2/9JDB4Tv6nZ9xlfMN5EWoQWNG8astzQ/qwYNF20dPffEZ2W9G6xUPMtICk2uBvixLqWSTsO+J52szX2LS1qEC45uy8RVel3H3u MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91251080-99e3-4b30-c579-08d490d9473f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:DM2PR0301MB0910; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0910; 3:IahLFxuxbkpoS+pH7srZSyWGBHh+23TN8KblzEvoN+ijZ34WE7T7k4j5enyFdzjJFMzoaq9oQKTLVr+p/LRxv2cnrP86c7xOwQvrPq8KK0WNsT50MnGqhx3DCEAb6qNopnK/YvdUMtq+KAFClXgSOrDgBtzWqdSiT2nPZgjMNDoZofkkALKaTfbTMccgXjY9XYvmqUD5IoAzUwpOIh53S0Tlh5OTlKF82f/XLEhTcn/d4Dip+UTumTn7zBHQ/hBRTCwLx2yRWqRW7zNQDwkR4/K2QsULhlqUS/9yGd/D37KATS8f5IK4IfABehi9abNDrlWendj7pvhgxSOxHvOvmMlf0hBV7iD+3k3tgtwo3PdHOMGpD+0DQWl/nUxIut9C56Ucz2roBfdNSch/x0DCcaFVocVpUc4xNOE5zewzr6uj654xmNwNFvf5czIbk4ns; 25:IGZPrk67qnvNYQwi3EsEMWpO8e+cVltSOXZr029pw/heeasxAcfI/BJwfQvQNSW4eMQ1XHmXxwITPmvECr8Wchk8+M2Dd+KT0Mil0ARP6/8+YTyDPQZwUHSNwX+QuT/wlhlkD1ZYIDvR7lthTrPYOGDX6D/6Lz3S/7faWTjLMLaTDWX949weTXuOHlLRrT0Wh9vcosb9CmtWClNpRVS6NiU4o4nIlYjhrp5Qmz0vTnVRHDYXGmFWANZhGQhuDgr6xZtH12LtKOMTScjc+x5Vlop8u8ZkhD/sXYfItsWOOe1gc5U3b+JctEIJzsVtjVmE6kbxx0XY6uwJbK8QAlQAOVOqNVrO2jkxOOPELc3YAt9UbI5403Bgb4MCUi9CZ63s5tL8+JJ/ii9cWvfi04grao+TymCr5R9Xh6FiVrHJyZSFJYAXrVzFsqc1JoidNuw66egvEtFm0nTybD0Pa0L0ng== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0910; 31:z5jfx1jP+IHHlMfZPdsR+tsWMqz+/DCn/HdaV+MMp5GF3MOhUB5lYq86JI3cWPjy3LjK/JtQv3NvseeJKcsPKo02y+dhSShxQ2qzx3KUCoGPey0mtD9OOcYIgJaunL0Q29od5voLI6ENrAmuRg3BtXuzcMIE5BR103AMZ8Tjf53q6nVkmBTuJhId9ICu6aB34BnidSOu2lTOvoPMG8MH5ukiZ9gzujXTSTZRXaEn8gGwkLI4po7EZcbdasaXmJAA8qVcZ2R98cSWr6NESr/gRP3AmSP3s+1iR/6G1tE+7vw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(13024025)(13018025)(5005006)(13015025)(13017025)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123563025)(20161123559100)(20161123565025)(20161123556025)(20161123561025); SRVR:DM2PR0301MB0910; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0910; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0910; 4:02XewVNlDlpswbHyoOttTMXK32XoEmgIbu88e7MM?= =?us-ascii?Q?LxblrkdFypXyNqOOWL6a27lR6WKaF+/BBoIjqOZK7xoUy3GfXlyhA5V0vOCo?= =?us-ascii?Q?sDuoeY8XjudJ8G+EZuiD0gUQN9hz2DRLZX+OCW3CG0v5E6mFoZFW+OkRLUeV?= =?us-ascii?Q?3TW+P0tjq2mLHtPN3g2fqetSxgdm7O5d3PBukS/nxSJSjRyyvRNML+8i+Jtt?= =?us-ascii?Q?vASPxklmOI1WCiuT5NQvTDRr12on1Lty7VCe/cnjgBVP3goUzWIg89MbRAS9?= =?us-ascii?Q?+yC9/DlBs6pgN7reNXcsGXLGxY+QB/7bOQPkmMpZLKpPPb+gcO25g4TrrhJ+?= =?us-ascii?Q?DYmYy32MsbjKy0cBUcvM9bJ3OxpEdQXco5scxLRg0m/0z1hdASWLoRcDgU2u?= =?us-ascii?Q?w21qhpvZvxqut/IVPvnWUGUi3PL0Ih4swBk0wnYjHoGA2JgEkW5UdhKE+LSo?= =?us-ascii?Q?685+BiUX1gpt5+hZl5kTXWqfg3345HfzNF1iaSsN/xk4Esi+oW+i3YUJTCQh?= =?us-ascii?Q?Q5jtwHGuhqDYGfkWd0JzZtKwnTvVu9CV6XieunlG9w4fEu8ShFYgYYVkakRD?= =?us-ascii?Q?pcppdOc20BJGBiijfDoqLfo+Q1i4tX1HauMrN981hENoJkTy3nw6hTgUg51q?= =?us-ascii?Q?vpZRgLGxi8B+m7GGkedSg7hYlriP5ehKRC/BPz+RxlcQ2bcR8HiGGvpQyGRs?= =?us-ascii?Q?VzsVN7NAAmt5gccGE5Ygcx7FAABFK7nUGDmiol5G+blS11e5PGbyjDrNaoVs?= =?us-ascii?Q?tSAk7MZKi3uYgzcHYTMDiU+kr42a4qVa64H4UjvQHR3OaeDN+UQ8iONQE4Re?= =?us-ascii?Q?CG6LBhLQHTXK4TjaGkHX0+vJMSVaXznjHf4ciTyUhTwI79vlw8d6b3o1w72o?= =?us-ascii?Q?eHpoI0kr72JAK6mUwNfOrFElNPnvtnhsLR3rOnAgsWo3JvU4t82qGYg+SttU?= =?us-ascii?Q?hQzJOVjnt63g7Ty5dtilok7YNmu1B09xi6W3LvRtubdIYNzTG4uL8ebB7h/Q?= =?us-ascii?Q?8h7q3/7Gcx9Vf9hinyTDpkpo?= X-Forefront-PRVS: 02945962BD X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0910; 23:Y4pn7rpZdJRG2J70SdQghOXSxLK3nN28GxiERW7?= =?us-ascii?Q?+LiYSCQ6vG8JY0G0N/35SHcxBF8sHfnJZMLxfM2x684iZkI0gxmnkSzqQdbz?= =?us-ascii?Q?oIeo9beGecmJYC7RJqNpSZWd4j6Vg44nPK1JsQTAnj2TNZ/b/XZQu18jzr2R?= =?us-ascii?Q?LG0nuU2G0WyNOiWDEjOedGGUbTiU3GuiFVB1+IldCzO96DrxfjJjXxvCGO+C?= =?us-ascii?Q?LJAGY5X0j9uS45AYmO9gHgi/1u/5XZzgoHepoUmJutbR19AcD/I8uRYIhJIp?= =?us-ascii?Q?mOSJWw5SZZvPZ+Mkhkz2+wFwONF8e4L21J6LK2lQhUXNBNEhKNCIX5oYlKkj?= =?us-ascii?Q?INrdaAkjRUFYIQN9OJFD0YrGMAgKRxXD3i83yepPijfWf+Z00nfYroj6jX3X?= =?us-ascii?Q?O48cGvP95EznkLm4HW11fBs20/EwZGTea6maaGdHCdCJ0kRemROOkUSBaGx0?= =?us-ascii?Q?M5GVf6yiO0fdcSnR52bchufDFO63EmnJ3zrL1fpe5xQ8fgCfcatavuSPJUUI?= =?us-ascii?Q?Lt1s8XbI56br62RqgKt2eY07/wwZDMKgtsuMVKq+fGwm/Rs0VzCx6XUi3DYG?= =?us-ascii?Q?93Z7hXcflX2j810awU3pubcL2Rf9U4aP/m+9iuNubeS04SnwJ3w4j2hSuyD8?= =?us-ascii?Q?ioEbB+631wW945lat//nen4cTgmrfHNBPx2QVR81aTIJMdm4Ew+JZhdMyxgI?= =?us-ascii?Q?TFR1fXbbgjPNiH2P7QceQjj3zYyNf3aXRYPHfiK5bePYS3nokYnDxBVAupAw?= =?us-ascii?Q?B0KGb1wkFCb58deDbucJBkYxLgK20CXTEC94T0gLTipim2iEdiJ5QFSDpH0B?= =?us-ascii?Q?r5KuwARq76ZjXUzJOP6B8yeRNCrRHy8Z3wwtz5EqXQEizmbwzsuLYF9TXZPU?= =?us-ascii?Q?Jc76635+hllGD7QrrGo5tvOGYeBxg8WaQz4oa8/Xe06mPQEtMtaJTUCMutU3?= =?us-ascii?Q?O715dX19uLQEDGUSW81KUZvEUpI5H2W66paKNp+ik43q1lYx1hY84ZJ9cicd?= =?us-ascii?Q?I99RZAI5bceiUO+a0wp1zI5CqqPeXbgoUEFxGO4dtey7ffbaa5PPNwSMh099?= =?us-ascii?Q?y1YJju+ft2aJt6tEIA/w1H6QyD/W67mzQlQLpAU83bIBKu8KdJ2rNYG7IZmE?= =?us-ascii?Q?y+u3oSZIB6ZB8iiWVDWCFHNtT9tjIiTfmb/woKDEIfWv0DFlKxDDb36gVqus?= =?us-ascii?Q?5Xyoe4Ub0eb/W7YaARbn0muccuqQ9B3uZfY/N0b71sjvUfW1cc7wf7Xf/nXi?= =?us-ascii?Q?Ox77Pax9fhjk3a3M67eOcou0/ctf/CLQ5R71FnFLlXFFVHnlYZ7kETiBcUZS?= =?us-ascii?Q?lHQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0910; 6:C7ksgN/DjehPmhjO/DVIQAo3pMTlbaiMky1uZL4K8N1zFx1EpH/EMsw1npGUel/NDOulzyM4VTfVWsoqZYeFr4pnqvCUNDh18m5zUfBBFm4NGI9n1H5X3QmmQVMEEfYqh51Kl2MVZdrnv9QP3fsi9Z22Gj/MfbjWKRYPMG7o+WdsV0Cte5uAlGnC2Agffv7L6stUGQBLiLgeFnk+urW6Wf3vaKBg2CU0Wsh4IToaxfJKD1TASD2giJDBxK9F4cIm7oKOaIrxZ645lD9MRHMd1pjqKlWi5iuw7AUVSXMUItsEuzNkzodbi2otOthpKN/ilR24o1WcIz59+SIbEnsvJ1Lv/ln80wCwlfgHVOBLuqFPiZPrQDW5O3BRRe6BGNLG8ayqQLl4Tj4/L7jvAS5c6Ars0WIPh4tztihMflAsMO7UISVveRrMMXz+BX0YXodHNhP+IzqsfOz1l7D5y12fgROTc5zcBYtF/GheXmPRMZIdJIarRYx4zXTYcsr/T6rCS/O6vg0SH4uZZgErqTYkAw==; 5:YSY+SgHuBCRwd2Bd4qeGOD/SVWztWRIr0qHFb5pHaHUz5yOXmTH1Bahttd8etgZ3pLNOwYQ1b/GG0E752iSBpSNhxF87MxgE6nhjxd0VOm5/U0qI2/QuMfxgGpZAGw9BwNYM3zZ/fs63pO4gP2MbHGqfQbEnc0TLrkXmCO7x7sdF4VarCZUiHpFFTzpGSZx4; 24:N/v5STFujf9sNREbu42kR0ujE3gJ7l/FAfk5K0fqLgAP8EZdvg+FHV1kAaVrQWhu5+Vh/ZudGvtSyzlYMu8IuGB92rJwYxBNTCckt4anD1Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0910; 7:LWXkiGUgZ70T6vj4y9oLmPT8X8LbrD0ieRRKw1AVCBkhgnS1dHwsf36XSz52J4QeRdNSTV9V5/MCUEy4PVM+bES6iTrNOqNT1UkfWRiRrRdtqX9i6Tny7b3Lk0Li5wzAnSUKVoXYUTc9FdBiw/+cMZjqy/I4cfcHSrXoRpDCgAD11FmPyUNBHFG3PEMkPkcEzJxF+27phciZfcyD5po2NmicJqrzesqJsNPoyi4hGWC0UVUC0NE9Yl04wC/AXzXnOAoBc4f9pduFlBm/D0X/HwPDQgwkZicGgHJ7L2duNV5+Ime7SaW+2HR2uFhLIIYNj+2RN+Xr5AGZRtHpmzcSvw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2017 21:30:24.1407 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0910 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: roy.pledge@nxp.com Cc: roy.pledge@nxp.com, madalin.bucur@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Rework ioremap() for PPC and ARM. The PPC devices require a non-coherent mapping while ARM will work with a non-cachable/write combine mapping. Signed-off-by: Roy Pledge --- drivers/soc/fsl/qbman/bman_portal.c | 12 +++++++++--- drivers/soc/fsl/qbman/qman_portal.c | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/soc/fsl/qbman/bman_portal.c b/drivers/soc/fsl/qbman/bman_portal.c index 8354d4d..d37f563 100644 --- a/drivers/soc/fsl/qbman/bman_portal.c +++ b/drivers/soc/fsl/qbman/bman_portal.c @@ -125,7 +125,14 @@ static int bman_portal_probe(struct platform_device *pdev) } pcfg->irq = irq; - va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), 0); +#ifdef CONFIG_PPC + /* PPC requires a cacheable/non-coherent mapping of the portal */ + va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), + (pgprot_val(PAGE_KERNEL) & ~_PAGE_COHERENT)); +#else + /* For ARM we can use write combine mapping. */ + va = ioremap_wc(addr_phys[0]->start, resource_size(addr_phys[0])); +#endif if (!va) { dev_err(dev, "ioremap::CE failed\n"); goto err_ioremap1; @@ -133,8 +140,7 @@ static int bman_portal_probe(struct platform_device *pdev) pcfg->addr_virt[DPAA_PORTAL_CE] = va; - va = ioremap_prot(addr_phys[1]->start, resource_size(addr_phys[1]), - _PAGE_GUARDED | _PAGE_NO_CACHE); + va = ioremap(addr_phys[1]->start, resource_size(addr_phys[1])); if (!va) { dev_err(dev, "ioremap::CI failed\n"); goto err_ioremap2; diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c index adbaa30..b5463e4 100644 --- a/drivers/soc/fsl/qbman/qman_portal.c +++ b/drivers/soc/fsl/qbman/qman_portal.c @@ -265,7 +265,14 @@ static int qman_portal_probe(struct platform_device *pdev) } pcfg->irq = irq; - va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), 0); +#ifdef CONFIG_PPC + /* PPC requires a cacheable/non-coherent mapping of the portal */ + va = ioremap_prot(addr_phys[0]->start, resource_size(addr_phys[0]), + (pgprot_val(PAGE_KERNEL) & ~_PAGE_COHERENT)); +#else + /* For ARM we can use write combine mapping. */ + va = ioremap_wc(addr_phys[0]->start, resource_size(addr_phys[0])); +#endif if (!va) { dev_err(dev, "ioremap::CE failed\n"); goto err_ioremap1; @@ -273,8 +280,7 @@ static int qman_portal_probe(struct platform_device *pdev) pcfg->addr_virt[DPAA_PORTAL_CE] = va; - va = ioremap_prot(addr_phys[1]->start, resource_size(addr_phys[1]), - _PAGE_GUARDED | _PAGE_NO_CACHE); + va = ioremap(addr_phys[1]->start, resource_size(addr_phys[1])); if (!va) { dev_err(dev, "ioremap::CI failed\n"); goto err_ioremap2;