From patchwork Sat Nov 18 19:09:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 839260 X-Patchwork-Delegate: sr@denx.de 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 3yfPg040Xsz9s0Z for ; Sun, 19 Nov 2017 06:09:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8C71BC21DDB; Sat, 18 Nov 2017 19:09:22 +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_BLOCKED, 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 40C07C21D8C; Sat, 18 Nov 2017 19:09:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 25A1DC21D99; Sat, 18 Nov 2017 19:09:19 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0048.outbound.protection.outlook.com [104.47.41.48]) by lists.denx.de (Postfix) with ESMTPS id 456D6C21D8C for ; Sat, 18 Nov 2017 19:09:18 +0000 (UTC) Received: from BN6PR03CA0001.namprd03.prod.outlook.com (10.168.230.139) by CY4PR03MB2695.namprd03.prod.outlook.com (10.173.43.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.218.12; Sat, 18 Nov 2017 19:09:16 +0000 Received: from BY2FFO11FD016.protection.gbl (2a01:111:f400:7c0c::117) by BN6PR03CA0001.outlook.office365.com (2603:10b6:404:23::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.239.5 via Frontend Transport; Sat, 18 Nov 2017 19:09:15 +0000 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 BY2FFO11FD016.mail.protection.outlook.com (10.1.14.148) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.218.12 via Frontend Transport; Sat, 18 Nov 2017 19:09:14 +0000 Received: from oslab-l16.am.freescale.net ([10.214.84.160]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAIJ9CHp017900; Sat, 18 Nov 2017 12:09:13 -0700 From: York Sun To: Date: Sat, 18 Nov 2017 11:09:08 -0800 Message-ID: <1511032148-30190-1-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131555057548365038; (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)(376002)(39860400002)(346002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(305945005)(86362001)(68736007)(5660300001)(6916009)(2351001)(81166006)(81156014)(8676002)(50226002)(8936002)(498600001)(5003940100001)(189998001)(356003)(8656006)(104016004)(316002)(50986999)(16586007)(2906002)(50466002)(6666003)(4326008)(33646002)(77096006)(36756003)(48376002)(47776003)(54906003)(39060400002)(105606002)(97736004)(106466001)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2695; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD016; 1:2jcdcoEDqw8Vf3i1bdHTZ7VrnrlXtNc3eH45ByUa9UHJPrZFmu10F9JzHK4kGByVwSEjKl2fwlI2l+jmD7kojboeRtY9dg1tCl1aRQKF9A/Q+MgO2XIGkEtZS21grmPS MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba8ce170-4138-4eaa-2b8d-08d52eb7dc08 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603258); SRVR:CY4PR03MB2695; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 3:jfBDRUHjif1GaRIqhQZq4ump937OHhrxXKRj/Ah+iSOcId7crm8Q8LZZY8wu4tYCjdfTgYbQE9Hpz+lrbyL7odGBjNVQsnpX6Liy/u1A/Z82hJg1YXP5Q9PlyLHRCeY32aQGm2Z0yQze8s+bDe0XRFxyZpgtVYU/38iHyMNp11K79ww2j6JkXDI5yTiEsQDwK5VYtJsKDkpbWSRWugErezbqn7XGixWq93w2QC4WOYdCjmymRTzuC6pmz5DQ8UDIbIe5LfHPh/+qhmzH3v/no9z720LhjdmPuyV/IhOQbpe/WsMrMBjYFkP7RyFkezsWkdMTPzf9Kg1Cvt147BT7mXnbLImVEqejHKT3qq0HyrA=; 25:C22jFxh+6N0Fczi2NcpWyk2DK6qOpJWJazHg8m1ACwIdqKV2hgPNHVSGJVc+zUJdvwInvczHdyC9EaBQsRG4S7rDrmbqMHkQa6gDkIcrJOI4sTMr1Ym6o/VmsDJ6gnxHcQambmykhb+cWbUHrG3s4akrSGQN/iecQLZ4adoMzwDTnhxZyoWP+6V+PesYXQ0Pby6u3HkgWNSs9n5ic0q91+1cY1vsLIywGGmkM2TDa8OgEFlMAovjE3tZ2m1EdWvg8MiVb04e5uB09etv0aEqKM8lNn+UuusGCmYsRfHYJdO1l4nFAF2I0uS5KJ/iO7cLmVu0ysaJpCGOAlgwBG2Mag== X-MS-TrafficTypeDiagnostic: CY4PR03MB2695: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 31:egmCzYylquHhanargzNymYJXXn9bPHMU87mT9lfy8QgIxKkDHJFK7zdpPWe5w3YXBfwVWqpKAYf5ucF4r0Rdf/I+1KTtP9TFkDtrR3re9pGkwBm4ZO3B6rz7VVP+NNvinturaHBxRELfjXfHD62wJ9Mk41af/gRNE2sO3cUSWf6a1Eh6F1UJkG/JrAQdnI6S/COtOMg8rAqKsu7NiEqL+GMHRIkIFtNFUNhh7pUIgtc=; 4:bqqEOgJTz+tihnWOCD9jQ2Q0NC8hnJxEuLFDnUIyHMPSZjBmxFpIBB4aRCbFv6N78HENx451OgicWtikDYfw7sV9UFiLMLD0EGZWa0YjhaKPs2xQkjifaGoFjpbfrTMuIRisRiQdeQ5HXLy2mTyYEBh2SZa92Js7ybRDJi3IvZyW++sz7Ptp5sqYvZe2CY31JGzuvLVpUe2US6CrbiHmHC8LOk6NEDupk5iZOXSE4NLUOaezi8eRqKF6gOruxrpZMvfF+pgcRAxqN5uEQxZKek7yRvvhr/+YDr16vQIpoeArIodNqxu2qYm0UNb5y1Pj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231022)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6096035)(20161123565025)(20161123561025)(20161123563025)(20161123556025)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB2695; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB2695; X-Forefront-PRVS: 04953B1F22 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2695; 23:XQGq6HbJ0NJxLIsYbffW+WLn7+ZhbfqgtxgjicvXL?= 1H36ZXdkBWKaFCdV1NxO9xXRnAwDpA7R0/wxPlrimH4z7IxWdaTSJokg5mezsMfuV96DLeK/nbKxsniPdUym7fDNYLaHcaMoJqUTRUTlqaDL4XUBUoTcz4PSq+vHB0AYBWdQjYi2nk8nexg71zDN726wsxz4KfQMERN1Y3i5qN6ariQY738efEbS7YNfvnO1dqca6/Hr5d301h3gZJnwipce2XMc4rKQW7eQ9yhH06TgSeo+vTj1nM1Neu7zdqesU+MwLxgFqPRZq9ts+Rv5HJo5wmx2bOtCsvqntzVpZaNHjvmBuKHR7SpjOMpLrQROygbu3st7sZT8OYK+oUV3CPRAjS7/Lau2b/nh8ggjwFmXdvzRyDIKvzCHfm7QdSr0xwANTxgqWL378NFVnn7B2E0PuyKOgQQ7vhohT3QeNWAJU2IiQO3g2s6uujUY10G/D1Dvf2iI+rJ/QDBY/i52MXwAdkuCpIGJAHT/8nyz9XKeTFGPUYXV4KEVNKw779jqh+/yxRAJTbBjRhZldCMKn5Qbr6g7bQndqw9RUF8iUDIvbbjZyHfucQem/zGrTrGZFGUzwqb9SF8656wagMdr2NXM0Uaa3tfgsbNcg/Ob1sdOScPdR0dabwjL2usbtcga3XnkxT22fyfZx6NGLJGz3PVnDeZ0cg2jF6BVNGpO03N1kqMHr7/oE8mZ3APLIzvboreJeL2uhBhnBpCcIEb9q0OD+8cukUU2fQ4sHGqHGUxQVpzHS3uB56qPbImEWRXyMU04rj+fxQnsfrG1U1lZ63EPf3ZvxujFWqfB68OUZYNpmaV0sQBZcS3fzMg+Ph/dqSmhY7zfAj1TcTI1B9UDo/gujpP9Q2AB/SKBiPAe0gLc/xc757n96BncWTM7sFVSjbJdfbQR+5qrWELcxwu+PL4cA51AuCG1YD0Rlx7KjgpfhfH7zuFlep2M4IXWm6S9BbrwBTanHEp0GX4pahAfm1Pr5XnqFF4BA81mUUgAfT2zMWrhwRLO9fzjN393ue87WHaDIe0WmB6ybpoitZ5vyoq+9D/W1DN2onmQVkSNYyHiPoGU8Cl40zRu9zKWwv4t0s= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 6:xLfcLkq0fpnewns6NscL7DvSgp+fP/BsuTxpzZ9EDEuvj3MfeYoR0I50qA4bGQMHdKjzKjr1pVnG88ds5LTckhkIM9BoD2ctObtpT0GUp0FWf9aSaP1OEv/8o791URwerYejBEIDz73dFKp6HbeaupFEvlVYhtGXioi8sBz1p6gwUPQbC8C1FMiwYYFp2OyCBVekL2npge0uFzFybN6VzzJHlQtuYrXsCwm7KSXipcRVz/adU4REtRAishkgf5qHSoAOrteawveL+qWVmnk3q7aCq9mocXwQ39SwOEQTBLrtlD4TkX1b795nOdjajyGzgYkNYXlbDeYERwK51x+Qr2MjmQ3IcevWx9sFkfPSy+A=; 5:uCPfMU+mF6cKPb6kYKXDmLQr5hvTnJvWCabUcL3+16khcamzJu46AEIfaXFr/wzZ+w24pBwq+viqQOAc5XGmnQFnU2/HZ2Ho2Ka9v74vy4pF6uIeOHUsLmRcJg0RqXZXGFMtqUaRV4+ZV5H7YDxux5fOe64Qh/ngH3hh8Zwdhj0=; 24:PYZYNCElR4b+nC3t5VNUj6zjvUkiTH4mwXeJDhi6Z9BuBPmm8RLwYiSIDcf7RhGeb0hcvoOetBQUTFrZWn3W3bIFKz3BmEfGEL8d2/pDt/0=; 7:aEGEglfJ46WvN5GMtl3AqOO66xWhK9m7dArvdXmcCSZ2Vk1Id/FoafcuHfFvlq69Ysh80CcuIj9IvkIejD8ZZGmtIVQ1hz/BvyrC76YtuJEXRgs/zkPkFvrPzBTHX37guFc6ba5tgcVjJZtRQ3QiJ7uGCDPUaJfIMx1R5Qr1a0w5QG/wrZmB8+Cr+Nc56Ct5ht5bO22fEgXBTLbG6cthhDb/h+sqBDb7T0rVJRtdsaHjPE2dVQM1yAlsOG3PYPdK SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2017 19:09:14.6337 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba8ce170-4138-4eaa-2b8d-08d52eb7dc08 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: CY4PR03MB2695 Cc: Stefan Roese Subject: [U-Boot] [PATCH] mtd: cfi: Fix checking status register feature 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" Commit 72443c7f7d21 ("mtd: cfi: Add support for status register polling") added a feature check to determine if status register is available for certain flash chips. The "lower software bits" register used to determine this feature is not backward compati- ble. Older flash chips without this feature has reserved value 0xff. Instead of checking "lower software bits" register, use CFI primary vendor-specific extended query. Since CFI version 1.4, software features can be read from offset 0x53 according to document AN201168 from Cypress. Signed-off-by: York Sun CC: Marek Vasut Tested-by: Marek Vasut --- drivers/mtd/cfi_flash.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 8a5babe..f096e03 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1694,7 +1694,7 @@ static void cmdset_amd_read_jedec_ids(flash_info_t *info) { ushort bankId = 0; uchar manuId; - uchar lsbits; + uchar feature; flash_write_cmd(info, 0, 0, AMD_CMD_RESET); flash_unlock_seq(info, 0); @@ -1710,8 +1710,14 @@ static void cmdset_amd_read_jedec_ids(flash_info_t *info) } info->manufacturer_id = manuId; - lsbits = flash_read_uchar(info, FLASH_OFFSET_LOWER_SW_BITS); - info->sr_supported = lsbits & BIT(0); + debug("info->ext_addr = 0x%x, cfi_version = 0x%x\n", + info->ext_addr, info->cfi_version); + if (info->ext_addr && info->cfi_version >= 0x3134) { + /* read software feature (at 0x53) */ + feature = flash_read_uchar(info, info->ext_addr + 0x13); + debug("feature = 0x%x\n", feature); + info->sr_supported = feature & 0x1; + } switch (info->chipwidth){ case FLASH_CFI_8BIT: