From patchwork Wed Jul 13 07:16:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2124 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2B4923F066 for ; Wed, 13 Jul 2022 09:16:45 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id s17-20020a056402521100b0043ade613038sf4522451edd.17 for ; Wed, 13 Jul 2022 00:16:45 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657696605; cv=pass; d=google.com; s=arc-20160816; b=eeO5mebJXEs6sPYM8pkKgoPCG1p59Uzn2CDCvY1W4SO/caTLpWLRYPIGXjDUiFkhUu 1wOdVBSUqZcxvEPUPgyc7EPnXZB252jIyvtWuD/7klqJrFV5axHHKSL66VlmcRLLCI7U W0Zdzn4zWn3VBYPmX6BWWu6iZa+1Q9wiDar+Xx2P2ee/nQOCMt2zgR2yOXduu6u6v9w4 dNiH02eThcpkXppaeXuTaYkKlszmTzICkZVrY6lgXEzCy0pJFtcwi0Iq37Ll2kkiLBdp hm6Y4NvPbpvP9qYBB/Ia+6e0JoLrzbpa4eipCNZF36kPhiqVYg6wR63QIculUuwxZQap YFwQ== 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:to :from:dkim-signature; bh=w6jeEffYbyh5yW4irRptvwg51uM2EHfMcnY/JdAF/24=; b=Ih/QIXCD8vuRqngVWNGn0xzaLZIW2i9kPBU7rYf7oXLHKbbrPSq1AbvMgLJrBYQDet c33qO5HP/mw+VJbua1ooKPLYVofAhUjEAe4esw651Lpip3Ju3Q3IxsoqCTOCT0ndGUlN gWUVTQBQpMbYuFxWGbOaIWTOL/0aSygS3Zh8exhvZ4DO1nGbOBejkT5bi55SCQfvjk5v nWY9dyZJOuuI6Pv5vSBQJM6zrE4KzEH3GmUNruFz8TNiqFBRCh3iJAYsigii9o28FFGk XdVDgbhgMC72rivef7xKDMH6j9kliKKKSbc0QdzbvFvbjlJOSv6j26nyyrKUMfPuCIPx LXrw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=B3PYyACO; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@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: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=w6jeEffYbyh5yW4irRptvwg51uM2EHfMcnY/JdAF/24=; b=EwVb6Fn03lYEMl6aRHZ5k8eLy9gXvbb3IkuSOfyUnn0+oQa31isQNFjtGZ24algyvn faGnwZk2ZSqwZ+7eGeWXmoAcY+rHkU18JcRLEh/Fk7+iEMXHUbvj8oxs1LRALnFtRujk TKi3zBQ2kXgSknfJtGtpg3zmhvww2yM1UzVNg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to: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=w6jeEffYbyh5yW4irRptvwg51uM2EHfMcnY/JdAF/24=; b=XPwinDRXup/NO93iwcpr1v1jwhH+LBZALuCNCiNcTNYTBHx3ltEO+jLdlkHM/V1dam 4tVkZFQvk6/u4yjmgXrQvI/PKY47G6vQObmSOkRU6C68NeKXw+N1IIQkoTXq2vEGAg84 JoZwqhsnZ/00QyagMJy/8GOsybl+AuQA+lm5ikeLgVAujO2YdAekbJY3lr1vpWj3XXm2 gsFmhYitZHrBVvHqAHXzJoJdNhJLTt6UwH186Ar14Y6r4vuk9MkQf6CNsA/pMRZSUP/g vk66FVOqZzI8DMhmkCqwB1UBigO/am/8SP5A6tBZKpsyifzs+Rjvs9bRdze4yY4XLFU4 b17Q== X-Gm-Message-State: AJIora/BcL5MklgUtqj8MPfe0Gmb6tFiv3xJO4t7j91FzWNRauK1mM9v kYEHmBLh+NodjaKaBKwow/duhKw0 X-Google-Smtp-Source: AGRyM1u6kU7KXAS7jGJHifbKNCaXGfc3mlASjaAdAc7B8Lu88c0K3HbVt+vL1pAvOcfTB1gGtADvAA== X-Received: by 2002:a17:907:b17:b0:72a:edb8:7529 with SMTP id h23-20020a1709070b1700b0072aedb87529mr1902678ejl.749.1657696604940; Wed, 13 Jul 2022 00:16:44 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:907:1c89:b0:72b:5b68:a7e with SMTP id nb9-20020a1709071c8900b0072b5b680a7els100069ejc.1.gmail; Wed, 13 Jul 2022 00:16:43 -0700 (PDT) X-Received: by 2002:a17:906:5a6f:b0:72b:10c8:8513 with SMTP id my47-20020a1709065a6f00b0072b10c88513mr2020220ejc.312.1657696603514; Wed, 13 Jul 2022 00:16:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657696603; cv=none; d=google.com; s=arc-20160816; b=SOpCndKfUKpmI8PAIFp94Tj7C7G/uo7leIxPT9n3EQqwKB9Bx9OmqY88i2JxwEpPhG fl/+wBaQ3y0/xN5a4w2zMfbAJgEfcBF/oAJzCT999YQ55sV6aF/M8aL4IXiXOOT1w3Ck UWkk6pPiUAT7oU76pTNC5WQLzTavS0qJdR5pW9dDIUkdsyZe1XJwgla0ohf0EcI23zHi vMNY9Zw3vFMdfulkpbxWjsBDYnGQ4UAnkUXOGXJOg/irnDfcTxeq7tNEmXXyp+5LIAej XM05oqZftRmImCwReOfn7v4dkl6exmDaF4fcWd+mdfxPY2Gl6JZ/CX3G3S4z2kuRtmb6 mKQQ== 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:to :from:dkim-signature; bh=lIuIWLqqz2ogXeLR2OiG+YgBNXzZxQ2P6FCSJQWqai8=; b=HahvC5SJvpjmY1CEcEHihKX/dSwnhnM76SCPPkslENnjF4Jkuuc9/dKEM/yZ/MjK+6 jQRrMpBXQIv5hSe8gU7zy5v9esq350sl99Pj1t9j3BRAiLHG6m7NTpe7aSKxpOtj+BS3 R4KsVPhj41hWqa+GzVPCVludCTgC80d2pzymUo9Yj0KvGxOEjmOF6Ty4hY+WB3NVgaq8 B1FCbb8sxrlCpy+HwpWGLv4t0Po+AZXoi5KAwJz+ELLUqurIz4C80/dW1iluWeAdT6x5 Bd8g6TzkkLVtZvINEGXj1en+GXV8b4/kCTO9nUXumv1leA3k66r/WNVu5+Bjo6MPVwJU t9SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=B3PYyACO; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@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 gr21-20020a170906e2d500b00726946aa176sor3601965ejb.48.2022.07.13.00.16.43 for (Google Transport Security); Wed, 13 Jul 2022 00:16:43 -0700 (PDT) Received-SPF: pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a17:906:c150:b0:726:b4e7:772 with SMTP id dp16-20020a170906c15000b00726b4e70772mr1907613ejc.499.1657696603142; Wed, 13 Jul 2022 00:16:43 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id z41-20020a509e2c000000b0043a95981050sm7414523ede.79.2022.07.13.00.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 00:16:41 -0700 (PDT) From: Michael Trimarchi To: Dario Binacchi , linux-amarula@amarulasolutions.com, Tommaso Merciai Subject: [PATCH 1/4] mtd: nand: Drop busw variable and use chip->options field Date: Wed, 13 Jul 2022 09:16:34 +0200 Message-Id: <20220713071637.275456-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Original-Sender: michael@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=B3PYyACO; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@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: , No functional change. Reduce the function parameters in preparation of support specific nand manufacture Signed-off-by: Michael Trimarchi --- drivers/mtd/nand/raw/nand_base.c | 58 ++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 6f81257cf1..cb22e0ec13 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -3890,8 +3890,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]; @@ -3963,9 +3962,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; @@ -3995,8 +3992,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; } @@ -4005,8 +4001,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; @@ -4068,9 +4063,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]; @@ -4160,7 +4153,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 */ @@ -4213,7 +4206,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; @@ -4254,7 +4246,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); @@ -4267,7 +4258,7 @@ 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; + chip->options |= (extid & 0x01) ? NAND_BUSWIDTH_16 : 0; /* * Toshiba 24nm raw SLC (i.e., not BENAND) have 32B OOB per @@ -4293,15 +4284,14 @@ 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; + chip->options |= (type->options & NAND_BUSWIDTH_16) ? NAND_BUSWIDTH_16 : 0; /* All legacy ID NAND are small-page, SLC */ chip->bits_per_cell = 1; @@ -4363,7 +4353,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; @@ -4378,7 +4368,7 @@ 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; + chip->options |= (type->options & NAND_BUSWIDTH_16) ? NAND_BUSWIDTH_16 : 0; if (!mtd->name) mtd->name = type->name; @@ -4441,9 +4431,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; @@ -4453,11 +4458,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; } @@ -4471,10 +4476,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;