From patchwork Mon Jan 25 06:38:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar Kushwaha X-Patchwork-Id: 572613 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 55C57140271 for ; Mon, 25 Jan 2016 17:39:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F7CAA74D5; Mon, 25 Jan 2016 07:39:20 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O0uJJY4hWg9t; Mon, 25 Jan 2016 07:39:20 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 76DCA4BFD9; Mon, 25 Jan 2016 07:39:17 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E39FB4BFBB for ; Mon, 25 Jan 2016 07:39:13 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NIxmD_LS9mgq for ; Mon, 25 Jan 2016 07:39:13 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0087.outbound.protection.outlook.com [65.55.169.87]) by theia.denx.de (Postfix) with ESMTPS id 0CA0A4BF93 for ; Mon, 25 Jan 2016 07:39:08 +0100 (CET) Received: from BLUPR03CA002.namprd03.prod.outlook.com (10.255.124.19) by DM2PR0301MB1264.namprd03.prod.outlook.com (10.160.220.11) with Microsoft SMTP Server (TLS) id 15.1.361.13; Mon, 25 Jan 2016 06:39:06 +0000 Received: from BN1AFFO11FD021.protection.gbl (10.255.124.4) by BLUPR03CA002.outlook.office365.com (10.255.124.19) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Mon, 25 Jan 2016 06:39:06 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.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; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD021.mail.protection.outlook.com (10.58.52.81) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Mon, 25 Jan 2016 06:39:06 +0000 Received: from b32579-VirtualBox.ap.freescale.net ([10.232.40.78]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0P6cntk029022; Sun, 24 Jan 2016 23:39:04 -0700 From: Prabhakar Kushwaha To: Date: Mon, 25 Jan 2016 12:08:45 +0530 Message-ID: <1453703925-1294-1-git-send-email-prabhakar.kushwaha@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 130981775467041097; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD021; 1:1V3CAS5QYsNBd0OTUnlUcSt4jIb7PsaWEMXDcUf2IfuS3Hhnlgo8Vp1lakcYlJtNUqJmBLW1owDjmakaaOSCAWFx+q/4vBIQT946Vpd0xtNliVrv28tf54CmPiiTV5Fyjy4eyIzaul4sLKrtG2mbEzHJvG8CZ8adBvbEVMjrFR0vxP1i5AM9Kk7aj4irPHx20MGlVknB/U+/9xuV0GEVzjMgcpa9cAfIFrchA/wxe5fCK1rrsl0Ypt9JQG9W7gelstrxzT7TgzlO+MbcnerKKjni0/kwYV/V+FAij9tNSN2WAiVStygBaCQZEwKM1ZHqHIapRg9CF4FWhwZpiVlsEEHkodtRld11cyhBZsOQT5KvAumQHQMrZnZGOYV6DGjpHqMdukBxLvAVuzFMwrTK1ylUFMH9CpWHPLo7BURe5kyWd4Xwp9ZLHzI2y5qi2/gfgOEQPRhFv/E4ZoswrNaA50/LhaTJMaFnYYQYkH3Lb9BbtmntpySQkiEKg0LCtM52PyV0kesHdJiMjbL6XxlVBywbUrMgoK7tUHycv7cJWn50xkbdUvVIluFIbUyKXsIqaRIwriS/fBuh1J+suPomWw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(77096005)(5001960100002)(229853001)(110136002)(1096002)(1220700001)(104016004)(2351001)(11100500001)(6806005)(586003)(5008740100001)(106466001)(50986999)(105606002)(97736004)(48376002)(81156007)(189998001)(47776003)(19580405001)(19580395003)(50466002)(2906002)(87936001)(4326007)(36756003)(85426001)(50226001)(5003940100001)(86362001)(33646002)(575784001)(92566002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB1264; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1264; 2:uhIpd3hgzZb2wqRFk+2JEUk+Y9NsWB5cB9er23IKOKFmydTi2g1uMo3GjGHzDbucAx7eZd5TgmN7UtqPEnhnbnSWyvDrC6lIUq3u+MKm1+GfSQwv8jhCMVYQFiEJZAdWArkILGXoXyWENpOs/Ta4Lg==; 3:oOXI/CWfHeJ8+66WDUisD57E72xkjstBj4yd2MRtiL4L+hB7CHjFUqWq5miq2AalevdeFHM8Pb1aPD750GLpngJikIuY/rT5wDTvdraaE9byRnLMrxCSOPQrzPQ1CwvV3xzeC/Xrc5vnRPKvrrpy19diZmKAY37iC64rTQ6Zsf/chVr9WQrfRex6VRrghe4Dh0NQOBbaH7bSV5+amlPiS5BNsZDcYPNEG9uqzjpB5+8=; 25:5HJRzLB5fcmFh6IPFF6euVZKXqCy6byllqmbaa0gYN1h1Obd/UX2PUsiEgMkfDaMCUQ9wn5F49M1H5mRP0nZV9a5yVKMGSHHW0Zm3yqDejssi0l7hWypqmxfqTGc5KBO3OjS76YZn0Saqo3FvbzTwSLvh4sXWT75Y7rxv6prL49ingHRGKauXqcE0vnefsL/YPO+gJpukLIgnq2P0of0obsXRYEMTtJrMSfZacLLVImJBmy3hsmd9BwLT08bdV39 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1264; X-MS-Office365-Filtering-Correlation-Id: a3000c8d-2301-440f-efe9-08d325523937 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(8121501046)(520078)(13024025)(13015025)(13023025)(13017025)(5005006)(3002001)(10201501046); SRVR:DM2PR0301MB1264; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB1264; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1264; 4:NNpILF8G6b4cuc0QztxeyGP/DBsDbs3MzICYk1Zlc7zrMV4e+YVpN+boUATc5sY12YP7gSx2kT9QxwVCB10aOKBbQ1o/kiECrmvXIhaPEyj1A7vVqCZ8kSR3lRUJDq3ryxU1VPLE6/b0bY5UeyZZF9YUBcLfSYin+WmkBgC8gSumGVP13SIiofLmsahlJgwAUs8BjuzEXD2zViJMiowQmMWe4187G4eb4Iy/etHiAOuJHuMY9XarCdtunKJhCMohlvydK4TfzVacBByaf0PkIjMYXGYVlFPfms7ARLDTTYZkkhmq0I8gNGLv3rJZaoV+T4AIr91f/wMO8yZrIxZO7yKQXWp6XeuyGildoyMaFEkEMdQuwRPt12P2/5TKXElMs9qkaFcoNjnRduQkIHKgvVgWr1stXFDYnys/yQwm43euWCiYLWh2bDvdKYsfRxKpVkJy2n0bSou0wR1KDuxX1hf7KA1HaEVz8j4O9dU5nw4gSGAI1t5rc8Ma5soyE0xKXjB7vmqHgN+eS7ibH/LxWA== X-Forefront-PRVS: 083289FD26 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1264; 23:TUyXltKC6omD5CjVT1Iw5sWemQTSG69BuYATN4z?= =?us-ascii?Q?X4BqxInZlkh20P6FQLvkHLYqnBwBV/+M0urWSh1FLPOEGF0yULx82VV4Tm/R?= =?us-ascii?Q?0JmkmkKmZ1DdqqxRC4cZRKlGOOPx4mNDGeabf5PFi34u4sRaTx5s+1aWeuzg?= =?us-ascii?Q?A61fuD46kz+5WU1k4WhGeq0TNQmvXgmenhsSpmM+hd8TrsNG+cyYS9/Ruj6P?= =?us-ascii?Q?PPZj4tYcag+ybFckXmiEET8AQcGq/jDrxfGmAgvQDDDOWUpEyvwsSBDFVL8g?= =?us-ascii?Q?1kA6jZ/X/Ic101KKAd9/gSjiGYM3l8vV5cV3z1he4LDIgA2bwU1s1lQIigJl?= =?us-ascii?Q?0CE/eHFJRdLb703miPM6tGtPNM2jVDS9PhGs8glK6RGhHrQN//ceiBAuITr7?= =?us-ascii?Q?3GbOC9v+zEZFCa+L6z2Mb4GEwEfRypMInvhOsbaAbnQN4oNkO968fZG3iQaw?= =?us-ascii?Q?oS8JmofjaiAucve5URF9r2+5sOHMlcmJS0FVvDMhyz/PZv51sdQfIJWJIm3b?= =?us-ascii?Q?i3uTuslhKnhWyF9fMmivrnyOBYvz507USedLJo9bVevjsT/a8yDmVlU4xs8a?= =?us-ascii?Q?pAGSSgEuYsrATc6qY4JWH6di9O9hzlb/f3S08aPNiVijQ8IrKS7JJWiMEU6Q?= =?us-ascii?Q?rTDJXk0eu5U24uIpuhSz3xo6huKwvhfcPKmvR4xXCFyKYdEyK9vlYSX2TzzL?= =?us-ascii?Q?VGXiaxZa2imrCRjNJcu6s+3JrgBqMXDHo2xkWKZWxWTCQablh9sOQdeEsYLg?= =?us-ascii?Q?bUbR8ln7ex07sxU2uE/GWMnTYzQy3F6QyLBqqoKfCySrR+maOfZqKCw71j1/?= =?us-ascii?Q?djtx09aIB/GZBbI4AvnXy5F5QLpi5hO1PYDY3vQgQfDIu3E6qYiy7wfxcYS3?= =?us-ascii?Q?OhdbnKl08bPECv0ttso8qix4bZQGuch3p4Q+PKL/996K9WN3do4rTOvEIRyK?= =?us-ascii?Q?lHbQZu9p/KUwJiBpRpar5h5YCdvxjJzKInAgtIk1lPLkSdBHIQJ4I4lI+7he?= =?us-ascii?Q?MSDeDnddqS2BRW0rmckFL9zVgGpmja2TTOPaVU15ZBXCXQK3d/Pc0D9iWoXN?= =?us-ascii?Q?R52UGyVPL8iqlghId3G5Mgo/Fg+haHk6jK1o5RMFV8Wu1pKNqDw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1264; 5:ususcCa9OAf8wGCUfAXkUxC4PpDaCiu7VgPHOl02y2iFXMpzDMLOjwDoI5pfx+h06eFIxzrGN0om2TiwQBybJbgmHA906xNEerK3tYm/OSya1rFukRqB9idJ2++7FB+A0fhEsZ7NqeQSvQCKfS+H71F0Hm6zYgS16Eqvu2YnSJQ=; 24:0CJmDJSWxrs66RqRgzdBBU9EImXZ2uXWIXS7zEfoxEUf47x7bePo1i599tbi4tO5EaZu+dN+SLCAVxgfFPF2kmz85eCou6QZtLEiiFXy6HA= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2016 06:39:06.5169 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1264 Subject: [U-Boot] [PATCH] armv8: lsch3: Enable WUO config for RNI-20 node X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable wuo config to accelerate coherent ordered writes for LS2080A and LS2085A. WRIOP IP is connected to RNI-20 Node. Signed-off-by: Prabhakar Kushwaha --- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 8 ++++++++ arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 ++ arch/arm/lib/ccn504.S | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index 41e1704..9c69ed1 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -18,6 +18,14 @@ ENTRY(lowlevel_init) mov x29, lr /* Save LR */ #ifdef CONFIG_FSL_LSCH3 + + /* Set Wuo bit for RN-I 20 */ +#if defined(CONFIG_LS2085A) || defined (CONFIG_LS2080A) + ldr x0, =CCI_AUX_CONTROL_BASE(20) + ldr x1, =0x00000010 + bl ccn504_set_aux +#endif + /* Add fully-coherent masters to DVM domain */ ldr x0, =CCI_MN_BASE ldr x1, =CCI_MN_RNF_NODEID_LIST diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 49b113d..f5a8595 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -91,6 +91,8 @@ #define CCI_S1_QOS_CONTROL_BASE(x) ((CCI_RN_I_0_BASE + (x * 0x10000)) + 0x110) #define CCI_S2_QOS_CONTROL_BASE(x) ((CCI_RN_I_0_BASE + (x * 0x10000)) + 0x210) +#define CCI_AUX_CONTROL_BASE(x) ((CCI_RN_I_0_BASE + (x * 0x10000)) + 0x0500) + /* TZ Protection Controller Definitions */ #define TZPC_BASE 0x02200000 #define TZPCR0SIZE_BASE (TZPC_BASE) diff --git a/arch/arm/lib/ccn504.S b/arch/arm/lib/ccn504.S index 7570c7b..1e07876 100644 --- a/arch/arm/lib/ccn504.S +++ b/arch/arm/lib/ccn504.S @@ -59,3 +59,24 @@ ENTRY(ccn504_set_qos) ret ENDPROC(ccn504_set_qos) +/************************************************************************* + * + * void ccn504_set_aux(CCI_AUX_CONTROL_BASE, Value); + * + * Initialize AUX control settings + * + *************************************************************************/ +ENTRY(ccn504_set_aux) + /* + * x0: CCI_AUX_CONTROL_BASE + * x1: Value + */ + + ldr x9, [x0] + mov x10, x1 + orr x9, x9, x10 + str x9, [x0] + + ret +ENDPROC(ccn504_set_aux) +