From patchwork Fri Nov 20 07:52:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengzhou Liu X-Patchwork-Id: 547076 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 5D484141487 for ; Sat, 21 Nov 2015 10:14:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 293154B84F; Sat, 21 Nov 2015 00:14:48 +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 pHZ45ScSZhcg; Sat, 21 Nov 2015 00:14:47 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 419F6A7448; Sat, 21 Nov 2015 00:14:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D9EDE4B83D for ; Fri, 20 Nov 2015 08:59:24 +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 2J0KhQ72ayLV for ; Fri, 20 Nov 2015 08:59:23 +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-by2-obe.outbound.protection.outlook.com (mail-by2on0137.outbound.protection.outlook.com [207.46.100.137]) by theia.denx.de (Postfix) with ESMTPS id BDA914B836 for ; Fri, 20 Nov 2015 08:59:13 +0100 (CET) Received: from SN2PR03CA008.namprd03.prod.outlook.com (10.255.175.25) by CY1PR0301MB1290.namprd03.prod.outlook.com (10.161.213.152) with Microsoft SMTP Server (TLS) id 15.1.318.15; Fri, 20 Nov 2015 07:59:11 +0000 Received: from BY2FFO11FD051.protection.gbl (207.46.163.243) by SN2PR03CA008.outlook.office365.com (10.255.175.25) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Fri, 20 Nov 2015 07:59:10 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD051.mail.protection.outlook.com (10.1.15.188) with Microsoft SMTP Server (TLS) id 15.1.325.5 via Frontend Transport; Fri, 20 Nov 2015 07:59:10 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAK7x3is013778; Fri, 20 Nov 2015 00:59:08 -0700 From: Shengzhou Liu To: , Date: Fri, 20 Nov 2015 15:52:04 +0800 Message-ID: <1448005924-26054-3-git-send-email-Shengzhou.Liu@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1448005924-26054-1-git-send-email-Shengzhou.Liu@freescale.com> References: <1448005924-26054-1-git-send-email-Shengzhou.Liu@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD051; 1:XDYXsLU4rNmNfKKuwzP681G3zjnkBxk3bMj8gLO1uQmiK4Wduqnh9K40nZ5dY0ezzPqU1XZrWbdJLcpWtQxHuYpSvqpZ1uzeNhbGvCuIyg6S0xrOcOeNISFWc1zI7czhkhTy9Bwbub3uOkFEr7VuYL5m97S4UhgUVwMf5XEVQhTdtrrQ+CNiHiVwOXNWd1AoMObu4cv8e1RF4Jrm3jNe6+QCn6e12UAq4ULhw4EfbgXmlUPwfmy8U4YvXeA6pl/a/JozpSwsn+a3Lm0Jo/vyQRvt+JVdA6OqB9OTcUlBrd3QpiY5fP7Q9Bug/XZep7cPfB2XitqVU+j8PgPlwMFbytiW6qUpEFU9qB0qtk3H93LW3Mf9ZQdusCWJ1ate0aQBrMsPGRz1u22rcBiilFhOz1/ppgDKHuayn9l+fuSHf8c= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(6029001)(2980300002)(448002)(189002)(199003)(87936001)(50466002)(86362001)(50986999)(76176999)(85326001)(48376002)(5003940100001)(11100500001)(2950100001)(77096005)(6806005)(92566002)(5008740100001)(104016004)(586003)(5007970100001)(450100001)(21840400001)(81156007)(4001450100002)(107886002)(5001960100002)(97736004)(5001770100001)(4001430100002)(106466001)(189998001)(69596002)(19580395003)(19580405001)(229853001)(50226001)(47776003)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1290; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 2:a9oFjWPFrrZeoEvF1TxIkWHWSRHDVSyKoI5FSHi1zVJjmrPoSjLd6PyTXIoQCY4V6GD33jjGjPnfUi8sQ+diwvlrrRySMv0KtRHLDyOvRIFBs5E+9BuErAVshzI4x88BSzqV6uwKx63HRTLr6IxH3VlXI4BPXgNs8JHC6a9/7vM=; 3:sIu3KtL1UKnsjCVI9iuMbKSR5hKId+Xk7TedLGGxqzR/7jD31ft77oKNf0dGr/JiHVfdVPRv2oSrFh/W6px4QCzx4s95r9aI7CzKsWLhKa3hgfKStz6Ah143BJYiD9YaRQHy3Kzx/jrAdKSsA67XeQkA+q6CPgM4Kg+6pwlYrqX28d2AE0Cu6mYCvOtRRiK1RIPOddIDPRmmIUmEQ61x+fTL4h1xHf4PU4/n7hPgebY=; 25:Nk0VMuUnZ/611KP2qVbam0FxJXbHJSPnX69wfFXObdtmm0FCHump0g9vn290QJeXop42HpBismonxCwj44PrrVrJevOyKMxOLNYXI5b5HBlABNPWnLNkrqMSZHlXmIhSRad0ctYNDoDDksn/T8/A2PsTJ3tMHdOEyYXLNFXL00HwRHx73gfoZdU/HSyua4tKQ2akhKTwUvaMOh1vPaiuS4E1YmjqYQag/wTe1aJjoPOOOQdBQshlbjQfc3JAfO3JqmVrDsqVHgc3nk/B/mCKfA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1290; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 20:JvnGLExQSJx3hgW4Yi2jyxoB/BwpBE//WzLhHpAOthHsTc9Pd4E9nqsFRGiVpHqECdZRUDcSfS3kYbkLOO4o/OQbVQ3EdCDlr9iO3DdoDpIvwtQI99PwZvhSKTLBJ/VRmflUoVQiPDJP+3K8r7WMOU4QcwsJAM3gAxC5bS+h4HBZ2fQxIJ328Hy49hDO/1YZIw/ogMstazKFDnI3ZO0Mrhy6exISjQBWDaNslCuAd75oHuyOvE/jS3BzTBznc60WrL7EzGSivzKRAcPRXDZPnu4gUyNMfVYCJom5vyw+Cx/MisfPeG0Si7xHlt36oHIWAEvwqXSLVjWgwl62IJ9oYjTbGp5bEmjCtkM8jcpTH2I=; 4:EKe6lSFAFBxfckWUH9nYNU2lWi5EepGoKG6ZeVvC751FkPcreDvMRYfwOYvI5LlUP8hW/7tmR/KL3E0n8C4b8GBlFVqWKqQ38AXBqmBY3OfZ9qeaa/I8wmjBMKEwQj0L9zzHrA8uFU71tF7Xg9NvrSop86170OOCu6nCco7nC+Mfc7QtzSfTumY+pGjpn1CT/WCHOVxvYelSNzI+Vf1HVK47p7LLNuJ/QmTcdrd0F/xQId266Ibvqw/wzmBRDxVSutrU/pcrd6IdPfb9Q8DfAPaIUaateSWULo+DegboQiSfx1osnszX5148M7pX5cFlO4/ntT/psk5/TRQV2OPI3wDIEp+nJ0Yf9KoLMkwI9r2mMqT15lQDsIXEaO5KTlor4LS0D+KmIiG06BX12y+5NQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001); SRVR:CY1PR0301MB1290; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1290; X-Forefront-PRVS: 07665BE9D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1290; 23:/mf4jUyJO/VL8vgSscnz5nEX5lVy6ZWRjD/DlGo?= =?us-ascii?Q?3uGn0qdV3sUrLzdfkijkEk/Hc/z3CWpacOThG10T5vor7XdKuKy3enUKl28T?= =?us-ascii?Q?hB5iojKlS/swzTVTq9AQT6loy5qS/WhAoXB9hMuGN1BmbTtTDmUtRdoweDsS?= =?us-ascii?Q?9HIx5wW93vSJ2EHPS9eFhP46lXRxZ+x9BJ8/+X3y8LS3j8/e5ep0IJyp/psp?= =?us-ascii?Q?VgrPTn9+K6jZTgPCDTFgHGKFGn3nYhcrU4nwkzrHeltSNFncWBVOmpf1Qrz/?= =?us-ascii?Q?QiV3P5yJSZlqlmYSjXqUIHMJuJRdaZnKweDEUllw2ljMcu0mJoF2c6z1Q4ts?= =?us-ascii?Q?JuTK1JHi8JXPi8MCIhS5VNjVWvT5U9SeefWwaROhovWGF4y7kULjF2trwYWE?= =?us-ascii?Q?AuQAV6wxm9+1zG7EbwYXJNlsaGF1PugaCqD78zg2MdHsVu4t7l7/fv5mh+or?= =?us-ascii?Q?AxbV1KO6Vx/lIZ7lF8ohAyXcQu0U79lVDsaNhrSv02bSIKpB5L5CTJlTPUiR?= =?us-ascii?Q?TOgyqKwNNcm4Izp8I58j1FLWOZxjYEOeycBLc/LFBFPljF52Xpct43+u+iel?= =?us-ascii?Q?MgdxXpibxxjEDcD8RBaeyiwoeRzTwQBz7Lig8DiHzXIFmWqMdvlJEbliXtot?= =?us-ascii?Q?oUM/YInhhSMD+gEXn82m6Sjl84z6ro2X+FIAl1vNf7KHZ2srL8nH1KGRChTA?= =?us-ascii?Q?p2kuqUAX1zw3PpKVKwiiCntXtvu0gqnCGOy2tkw7PpGUlkc9usMDtKHpzTPN?= =?us-ascii?Q?va5uWj+/yxLne3kJaE2RPIbWYxt1ZGI3/wcSapNtgfzZ+Q4xmtSVYTBixdLL?= =?us-ascii?Q?i1lyuE7KbBYhMQ9e1v/mY+fZphMOP1Eh/L4y34RX0pCK0w22XWrXP5/8Vi0T?= =?us-ascii?Q?9dxYYG+xlEy9N4hcYJzqaDpgVJ2Pm163MGRmzEXdwvZhALNaos5z7FTQQP3X?= =?us-ascii?Q?5SLG4cgIXPn2mygU61Yc2mYZj36NsU2VOGak8IdDauFNckckfy9za0PW4bIz?= =?us-ascii?Q?njUz2BBCYuqtiUKGufHAK6dRoHcTIJ0IG+R8dzsVjc+DuNMd9aIuOUOrHfJN?= =?us-ascii?Q?ZGpntOcp6noLGd8uiBRRqYNTKkXh1F42bMN6ovjcBi+2MPyyGbXafilkZQfe?= =?us-ascii?Q?4uFZuR3A9H2M7ENCms+9FU4E9BPrXYFoP?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 5:h0RU1ymFo/TfPr29NYTqWnhKrMyHKQ23N8uk7FoAFL6arEICITBoTKvR+MwA1l+OY8A0FR4viD8dv0L+td42rz9qukEtULFZv0yaCQDni/8QhMPFbGT1fM+XEyjpl6FlRgjblhAzj47EVAwNii0dyg==; 24:bKorJcrPy/mWJz9zU48OtY8YNzkFZ3DuEqAE2su+XxCol5eG49GR6KOuu6VMhjbAkqd1f68lJcxts4FXtQ5GWLvnzuNHNFyJ2A15hRMpbjg=; 20:3K2lNChL301Rto4iBIq2DfWKHDM9ILaFaxWJGy+4HQn+0WHz77EGvH+bqcRhCZ1rRrCNA0AfNnod2J3Yn/jTxg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2015 07:59:10.5224 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1290 Subject: [U-Boot] [PATCH 3/3] fsl/ddr: updated ddr errata-A008378 for arm and power SoCs 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" DDR errata-A008378 applies to LS1021-20-22A-R1.0, T1023-R1.0, T1024-R1.0, T1040-42-20-22-R1.0/R1.1, it has been fixed on LS102x Rev2. Signed-off-by: Shengzhou Liu --- arch/powerpc/include/asm/config_mpc85xx.h | 2 ++ drivers/ddr/fsl/fsl_ddr_gen4.c | 9 ++++++--- include/fsl_errata.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index aabe253..6308c6e 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -797,6 +797,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 #define CONFIG_SYS_FSL_SFP_VER_3_0 +#define CONFIG_SYS_FSL_ERRATUM_A008378 #elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) ||\ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) @@ -844,6 +845,7 @@ defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013) #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 #define CONFIG_SYS_FSL_SFP_VER_3_0 +#define CONFIG_SYS_FSL_ERRATUM_A008378 #elif defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) #define CONFIG_E6500 diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c index 4eef047..1ef220b 100644 --- a/drivers/ddr/fsl/fsl_ddr_gen4.c +++ b/drivers/ddr/fsl/fsl_ddr_gen4.c @@ -10,6 +10,7 @@ #include #include #include +#include #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4) #error Invalid setting for CONFIG_CHIP_SELECTS_PER_CTRL @@ -175,9 +176,11 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, /* Erratum applies when accumulated ECC is used, or DBI is enabled */ #define IS_ACC_ECC_EN(v) ((v) & 0x4) #define IS_DBI(v) ((((v) >> 12) & 0x3) == 0x2) - if (IS_ACC_ECC_EN(regs->ddr_sdram_cfg) || - IS_DBI(regs->ddr_sdram_cfg_3)) - ddr_setbits32(ddr->debug[28], 0x9 << 20); + if (has_erratum_a008378()) { + if (IS_ACC_ECC_EN(regs->ddr_sdram_cfg) || + IS_DBI(regs->ddr_sdram_cfg_3)) + ddr_setbits32(&ddr->debug[28], 0x9 << 20); + } #endif /* diff --git a/include/fsl_errata.h b/include/fsl_errata.h index 8f81e4c..283cfcf 100644 --- a/include/fsl_errata.h +++ b/include/fsl_errata.h @@ -58,4 +58,35 @@ static inline bool has_erratum_a007186(void) } #endif +#ifdef CONFIG_SYS_FSL_ERRATUM_A008378 +static inline bool has_erratum_a008378(void) +{ + u32 svr = get_svr(); + u32 soc = SVR_SOC_VER(svr); + + + switch (soc) { +#ifdef CONFIG_LS102XA + case SOC_VER_LS1020: + case SOC_VER_LS1021: + case SOC_VER_LS1022: + case SOC_VER_SLS1020: + return IS_SVR_REV(svr, 1, 0); +#endif +#ifdef CONFIG_PPC + case SVR_T1023: + case SVR_T1024: + return IS_SVR_REV(svr, 1, 0); + case SVR_T1020: + case SVR_T1022: + case SVR_T1040: + case SVR_T1042: + return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); +#endif + default: + return false; + } +} +#endif + #endif /* _FSL_ERRATA_H */