From patchwork Wed Jul 20 16:22:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2202 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 354123F046 for ; Wed, 20 Jul 2022 18:22:27 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id t5-20020a056402524500b0043a923324b2sf12565614edd.22 for ; Wed, 20 Jul 2022 09:22:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1658334147; cv=pass; d=google.com; s=arc-20160816; b=qwYAkpk+7/2wlULu0nALVmzK4ViHNhxTt7q17wjau+27456TKXxqdNw6oMeE52/t9V zrBokd0ZFA+F41+3cs64MfQwFVLeR0chRavO2SsaRD/3kDj+3R0ritfIL2vQ+ke4qpum TQlF7amzIHBXfIoW3Mz+ObDCcX+wdysHzU0mF7K38H/TLOoxFBrfBcqQq9RvpqDhUrwZ m5XTjouVH9JH9VGUi9GAhaZPh64OKQbUoosLdc8Akw7eOD1v5i7yrCxj4X9ab+OkP8G3 gACMkWgp74olI4EAF5u/0HJ+oyE8fCUJcBAJGfEcFxPr7Lb2MgCbRIxBuXNHt01BUQjt QIzQ== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=ouBh2Q3M3uq8SGXgzpjsuL+uKHbP9udtl7iMsA//JLA=; b=hZtDKHfW/gh6hNP3W/ToMKNTWt3pk883L9WW8Bc76+VckrX4BFW100HKAkyb3xTQm0 rEuFIoJRkFp7KmWts1HvBbpI61NFu7K+F907gzxFTIgyQi9J9aG/xYAiFniKPqVvy8Z6 DPLGk6UDoaB/LOEoxFnOiTjAXXeMvg8RHN+X840O5SVzRhrw6M7kHiElr7OPO3PnYzg+ CJaqdE1VFkBvf7RbyRezgpWPHHwluvfMolorchpXkJmdhIQq8uYTflasvxL2pArR8JHO cXUd9oGcG+ZbY7BrkkCe/ihrexPsRERkW27eB2tSDEgh7IyuycF5vZ7T6gIF50UftVt0 9GDg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=meB6lF5s; 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:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ouBh2Q3M3uq8SGXgzpjsuL+uKHbP9udtl7iMsA//JLA=; b=UurpqkCEuPLB8EY1AixvPzH5oZBwmFMTnkyEguy4kQmGo1h3NmtbWkTVI4WubXzgGj zai16B6se13aM4ZowGEkXwMWX+sZgmeMhApxuYBeWrxpVmPeGvy5B8kBcF5oDBL4b/D0 oSDUpx0WGwiCSs+RW2Ck/VHnw6BtSViXs8Vk8= 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 :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=ouBh2Q3M3uq8SGXgzpjsuL+uKHbP9udtl7iMsA//JLA=; b=NPPTWOUWeXM6X7I7KpCcKiLmuXjdjcc8P/zAZEF2MJW4nxHEmks+qbdu1Ecy605WwI u5YDYAwglg26fHdDCm+8dvB1idlhxAp4IAjnlbMJNPrDwgDsDJn4O8S+oRObQBL399gU PqUTIO8PAJVsoYipbUSHaT7ff8ybsUYEyAQam77Qu5Y8YH/EGWCL4W2AiC3iTNHqvMUg Ro18+OFywa0lsemmSwRVJQbU5V6yQ0d6oCBeF/B+qUYBONTy+FOHrEMjkmQxVwBCRXJh vEy+gowsMz5kg1NoHqgJKmCX67E4D5RvAb42OKj9bRiRvxlOBrwJDNp5zITK0WM+oGvC RzCQ== X-Gm-Message-State: AJIora/cQTtD/zlKg03qcnApFCFWWPlggA6hR0+RB6Ty0lCmBVKHCIOv vo3rS7L3UfFGG4ER8tRvbxeKIpVF X-Google-Smtp-Source: AGRyM1s6NR4q1IRP+zelzmMpBD80woyq9XFvQvQ0LaIDJ/tnfsvYO+/hHT7uupNdqZqpYTVSm6IL9A== X-Received: by 2002:a05:6402:2549:b0:43a:dcf2:27f8 with SMTP id l9-20020a056402254900b0043adcf227f8mr51827591edb.143.1658334146885; Wed, 20 Jul 2022 09:22:26 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:e4d:b0:72f:5c1f:1852 with SMTP id q13-20020a1709060e4d00b0072f5c1f1852ls376844eji.0.-pod-prod-gmail; Wed, 20 Jul 2022 09:22:25 -0700 (PDT) X-Received: by 2002:a17:906:847c:b0:72b:4188:f940 with SMTP id hx28-20020a170906847c00b0072b4188f940mr36256457ejc.552.1658334145724; Wed, 20 Jul 2022 09:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658334145; cv=none; d=google.com; s=arc-20160816; b=CWjpZA2xiLVErfKC01t8iYYKdBfYHNwLsajMlEHomi+13jyboNCneejHJ7mZkM7Isq 2DYcnKqD0T94J8qUPj2wLe3mt3cBnMGQfO+66e/eBYT1kEvsEBKk1gSclFtORu0SMRcy ObFX0qL76nx3Wi7TvnsjIdOOivgf0GTwqwJ1nu0DKiGgVjTsfqpH+/lbhx33Rg7ky00u X3/HhdRwqQUq5KqJe8EuJ3bxBAo2u+cI0XMquhtGrtZjL8/gc408o3h4r3occqcn5TCW aAtq6o4tYhhfacnAM5hambuUvbm89STS3HWg3Apd9MF/e3j2zrYL9dlGt7m0FyTObatJ kawA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=Pjc68EH3MfbHU+IghcH+O86js6/5fZzjKV5AuE4OsIU=; b=ChDQaizLVI+NQmsclV1gpl/ifxzpO9sZnM/M50YgJlZKRSAN7oJGbNmXFmmF9fIQ7G RCIJTvV9x26TilbV7f5AxevPzofuOyCmiNXU/ID1pe48zxlVt0xhBKGXy4TiMP2quAe+ ZGeov6XMmuxwFqcFLs5KTXkKP5cJr8TRNg+T4Nm1wkOHRLlpg3H9v4BkKLJcHmANE4U8 ZCXCpZqYQnkpC5M/a/DFcxMfdbuHWNmD9Xa+JVsX35Np9AYCqHNNhcsD8ZHVHXkbrG+W AjrUkMM8hPbqkhRrtqcxREPlrf3bI8rVVgtlvIFIjvc29+3nbi0a6y+LShGMUr8peAVQ kKyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=meB6lF5s; 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 z16-20020a1709060f1000b0072b33e30911sor6494072eji.2.2022.07.20.09.22.25 for (Google Transport Security); Wed, 20 Jul 2022 09:22:25 -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:d05:b0:6f4:3729:8e36 with SMTP id gn5-20020a1709070d0500b006f437298e36mr36921472ejc.475.1658334145482; Wed, 20 Jul 2022 09:22:25 -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 jl10-20020a17090775ca00b0072ed9efc9dfsm8057839ejc.48.2022.07.20.09.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jul 2022 09:22:25 -0700 (PDT) From: Dario Binacchi To: michael@amarulasolutions.com Cc: Amarula patchwork , Dario Binacchi Subject: [PATCH v3 01/13] mtd: nand: Get rid of busw parameter Date: Wed, 20 Jul 2022 18:22:04 +0200 Message-Id: <20220720162216.2397616-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.32.0 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=meB6lF5s; 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 --- 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;