From patchwork Fri Nov 20 07:52:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengzhou Liu X-Patchwork-Id: 547077 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 6C8B0141487 for ; Sat, 21 Nov 2015 10:15:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 10ABBA745E; Sat, 21 Nov 2015 00:15:01 +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 qj-2SX1vPu-O; Sat, 21 Nov 2015 00:15:00 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6BE8EA7463; Sat, 21 Nov 2015 00:14:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B4CEB4B836 for ; Fri, 20 Nov 2015 08:59:41 +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 Zge11d8nr4lS for ; Fri, 20 Nov 2015 08:59:29 +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-by2on0105.outbound.protection.outlook.com [207.46.100.105]) by theia.denx.de (Postfix) with ESMTPS id 729B74B82B for ; Fri, 20 Nov 2015 08:59:12 +0100 (CET) Received: from BN3PR0301CA0073.namprd03.prod.outlook.com (10.160.152.169) by CY1PR0301MB1292.namprd03.prod.outlook.com (10.161.213.154) with Microsoft SMTP Server (TLS) id 15.1.318.15; Fri, 20 Nov 2015 07:59:09 +0000 Received: from BN1BFFO11FD010.protection.gbl (2a01:111:f400:7c10::1:189) by BN3PR0301CA0073.outlook.office365.com (2a01:111:e400:401e::41) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Fri, 20 Nov 2015 07:59:08 +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 BN1BFFO11FD010.mail.protection.outlook.com (10.58.144.73) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Fri, 20 Nov 2015 07:59:08 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAK7x3ir013778; Fri, 20 Nov 2015 00:59:06 -0700 From: Shengzhou Liu To: , Date: Fri, 20 Nov 2015 15:52:03 +0800 Message-ID: <1448005924-26054-2-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; BN1BFFO11FD010; 1:trjZuL/3nMgwnG4yCALa4eHeZ548jZysk/BU3rTI6dSlH6M/Q5uafuiSUEv0VU+OSCwtrY1sM/cxRDMtQBzqEBRFazTG0ZFSwqIRLW96vf2xXfjC9ibQzPS2AHfZLsLJoFxPMFMYKdJBnKoRCs9WjlpWLZjfFACwBvoApjdWvbZbSucPPeyr4m61dYHeahS2WcV9BmblgiHjb1CMpj5Y0jIwqigf1WuZpf7c0pXLkKRh0oJPvJq3evCBj1ViRMiDg5FAQSE8FzYOnOa7p380iapcUqer72i/AA9/27X0GeupD+gffwubcE/iTOngMEI0S2GUIQgJdPyXLSEeJCWbp60+8s2GuEz5cbsE+MxogbBoJFTkskPjKtYKuqWdwrInetSDUXDuuyMc+kL+pRmniM6YRK5nKYRu7DSy0Ys3ZZQ= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(6806005)(87936001)(69596002)(19580395003)(586003)(92566002)(19580405001)(4001450100002)(50466002)(229853001)(86362001)(450100001)(189998001)(106466001)(97736004)(5008740100001)(4001430100002)(36756003)(104016004)(85326001)(5001960100002)(5001920100001)(5003940100001)(81156007)(5007970100001)(76176999)(107886002)(50986999)(48376002)(2950100001)(77096005)(47776003)(11100500001)(50226001)(5001770100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1292; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1292; 2:sJop8Np55Os7Wz+Vq0nTJsQ0fKlUtBvnTqSO4a+QDeNwN+HMKevXakU3kW9BDGR7zD314EELcV94yFCAIo4SrrnG5wfIhd4EJra24p/xr08pakTNWdnnG+E2uKQD9Up6fU3b39FM4IBPEsl7pcypL/yMLdx9k/TzjiWqi+JeMzg=; 3:YHdazmmKs3dU4KM9pwHqSwS8yr1gRB5A/uIZFd5Of4X54/0tf4DK0oYf8BW21QaU+R+QG1ewRWiryFFLZaUTRfKOn130QH5/6JA5pTfPCvz3ogSAuYpE3iGTAceGKKfaVatHifwIYgYtxrbe7UEasWZEiGGHH4tt4sCgX6jqHqn9XPbH6v8/da1tCCYBeCoNCtWYV/UGITQkrkONrWH9mwVQ+x992X04dht8PKpPl5A=; 25:ZTBumbANZXgmB8cYO/71W4x6/d0LDuY4YWZklAcQ6HkdLDz/haadEjkmLHJ7r3pn+I3US5eKzmxcvOpiAJUKoP3zyVIDbMe5M9MAOm00GOD5svX/WI7+hIXfEuCVH6tgeI2hpw/amXg1QkgWu+8B+tiyqSX0gEIDk/VSo0uZaQo1f2M6kHpNvxlDZA4pfiERnatOIMDCmb6UyNiD3+khE0f9AaVJhrgGeTVhDCaftxr7U562BTu8GR/jUg5zRapT X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1292; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1292; 20:eP3JO7UM2Ga9D/S4UjBAeHiHttM4WoSjvURtgPfDP/5cex/GSv90o0OhQyY7ocN4rjaSLHCgRLCbiCMWgKJjhv6Z8FVy87C1WxLrWxpwoPOa/TpgA7tfvmD99Ow/8Sd9FhzzMsEgukKLIfXUiz6xPFA0omNg/C1KSNkDxg3yTF5h+hqAXdiF2q7/VNieR4fLn/zsqIhCTZ0v+/GPMGrAwUzYkF9dFbFzE9HoWnXwZemdvcEMGZ6ArD070QMj4jOPHp/DgEVgVxKtGjS6RJcKei5N+mJJOC3bmSGDhIZMAVJfTRqRhVQfuR8d+mGE0hmKdedT6xuwgInDbBNUeTWEIhq8HrTRh3/q1AgsA91vTzY=; 4:l3sJ8utoxCpBlPNPHoyGkbmkko1IjNmnfnCITw6ebHpw9+NKzFbCIqwlWHqL0jOo27/2SaYZ5P8eLTwGmIu/Q0wYRDgNmD+iSsaDUe58SzjVAy9YtAfLw9ZpOeR/nekuFJ0ICFfOPl7DZoR3599ZaooAF9lbJW/+DPZnDXNJUIcaAp55jLLb4C4jad4idJ4pdgeO+6VjPjQN90f1iqmwy/w5p/fgpnerl4hHNEkBtKZzDqQETMpsLgcOb/Nsn8IRupml4nPnGBalm5jbg1mfqbmSgMQVDo9STs6alI9OgTVGADRQyqps+pJ8yKxMBfg2YFfZ+5RwOjOeTVrPWoprAaJvaGQWVruVTRGcHTIDLr+9NUc6xgk3462FDf0rEMoU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(10201501046)(3002001); SRVR:CY1PR0301MB1292; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1292; X-Forefront-PRVS: 07665BE9D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1292; 23:d7IRRpJneuO+nO1zvq9Pop5/6VbJIuom6uffDpq?= =?us-ascii?Q?xN1Tk2tVk0nO0ZEeLkm25zXfa2AFErML5Mer7R4qan2vLxRhI/iWbvc6s4rU?= =?us-ascii?Q?hi1emmMTfB2Cz0RPas4FYbmrJunMwEwElc0Mfp/Afw07w0BtnpYA07pHTJeg?= =?us-ascii?Q?m69CfB+NfayHKUF9/XadyvNtJBHp5uACPXnF2NmOGncnIp/JXlUVLSgjCgGv?= =?us-ascii?Q?UdMCDxfsFH4OxJwok0TG0KLJ8EWrVzMwwaX9LRsthn0omxXWVyjAljguJ0P9?= =?us-ascii?Q?oLdb+9CT6GaltpUsCSjSZvF2c7amUIqW0VwIOhE9010y5G0gQzk9Q8fYjrH3?= =?us-ascii?Q?cIRd4FUAn9eAChartAadgvrgZKLcjy9EYxi1+qogGcz7iK/hQDAQMy2joyMb?= =?us-ascii?Q?GBgRAgnJZN/i31KJA/HjnLxaCt7iqZwhxNJHOnnuQY1j17WeN4ra7Dqcqb/T?= =?us-ascii?Q?bjpCEsaL5UNtMkhvoDQNhEvyCPZYbjWY/qDQJtOUpJOCKyOHIqT70y3/JGhz?= =?us-ascii?Q?IfnUs1j+F/2oE4xmb5FOBv2lYnw+h+PyVyq+H9dy15QHzvw41GVdflyfGb1x?= =?us-ascii?Q?S6ngLLPYO16ccFlukFuj+gzixzZP3smXc9ABIPRBvIUdmH44wIyeyozE1b2A?= =?us-ascii?Q?sCu5uqXHPO/HxUA8ho6qE5fHP0WiqNGFZGZO0YZ7Swxb1461bF15f0A9rytn?= =?us-ascii?Q?2GkY7MqlDi8D4J9qBpds/tUim1ynOz/2QWq9oaHU2PpW9cqQEZh5VSf8Bazn?= =?us-ascii?Q?9P+3JjaP/payNsyzgyCdGprNHZ2/csn7eXqg+C1cWF0RUlKr0NfeWdLOeYYc?= =?us-ascii?Q?G5wdvNT0Svnz0tghQSaJSLsiNkUNBW16ZufTCLXndKdX4l46BfuMhEUaadlf?= =?us-ascii?Q?wbIH0wyt7XoBEKdOCojynVtIP1cvfVkVw2e4fUw/ATW6OSEHqML3Qz7yZ9pW?= =?us-ascii?Q?zYJPtMY8g7LM0iZ1cN/m3XpXwbFl6prL/u4jaST0B+88JqcQwiMsmU2xqTNe?= =?us-ascii?Q?tEkQdjlLyv3uwG7Qn2r/I/6yJFtEHUqO9c4zXKqtoQ8uX/UetY+jNKEQZ/0f?= =?us-ascii?Q?7r5t+xCULMPql4+0M8KuzNFVMTTLQv64agmylbORiSFk78+VrT8+rI3Vw9yy?= =?us-ascii?Q?rCIMMrHt98ho=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1292; 5:ZBWneUSl5w6M7xdFexpgMs9pII1lw1Kep1MIVN6qWyWNf6D+ud0O1nNyd3Y6BzDWA+Gk+a6kc3MwaSkn5PrvNDRuUQYNo4uca1v9ATG6OtKIcvBAZAFGpuFdy7R6gXLh+xFOYA4/XF9DjfK5gRH6Lw==; 24:4lE23MhfOjQmuax/IPwW9yLeTorIaTVKBQytmzXXEhGqSm2JI8+loKY3IPi8EGr1Kw8vf4KRYs17ThoPH5x5AsHBGjk8A7anVsz5FWihfqY=; 20:qb7dbX5iropPLCh06MazWSLzSF5MZfXaV0MzwAH69W7dIQAh3Jw51BVfPn044DI3qpH4ZUtS8hnsqxFHUBzh9g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2015 07:59:08.3686 (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: CY1PR0301MB1292 Subject: [U-Boot] [PATCH 2/3] fsl/errata: move fsl_errata.h to common directory 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" move arch/powerpc/include/asm/fsl_errata.h to include/fsl_errata.h to make it public for both ARM and POWER SoCs. Signed-off-by: Shengzhou Liu --- arch/powerpc/cpu/mpc85xx/cmd_errata.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 2 +- arch/powerpc/include/asm/fsl_errata.h | 53 ---------------------- include/fsl_errata.h | 61 ++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 56 deletions(-) delete mode 100644 arch/powerpc/include/asm/fsl_errata.h create mode 100644 include/fsl_errata.h diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c index b368562..a493556 100644 --- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c +++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include "fsl_corenet_serdes.h" diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index eb0534b..51b5f5e 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c index acb1353..f89c94e 100644 --- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "fsl_corenet2_serdes.h" #ifdef CONFIG_SYS_FSL_SRDS_1 diff --git a/arch/powerpc/include/asm/fsl_errata.h b/arch/powerpc/include/asm/fsl_errata.h deleted file mode 100644 index 4861e3bf..0000000 --- a/arch/powerpc/include/asm/fsl_errata.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2013 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _ASM_FSL_ERRATA_H -#define _ASM_FSL_ERRATA_H - -#include -#include - -#ifdef CONFIG_SYS_FSL_ERRATUM_A006379 -static inline bool has_erratum_a006379(void) -{ - u32 svr = get_svr(); - if (((SVR_SOC_VER(svr) == SVR_T4240) && SVR_MAJ(svr) <= 1) || - ((SVR_SOC_VER(svr) == SVR_T4160) && SVR_MAJ(svr) <= 1) || - ((SVR_SOC_VER(svr) == SVR_T4080) && SVR_MAJ(svr) <= 1) || - ((SVR_SOC_VER(svr) == SVR_B4860) && SVR_MAJ(svr) <= 2) || - ((SVR_SOC_VER(svr) == SVR_B4420) && SVR_MAJ(svr) <= 2) || - ((SVR_SOC_VER(svr) == SVR_T2080) && SVR_MAJ(svr) <= 1) || - ((SVR_SOC_VER(svr) == SVR_T2081) && SVR_MAJ(svr) <= 1)) - return true; - - return false; -} -#endif -#endif - -#ifdef CONFIG_SYS_FSL_ERRATUM_A007186 -static inline bool has_erratum_a007186(void) -{ - u32 svr = get_svr(); - u32 soc = SVR_SOC_VER(svr); - - switch (soc) { - case SVR_T4240: - return IS_SVR_REV(svr, 2, 0); - case SVR_T4160: - return IS_SVR_REV(svr, 2, 0); - case SVR_B4860: - return IS_SVR_REV(svr, 2, 0); - case SVR_B4420: - return IS_SVR_REV(svr, 2, 0); - case SVR_T2081: - case SVR_T2080: - return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); - } - - return false; -} -#endif diff --git a/include/fsl_errata.h b/include/fsl_errata.h new file mode 100644 index 0000000..8f81e4c --- /dev/null +++ b/include/fsl_errata.h @@ -0,0 +1,61 @@ +/* + * Copyright 2013 - 2015 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _FSL_ERRATA_H +#define _FSL_ERRATA_H + +#include +#if defined(CONFIG_PPC) +#include +#elif defined(CONFIG_LS102XA) +#include +#elif defined(CONFIG_FSL_LSCH3) +#include +#endif + + +#ifdef CONFIG_SYS_FSL_ERRATUM_A006379 +static inline bool has_erratum_a006379(void) +{ + u32 svr = get_svr(); + if (((SVR_SOC_VER(svr) == SVR_T4240) && SVR_MAJ(svr) <= 1) || + ((SVR_SOC_VER(svr) == SVR_T4160) && SVR_MAJ(svr) <= 1) || + ((SVR_SOC_VER(svr) == SVR_T4080) && SVR_MAJ(svr) <= 1) || + ((SVR_SOC_VER(svr) == SVR_B4860) && SVR_MAJ(svr) <= 2) || + ((SVR_SOC_VER(svr) == SVR_B4420) && SVR_MAJ(svr) <= 2) || + ((SVR_SOC_VER(svr) == SVR_T2080) && SVR_MAJ(svr) <= 1) || + ((SVR_SOC_VER(svr) == SVR_T2081) && SVR_MAJ(svr) <= 1)) + return true; + + return false; +} +#endif + +#ifdef CONFIG_SYS_FSL_ERRATUM_A007186 +static inline bool has_erratum_a007186(void) +{ + u32 svr = get_svr(); + u32 soc = SVR_SOC_VER(svr); + + switch (soc) { + case SVR_T4240: + return IS_SVR_REV(svr, 2, 0); + case SVR_T4160: + return IS_SVR_REV(svr, 2, 0); + case SVR_B4860: + return IS_SVR_REV(svr, 2, 0); + case SVR_B4420: + return IS_SVR_REV(svr, 2, 0); + case SVR_T2081: + case SVR_T2080: + return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); + } + + return false; +} +#endif + +#endif /* _FSL_ERRATA_H */