Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD820C433EF for ; Fri, 10 Jun 2022 13:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238539AbiFJNxd (ORCPT ); Fri, 10 Jun 2022 09:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344944AbiFJNxD (ORCPT ); Fri, 10 Jun 2022 09:53:03 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2A253BF81 for ; Fri, 10 Jun 2022 06:52:52 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id y187so24856014pgd.3 for ; Fri, 10 Jun 2022 06:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bfL82UjliEnQJ9qD3CYiTA5SODnWBxqMOqNq7lHPGnM=; b=ghdvESKgY77exujhRnn0la/r67P92XQU+8uGUeM7q2gIm6vDyLLJK6/yKOOzUggKAB yHapdHSbIWSjsOAPAT0SKI2xdoGGC2HQtc/85E4KZqpYhiH6DzP5LBErbmXI5QBmqhAN o7BDFjOgy9gKaT2rKlH0o0Yf2YYV9w5+CkBmJNt8ow3jGlIHgpaERDaeRQKo5dEP2tiJ jfuLhhS/nvJUAxTrDCC0DKV12WIbQRX/uk+v5+WXlDx02rzRZ16LWm3f8/XOE9iStYyv qoiVbveoJ1BcdTLpwVl7c/PH3fgFKXkrTj/po84wl+EL3Qtv7c1rsyloRlqYP3A8KUJ4 TBFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bfL82UjliEnQJ9qD3CYiTA5SODnWBxqMOqNq7lHPGnM=; b=0UlrKvOi9mMtoSHT62MQQulrlIROFUjkfQQ6r/L408ihCYPM7hNEdzcfkbMrRXGFgD 8/gJmxv+CERuClJF7L2cEkqZYGWmrRuqDiUbNVzSyYiPs6tnokJahaNcxLDPpSfwJ+v6 g0UgoDZGjcVKDuwYtLQyk6NbFRNHKRvrymK4z/O4uxbOwiFRWsfd1THiDX23xeLh4lpq aHjtC+0OZsJLLAEdF+Im9jWtYXIiTyZmUnSekKmWXop/i+crZJuh8ryavfzwOrOc+T5N 0i4XDSves+nl2691bLxhA/AS03JtRg+LKcmET7a7xUruX6eh3hkQZSCsCF90vfm4iVMF JJgQ== X-Gm-Message-State: AOAM530/z6go7NH9u7sLUph+SBPfZ0x1EMZ8h/QyGLmhdqUCtb7383fJ sMBWbaNCH6JeafgDGTq0VlmDdGrbyh8= X-Google-Smtp-Source: ABdhPJwM8pVaK0rv3O47rQDWQFXmdOy3VXQxdveXTW2+0vcqiRBSDRauB2yBcNYRMpzMKmtYAn9FQQ== X-Received: by 2002:a05:6a00:c5:b0:51b:c452:47ce with SMTP id e5-20020a056a0000c500b0051bc45247cemr45014780pfj.52.1654869172017; Fri, 10 Jun 2022 06:52:52 -0700 (PDT) Received: from tokunori-desktop.flets-east.jp ([240b:10:2720:5500:2f3e:9a91:223c:1860]) by smtp.gmail.com with ESMTPSA id t5-20020a170902e84500b0016390e0db7asm19154074plg.121.2022.06.10.06.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 06:52:51 -0700 (PDT) From: Tokunori Ikegami To: gregkh@linuxfoundation.org Cc: Tokunori Ikegami , stable@vger.kernel.org, Vignesh Raghavendra , Miquel Raynal Subject: [PATCH for 5.4.y] mtd: cfi_cmdset_0002: Use chip_ready() for write on S29GL064N Date: Fri, 10 Jun 2022 22:52:31 +0900 Message-Id: <20220610135231.336796-1-ikegami.t@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Since commit dfeae1073583("mtd: cfi_cmdset_0002: Change write buffer to check correct value") buffered writes fail on S29GL064N. This is because, on S29GL064N, reads return 0xFF at the end of DQ polling for write completion, where as, chip_good() check expects actual data written to the last location to be returned post DQ polling completion. Fix is to revert to using chip_good() for S29GL064N which only checks for DQ lines to settle down to determine write completion. Link: https://lore.kernel.org/r/b687c259-6413-26c9-d4c9-b3afa69ea124@pengutronix.de/ Fixes: dfeae1073583("mtd: cfi_cmdset_0002: Change write buffer to check correct value") Cc: stable@vger.kernel.org Signed-off-by: Tokunori Ikegami Acked-by: Vignesh Raghavendra Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20220323170458.5608-3-ikegami.t@gmail.com --- drivers/mtd/chips/cfi_cmdset_0002.c | 42 +++++++++++++++++++++++------ include/linux/mtd/cfi.h | 1 + 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index fa5324693200..006221284d0a 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -59,6 +59,10 @@ #define CFI_SR_WBASB BIT(3) #define CFI_SR_SLSB BIT(1) +enum cfi_quirks { + CFI_QUIRK_DQ_TRUE_DATA = BIT(0), +}; + static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); #if !FORCE_WORD_WRITE @@ -432,6 +436,15 @@ static void fixup_s29ns512p_sectors(struct mtd_info *mtd) mtd->name); } +static void fixup_quirks(struct mtd_info *mtd) +{ + struct map_info *map = mtd->priv; + struct cfi_private *cfi = map->fldrv_priv; + + if (cfi->mfr == CFI_MFR_AMD && cfi->id == 0x0c01) + cfi->quirks |= CFI_QUIRK_DQ_TRUE_DATA; +} + /* Used to fix CFI-Tables of chips without Extended Query Tables */ static struct cfi_fixup cfi_nopri_fixup_table[] = { { CFI_MFR_SST, 0x234a, fixup_sst39vf }, /* SST39VF1602 */ @@ -470,6 +483,7 @@ static struct cfi_fixup cfi_fixup_table[] = { #if !FORCE_WORD_WRITE { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers }, #endif + { CFI_MFR_ANY, CFI_ID_ANY, fixup_quirks }, { 0, 0, NULL } }; static struct cfi_fixup jedec_fixup_table[] = { @@ -842,6 +856,18 @@ static int __xipram chip_ready(struct map_info *map, struct flchip *chip, return map_word_equal(map, t, *expected); } +static int __xipram chip_good(struct map_info *map, struct flchip *chip, + unsigned long addr, map_word *expected) +{ + struct cfi_private *cfi = map->fldrv_priv; + map_word *datum = expected; + + if (cfi->quirks & CFI_QUIRK_DQ_TRUE_DATA) + datum = NULL; + + return chip_ready(map, chip, addr, datum); +} + static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr, int mode) { DECLARE_WAITQUEUE(wait, current); @@ -1658,11 +1684,11 @@ static int __xipram do_write_oneword_once(struct map_info *map, } /* - * We check "time_after" and "!chip_ready" before checking - * "chip_ready" to avoid the failure due to scheduling. + * We check "time_after" and "!chip_good" before checking + * "chip_good" to avoid the failure due to scheduling. */ if (time_after(jiffies, timeo) && - !chip_ready(map, chip, adr, &datum)) { + !chip_good(map, chip, adr, &datum)) { xip_enable(map, chip, adr); printk(KERN_WARNING "MTD %s(): software timeout\n", __func__); xip_disable(map, chip, adr); @@ -1670,7 +1696,7 @@ static int __xipram do_write_oneword_once(struct map_info *map, break; } - if (chip_ready(map, chip, adr, &datum)) { + if (chip_good(map, chip, adr, &datum)) { if (cfi_check_err_status(map, chip, adr)) ret = -EIO; break; @@ -1938,18 +1964,18 @@ static int __xipram do_write_buffer_wait(struct map_info *map, } /* - * We check "time_after" and "!chip_ready" before checking - * "chip_ready" to avoid the failure due to scheduling. + * We check "time_after" and "!chip_good" before checking + * "chip_good" to avoid the failure due to scheduling. */ if (time_after(jiffies, timeo) && - !chip_ready(map, chip, adr, &datum)) { + !chip_good(map, chip, adr, &datum)) { pr_err("MTD %s(): software timeout, address:0x%.8lx.\n", __func__, adr); ret = -EIO; break; } - if (chip_ready(map, chip, adr, &datum)) { + if (chip_good(map, chip, adr, &datum)) { if (cfi_check_err_status(map, chip, adr)) ret = -EIO; break; diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index c98a21108688..f3c149073c21 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h @@ -286,6 +286,7 @@ struct cfi_private { map_word sector_erase_cmd; unsigned long chipshift; /* Because they're of the same type */ const char *im_name; /* inter_module name for cmdset_setup */ + unsigned long quirks; struct flchip chips[0]; /* per-chip data structure for each chip */ }; -- 2.34.1