From patchwork Fri Jul 22 16:09:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2230 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A2DF73F047 for ; Fri, 22 Jul 2022 18:11:09 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id w15-20020a056402268f00b0043ac600a6bcsf3113108edd.6 for ; Fri, 22 Jul 2022 09:11:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658506269; cv=pass; d=google.com; s=arc-20160816; b=r/7M0rU5E9Cr3guZq15TRj7rttaOr+e5kiWZYH8t9TG2uZj4zkNmIhnJ3blXmzFtWi fjg6doTXDhQuerbbjGxQ9qujnrEJ0IZeOM+WVuur/L400K/verKO1mupQkNeUa1WE+Ov tBbdhJLcuqUgvpxdGvHNICwYcI22SM4U69+8oyv9mZ/0mPypC9FfHkS4LKRRlVcpnsDK 23ojvFxvRz9I+1IS2LCIQjyH3N7fP+mB76vuHaAl7nqD2FR8AtC4g6BrLvdCv1ky3ZVH MzRhtR5o7ggfTOdn4V8XYfqNS8tvI20hDlGZEp1yqRA9+znuaGppjQO6nNc0gtmnrLDm +pKA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NvDKTqSpMiZK09DpgobAKvYfVWZ4vJSSyEY7EknLV2g=; b=CGpZuaWJpaixC74o+m2zGmm6ou1d2noZVtnDd/4AaiKwLO/Tfyd9KcIPbbp/II4Xdo iXlAFk3v3qkShsdqlLkAGMF+2oiUit0iP1zdkW8lfUwwusOKxE6hYWqXTUPQJYTbSutN FMRnzH4OY+AfuTnMiiNzDZbi816bx8BIfeVcFzZIoTwaZLKBrV6OMoyxxMSw4yTVPqQs kbRh2KsiARpcpqMu4W8mo4I98HasJKI1ZrG4t4JE9N5zJoGX8d4pWZApaayENosNP4wP VDVC+/1mqq61cOrSc74N45IeeXBXHitM5l81zaLNh1cJMzftJ+cduQhAz1XKuRUmxhC6 bJnA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=I7jHdhGU; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=NvDKTqSpMiZK09DpgobAKvYfVWZ4vJSSyEY7EknLV2g=; b=p1NPPdA1ebSsDigzEwuFLP6mDYr4Eji0IKvM5R08GH6BWKoYj6AFxihJT2+PPKlNG2 f3B+HtaDfFafSxGpGruVzdA4Osvl0lDx/fHm6P5SDJ7x1wXqcsYdA7XNltIoijRRkgMF sBeWcRFQidMCMvbcKpRWIX0clNjcXyjOuJ2Ik= 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:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=NvDKTqSpMiZK09DpgobAKvYfVWZ4vJSSyEY7EknLV2g=; b=q7SKA3DFaaKv+ZLZyjPGJYogyKKvFvnKtbAqQx2fmlNsgHcUm5hAvt9/bjJV0XUcUh gaPbhMuX1EKEND/r8NC7ga2Muh07nAQag/wmrzvu+X2qbgaMgACf7vtujUYKbWX6jgNX aY9hVbALd3gRoNQAE1npDbgFeRSRpJNmVTqCcIpXz4CPFIAI1tSpjVZCTbtRe7hjQY1e irlM6YGHJ6D2UcTSnDp9tt59EsGY//x+FnHEtbR4pzeaB9Sydkp11xgQj2EVWRRhlQ6o k/8/BIsQLZXiXGNlagP+R+HE+uC/MjjK3wKkj/DFCziI+MR0PRztkkEGFGG5H6jg3XmT njNw== X-Gm-Message-State: AJIora8vI5uQYMfNai8REQVb5NJ7bY2rhE4IDWYsHsi74baqyZhKizwf 8XFNi9Cs9B3cHJLCELt0Jj4wdssD X-Google-Smtp-Source: AGRyM1u6KiugAiIdR/BnAwxYDcFxqMGzkN+vIotN4o/txFmYr+fTdvElBn3FZZO7QH1KTGPizt8f7Q== X-Received: by 2002:a05:6402:1d4a:b0:43a:ca49:abc6 with SMTP id dz10-20020a0564021d4a00b0043aca49abc6mr591268edb.376.1658506269301; Fri, 22 Jul 2022 09:11:09 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:3691:b0:72b:564b:c25b with SMTP id a17-20020a170906369100b0072b564bc25bls3081862ejc.7.-pod-prod-gmail; Fri, 22 Jul 2022 09:11:08 -0700 (PDT) X-Received: by 2002:a17:907:6ea7:b0:72f:2cf2:9aef with SMTP id sh39-20020a1709076ea700b0072f2cf29aefmr484114ejc.215.1658506268100; Fri, 22 Jul 2022 09:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658506268; cv=none; d=google.com; s=arc-20160816; b=c4rxb/vvi1tUDnYoS9HpQAb3/FrCvcdBbwffvsQs8OdeKK4qZuI5O5rLM2/WxuSSHx 7sHXeOfXKHZR+zIPvz4wyGUn4FDn57zI+YqufmKUSik/ReqGKkI3TJHKi2seKAdwJI73 BP/FaQSYWU4AXQVzlATq7/cnXcaf8mGX1inGBx2fPdifoFEKpwjM1KvWRWUDTI99y+TQ 3AbAACCoVC6JPqNHhmel9cjdaFXh5zIEZzMbmJBywSVt7fA63wOloDJmkYT/KrZIM3PC ucu/2XBn17RSfhVnFBFiTm9zHSE2H9l5Z9qPjBi7J0TAts9nQ1MFld/mTMdY3Qrqe6sS yL+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=MIMeEQi2VWuSW6sjH1otL/u4J2uLB6sK3BK7CTYNm7w=; b=TsOvqGNfUcBRR0L+tt9xvDHG8Rmx37MU97f1oZUrqYUBWWqZAvPTChRHkYxrDvoNAO LVOyN7CX7B7TqoDpw3Se2RVu0FcOYY7uZUHJXAKMYhxAdtPBU7dPHpLuRooQFyI9GQ3c fP0nIxf0gmuNgupeQCbihUrmBDdAFdZ5EV+3hlS4Osa1U71TVLMWOau9/uZuS7va5ybu AzezO+wnwVTYCwAgaYk+WUUm9XO0kUhjTEUh2ASmKX6sTFz8nsww4FDwlRV8NkNGD9G+ 1RVzwhN8QcZHmcmm0XgUHGuW1CobLUiX+EG+ZFRRbTPSzKtfmjrhlzVy7dNc3EjGdzsE cEtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=I7jHdhGU; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id f2-20020a17090660c200b0072f8a4320e8sor2194773ejk.47.2022.07.22.09.11.08 for (Google Transport Security); Fri, 22 Jul 2022 09:11:08 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:907:94ce:b0:72f:2cfa:b7b7 with SMTP id dn14-20020a17090794ce00b0072f2cfab7b7mr475467ejc.630.1658506267653; Fri, 22 Jul 2022 09:11:07 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.pdxnet.pdxeng.ch (host-87-14-98-67.retail.telecomitalia.it. [87.14.98.67]) by smtp.gmail.com with ESMTPSA id d19-20020a170906305300b006fe8ac6bc69sm2174025ejd.140.2022.07.22.09.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 09:11:07 -0700 (PDT) From: Dario Binacchi To: u-boot@lists.denx.de Cc: Amarula patchwork , michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v4 01/14] mtd: nand: Get rid of busw parameter Date: Fri, 22 Jul 2022 18:09:55 +0200 Message-Id: <20220722161009.2686504-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220722161009.2686504-1-dario.binacchi@amarulasolutions.com> References: <20220722161009.2686504-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=I7jHdhGU; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Michael Trimarchi Upstream linux commit 29a198a1592d83. Auto-detection functions are passed a busw parameter to retrieve the actual NAND bus width and eventually set the correct value in chip->options. Rework the nand_get_flash_type() function to get rid of this extra parameter and let detection code directly set the NAND_BUSWIDTH_16 flag in chip->options if needed. Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- (no changes since v3) Changes in v3: - Use commit sha1 with 13 digits. Changes in v2: - Use short-commit form. - Remove linux info. Uboot seems that backport without add this extra information. drivers/mtd/nand/raw/nand_base.c | 59 +++++++++++++++++--------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index e8ece0a4a0dd..9a2194ebd3f8 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -3898,8 +3898,7 @@ static void nand_onfi_detect_micron(struct nand_chip *chip, /* * Check if the NAND chip is ONFI compliant, returns 1 if it is, 0 otherwise. */ -static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, - int *busw) +static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip) { struct nand_onfi_params *p = &chip->onfi_params; char id[4]; @@ -3971,9 +3970,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, chip->bits_per_cell = p->bits_per_cell; if (onfi_feature(chip) & ONFI_FEATURE_16_BIT_BUS) - *busw = NAND_BUSWIDTH_16; - else - *busw = 0; + chip->options |= NAND_BUSWIDTH_16; if (p->ecc_bits != 0xff) { chip->ecc_strength_ds = p->ecc_bits; @@ -4003,8 +4000,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, return 1; } #else -static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, - int *busw) +static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip) { return 0; } @@ -4013,8 +4009,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, /* * Check if the NAND chip is JEDEC compliant, returns 1 if it is, 0 otherwise. */ -static int nand_flash_detect_jedec(struct mtd_info *mtd, struct nand_chip *chip, - int *busw) +static int nand_flash_detect_jedec(struct mtd_info *mtd, struct nand_chip *chip) { struct nand_jedec_params *p = &chip->jedec_params; struct jedec_ecc_info *ecc; @@ -4076,9 +4071,7 @@ static int nand_flash_detect_jedec(struct mtd_info *mtd, struct nand_chip *chip, chip->bits_per_cell = p->bits_per_cell; if (jedec_feature(chip) & JEDEC_FEATURE_16_BIT_BUS) - *busw = NAND_BUSWIDTH_16; - else - *busw = 0; + chip->options |= NAND_BUSWIDTH_16; /* ECC info */ ecc = &p->ecc_info[0]; @@ -4168,7 +4161,7 @@ static int nand_get_bits_per_cell(u8 cellinfo) * manufacturer-specific "extended ID" decoding patterns. */ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, - u8 id_data[8], int *busw) + u8 id_data[8]) { int extid, id_len; /* The 3rd id byte holds MLC / multichip data */ @@ -4221,7 +4214,6 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, /* Calc blocksize */ mtd->erasesize = (128 * 1024) << (((extid >> 1) & 0x04) | (extid & 0x03)); - *busw = 0; } else if (id_len == 6 && id_data[0] == NAND_MFR_HYNIX && !nand_is_slc(chip)) { unsigned int tmp; @@ -4262,7 +4254,6 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, mtd->erasesize = 768 * 1024; else mtd->erasesize = (64 * 1024) << tmp; - *busw = 0; } else { /* Calc pagesize */ mtd->writesize = 1024 << (extid & 0x03); @@ -4275,7 +4266,9 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, mtd->erasesize = (64 * 1024) << (extid & 0x03); extid >>= 2; /* Get buswidth information */ - *busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0; + /* Get buswidth information */ + if (extid & 0x1) + chip->options |= NAND_BUSWIDTH_16; /* * Toshiba 24nm raw SLC (i.e., not BENAND) have 32B OOB per @@ -4301,15 +4294,13 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, * the chip. */ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, - struct nand_flash_dev *type, u8 id_data[8], - int *busw) + struct nand_flash_dev *type, u8 id_data[8]) { int maf_id = id_data[0]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize; mtd->oobsize = mtd->writesize / 32; - *busw = type->options & NAND_BUSWIDTH_16; /* All legacy ID NAND are small-page, SLC */ chip->bits_per_cell = 1; @@ -4371,7 +4362,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) } static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, - struct nand_flash_dev *type, u8 *id_data, int *busw) + struct nand_flash_dev *type, u8 *id_data) { if (!strncmp((char *)type->id, (char *)id_data, type->id_len)) { mtd->writesize = type->pagesize; @@ -4386,8 +4377,6 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, chip->onfi_timing_mode_default = type->onfi_timing_mode_default; - *busw = type->options & NAND_BUSWIDTH_16; - if (!mtd->name) mtd->name = type->name; @@ -4449,9 +4438,24 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, if (!type) type = nand_flash_ids; + /* + * Save the NAND_BUSWIDTH_16 flag before letting auto-detection logic + * override it. + * This is required to make sure initial NAND bus width set by the + * NAND controller driver is coherent with the real NAND bus width + * (extracted by auto-detection code). + */ + busw = chip->options & NAND_BUSWIDTH_16; + + /* + * The flag is only set (never cleared), reset it to its default value + * before starting auto-detection. + */ + chip->options &= ~NAND_BUSWIDTH_16; + for (; type->name != NULL; type++) { if (is_full_id_nand(type)) { - if (find_full_id_nand(mtd, chip, type, id_data, &busw)) + if (find_full_id_nand(mtd, chip, type, id_data)) goto ident_done; } else if (*dev_id == type->dev_id) { break; @@ -4461,11 +4465,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->onfi_version = 0; if (!type->name || !type->pagesize) { /* Check if the chip is ONFI compliant */ - if (nand_flash_detect_onfi(mtd, chip, &busw)) + if (nand_flash_detect_onfi(mtd, chip)) goto ident_done; /* Check if the chip is JEDEC compliant */ - if (nand_flash_detect_jedec(mtd, chip, &busw)) + if (nand_flash_detect_jedec(mtd, chip)) goto ident_done; } @@ -4479,10 +4483,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, if (!type->pagesize) { /* Decode parameters from extended ID */ - nand_decode_ext_id(mtd, chip, id_data, &busw); + nand_decode_ext_id(mtd, chip, id_data); } else { - nand_decode_id(mtd, chip, type, id_data, &busw); + nand_decode_id(mtd, chip, type, id_data); } + /* Get chip options */ chip->options |= type->options;