Message ID | 1494003394-15619-1-git-send-email-york.sun@nxp.com |
---|---|
State | Accepted |
Commit | fbe44dd1aae749255bcd7e458d4a91cac4181994 |
Delegated to: | York Sun |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3wKJ334ygxz9s7r for <incoming@patchwork.ozlabs.org>; Sat, 6 May 2017 02:57:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 59199C21C51; Fri, 5 May 2017 16:56:50 +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 81F69C21C33; Fri, 5 May 2017 16:56:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A3343C21C32; Fri, 5 May 2017 16:56:45 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0047.outbound.protection.outlook.com [104.47.34.47]) by lists.denx.de (Postfix) with ESMTPS id C2212C21C7E for <u-boot@lists.denx.de>; Fri, 5 May 2017 16:56:44 +0000 (UTC) Received: from BN6PR03CA0047.namprd03.prod.outlook.com (10.175.124.33) by BN1PR03MB169.namprd03.prod.outlook.com (10.255.200.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Fri, 5 May 2017 16:56:42 +0000 Received: from BN1AFFO11FD026.protection.gbl (2a01:111:f400:7c10::132) by BN6PR03CA0047.outlook.office365.com (2603:10b6:404:10c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11 via Frontend Transport; Fri, 5 May 2017 16:56:42 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; denx.de; dkim=none (message not signed) header.d=none;denx.de; 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 BN1AFFO11FD026.mail.protection.outlook.com (10.58.52.86) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1047.9 via Frontend Transport; Fri, 5 May 2017 16:56:41 +0000 Received: from oslab-l16.am.freescale.net ([10.213.175.9]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v45Gudu3012989; Fri, 5 May 2017 09:56:40 -0700 From: York Sun <york.sun@nxp.com> To: <u-boot@lists.denx.de> Date: Fri, 5 May 2017 09:56:33 -0700 Message-ID: <1494003394-15619-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131384770015744106; (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)(39380400002)(39400400002)(39410400002)(39450400003)(39850400002)(39860400002)(39840400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(50466002)(105606002)(2906002)(8936002)(106466001)(4326008)(50226002)(5660300001)(498600001)(48376002)(47776003)(85426001)(5003940100001)(305945005)(86362001)(50986999)(356003)(6916009)(6666003)(8656002)(8676002)(39060400002)(189998001)(81156014)(81166006)(54906002)(77096006)(104016004)(53936002)(33646002)(110136004)(38730400002)(2351001)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR03MB169; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD026; 1:5AK02BN6Vn0ek58wPkMH+IyyhYi0SedXA+A6MT5nBE03hpKFi0GxnXiopZ5AciBYa4NNz7gn96zwghE1zeaChao0c/2yu1vbAQHMO9GQNMf5UIgfJ2K3BcjktDXM+rh9L1iDi+Cjo3WQ5CnXPUOi5fZHIdfTvOYrK0ZCRBQsCFfwHJUTol/gjsz3jRx/j7yY0x/oUooT180nldf+ucp4aTPGTAwinBW1qfFaZi5KzxJSmZN2QKBQ/SI2cwep/l5le4mEilnQ14dUM+ZjSyNBBevjCZAyfCLzJJfzdbRHupcNzQrHc+ls7wZZAtC6gXG1EAqpzN2vD0rx7gcxlZaiosDTUcDr6drsulGTpmnHzOhRemw9lhgD+MHXwkI/PcHIyw3AHRy2LiYAm+DDlxNI+OVf1rM83BA6ZQAXRcVCz1mmq5ob9+CwbY1j0mnyafUMO0EFr2LS0wuOszPknbe65XXGhGC8LAcUWWs3KSx2N5PPrcG0rz/GcmHHt1EVzV8GFGMSccKYxwxOWfCIykl9TfpyPT8wxzOgwo8On4VhDgZnVTTZZgbipxY+5rWK12+GKecHMvh+y0LEhXgCesV/4F6f79hLqQdGg6SSpH/st74Tjp8kBK4NqIQzFGotYxzc MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9162e97-f7f1-4d70-ef09-08d493d7b423 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN1PR03MB169; X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 3:bGvBZLJtepaFt9zHe1Cmr8MGtGZTadA7yUj6PkZAPJhv1z/ZYUAn0kHucRwF/HQfNp8KwmAZgOVjb6plc0OVLmVFack9uOUZqsSrSutXwdOp295TiNQTuxcx5t99j7T9Sy3w91o6+LQtlls8qPWKk1g6RZzb9tTasR5NyEvpVUQsVAjoH16vScHG4KaqlyNWW5b29fOjvL9pYS3d/QqBrcK/MDBJa5i+TnLRWy0DeUCnYHi+hViRN8cMrujzfpu7LF/CGmZYR+F5kqWnoNxJeczqN10tbz9IRWM9ws1APp2ChXtv+8MQw8rFQkTNlaEMNUU2aACk4whHbRl/Xcm0dJg3UPkW0JqN8oLMvG/wJuGyu/4cU8NEjCmjGto5Zddlt+7uo4A95UeRVj+JYxpa+fodFNabhrBejNl0aaFy33eHuJ7vzASq9GeueIqemCs+; 25:lfGYyBEF3IE/lGgJ8pAMR2OqKs2GevCpPduZMe4Fch0I32EiPc6jizJQZIRrfYBQe1KyNq+wV1a4OcPvSS/xJd0zsk2L0xEBBVGbDbpqkgB1fshQmbfAjTepwaIiHMHb5vRCueNOYhfxIi08k7AkEvjyzID0MbquptkX5NyDbZC+nIe7cP19/eVSH8T2rwM53C/4pa7c2mX39LLSgFIItU1PKc1bS7ycGBI+x2KsKU3EWeUk45UWBp9lMvNCPdhexjGcWIb2SnaRQ4kZLS411cEU2xgCM3hhzG88E123OJSjQRkdNuD9E1zMtX0m1KRHC/H/2uj3UhBiNDuXak9ZsQPsLtyfxzFoSIiFIfxGYizyTZerCWWAX7Ca+9de0/uearZOuiyS7btSFc0zbs2kbZPiRxgHgRLDPfiuFyqzByAOWlU8zx/ndwoIgfHGZnCPAhPdnauSrgBoR+fk79qwBA== X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 31:ZZLT6A+SvheBfT6x9dl7WuUT7Y4o0DSegz8Z1nG2VxrRHbC7OycR8fBG+Getl4EHDgUXzivSY9ZLgZzB/Ta1YkDCNhAggbmJfCCTtaTsqYIr+/krYMtWU5KJKNdYjPWOMtfKZfuyyo1UTHBdc8Pugr/sZvzP+pv6t7UvRJvkgXsonH63dvmtcEd0CcZewi/N3nBsa/JKZRtZ/6xc3Tdpx+rCPDa+Ripi+SBWa7su4E2GtYh3E9PT32gWGD1VYwwbJkLR7NhHiocqioQ7lRlA+dsUqNwBcqgl6E4T0//rUM8= X-Microsoft-Antispam-PRVS: <BN1PR03MB1695F761BEC7D82EF40FDD79AEB0@BN1PR03MB169.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13023025)(13018025)(13015025)(5005006)(13024025)(8121501046)(13017025)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100)(20161123556025)(20161123561025)(20161123563025); SRVR:BN1PR03MB169; BCL:0; PCL:0; RULEID:(400006); SRVR:BN1PR03MB169; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR03MB169; 4:/JWzGW+uzK7JCY+ZGbnMUKhH2eRMv9hzRunZl5J8sfK?= =?us-ascii?Q?fEsuf94owi7pxNXRXFYQMZsmCbxl8EqwxcwkonmA4MDqpAUoysrScfmYyJTo?= =?us-ascii?Q?KZZPwiaA1wGLzJT6aJADnI6h7Ru/B3IA3VXSA3qnQ+ji019kXBfw3SU2nZd4?= =?us-ascii?Q?D0S5IeOW/DQ+yUQ+9gpU3gXwD8toQNDHXIeDZ50JD7XIdzNghr37H+3hFUcE?= =?us-ascii?Q?PZveh08ZCo+Xs3jfUlul0JNRIqvwrzFm1/D8CJ/shy6IkULvq5/vMyFsNXME?= =?us-ascii?Q?iJs83HM43LYl1eQ3MuA7qsN4eiC/iiRey89/UhV6kcpUD7yjg4yvaOvHdE44?= =?us-ascii?Q?bGAlCxLzIP/XS9U9ztyGgVAOLiJwHOVDVYi3A0/scbUsKZPCIU3/wGhrARj7?= =?us-ascii?Q?RtA0aK/2uivA5CB891AxVHPgpXyTsTYRamlnSxAWmq1kel0wB/99ViZq9kMw?= =?us-ascii?Q?qBhynLXVpTnTZ3YUR0MnFcCCqEZHnVRIguwqOFyUcCrJoAq1/xoBKNaFhUXC?= =?us-ascii?Q?kfUd5mkeFPAdXCDyECXre9RjFBPZAxz/zMi9zxofbblqlVQf+q0lT04vQLzN?= =?us-ascii?Q?5OtP6SZ39sK/wbRcEAa7okSqQYle4gwerbOtgHl2N2dZAFFxqFlaFw1TYtOV?= =?us-ascii?Q?uobjr0o1XON7fEpMKCAxg3ACi4cufAcHKQyFhtye0SA0mDebLMBC5w8n6V9p?= =?us-ascii?Q?yKRmoZXNk8S2EqkOdNPH4dY9A83t4wfCL+lzMsl+GJImPE9n4F8UC8ogvqV+?= =?us-ascii?Q?PnIXd5nJ/EGuX5uhhO85FCcAa3aja9MkBPVro0fBdroDFAeZs1ygF8u/DV6h?= =?us-ascii?Q?fjMQxlPvRShopWjrKyyXtGoixWbSwlVZjY5eJc2lQPqpf6c3yvsnkB9k75Cm?= =?us-ascii?Q?vBuCfN2O1A3C9jyqFyFzdFWDFek7XeIb8wb2BKPcPGMj5HpuOPhfV9O9gJvc?= =?us-ascii?Q?R9G/tIfRhiM2ofBL6EEIwKDCH0XtP/UNvYTJevQ=3D=3D?= X-Forefront-PRVS: 02981BE340 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR03MB169; 23:kuTVd4kSqyC4mZu8PdgArE0ljGNat3z7Jv7OR/js1O?= =?us-ascii?Q?uK19kVXF15IObSzmIdENwunbkBQn838N+5qUHJmLKF5h+iVFiMZJl1PzvN2M?= =?us-ascii?Q?+/lpmFyDP0QSDPTggSWFdzN147slsScByJzIEEHsnF95nfR60wH6jjvKO/0T?= =?us-ascii?Q?2oZcPYXQLCk/D5dEc5GuhKbTcNlKarkLpXjcw5osxazuW9P+Q0ApXGIi/0VN?= =?us-ascii?Q?/1fYN0IQ0PWG1qDDPa55P3fjHLSuhW/xeCE4M2omQhuX4Ypy3mscr1CxMYKM?= =?us-ascii?Q?OmjycBps16iiYtMBl99o5Iu21xs9sIesUZm8s2LRSvF1YAaQgyvsRDeFUmQx?= =?us-ascii?Q?g0rCf7KkxEfQQ8ATRqJqCBAYggfVp+OjcSZVByEC3vHUtWe8Svc7AmQdzWsV?= =?us-ascii?Q?4JiJr1DSxSxE+M0aIU4vE413+50rknWhJBnpUV5MbKy0XPafVmdZkCc+/m8F?= =?us-ascii?Q?jecFSSxa1IAnkps7z1CC9z7XFVK+uuY31PT6Q7NaX9rBsIPWKOQLSJUSiG6g?= =?us-ascii?Q?hMaPxDGV07Qxc6nuhUo/uCx4xAYqzXhgZwuZnJDKsS+y1Dk23oxOvnVOWQ3k?= =?us-ascii?Q?ivmEwrqXWtXkl8oO+dDzSgZXpDZHaOGdy5JURU6Spi0DRtFHA3Ix8fZdaAIq?= =?us-ascii?Q?HJsID7kUIraU3OSkFMNBwFWOkrw+hXpBj96DA8uHcNToUdUtFAHs+d4gJbkb?= =?us-ascii?Q?EBOvE6l8dXso+i91vS6U93uq6KeDtib2bEnyUf4FZQWGJdcWQ3wBO0oPVP15?= =?us-ascii?Q?E6InlVZvE8F+DsTyRjmrh9tVs3HtPZTwn8JNDqUs+OHyqRJnegKlPPic9pf1?= =?us-ascii?Q?Ahnbite396Sjqrhq96apLCWw9cjP7DKkHZnKYFzrRNdyyZDHZ/K2wKfXKmDl?= =?us-ascii?Q?RAkA+ehoNMDYxC0woMjc5yrPLyLwey+f5wcSY1ozChye4KG88+8DhgHEL/Xk?= =?us-ascii?Q?77QcDFSwrZu2YvobpkDVITL61YQjrej8iguFpCR42ZfNLfsKFC5RyA5fnIsJ?= =?us-ascii?Q?3/ZBptaAmkoouRSok1M9W/Msbawf7hgbkTkTr+OUXkc6BiaT+skC0GmgZ7te?= =?us-ascii?Q?Q/vPmtrS2LhI95RkAHvdoV3mtMUowTSB8uAB7OsoZVXCLFy9L1LWn5RHfKJ8?= =?us-ascii?Q?IelQcbZ7aX6pCq31qDAjstX1ZW/oEU1nkPW5m1nrHEyl07MxfUvsqtxW8y9K?= =?us-ascii?Q?W6XuGKUWfpFJURz0C3UpcGBx4YD51s3YiTu/AwhtvNz4sSOp5kVIAQONCwvc?= =?us-ascii?Q?GuKDJ89y+sZVvVu9Y=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 6:AnNtUVCQsdH5x2zv3lWCCOxLmi1ycWgQySgZ5z2yWwwowj7yLmllux6fwZUCi2Oiuc0rLCWUvNEViDcuDkozSmRKakKFAHmD86WE6jHPiktvyGNrOWPdIHXHfvxLlitctPpS4B/erE2NpsmTBnIe+o9u4fRZcjSdXA2DHqsha3yo5tAYxO4/BPcv2BYK1XinFQou1gLa5flUu0v0adF4SEB+WR5GCti+WB4uDVK2UCW5wi6Lh9guj+SLu8I2FFV1An1tr+1rmwQpOkXngxePAXcaN7sHVRYWSUp8+phQ9xuaR/EagSTG5hAihhaXQknbLWFIyzZ29eJm99vDv4uIH/jfdjyHsmFgeWTcseDbu0Nc8C9eAPa0b5ATdMaQ555PiYLN/onNZyaHzVizwEn4Uk0gUbeTGNJg9zcKNjynewE6kuvpamhu1zA2aa3H6rCeGcdTpMSn6q/Qmo9IRy9/k1cemQEjp4EUCE5+rSmkOccBFcGegumm7VE54J+ESR1n; 5:p/JDflB3ArOqsSH/bvkvXSCX/SfxA/Dbd5o3RwJ+aiM0IYOF/LhyY7Ri17gR+swpOzYo6fLVz84UKrQYZ1PSQUC4+IdIz8eoj9R2hZPsoLJObIDzWXbMNNeGteSEMOxycr9Kn2FdSTwyMBqMG7oxRWZ1IBz91iL1GmwUnlEPcNr3P2xtviMHs9KqGbrqDzgF; 24:3oYpZq0F0lRYJ960bNY8uqXONOEzapWOINTEHq/5ARqczxraI9uxGvgKjl4zkpBrZVa0prG18SLjOQEuZ7XzR6UXLWSEACjebzhAQVPkWkk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN1PR03MB169; 7:k6IDtIQM0qKh6vSUGJ7YuI2iy5V6YE2+Zhktz9YtIU81UVzYSbAg9LSFr2azbwEtiR6btHWB27Fhq4iBnLffghvo5Jbope524ilRKYi3J8q5JvCumZvC1+o7QRQlc/cxzh6b2wVLKkFyDdlmgL4EWXNIaEXxVV2IN19Zb0+PL4/od3DdDbg4p/Gov8ekNNgH4HYP9VMpeZZ0S0ImMi+8aPQxMEa0BR2FWsdApI8FBlFLE3tD70JMm5C5mHS7buzLSIped/ifvy9PPxbNOXt2GOtjH0ZdcX7RqDDvrx28K8Ur6IulSHCF+tax/T+aylh7Lpj4s3EzZErkDUkDsQfG8A== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2017 16:56:41.3248 (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: BN1PR03MB169 Cc: Kumar Gala <galak@kernel.crashing.org>, Stefan Roese <sr@denx.de>, Andy Fleming <afleming@gmail.com> Subject: [U-Boot] [PATCH] powerpc: t1024: Fix SRDS_MAX_LANES value X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
diff --git a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c index 2ba314a..7c4519e 100644 --- a/arch/powerpc/cpu/mpc85xx/t1024_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t1024_serdes.c @@ -10,7 +10,7 @@ #include <asm/io.h> -static u8 serdes_cfg_tbl[][4] = { +static u8 serdes_cfg_tbl[][SRDS_MAX_LANES] = { [0x40] = {PCIE1, PCIE1, PCIE1, PCIE1}, [0xD5] = {QSGMII_FM1_A, PCIE3, PCIE2, PCIE1}, [0xD6] = {QSGMII_FM1_A, PCIE3, PCIE2, SATA1}, @@ -45,7 +45,7 @@ int is_serdes_prtcl_valid(int serdes, u32 prtcl) if (prtcl >= ARRAY_SIZE(serdes_cfg_tbl)) return 0; - for (i = 0; i < 4; i++) { + for (i = 0; i < SRDS_MAX_LANES; i++) { if (serdes_cfg_tbl[prtcl][i] != NONE) return 1; } diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 762b174..ee537f4 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2523,7 +2523,11 @@ typedef struct ccsr_gur { #ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2 #define MAX_SERDES 4 +#if defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023) +#define SRDS_MAX_LANES 4 +#else #define SRDS_MAX_LANES 8 +#endif #define SRDS_MAX_BANK 2 typedef struct serdes_corenet { struct {