From patchwork Fri Jan 22 10:20:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish Kumar X-Patchwork-Id: 571599 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 B14651402BF for ; Fri, 22 Jan 2016 21:20:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 32EB84BDAB; Fri, 22 Jan 2016 11:20:25 +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 X5LBxZeOBP4A; Fri, 22 Jan 2016 11:20:24 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 987B04BD53; Fri, 22 Jan 2016 11:20:24 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C8D584BD51 for ; Fri, 22 Jan 2016 11:20:21 +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 JzjoK2rBT7Oj for ; Fri, 22 Jan 2016 11:20:21 +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-bl2on0093.outbound.protection.outlook.com [65.55.169.93]) by theia.denx.de (Postfix) with ESMTPS id 165654BD36 for ; Fri, 22 Jan 2016 11:20:16 +0100 (CET) Received: from CH1PR03CA003.namprd03.prod.outlook.com (10.255.156.148) by BY2PR03MB361.namprd03.prod.outlook.com (10.242.237.13) with Microsoft SMTP Server (TLS) id 15.1.390.13; Fri, 22 Jan 2016 10:20:14 +0000 Received: from BL2FFO11FD019.protection.gbl (10.255.156.132) by CH1PR03CA003.outlook.office365.com (10.255.156.148) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Fri, 22 Jan 2016 10:20:13 +0000 Authentication-Results: spf=none (sender IP is 192.88.168.50) smtp.mailfrom=nmglablinux22.freescale.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: None (protection.outlook.com: nmglablinux22.freescale.com does not designate permitted sender hosts) Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Fri, 22 Jan 2016 10:20:13 +0000 Received: from nmglablinux22.freescale.com ([10.232.20.244]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0MAKBYi008690; Fri, 22 Jan 2016 03:20:12 -0700 Received: by nmglablinux22.freescale.com (Postfix, from userid 65013024) id 81F935DC93; Fri, 22 Jan 2016 15:50:11 +0530 (IST) From: Ashish Kumar To: , , Date: Fri, 22 Jan 2016 15:50:10 +0530 Message-ID: <1453458010-18418-1-git-send-email-Ashish.Kumar@nxp.com> X-Mailer: git-send-email 1.7.6.GIT X-EOPAttributedMessage: 0 X-Matching-Connectors: 130979316138287707; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD019; 1:zXFzb3Moa3iqJEqXsOg0/AuBXX1lkDOommr4lJ70ytBc4R7whpClxkG8FjP9ynk3HKNKPCgKEJl8ljmN7PM97cD0kM+CTyRYavt2KViLdC0kE/1pyw2alHX0+UBoYiFqz+XjLM4SXGwEubuqZ0Ei07cTk8KlwggBtqkLI6CDV8/vMo2o1XIUHF+tw9px56X51gdoS27iDzf950gmB+PZNpxwmxGU/hgFEQlqQOQCz+Xj1s+6zbWZ4z6sIkT+IbJcS3H8WvyHxjEosp/t+eR5fkbE8eiIHKN64EehcK7IRYcHAt9TsH9Mt42NP74JkDLvLpZDfdzGGWqeELDkV694R7uiT/ArfnVgqAz3l3X6293otaVB4sa+E5i74X0iR/7+uqhIXInSr4On9ns7SvY0sTuXWJuZGZp5KohzJW/jYJknMXLVTfKt3T7brC/nJB1jH51UyRWNDEimder7/pUyI1ycLxfguiJMnhgYUcsWUACmozG4ScRUv4nqW7G12ZQRHcx9faQfjg1qM2zs9aB7R7QQNRSc5Hl/Lsp4uyB4xNjItw91MDFdqpZU3nMilBibK8JQtcwXXfbLm/CY2DhsJw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6039001)(6009001)(2980300002)(428002)(189002)(199003)(105586002)(19580405001)(229853001)(2201001)(19580395003)(106466001)(50466002)(103686003)(52956003)(87936001)(5003940100001)(189998001)(36756003)(47776003)(960300001)(46386002)(2906002)(81156007)(42186005)(92566002)(4326007)(5008740100001)(45336002)(97736004)(586003)(101416001)(5001770100001)(50986999)(5001960100002)(11100500001)(1220700001)(16796002)(6806005)(1096002)(48376002)(50226001)(90966002)(86372001)(7059030)(42882005); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB361; H:tx30smr01.am.freescale.net; FPR:; SPF:None; PTR:InfoDomainNonexistent; MX:1; A:0; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: eff38a1d-3c94-4603-a25b-08d323159dcf X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB361; 2:IkUfTLjn4i+9bDAyFG4yWT2Ts8KjQElcW4poGPtXKIIGvBjS9IlYhZeM+VHdzgl++BvSXe7HcEs57RgSwFR0ezWgv0tO9fgyYL4FndEhaZAk/Z/u1sX8ZHyu3tLb62TWfwCm2l4HoOCV5Q/qyDDHGdzM+hz2IJKEae4iToi1RLgJEemF5RfmqmbVWucXF9iN; 3:Yg8RNvwTVl32umqruGaqlwzvWmJwPolHb3mUWMmckI3WyRVPKcSaJtLmyoepEXyM8NdChEfibA3Vnd3XajJbzvoYKoWANmJCFndfWzmt9NFDpAkX3AwiE9dncw+B8beMLAhTcr1PlOt0CV0dHhCilKInv1O7nBdngA3al1v+cW+aoHG3bKxy6J5DDqcpppIVrXwmjlt+cYIN8UHOl32Y0VJ4W1o0LiM1tTkM4JPhOlQ=; 25:zbOs5VFHFL9j2PzsnN7BGdHrC2scyzmWvpp191na+ww8552bS3CsQImm15bkyB1KEm1Ts+BX0e9Vh4FoE8gq62KiGrzhrrjraH32+i/QKr1xKfypa4ibVwYX2UsNoNLU1ndpO4wPwruVAFcQOp+pG7M+zzedWyi0q/xzcV9HAnibq3CrjVquYKQ7ohVjzNvXnAyZLaD1YgWswGCmwb1cRPA/6Wbu+oDCcfJl4e3BbFdltmyZodDneq4K9/GVMpmy X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB361; UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(123027)(601004)(2401047)(13018025)(13024025)(13015025)(13017025)(5005006)(13023025)(520078)(8121501046)(3002001)(10201501046); SRVR:BY2PR03MB361; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB361; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB361; 4:TXbJWQ++b1XXtgIPilfHIwwetwzuVKJGRLsgnJsm3xPlI6AaDwfH/z1qwm4Sf2kcfhxLzNBX5aUnG3qSm36VJfv2lMJTwMFY6UwCaKuvbYVWYsjirHnIq3w26XNPe4ZVE5wnOt5Gr4WK5z1d5+qpHhIpQYveuFx6X88f7UX40+d8w49m4oeutCynyAesf+w+/t+1XtM3dLiQqhPRkRnIw1ey9PXEX3fek0S94FbWgCCyAG9OsWJtyP+OOEI6hEqHJB+l3D6IUEodwXF2H9QZ4R873gdH3QzHB+2EXzeIvpoEt82FS4hsDTdFA4nT0XrpD1IiJzjibXY8NyjMdDcPI1iVvWIdwhMQI8DobxnSuKp+2NeP4NZuZTvA97sNL5/tqxKnRGrCALryNYySTJksQvlwq7DT04jjdU8RD1lHhELqq0GDPa1mFdoJmoJ2kSENNsZ9PbFDEV2wNuYzeTFtrBTqZdzl8EbzkXus+IMGVxhBdyGiVQJQ7Oqhs+727rARpD7fzdPkKrdHZd4YKE8SwDHydRu5Di/omTxZEMS8zLA= X-Forefront-PRVS: 08296C9B35 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB361; 23:vi7eytyWG88VWX+AbtufbLl3okFLj6a/FfRGJVrfwk?= =?us-ascii?Q?x98WzEZ/4GQg5w0ZxcPXTxX/f+6MIm0ed8qY6nUS9nfni9fF7ufElg2VFCiI?= =?us-ascii?Q?k7mTL1WNbuhkZWJoJOH44IGq83StiQkXuNf7rp/RxftddD/s6YpLsJKhBZtj?= =?us-ascii?Q?ry0xrxVW1+Mt6DtrikRC2m2AC1xdSS2La7sKy5nh5KpgT4W/gHjxaRbLrggP?= =?us-ascii?Q?Si692MEDZ9j+CBPJVHNFsMQv6ppR2pWf07wV8fct3BUYiaFk1A9CwFNHAyOj?= =?us-ascii?Q?Foy5Vxaxp8U6uRwcBrkKetcdUOaa35n2divfj4xwM0f8E3zvitUK2IVMxyIk?= =?us-ascii?Q?UDWqKO0VQIZkp+W9d1d+Cxm1a0k4t6M2hCUbYbfdRrk1cVaUV332QXZwmiC6?= =?us-ascii?Q?4lYL5/6wWeDNM8O8UFna97jjCfQSBD5vi6Jv7PBin05RSyIkNLUnjwjO0pvT?= =?us-ascii?Q?3rn7Aa9I3O9DZJG9/SPQhMig68HGE3Zi8k2bRnx0YP2dgsfuLZAy73BAlsSa?= =?us-ascii?Q?DU8xNqr0Lqs8+fQxH0KQegjkviMtDyiyJu2nTfgklz1nbZ6oZBpqkUVWOi3/?= =?us-ascii?Q?pscx2DAbCiGJzeFpVXo4CNbYd8ODr3qtCAJDaoqPJajeJj+BjwEs9s+s8DPH?= =?us-ascii?Q?4EeZln4w64AWKPR291xtlV8lDvVeAugyVDDKf0g8u31edylarg9HJqlSRjPx?= =?us-ascii?Q?dYdKlkRlOKP4zhZigErZVvmFHsDvJsl5zKNtHcMAZdPJ1OKr+ZvPQ5Fpm3uV?= =?us-ascii?Q?JZZdT4yXkqFlr7+lTeYWqm1pZ7AsiagfjNuqqc/sguuNs4X3ZeUddcQE8STC?= =?us-ascii?Q?ZkwEz00OgjESaF3XksQ7OJRUkuwaw56Tf4begBOnukgOuERz3vgd68P5tYh1?= =?us-ascii?Q?tsMNK6WOdESkYjyfsrt3SPkWhzJiHepXxgJ0WyTFB8sPyFBkfg9uDSHqvA3l?= =?us-ascii?Q?R2cT4EYMDfMmIBMZnAjdVWQ0BASQ/TTEvu3KQtftQuKELDh/KMk122A4u2NS?= =?us-ascii?Q?GhtcyFwmX2aneMzbd0I/a18mSYGxL3D/4lQRkJCk6ZqBRNV1ACpceMsRNtkz?= =?us-ascii?Q?FwCKq5Wx0b/t3BLOml9XiFdZfSms+nPb9oo+5bbKkLGMFbCBXXk3FxngISNn?= =?us-ascii?Q?ERqJM/+vVfrLDeQJVecU/ss5XAr2hwgADAU0CQcKOK/bAEm9OhfHlyf5HIdQ?= =?us-ascii?Q?lgD5MkCGLPXuw=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB361; 5:EF2LGZVZl7qlHm5X5N6Ph0+rBWzoC1Bo+qjGsW4ed053zJ41Fkne2BmiTxzQIODT1UsO0Y6/zM1k06w6/PBrJmTFX8BYbavegc3Ibpf7NjEdUY9bENiK6yQmlUY9wrXIN3UPrulIMSlT1PcgWlMm15jlRoTK9LXVvQWuz0/WOfY=; 24:Tr4Dpb1fhJpTKCHn9qMfMMr40SBCPNwKDL54Rsdm9AgUYt9nSG9lN4JVbLNVgRuYa6HFq+L2zAr7aFSqE6RNJ9yCxVxFBiHSb+sHVzu8HuA= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2016 10:20:13.6415 (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: BY2PR03MB361 Subject: [U-Boot] [PATCH][v2] arch/powperpc: Fix start_align due to use of __ffs64() instead ffs64() 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" Return value of ffs64() different to that of __ffs64(), ffs64(0x80000000) = 0x20 __ffs64(0x80000000) = 0x1f, as result of this change -1 from start_align needs to be removed. Incorrect DDR law was created in case of B4860qds Signed-off-by: Ashish Kumar --- * Test on B4860qds and T1040 * 83xx platform not tested arch/powerpc/cpu/mpc83xx/law.c | 4 ++-- arch/powerpc/cpu/mpc8xxx/law.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c index 262ae7f..ae9cba8 100644 --- a/arch/powerpc/cpu/mpc83xx/law.c +++ b/arch/powerpc/cpu/mpc83xx/law.c @@ -21,7 +21,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (start == 0) start_align = 1ull << (LAW_SIZE_2G + 1); else - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; @@ -41,7 +41,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (sz) { start += law_sz; - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; ecm = &immap->sysconf.ddrlaw[1]; diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 24baad4..bd79297 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -188,7 +188,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (start == 0) start_align = 1ull << (LAW_SIZE_32G + 1); else - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; @@ -203,7 +203,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (sz) { start += law_sz; - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1;