From patchwork Thu Aug 17 07:31:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ran Wang X-Patchwork-Id: 802396 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xXyz21ZLrz9sN5 for ; Thu, 17 Aug 2017 17:49:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E24B0C21F4E; Thu, 17 Aug 2017 07:48:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B228DC21F29; Thu, 17 Aug 2017 07:48:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8DA93C21EE0; Thu, 17 Aug 2017 07:48:39 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0049.outbound.protection.outlook.com [104.47.37.49]) by lists.denx.de (Postfix) with ESMTPS id 34748C21EAE for ; Thu, 17 Aug 2017 07:48:35 +0000 (UTC) Received: from BN6PR03CA0011.namprd03.prod.outlook.com (10.168.230.149) by CO2PR03MB2261.namprd03.prod.outlook.com (10.166.92.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.21; Thu, 17 Aug 2017 07:48:33 +0000 Received: from BN1BFFO11FD025.protection.gbl (2a01:111:f400:7c10::1:103) by BN6PR03CA0011.outlook.office365.com (2603:10b6:404:23::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18 via Frontend Transport; Thu, 17 Aug 2017 07:48:32 +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=fail 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 BN1BFFO11FD025.mail.protection.outlook.com (10.58.144.88) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Thu, 17 Aug 2017 07:48:32 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7H7mNcS022692; Thu, 17 Aug 2017 00:48:28 -0700 From: Ran Wang To: open list , Albert Aribaud , York Sun , Suresh Gupta , Sriram Dash Date: Thu, 17 Aug 2017 15:31:23 +0800 Message-ID: <1502955089-2049-2-git-send-email-ran.wang_1@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1502955089-2049-1-git-send-email-ran.wang_1@nxp.com> References: <1502955089-2049-1-git-send-email-ran.wang_1@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131474297124687351; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(97736004)(498600001)(53936002)(50466002)(54906002)(48376002)(5660300001)(305945005)(4326008)(8656003)(626005)(189998001)(77096006)(7416002)(86362001)(47776003)(104016004)(33646002)(8936002)(2950100002)(6666003)(106466001)(8676002)(81156014)(2906002)(105606002)(81166006)(5003940100001)(356003)(6636002)(68736007)(36756003)(76176999)(50986999)(85426001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2261; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD025; 1:V7Hxd9EPh7JpU13kpBXEtEe6rFOUppGH/2ow90MPlcux5RVvsDYY4qjXUNMD62dz6wYIGKIXAymQc5P14wCVMtKzKKA1edIdD8M/w1XNc/oXRVXj42oWqk0UXfcLVjGx MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7365a1b9-b7df-4e2d-a1a0-08d4e5445b97 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(300000503095)(300135400095)(2017052603031)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CO2PR03MB2261; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2261; 3:V8nTNdzzMcdSoBpKv8OEyYVHsJcIXc0dLVm+M30LOVjjV/J3HtWVKDJ1isx1T3ltH+8+TZDwFt5a7QzEDtmvvSw1PPwMBvmLgXt/75FQbZxUIjlguKU4Km9A1leqTG6k72OFVd892XlIz1Lkukl4cAvkhdPFfOPi5q3kf4Ut66PXd10WcM3Tdbxi2256AirRIBZ3iEoS8vCp9f98nTi2gMfDNvc1UN/kEWZPJDuGT34I1tHl3ELLkcssG2xg1vBKPTDotImKVQCkRryM/TXxj7+HVG4GBMCA6ag7w115aI/gBgkGlbnRQGX17A891aidc0iTaLNLKH6hWU9K33Rzs7GKAUW9AN5HQhPtL2E1M9I=; 25:cxSezM2b7ZPeozFyFSeqx6XesEWWKgVcCWvtQr3Bz4dvDjEs4UgtfDwFdgxR/1fpFAAhvIenCbsnhKYMFQcyqmAXpKWiAU/LFnOzwxSwBPrl6rlgB+dz86G/eJ+4migAB2SHwlprHx+tH8SgsVIXMmJsLZQ2D8SAubNsrnZ5pzRl3ZTWp3fMuf+tddrTu/GafUHzN9FrFMSKS++mLPXGydcMGIDrk0keJ4oXU0kL+slBD8MgHn3JpvCvF2dzwAD7d5PUdd8hkiB27uUvx9mOWg/spUN59ltP43zhezWvKauxcBddqUiKg5+vQ5Ge9FWpXX/509MLBhTj+f0VonEWUg== X-MS-TrafficTypeDiagnostic: CO2PR03MB2261: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2261; 31:rEHvJhWMLP8okErbYCo9Dm6Rys04yTgmOcjiT0bl4hlvpqhtNeaV50OgldnYnO8uVrHn+AHksjFGm4zM8FiBMRFj+1hperqK69mUNW2m9Vj9yhsf6rYsMbVFsH3+GQ7r/umcdiCx0EVwIIB3ELT54FBH71rltloZLuQEP/x2JJylrAqC0zkyMtzDPFHGMEx8d+1hzVgUN8Zm/WmhnOLwMlreBm2RmTq+nHw8Vj6G4fM=; 4:1u2mMknkbkKlD6TR7v0QKD9ktlUzltf3DFUZ2O4++MuKE/EeGrg1DXC1ChwQlxTxJsMHtV9edveG/UWdPV3uBUB7JFKAUCXGbIw9AQr62opHgEv+6McwP6979bnzwuN3Di95WKUmAwgxLoqPOkY1h+Iv1fA+X77uVDWKogh7s/bKE7hW9my8U3urnoSDDQRsrfacz10kfCDeq0GGy62EA3/9v3li0mo3LpIqaYuQROW2X0Rv0xpB7BvlzTcRuui+Xl2TMqSvYgf4EqveeNnVPn13nAyMyN25ATnORzXrTsM= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13016025)(5005006)(8121501046)(13018025)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123556025)(20161123561025)(20161123565025)(20161123559100)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2261; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2261; X-Forefront-PRVS: 0402872DA1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2261; 23:cVlpkrBg+PC0E5wm8Psi5gTwCa1h7vHTiwQXP7rvx?= =?us-ascii?Q?pjiIgKR10JTGDDi889CrlVsHo1ZlS89znT4yJzICqpaW/eJNhfBJzSdepXNx?= =?us-ascii?Q?mdi/upEMlxwBP+Uv0hY1cliiCBxCZKt3ByziV4S2vuaDRFznuExmCRfOkK1W?= =?us-ascii?Q?NOFNzjdomy7CEG0HQhWilskvjOF06ytjlTIjFOmuDS0S2Ld22igT9m/PYOJk?= =?us-ascii?Q?Ow6z62t1niocGdjt0W5uU7G0dVJzVhLB229iPuksZ+8luBY6ZhpUaIiH9fcY?= =?us-ascii?Q?ACRNQUhONMaXkjMw9zA9RLWY6oti81NVIWQ5sZqm+BJpOTOrAuLZM0dQJj/T?= =?us-ascii?Q?mrMVX2wG1RZDhNAZQyMdnclqy6j2bHSF1hdDHJcWeHPyOtk+xPHMfnd3+c+w?= =?us-ascii?Q?IceL66luXhngEdex/FUVF6lncxCi9PNeDiVtsBIsNRBK30+8uh5q1pgwmJ1P?= =?us-ascii?Q?56GErrmivKseC7Ak+5Q2HkxWx2Bay0edTd8Inr2pCl2BuSy3clFWX8g3K9lX?= =?us-ascii?Q?e8aaQS62y5ymE1BdUqja/+wwdDzcGwjsvYa5sn5kWg1qHoNpObUXXuE4RruE?= =?us-ascii?Q?IhVTGIDzf3efA/n/jMsJrAjA90CYGTS8ruFMkdDaTr7YGPkCEUXpSCf8nehG?= =?us-ascii?Q?pA/4oAkk07F4L5Bv/klffM6CS+vHc/a+Yi+TZRQ/Uu2UbFMKzkOuMMHpNSQ0?= =?us-ascii?Q?oA+yVBthr61vYx7A9D1QA/vlaMaKsGgBRIolpTy7SkaQYnm7QvJ09vOrQ/+4?= =?us-ascii?Q?i7SLu1MgN4d4POyRS+AMGfQ3C2E/KhvtiNVkKqpFOC102bh53D1P4/ofrMIo?= =?us-ascii?Q?QW9S9r5E1tXcFRmN4Nv4gBxAh6S3nZ+85D7PgZvO1vrIsBeaRaPSg2TYbA/8?= =?us-ascii?Q?vPl96aAjst4U+/GkY+QNx+eC+FX/iSrPNWunvvmY4e1GPSDaJ7GRn1LQWVWQ?= =?us-ascii?Q?gcuKZxiVDP24YEb9CeXOtgpKLmeo2NjvRLSRG9qw428D9flHMtWuVPnvFvau?= =?us-ascii?Q?MhNCB6XjQ4cgn492nRG7H37D+zdVM49eQLIlEO0GcFPxcDPc346VQ0lawhHQ?= =?us-ascii?Q?aTqPE3xKajTa9QaGVy4y/c4BXZA240wW0Ff/HG02azWGNghpcwKu+hWjzQpJ?= =?us-ascii?Q?L7OmAwta7U=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2261; 6:354LfpJfsSg6TO72udDLWsdU7aA3PtmeHJvV9FQdPtrhmy5x9XwkXfZ/+Exm6Pt6Q+s/FgRJkcvtjTxy4iFFIj4lzXKQglpUMk6abab2Wx6D55VJIgvQJcPhcKPRAXq5cDJg73Zp4h8Y7pNtuO6kBwBKwon1A67K8xe72Ky70o2qGvGn4hQLICGm5D7/XU6EKYAHK2tZ8YECthuHhZgsZVLbIaSz4dd+gd5as2XkvCPgSZF8ZppYQrcoLzhgASZgfN3uZDj1OVcl3e+4aUS7PrHJG1coJp8LvEb8sl5W3gds9brAzeqkbvj8kpwstCIge33i9Gdnqlcobcx2E339lQ==; 5:25NIDxIXIBcOKw+U2aFDvKXFnS4Q4TFrI52E06s+1VY6baeneiEz5E57EQoc4wcK8mZe8EUCGikfbEMOiyWRrJbNUlE3Hfro3l0hoXf+/9WeeCed2mpsVTXK56OrnBmFTEPiHsQTRu5ms5UftZbyQQ==; 24:fMtjt/V0nV3kpEhv4csSNq71u657ITiRUzxtOhIW8dYyQCp835oLm0FuyAf4CczkeSJRdMOeLj9JYhK9ffsJDb/xZ1LxFnNP+ssxvWHLuBk=; 7:dU6qiShaeHmHcOmBhRdVx6R+9mB0iAB4Ze1XQ+qlxbEyxq56l5ZeBJ7o/TB4n5TQbfMyVr4msTReLuIvoieEwxAJ6SyVBwC2GxuR0sB2ozBYh2uIcrpqQ+/4W5sZM531mUaQzU2hJPhLjwo2PySFWqAdDk+Rm1aMVoJ3snC8hhQbGwq1yYC8lVN76lXK3xOmlHOtxM7yYb3Mwxfx3GU0BxAj/cZkkyLls0xtjRVBO6g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2017 07:48:32.0787 (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: CO2PR03MB2261 Cc: Priyanka Jain , ran.wang_1@nxp.com Subject: [U-Boot] [PATCH v3 2/8] armv8: Add workaround for USB erratum A-009798 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The default setting for USB High Speed Squelch Threshold results in a threshold close to or lower than 100mV. This leads to Receiver Compliance test failure for a 100mV threshold. The changes shift the threshold from ~100mV woards ~130mV resulting in passing of USB High Speed Receiver Sensitivity Compliance test. Signed-off-by: Sriram Dash Signed-off-by: Rajesh Bhagat Signed-off-by: Suresh Gupta Signed-off-by: Ran Wang --- Change in v3: Use inline function to make code cleaner. Change in v2: In function erratum_a009798(): 1.Put a blank line after variable declaration. 2.Move common code together. arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 5 ++++ arch/arm/cpu/armv8/fsl-layerscape/soc.c | 27 ++++++++++++++++++++++ .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 1 + 4 files changed, 34 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 300f5ce..2dae539 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -23,6 +23,7 @@ config ARCH_LS1043A select SYS_FSL_ERRATUM_A010315 select SYS_FSL_ERRATUM_A010539 select SYS_FSL_ERRATUM_A009008 + select SYS_FSL_ERRATUM_A009798 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_DDR4 select ARCH_EARLY_INIT_R @@ -45,6 +46,7 @@ config ARCH_LS1046A select SYS_FSL_ERRATUM_A010165 select SYS_FSL_ERRATUM_A010539 select SYS_FSL_ERRATUM_A009008 + select SYS_FSL_ERRATUM_A009798 select SYS_FSL_HAS_DDR4 select SYS_FSL_SRDS_2 select ARCH_EARLY_INIT_R @@ -82,6 +84,7 @@ config ARCH_LS2080A select SYS_FSL_ERRATUM_A010165 select SYS_FSL_ERRATUM_A009203 select SYS_FSL_ERRATUM_A009008 + select SYS_FSL_ERRATUM_A009798 select ARCH_EARLY_INIT_R select BOARD_EARLY_INIT_F @@ -228,6 +231,8 @@ config SYS_FSL_ERRATUM_A010539 config SYS_FSL_ERRATUM_A009008 bool "Workaround for USB PHY erratum A009008" +config SYS_FSL_ERRATUM_A009798 + bool "Workaround for USB PHY erratum A009798" config MAX_CPUS int "Maximum number of CPUs permitted for Layerscape" diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 7e5288b..dda19e0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -65,6 +65,7 @@ static void erratum_a009008(void) { #ifdef CONFIG_SYS_FSL_ERRATUM_A009008 u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE; + #if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A) set_usb_txvreftune(scfg, SCFG_USB3PRM1CR_USB1); set_usb_txvreftune(scfg, SCFG_USB3PRM1CR_USB2); @@ -75,6 +76,30 @@ static void erratum_a009008(void) #endif /* CONFIG_SYS_FSL_ERRATUM_A009008 */ } +static inline void set_usb_sqrxtune(u32 __iomem *scfg, u32 offset) +{ + u32 val; + + val = scfg_in32(scfg + offset / 4); + val &= USB_SQRXTUNE; + scfg_out32(scfg + offset / 4, val); +} + +static void erratum_a009798(void) +{ +#ifdef CONFIG_SYS_FSL_ERRATUM_A009798 + u32 __iomem *scfg = (u32 __iomem *)SCFG_BASE; + +#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A) + set_usb_sqrxtune(scfg, SCFG_USB3PRM1CR_USB1); + set_usb_sqrxtune(scfg, SCFG_USB3PRM1CR_USB2); + set_usb_sqrxtune(scfg, SCFG_USB3PRM1CR_USB3); +#elif defined(CONFIG_ARCH_LS2080A) + set_usb_sqrxtune(scfg, SCFG_USB3PRM1CR); +#endif +#endif /* CONFIG_SYS_FSL_ERRATUM_A009798 */ +} + #if defined(CONFIG_FSL_LSCH3) /* * This erratum requires setting a value to eddrtqcr1 to @@ -222,6 +247,7 @@ void fsl_lsch3_early_init_f(void) erratum_a008514(); erratum_a008336(); erratum_a009008(); + erratum_a009798(); #ifdef CONFIG_CHAIN_OF_TRUST /* In case of Secure Boot, the IBR configures the SMMU * to allow only Secure transactions. @@ -498,6 +524,7 @@ void fsl_lsch2_early_init_f(void) erratum_a009660(); erratum_a010539(); erratum_a009008(); + erratum_a009798(); } #endif diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index 62d7046..8bd40e8 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -342,6 +342,7 @@ struct ccsr_gur { #define SCFG_USB3PRM1CR_USB2 0x07C #define SCFG_USB3PRM1CR_USB3 0x088 #define USB_TXVREFTUNE 0x9 +#define USB_SQRXTUNE 0xFC7FFFFF #define SCFG_SNPCNFGCR_SECRDSNP 0x80000000 #define SCFG_SNPCNFGCR_SECWRSNP 0x40000000 diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index c622ee5..2d309d5 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -134,6 +134,7 @@ #define SCFG_USB3PRM1CR 0x000 #define SCFG_USB3PRM1CR_INIT 0x27672b2a #define USB_TXVREFTUNE 0x9 +#define USB_SQRXTUNE 0xFC7FFFFF #define SCFG_QSPICLKCTLR 0x10 #define TP_ITYP_AV 0x00000001 /* Initiator available */