From patchwork Wed Jul 13 17:11:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2139 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 721A13F066 for ; Wed, 13 Jul 2022 19:11:19 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id b15-20020a056402278f00b0043acaf76f8dsf7410972ede.21 for ; Wed, 13 Jul 2022 10:11:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657732279; cv=pass; d=google.com; s=arc-20160816; b=lSlqWhp5QE3gRhsvIOh8vgectxVvfnUWblTR6I+pQDgxVx1OQh59t5KRPVpyq+9PHZ wrFoD0CVtmZ3rQAorwuPUVZ5ja363AgJbgBsp4Q2I9DDIOjPzZatoR4m4bCd/affjtuR 1d2yciyWr1p3URs9vdg16ZfQ40YCxnxoaMwWa/tJJVf3ImXOuRU+0yo5YyvhpEiuhi3f zBUVcMVZm60cpIUeVnE5YBxrep9tc85jl6Kxlr659mWIp3In+wiSYpbTLVUhExO8wOba DcBm8vhfixGeeUfl4NFKyzr+QXf78Dx2B+6XUU7jZmtYQHPkNuh2lRNuqfBZqdG+DVHE hE5w== 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=EOpiqCLpkf6N34iEv2GdqhZBJu1AlHYF5+H8bPmhqyI=; b=VJWLkXjj73sVBABxKYPTJD9HKQG7OWYZ6rXCIw9MAgsdQm3NbwoHDKKwZ9iaKowVQL +cbJeKGtwGJuKiCHCkHvgEzCavNjaM9seBRw8p3SD3AKi6yGAxVNTO1TFLuXVDbIVvPt pAXmD5KZiXS3IoOO47DUON3eM3uRVlOF3lmFuXMSWXyuRfzReNC85lP/zDYBkBlusVeG iXLpH4IDGn6alZTDdE1QbJ4dpnSQedBBsQU6qkQytDZs1L4EwIumZ2M4EoZyflXFyuHM whNFfh/m+55KzayJthLtZc98KdAqwnSHsl62Aeh+aZPNKeWsLJ4cTCFqhj2EyiItEql4 X5Tw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BLQnlGx3; 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=EOpiqCLpkf6N34iEv2GdqhZBJu1AlHYF5+H8bPmhqyI=; b=hkFex/L2QpeiUL7as2Q9N3nlYbDuTtQAn9Ylm1FKOx7tMEM0xrDQkR/3fd3eNfBqv7 Vm3v41M2x9+m8kVTzDH4gbMvujhVJcihbh2zzOakj6tnJXZ10iYmDYB+GNQ0OWOlc2vi 6JMybMRT9eVtVmz6gBstAaH+8DsHXGLwQMsyw= 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=EOpiqCLpkf6N34iEv2GdqhZBJu1AlHYF5+H8bPmhqyI=; b=SA4U/kqnbb7OLy6shKYqCuG9HBTqsVmZ3dSoWqrVID94DpU4mqcDJVJLBjtzPotXwB tyQtIqv8v/WjyQ38+bl3yMwGyqMFP5Ifo82t2s7Nq8EJdBURyU5zYgUpjq2Jorp/plKD TdpPO2XZrJ0k0bOwUM19ebxFvk9dMXBBYtHpNHby9eZU9Aqf9oCmmBi8nce07bUSDu3c pFLap1i4QV0CHBcNhOKcaHRO8+SsIbmvQlmVB3ODKLCODBdfCgpVD9LUblZp476CnB8P uomLeX701O/sVfple5UHC3NYDSDugYSjIzNDCCI0NMsEjZ4uW9615LOck/Qykojz0BU0 1XrQ== X-Gm-Message-State: AJIora9kcVVbsy/CSXUlWB1kG4EVGboqWqgOZzZ4ld6CF4dKLvJFSQh0 Ef/OLU7khB6S3I5EVWnc13kRJbw5 X-Google-Smtp-Source: AGRyM1sIwlnUw8uvCL8ISyTaxFY+YGbhddIrw+Mtmm/ks06jJ103MYPVR6wH5yOXSNsVvh4B23BBPA== X-Received: by 2002:a05:6402:1518:b0:43a:103f:eaab with SMTP id f24-20020a056402151800b0043a103feaabmr6110393edw.280.1657732278963; Wed, 13 Jul 2022 10:11:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:906:95c1:b0:6ff:45d:c05d with SMTP id n1-20020a17090695c100b006ff045dc05dls3360699ejy.5.gmail; Wed, 13 Jul 2022 10:11:17 -0700 (PDT) X-Received: by 2002:a17:907:6e13:b0:72b:509e:bd6b with SMTP id sd19-20020a1709076e1300b0072b509ebd6bmr4544112ejc.202.1657732277605; Wed, 13 Jul 2022 10:11:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657732277; cv=none; d=google.com; s=arc-20160816; b=ng06R4L6XiMygwSBhQ/KJ836KvLK2F1/kFV9pbU1YARmpR6MvDiQrjdG3C1aM9YcTt cOdUZqkymdBvHaLcEPL93nIzkw30tzNR3kcay8Luaf/NIqjbF2AK/6I86QT1nuseGqIt aMWizruLcww8cf8dr4xD0vMCQmSnVmRQCtIrP3r7u3WZu+dbdGHqRp+x+bXbixEFUgY1 a3CYL8/2EZ8hkXBvZ5ftdyUEhOKoljrq76CVbeCVvDWE/CnvaMFiJKRCVUh5pk5BmN8I BtGWZa0yZX8OGwW9zShSFcWfN/vBSaEnh9r8fcBq5luwUsChbgb7SWb6blR6uzibZF9d 3tWQ== 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=QoykMmD6deblCNk3MyMVXZDZ/JuSl7VZD0u5e83RjB8=; b=vRawkFqe+8Wn8NbZ/P6DBvy3GVUtxex0jkzXOJs/hu3CQf33CHSKN+aD9GuX3CA80V qaJiZ7anlinw317M1l2IHlphkiU7sykNbfqFIcmoJoS+HekLFHpQ7AbY3zY+kAb0mw2n W2Eiu8Kz66TQgoXXx/Pal20NoTpVTBt+6NyZovtQLW5kY+p2Mav8reZ12yvK/D0JJp2d Iojx1kvVkdmpCZNpeh33sBzTUutVS/z25uyGxjANaY8rjO2qbwgXL5oGPSR2ZNXjKtqp QcMscjA7iKMMfwIbV6YAZUSvQH9C4nQV7eCSlc4meVc/n6h4ePd7VSUqnq3wOzjouA19 MH1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BLQnlGx3; 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 r20-20020a1709067fd400b0072b3119dfa4sor4356313ejs.65.2022.07.13.10.11.17 for (Google Transport Security); Wed, 13 Jul 2022 10:11:17 -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:2245:b0:715:7c81:e39d with SMTP id 5-20020a170906224500b007157c81e39dmr4576806ejr.262.1657732276819; Wed, 13 Jul 2022 10:11:16 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id lb16-20020a170907785000b0072b36cbcdaasm5218168ejc.92.2022.07.13.10.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 10:11:16 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH V3 1/4] mtd: nand: Get rid of busw parameter Date: Wed, 13 Jul 2022 19:11:08 +0200 Message-Id: <20220713171111.337338-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=BLQnlGx3; 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: , Upstream commit 29a198a1592d83f2bc1be3b2631b3bcf3d5b380f 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: Boris Brezillon Acked-by: Richard Weinberger Reviewed-by: Marek Vasut Signed-off-by: Michael Trimarchi --- V2->V3: - take commit message from upstream - take changes from upstream V1->V2: - reset the prefix as suggested by Dario - only drop busw assigment in find_full_id_nand --- 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 6f81257cf1..9244287b10 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,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 @@ -4293,15 +4286,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; @@ -4363,7 +4354,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,8 +4369,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; @@ -4441,9 +4430,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 +4457,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 +4475,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; From patchwork Wed Jul 13 17:11:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2140 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B7D573F066 for ; Wed, 13 Jul 2022 19:11:21 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id sc42-20020a1709078a2a00b0072b5f51a9dbsf3276749ejc.1 for ; Wed, 13 Jul 2022 10:11:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657732281; cv=pass; d=google.com; s=arc-20160816; b=Ja4L6FcNZawO6Dx3YscclHUL1xsR3C+jDjsrodJI6PX0Zk+EjjMBjHk3QLG9/XU6P+ xT8spr8iRlHLQj2/JDp7zSSDvTUM5aDoEttAE8kHA1+5Y1nX0n4CE3uRQJx3vTkaG+YX Sy9WGB0L0qcGQSjqRnHKt+kuWWblJL/jEB4Zci/nbOGtXseWNhNz8w6Ft/26VcXxlxKL dBL7c94tzwPmASUWNpTUF5Hwo0fr0YGdvlweEgbeZ7ogKtq0Ky8A39xLgYKJD2TTdu9X S2nJewZwlGvIejgaevqhVbCxf9dmmkXRsiy7Onc0xgTasei6hjfN4ed1zjcBvu88BrFh 6Rlw== 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:to:from:dkim-signature; bh=zG6wjqM5pKhjIObcbq+1697BitA63oTxB0xoc3v5vjg=; b=MCTfgoa2xUy96VjLEsQF0ypM2lr5u19VCbguXdmIbrrEJz4fWH0UoK29p/c8deyhPA Ocna2PrKWHzHkaMrHqID+2DftwJcjglVR5/0oTq2t1heiR246w2oT4bZdw8jH1ppJR0/ xMLZi0jS84/XPAZ0AHL8+WbvPvMZ4HbRkUdHtGej9TOjNMDIuinO60mZcLkVv2MXofue rXM2AdYqjdU7bJUDZeOYW2pCkRSvywhg/gBas8xt/iSi5sEhF6ktolVMss7ybvIND/iZ 7tqxMJ/ftqvDIN7pNKhJzzrHml/HdKNM9t6U52nOkdKW9ddL7dIJEMQ4vC74U1fULWcU Z+mw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qJH2TJ6a; 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: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=zG6wjqM5pKhjIObcbq+1697BitA63oTxB0xoc3v5vjg=; b=ZS0c3qxmlE+fCIuYc6wHOiZagGUdVaPHAqiAB59Osx60tNbAE7GPbgFLbM7gc9JeIY 74397xHkO2W91bpNGGRzYUw9k8uH+1kGqvEvhwtaU1BP9G35OR62z7fleWU5Y3uUJXeK 2CRDiaGQZoW7YQrXcxXlc4FFDtzBR57uPqPeA= 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: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=zG6wjqM5pKhjIObcbq+1697BitA63oTxB0xoc3v5vjg=; b=rhQ8ZVtF91XNUzm4xHAUbAGtOZm1TKmK516gGlxdw3emow27QxVVnZduHHRx6QHeQj Vl5klR0LkfxFDZgiLlC5s0+HKgA20gOiUc0QomJeh6OKfu8seKyj4PWrECNYB1oG7ill T6K6W4Pd98BfDYSDP56Hw5NjnThEvN3v0ZRU2jbbUJTykbXkeHcGKa/8M2NqLlSFuKBh uEclILdz8iprYBreqwep80iDldK9tGiY0XRHg0iicZV8CAqnnyoImkavDSAhLv+CNFIW q2XO+xLJrqYld7uyX8xyAFspthchij34gqoHUV08Prx4fJ9F7/Cgx7JN+upEPiMGH+87 X0Iw== X-Gm-Message-State: AJIora9538hwQ7+IROO0kFfYLpXJzIJykmwpWHjSSYYBs4UZc6J7zCJi 0C1a9AFXlw0ZhkU8VTNUf4LdKl4w X-Google-Smtp-Source: AGRyM1tNharPwSmHf4Bkd5pb52fE6TfRxE/Ht6iIjSh8E+zkfN4/T5bTk4F39WxLm/tEd6wmQk/jJg== X-Received: by 2002:a17:907:7638:b0:72d:f11b:5ebb with SMTP id jy24-20020a170907763800b0072df11b5ebbmr1976184ejc.647.1657732281560; Wed, 13 Jul 2022 10:11:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:907:9728:b0:72b:4fab:1c58 with SMTP id jg40-20020a170907972800b0072b4fab1c58ls923036ejc.3.gmail; Wed, 13 Jul 2022 10:11:20 -0700 (PDT) X-Received: by 2002:a17:906:9b09:b0:72b:9612:d373 with SMTP id eo9-20020a1709069b0900b0072b9612d373mr4344413ejc.606.1657732280207; Wed, 13 Jul 2022 10:11:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657732280; cv=none; d=google.com; s=arc-20160816; b=Xa+tqb09Pl/4lLXb3rDK6tZfaSt4U7m9vVYyXRv5JjVQQpgsDqvAxV9iW2AecrPwKJ 5NXK3GtyN422NzeHsKyPJIdhKEwLldaw02msCuZXOsZV5CLpop3jfTD7skiASnzFuBsD zMBDErojMATUMfgC2uihTmtn8C8KUvc6lw23VXiwlS0/8TGyjXOmwd9loHPuqGuwsZOJ OBukS52F3zQ4ZoCCyogVLeXaPbRUr2brHgVyuktkR8d6Fy69XxQ5batI9VdFrVZrzh3e rihhhSTuOQE7gU5EXKe2rU8JR00+7k6N1scC61TpR76NeDX9640RdbzkwMn1pIoklWGe LO/Q== 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:to:from:dkim-signature; bh=Gv8SBLd9l2dLRbvszGJpHjk1PR74fLOlZSaAeCY0NBQ=; b=kenvB8S0Xjakc+3iV9g6ZwpVRMYUj1xq0Z8PcnPlcFybGF2zqJLf4d1MSBouNpwFZO ppI7cF4TSEe3xRUmHX/t0NvdYVHYXTu5K7HY6rjL6gegndHjfW+MwHg3KUawHVcuzs3Y TXbYSqjYo648W/UgLCaCEIF9dWegix7KXB2By7pmGb+Jv4rAAvr+3PFGuOSoERkOdTFV fMW8OfBG4k35DSQ/dHeMzLr1YgMVaQhRAGuQnx+qHm1LvAatMB4SempHXRRmSwKy5p4v IfEEqzeDwDQPyXxNqOoCJcbQeWAyzPcjnpO8ThbMzFTymNcGh/ba3tN/6HPHqi25tlAN QDUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qJH2TJ6a; 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 l17-20020a1709067d5100b00722e1ac3ee8sor4042835ejp.110.2022.07.13.10.11.20 for (Google Transport Security); Wed, 13 Jul 2022 10:11:20 -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:907:7f9e:b0:72e:d375:431 with SMTP id qk30-20020a1709077f9e00b0072ed3750431mr606285ejc.580.1657732279274; Wed, 13 Jul 2022 10:11:19 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id lb16-20020a170907785000b0072b36cbcdaasm5218168ejc.92.2022.07.13.10.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 10:11:18 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH V3 2/4] mtd: nand: Store nand ID in struct nand_chip Date: Wed, 13 Jul 2022 19:11:09 +0200 Message-Id: <20220713171111.337338-2-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220713171111.337338-1-michael@amarulasolutions.com> References: <20220713171111.337338-1-michael@amarulasolutions.com> 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=qJH2TJ6a; 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: , Upstream commit 7f501f0a72036dc29ad9a53811474c393634b401 Store the NAND ID in struct nand_chip to avoid passing id_data and id_len as function parameters. Signed-off-by: Boris Brezillon Acked-by: Richard Weinberger Reviewed-by: Marek Vasut Signed-off-by: Michael Trimarchi --- drivers/mtd/nand/raw/nand_base.c | 54 ++++++++++++++++---------------- include/linux/mtd/rawnand.h | 15 +++++++++ 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 9244287b10..6e964275e5 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4152,16 +4152,14 @@ static int nand_get_bits_per_cell(u8 cellinfo) * chip. The rest of the parameters must be decoded according to generic or * manufacturer-specific "extended ID" decoding patterns. */ -static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, - u8 id_data[8]) +static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) { int extid, id_len; /* The 3rd id byte holds MLC / multichip data */ - chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]); + chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]); /* The 4th id byte is the important one */ - extid = id_data[3]; - - id_len = nand_id_len(id_data, 8); + extid = chip->id.data[3]; + id_len = chip->id.len; /* * Field definitions are in the following datasheets: @@ -4172,8 +4170,8 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, * Check for ID length, non-zero 6th byte, cell type, and Hynix/Samsung * ID to decide what to do. */ - if (id_len == 6 && id_data[0] == NAND_MFR_SAMSUNG && - !nand_is_slc(chip) && id_data[5] != 0x00) { + if (id_len == 6 && chip->id.data[0] == NAND_MFR_SAMSUNG && + !nand_is_slc(chip) && chip->id.data[5] != 0x00) { /* Calc pagesize */ mtd->writesize = 2048 << (extid & 0x03); extid >>= 2; @@ -4206,7 +4204,7 @@ 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)); - } else if (id_len == 6 && id_data[0] == NAND_MFR_HYNIX && + } else if (id_len == 6 && chip->id.data[0] == NAND_MFR_HYNIX && !nand_is_slc(chip)) { unsigned int tmp; @@ -4270,10 +4268,10 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip, * 110b -> 24nm * - ID byte 5, bit[7]: 1 -> BENAND, 0 -> raw SLC */ - if (id_len >= 6 && id_data[0] == NAND_MFR_TOSHIBA && + if (id_len >= 6 && chip->id.data[0] == NAND_MFR_TOSHIBA && nand_is_slc(chip) && - (id_data[5] & 0x7) == 0x6 /* 24nm */ && - !(id_data[4] & 0x80) /* !BENAND */) { + (chip->id.data[5] & 0x7) == 0x6 /* 24nm */ && + !(chip->id.data[4] & 0x80) /* !BENAND */) { mtd->oobsize = 32 * mtd->writesize >> 9; } @@ -4286,9 +4284,9 @@ 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]) + struct nand_flash_dev *type) { - int maf_id = id_data[0]; + int maf_id = chip->id.data[0]; mtd->erasesize = type->erasesize; mtd->writesize = type->pagesize; @@ -4303,11 +4301,11 @@ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, * listed in nand_ids table. * Data sheet (5 byte ID): Spansion S30ML-P ORNAND (p.39) */ - if (maf_id == NAND_MFR_AMD && id_data[4] != 0x00 && id_data[5] == 0x00 - && id_data[6] == 0x00 && id_data[7] == 0x00 + if (maf_id == NAND_MFR_AMD && chip->id.data[4] != 0x00 && chip->id.data[5] == 0x00 + && chip->id.data[6] == 0x00 && chip->id.data[7] == 0x00 && mtd->writesize == 512) { mtd->erasesize = 128 * 1024; - mtd->erasesize <<= ((id_data[3] & 0x03) << 1); + mtd->erasesize <<= ((chip->id.data[3] & 0x03) << 1); } } @@ -4317,9 +4315,9 @@ static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, * page size, cell-type information). */ static void nand_decode_bbm_options(struct mtd_info *mtd, - struct nand_chip *chip, u8 id_data[8]) + struct nand_chip *chip) { - int maf_id = id_data[0]; + int maf_id = chip->id.data[0]; /* Set the bad block position */ if (mtd->writesize > 512 || (chip->options & NAND_BUSWIDTH_16)) @@ -4354,14 +4352,14 @@ 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) + struct nand_flash_dev *type) { - if (!strncmp((char *)type->id, (char *)id_data, type->id_len)) { + if (!strncmp((char *)type->id, (char *)chip->id.data, type->id_len)) { mtd->writesize = type->pagesize; mtd->erasesize = type->erasesize; mtd->oobsize = type->oobsize; - chip->bits_per_cell = nand_get_bits_per_cell(id_data[2]); + chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]); chip->chipsize = (uint64_t)type->chipsize << 20; chip->options |= type->options; chip->ecc_strength_ds = NAND_ECC_STRENGTH(type); @@ -4387,7 +4385,7 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, { int busw, ret; int maf_idx; - u8 id_data[8]; + u8 *id_data = chip->id.data; /* * Reset the chip, required by some chips (e.g. Micron MT29FxGxxxxx) @@ -4445,9 +4443,11 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, */ chip->options &= ~NAND_BUSWIDTH_16; + chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data)); + for (; type->name != NULL; type++) { if (is_full_id_nand(type)) { - if (find_full_id_nand(mtd, chip, type, id_data)) + if (find_full_id_nand(mtd, chip, type)) goto ident_done; } else if (*dev_id == type->dev_id) { break; @@ -4475,9 +4475,9 @@ 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); + nand_decode_ext_id(mtd, chip); } else { - nand_decode_id(mtd, chip, type, id_data); + nand_decode_id(mtd, chip, type); } /* Get chip options */ @@ -4515,7 +4515,7 @@ ident_done: return ERR_PTR(-EINVAL); } - nand_decode_bbm_options(mtd, chip, id_data); + nand_decode_bbm_options(mtd, chip); /* Calculate the address shift from the page size */ chip->page_shift = ffs(mtd->writesize) - 1; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 3417ca2a0d..f2c6a978cb 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -507,6 +507,19 @@ static inline void nand_hw_control_init(struct nand_hw_control *nfc) init_waitqueue_head(&nfc->wq); } +/* The maximum expected count of bytes in the NAND ID sequence */ +#define NAND_MAX_ID_LEN 8 + +/** + * struct nand_id - NAND id structure + * @data: buffer containing the id bytes. + * @len: ID length. + */ +struct nand_id { + u8 data[NAND_MAX_ID_LEN]; + int len; +}; + /** * struct nand_ecc_step_info - ECC step information of ECC engine * @stepsize: data bytes per ECC step @@ -888,6 +901,8 @@ nand_get_sdr_timings(const struct nand_data_interface *conf) struct nand_chip { struct mtd_info mtd; + struct nand_id id; + void __iomem *IO_ADDR_R; void __iomem *IO_ADDR_W; From patchwork Wed Jul 13 17:11:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2141 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 725FE3F066 for ; Wed, 13 Jul 2022 19:11:24 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id nb10-20020a1709071c8a00b006e8f89863cesf3666631ejc.18 for ; Wed, 13 Jul 2022 10:11:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657732284; cv=pass; d=google.com; s=arc-20160816; b=gtlW6RMIyY63N9ngbs0kMTMJwyRY9dMCS7Rd+MRv4ffp8KNcFc373PfuY/wjbXfHDO a3qbW822ymjOqOG3vJVTWq48aO2tCKKlaTsPyxcAX1v4KtLnkZtAQN+XFOl4Uxs9lIR0 2U6uZ3qH3hqRFQt5VTZhlsOrchuFnTR2x7CHBkHBjnh1dOHqiFUBVOEs65XLD98Li1cb XkHJ0wo/suCr26KWMrf6FTfydmBYB6gGTzyK1oxX0y+IswOEeGLA74ACKsHUMBymUfyG 5I3+z3qCKgNv7cBFPQfivtyCBKGZv9cPOt78iItWcQ1aRQSdmwWg2KcOwRiek75/vOxu IdCg== 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:to:from:dkim-signature; bh=JpXqIHIv235h6o++wG12BeZEvn5KaWZoPpEUGWFr7cE=; b=DU2TuxvTenvLWiGypuF8wkXdXV23FrkD0mAB5f7YPMmpX7R8R4d+5pSdHTc8wkclY0 XqRk+87zVjNXpUCIyOfdQ/uK3N/KiJpyr0ntYDJ4A6HOPqUoEUMXHGem2GeOC6x6ABzO tiXc3HZUsufLdcHFRzf527pZaX3PabYFP/s9Co67ttxq3wMXDatAR7nonRbOG5Bp0B0N /fJjL/kH7qg5q1JSZ1xl8F/qVLKV0mvdyY/F6aAz88LJrqCURpJ/gZFQlIqxHOk1HbVH 3zSwac1Oz7sOj9TCsknkFdhbOotezK1ZqlSTWZURno7od/QV85NGJn1wr1jUVkmYgnGB zc/g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Ue9I7d2O; 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: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=JpXqIHIv235h6o++wG12BeZEvn5KaWZoPpEUGWFr7cE=; b=LMPxHgapvw2rhXCtgjTjhiTwZD20bJcTEJfS7+VWdFo/eeRAMBTEWbHQvxsP1pII2n m/kgA31yIIu8pFUn2wR8vTukfTDfL/unRGUhNMsxXnAONu/F4Rm5vmF3MwK/OEFk3Qp3 enGISr3SA+aByiGJgojEpgo3RKQ/9PNp8Qsvc= 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: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=JpXqIHIv235h6o++wG12BeZEvn5KaWZoPpEUGWFr7cE=; b=ZCAVbRgioHDlQCjmwPnvTtvbnqTyHVMGNadT9q+6f6MK5QhJ5V/e1M/L7h+K8/k3qR pflyrAiyFhupYilXoYW/j3HIXZNGDL+V4YG/mxY+7Cm6IbfTRYKrxmBCnLOPenad/yTd BCo1CCiNveexu9DGZgWj4i2BX+wDkL03lPgPBANDAw9D68sCenGWdLSZfWwNwZ0Nk0n6 R8tPe41lDtmlHBlUj/p1onQ3QWF4rurtt60qPDO4PyJzHDrEsX0svd5WYesLBd246Qhr 0ULwQQSANK7I2P4r1Y0r1E4QkMcalI2+lRbbAbNMEhx+0DkALfiTD2A7mPq/YLqU4TNp +R4A== X-Gm-Message-State: AJIora/tjW9iyn152c/o5PI60sCCkUM0mHyQNWj4chMR4rxrkaBmdUoo 5o0TkctjyfmIL8zVQbopu2VgB/9x X-Google-Smtp-Source: AGRyM1t+lOfkjdIcgqSH9OL11xFZwOrSD8lylaT3BNtLPJd/B8EMHszwpikPa0kL4cSn83AU79K4JQ== X-Received: by 2002:a17:907:2c4a:b0:72b:5b9b:9c50 with SMTP id hf10-20020a1709072c4a00b0072b5b9b9c50mr4601976ejc.636.1657732284250; Wed, 13 Jul 2022 10:11:24 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:907:7f27:b0:72b:6e70:8c8c with SMTP id qf39-20020a1709077f2700b0072b6e708c8cls1500463ejc.10.gmail; Wed, 13 Jul 2022 10:11:23 -0700 (PDT) X-Received: by 2002:a17:906:8a4a:b0:72b:5b23:3065 with SMTP id gx10-20020a1709068a4a00b0072b5b233065mr4462387ejc.557.1657732282836; Wed, 13 Jul 2022 10:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657732282; cv=none; d=google.com; s=arc-20160816; b=pJ070bXz534ZPSF1eLynsMaZdtiRfwDwMUBtB3t/oKFGprDK9pDz4JxILdel54L5B0 H7FLpvPE4AAWN+a1VbeDKdmJgm+0RZp5iuvj7nb9XG/Vf2eY/bQ1X16+04f3IJR8UZF4 BwpYzifmDhWqjorcFP2AC9X3n5WUBQfFpDPnnFWuCoxLHGlQ5dHUBGre6E1GV61nWYFN A2M7RIakJWyj7jofYy6z3rtD7Trhpv2wWUHbiPkxWD+Zj1hYP3GY3ixNZbN1RVkp79/j djG4sVpa8RmC/SwSS6OFU8dWfsWqxjfX/dtuF1RERiBTQSOvk/QgBRD7771UWmn+5oUp GPXw== 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:to:from:dkim-signature; bh=ygNrYdotaJQDkfnb9m1VDTVvYwwV3uPyyciPN0sEPOM=; b=KuOTbzXpKl6XjIhGh8urrVHjE6Y/Of9FGNLl46Pn+S41ncs272lH2Rxliq/1zCJS7r 0ycWExl1zdLWVa4hsvsDkRMSx8UUdeIyqZqb8UZoWWFj3tDy8N0XXuh3gjB/0Ej7gIl1 6J36DeTP/pTaGAJzA1FeJEBRguMHWNPMduxUWRb0fxI77n91AeHi/m6pAFvxW+FXOOxB tsJzYE8FvCLiJRajFpPDGZ9oegAXvNoWRcTCP0Oj4fi92kaWcRsePfITQW9k4wjzXXIX m+OUc/HpT6fBKMMpP9zf0daXggSPH2+/nO0AxxfntTyjUYWjDN4XTEFYQW4L13YmnDw1 tzoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Ue9I7d2O; 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 e24-20020a170906375800b00722e565b857sor4159805ejc.87.2022.07.13.10.11.22 for (Google Transport Security); Wed, 13 Jul 2022 10:11:22 -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:106:b0:715:7cdf:400f with SMTP id 6-20020a170906010600b007157cdf400fmr4562708eje.1.1657732282109; Wed, 13 Jul 2022 10:11:22 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id lb16-20020a170907785000b0072b36cbcdaasm5218168ejc.92.2022.07.13.10.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 10:11:21 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH V3 3/4] mtd: nand: Add manufacturer specific initialization/detection steps Date: Wed, 13 Jul 2022 19:11:10 +0200 Message-Id: <20220713171111.337338-3-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220713171111.337338-1-michael@amarulasolutions.com> References: <20220713171111.337338-1-michael@amarulasolutions.com> 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=Ue9I7d2O; 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: , Upstream commit abbe26d144ec22bb067fa414d717b9f7ca2e12bd A lot of NANDs are implementing generic features in a non-generic way, or are providing advanced auto-detection logic where the NAND ID bytes meaning changes with the NAND generation. Providing this vendor specific initialization step will allow us to get rid of full-id entries in the nand_ids table or all the vendor specific cases added over the time in the generic NAND ID decoding logic. Signed-off-by: Boris Brezillon Signed-off-by: Michael Trimarchi --- drivers/mtd/nand/raw/nand_base.c | 90 +++++++++++++++++++++++++------- include/linux/mtd/rawnand.h | 30 +++++++++++ 2 files changed, 102 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 6e964275e5..d9024432b7 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4278,6 +4278,39 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) } } +/* + * Manufacturer detection. Only used when the NAND is not ONFI or JEDEC + * compliant and does not have a full-id or legacy-id entry in the nand_ids + * table. + */ +static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chip) +{ + /* + * Try manufacturer detection if available and use + * nand_decode_ext_id() otherwise. + */ + if (chip->manufacturer.desc && chip->manufacturer.desc->ops && + chip->manufacturer.desc->ops->detect) + chip->manufacturer.desc->ops->detect(chip); + else + nand_decode_ext_id(mtd, chip); +} + +/* + * Manufacturer initialization. This function is called for all NANDs including + * ONFI and JEDEC compliant ones. + * Manufacturer drivers should put all their specific initialization code in + * their ->init() hook. + */ +static int nand_manufacturer_init(struct nand_chip *chip) +{ + if (!chip->manufacturer.desc || !chip->manufacturer.desc->ops || + !chip->manufacturer.desc->ops->init) + return 0; + + return chip->manufacturer.desc->ops->init(chip); +} + /* * Old devices have chip data hardcoded in the device ID table. nand_decode_id * decodes a matching ID table entry and assigns the MTD size parameters for @@ -4375,6 +4408,26 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, return false; } +/** + * nand_get_manufacturer_desc - Get manufacturer information from the + * manufacturer ID + * @id: manufacturer ID + * + * Returns a nand_manufacturer_desc object if the manufacturer is defined + * in the NAND manufacturers database, NULL otherwise. + */ +static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id) +{ + int i; + + for (i = 0; nand_manuf_ids[i].id != 0x0; i++) { + if (nand_manuf_ids[i].id == id) + return &nand_manuf_ids[i]; + } + + return NULL; +} + /* * Get the flash and manufacturer id and lookup if the type is supported. */ @@ -4383,8 +4436,8 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, int *maf_id, int *dev_id, struct nand_flash_dev *type) { + const struct nand_manufacturers *manufacturer_desc; int busw, ret; - int maf_idx; u8 *id_data = chip->id.data; /* @@ -4425,6 +4478,12 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, return ERR_PTR(-ENODEV); } + chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data)); + + /* Try to identify manufacturer */ + manufacturer_desc = nand_get_manufacturer_desc(*maf_id); + chip->manufacturer.desc = manufacturer_desc; + if (!type) type = nand_flash_ids; @@ -4443,8 +4502,6 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, */ chip->options &= ~NAND_BUSWIDTH_16; - chip->id.len = nand_id_len(id_data, ARRAY_SIZE(chip->id.data)); - for (; type->name != NULL; type++) { if (is_full_id_nand(type)) { if (find_full_id_nand(mtd, chip, type)) @@ -4474,8 +4531,7 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->chipsize = (uint64_t)type->chipsize << 20; if (!type->pagesize) { - /* Decode parameters from extended ID */ - nand_decode_ext_id(mtd, chip); + nand_manufacturer_detect(mtd, chip); } else { nand_decode_id(mtd, chip, type); } @@ -4491,12 +4547,6 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->options &= ~NAND_SAMSUNG_LP_OPTIONS; ident_done: - /* Try to identify manufacturer */ - for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_idx++) { - if (nand_manuf_ids[maf_idx].id == *maf_id) - break; - } - if (chip->options & NAND_BUSWIDTH_AUTO) { WARN_ON(chip->options & NAND_BUSWIDTH_16); chip->options |= busw; @@ -4508,7 +4558,7 @@ ident_done: */ pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", *maf_id, *dev_id); - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, mtd->name); + pr_info("%s %s\n", manufacturer_desc->name, mtd->name); pr_warn("bus width %d instead %d bit\n", (chip->options & NAND_BUSWIDTH_16) ? 16 : 8, busw ? 16 : 8); @@ -4541,28 +4591,32 @@ ident_done: if (mtd->writesize > 512 && chip->cmdfunc == nand_command) chip->cmdfunc = nand_command_lp; + ret = nand_manufacturer_init(chip); + if (ret) + return ERR_PTR(ret); + pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", *maf_id, *dev_id); #ifdef CONFIG_SYS_NAND_ONFI_DETECTION if (chip->onfi_version) - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, + pr_info("%s %s\n", manufacturer_desc->name, chip->onfi_params.model); else if (chip->jedec_version) - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, + pr_info("%s %s\n", manufacturer_desc->name, chip->jedec_params.model); else - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, + pr_info("%s %s\n", manufacturer_desc->name, type->name); #else if (chip->jedec_version) - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, + pr_info("%s %s\n", manufacturer_desc->name, chip->jedec_params.model); else - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, + pr_info("%s %s\n", manufacturer_desc->name, type->name); - pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, + pr_info("%s %s\n", manufacturer_desc->name, type->name); #endif diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index f2c6a978cb..57fe7fb47b 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -796,6 +796,17 @@ nand_get_sdr_timings(const struct nand_data_interface *conf) return &conf->timings.sdr; } +/** + * struct nand_manufacturer_ops - NAND Manufacturer operations + * @detect: detect the NAND memory organization and capabilities + * @init: initialize all vendor specific fields (like the ->read_retry() + * implementation) if any. + */ +struct nand_manufacturer_ops { + void (*detect)(struct nand_chip *chip); + int (*init)(struct nand_chip *chip); +}; + /** * struct nand_chip - NAND Private Flash Chip Data * @mtd: MTD device registered to the MTD framework @@ -897,6 +908,7 @@ nand_get_sdr_timings(const struct nand_data_interface *conf) * devices. * @priv: [OPTIONAL] pointer to private chip data * @write_page: [REPLACEABLE] High-level page write function + * @manufacturer: [INTERN] Contains manufacturer information */ struct nand_chip { @@ -983,6 +995,11 @@ struct nand_chip { struct nand_bbt_descr *badblock_pattern; void *priv; + + struct { + const struct nand_manufacturers *desc; + void *priv; + } manufacturer; }; static inline void nand_set_flash_node(struct nand_chip *chip, @@ -1016,6 +1033,17 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv) chip->priv = priv; } +static inline void nand_set_manufacturer_data(struct nand_chip *chip, + void *priv) +{ + chip->manufacturer.priv = priv; +} + +static inline void *nand_get_manufacturer_data(struct nand_chip *chip) +{ + return chip->manufacturer.priv; +} + /* * NAND Flash Manufacturer ID Codes */ @@ -1120,10 +1148,12 @@ struct nand_flash_dev { * struct nand_manufacturers - NAND Flash Manufacturer ID Structure * @name: Manufacturer name * @id: manufacturer ID code of device. + * @ops: manufacturer operations */ struct nand_manufacturers { int id; char *name; + const struct nand_manufacturer_ops *ops; }; extern struct nand_flash_dev nand_flash_ids[]; From patchwork Wed Jul 13 17:11:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2142 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 927183F066 for ; Wed, 13 Jul 2022 19:11:28 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id j6-20020a05640211c600b0043a8ea2c138sf8726317edw.2 for ; Wed, 13 Jul 2022 10:11:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657732288; cv=pass; d=google.com; s=arc-20160816; b=Gv7h0I3mNolL+05xkpb6ypEd4uHPyqU7haSk1di/8J8L7SeMXiI0+O1oJlEOXpGJVN /8lQMHP295fWvBtYzIWRVTnqqKeyibJW8JOff0C2BC0yAqO0gP2tgc2Aqto0Rzrmd6mm 60UIoNNQWzTTw1lI3qfLjpPta1zTnr8O1ghUlFa6UHFFUMDIjEOrkdraf433hip80qHw PuabL4ot/keJA69WdoFUrprrMbUhnNkJi92h3/hpc6UY2Zu4cOhalsVoDOCiFhCsZR2V jZX5cjqb1eysX53N8Ow4wWM2Wb2K36jkaL8PS5OznPdRc9gGH4OezlqPZ+ZE+AJbKND9 Va4w== 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:to:from:dkim-signature; bh=LJVrge4oQgL9MWhThMeFyT3eG38JB1zx02XLhq1cbDE=; b=JQRmeyKQgoSCVJR/6qb4Jb0QEc3W46dTpKFOcIaIEunMEkR3JBs/zTfDhhrNQddhJD GR8iczOQSE5Cq7nXzp/yPrT9thc8x/9rIW0Guij3Iu4vwv6aeHz3kOd7KRVbdjVEtqRD rbY0y6Wq7+3iRMq8nXpaZmkgrt0dRlFFdP0B+aOZa0pjg8DK4QNrv80H7veifOl8eRlo MnVcoCq753P8Kdkz9zQAVNxz8RoqcQNiIWhrh+hyBiSXoKSr13rNmMXKBTMeZg0aPBaQ 6lFgzRRZEi07t+2HWXaRHdQBjIHEoKXRraVEwQNFZ1VBYO8n70htbGv3YM5erU0zdUtR eIaQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qMYbkzGx; 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: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=LJVrge4oQgL9MWhThMeFyT3eG38JB1zx02XLhq1cbDE=; b=Lp3iww6r3AMdTuhgwK2FLcZ65xEkrm+Xg1hoIDP80+VBIHWX5mf3rKqNFweMtYF3dX xvgLp/HnMycpQqcYqpr90Mkn0VKqmFCu/WjyzPH0EIgCNA2DQz4bHgL7FlR3hmYNKc9b MrixpjISuNvw3rXhQZ6Vommf6IGXJ6ftwq+Ck= 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: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=LJVrge4oQgL9MWhThMeFyT3eG38JB1zx02XLhq1cbDE=; b=TdR9eTQOrefQo6ux/1trX99u1WKCXQSN3C2s5RYGVMgPstUynOFih+KDiDKNWc5TaA qnrgYyFaqmwyO8teQpzyJUdJz6HTxuIh5a1I0QeB7hh8gzPOhD8EbKUE7arl/B9xi9/k hnFAF9fHdXnFVHCvczWrI2JjowZtc4EXF8YNcw+vT+WUSqjf1izysUW122JzPjrLjBY1 kJIsmYEZ5lsAMDDPeslnzk9El4YOEsiKllt9mMV37tIRWaH9fyV9pTD9rx6Guao2hZ07 EtW2q4r8XQu/HY0SOcd2uUOU7vnT2LLL3X5rXx9Jt1aGffLg2dBV025FUagPKl7pq4yE fV7Q== X-Gm-Message-State: AJIora+ESzz4tOdGdYGymslPoECYsEuZLFkzHAwmDMLZHFFRiPLTDoVN w4OVvokR9AslrvJongP02MWzGl+u X-Google-Smtp-Source: AGRyM1vF8/qjcjAgBhPz7JSPKhK883aKnKLjW/Gv9p8xDJZNwFgcUZFvgtEn8JHlCv6tXgPt7fpMbA== X-Received: by 2002:a05:6402:348e:b0:43a:953d:ade8 with SMTP id v14-20020a056402348e00b0043a953dade8mr6237078edc.135.1657732288217; Wed, 13 Jul 2022 10:11:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:d0e:b0:43a:6e96:4ae7 with SMTP id eb14-20020a0564020d0e00b0043a6e964ae7ls126975edb.1.gmail; Wed, 13 Jul 2022 10:11:27 -0700 (PDT) X-Received: by 2002:a05:6402:27ca:b0:43a:c342:b226 with SMTP id c10-20020a05640227ca00b0043ac342b226mr6386090ede.342.1657732286855; Wed, 13 Jul 2022 10:11:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657732286; cv=none; d=google.com; s=arc-20160816; b=IWQF90fK4aTj3soqF9BvZlhGTdD/3cSOmzBwTTS0oQ0mLZGeNxaf7jdmItf6NJqSJN yhazzqCuPNKTROJttkbtjsxD+IFYMzNidgzXKoa4Rb6tm/L4yw9lRjDMPO+HAIqg48Mp Km1iKJNTxMEl/K4qOKftr9oQh2CtcOykHxiQs6WCmIDJqlC28t/3evcBPXftngLDe6R2 CE8vyjyHS7kWIHZmAJjSbGkVJEapkWwRQ2/BcNBuW7QB/tXkUbhZMyitLCv+BM+ZFW1y KzmDNKwELxg+YucSfZbbTUqAOpfhRFGDKKj3H8DDTfWhmbvn77tMA7E+fmreIh8Tt6ua BKyw== 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:to:from:dkim-signature; bh=jQ5TC0H2CtHvtROfYf0q+4f6r+UCA0JDylr/aUnbdhI=; b=BjWo6xNha2OZHwsu1EDyKC+1YmVpOy8OgmyjECncTfmXHH+ejCi5VkPHuYoUt3SJKg nOOXoiHV0oHWINhZ0ThwpQ4cPYsGTAnon19skkLbykzkOgeagq5CQV5B6yRT8DRQNGq3 ZXyM7Fg36bSz3nO47GY2JO6OHcuO9S5TlavNrCysjez7ZRyGGkcGAayoaAgzGvUfkNuJ woZXpUXbXPNSrxEN6V3q0DEguPn1R4/437aPmnV/j7h/3qbKKy+Um+Luy+TMZOvxGbU/ 4Q5dt63ECOWc17eEa84IQz8pK2ZQz9ipZH60Se0UANy47IM1AbRMfgdr3XEVL7e20Vw7 i/5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qMYbkzGx; 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 qn21-20020a170907871500b0072b17278302sor4142788ejc.78.2022.07.13.10.11.26 for (Google Transport Security); Wed, 13 Jul 2022 10:11:26 -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:907:75e9:b0:72b:2ddb:41fe with SMTP id jz9-20020a17090775e900b0072b2ddb41femr4536647ejc.329.1657732286160; Wed, 13 Jul 2022 10:11:26 -0700 (PDT) Received: from panicking.amarulasolutions.com ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id lb16-20020a170907785000b0072b36cbcdaasm5218168ejc.92.2022.07.13.10.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 10:11:25 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai Subject: [PATCH V3 4/4] mtd: nand: Get rid of mtd variable in function calls Date: Wed, 13 Jul 2022 19:11:11 +0200 Message-Id: <20220713171111.337338-4-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220713171111.337338-1-michael@amarulasolutions.com> References: <20220713171111.337338-1-michael@amarulasolutions.com> 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=qMYbkzGx; 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: , chip points to mtd. Passing chip is enough to have a reference to mtd when is necessary Signed-off-by: Michael Trimarchi --- V2->V3: - Adjust aligment --- drivers/mtd/nand/raw/nand_base.c | 20 +++++++++++--------- include/linux/mtd/rawnand.h | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index d9024432b7..be1a6738c1 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4152,8 +4152,9 @@ static int nand_get_bits_per_cell(u8 cellinfo) * chip. The rest of the parameters must be decoded according to generic or * manufacturer-specific "extended ID" decoding patterns. */ -static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) +static void nand_decode_ext_id(struct nand_chip *chip) { + struct mtd_info *mtd = &chip->mtd; int extid, id_len; /* The 3rd id byte holds MLC / multichip data */ chip->bits_per_cell = nand_get_bits_per_cell(chip->id.data[2]); @@ -4283,7 +4284,7 @@ static void nand_decode_ext_id(struct mtd_info *mtd, struct nand_chip *chip) * compliant and does not have a full-id or legacy-id entry in the nand_ids * table. */ -static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chip) +static void nand_manufacturer_detect(struct nand_chip *chip) { /* * Try manufacturer detection if available and use @@ -4293,7 +4294,7 @@ static void nand_manufacturer_detect(struct mtd_info *mtd, struct nand_chip *chi chip->manufacturer.desc->ops->detect) chip->manufacturer.desc->ops->detect(chip); else - nand_decode_ext_id(mtd, chip); + nand_decode_ext_id(chip); } /* @@ -4316,9 +4317,10 @@ static int nand_manufacturer_init(struct nand_chip *chip) * decodes a matching ID table entry and assigns the MTD size parameters for * the chip. */ -static void nand_decode_id(struct mtd_info *mtd, struct nand_chip *chip, +static void nand_decode_id(struct nand_chip *chip, struct nand_flash_dev *type) { + struct mtd_info *mtd = &chip->mtd; int maf_id = chip->id.data[0]; mtd->erasesize = type->erasesize; @@ -4431,11 +4433,11 @@ static const struct nand_manufacturers *nand_get_manufacturer_desc(u8 id) /* * Get the flash and manufacturer id and lookup if the type is supported. */ -struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, - struct nand_chip *chip, +struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id, int *dev_id, struct nand_flash_dev *type) { + struct mtd_info *mtd = &chip->mtd; const struct nand_manufacturers *manufacturer_desc; int busw, ret; u8 *id_data = chip->id.data; @@ -4531,9 +4533,9 @@ struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, chip->chipsize = (uint64_t)type->chipsize << 20; if (!type->pagesize) { - nand_manufacturer_detect(mtd, chip); + nand_manufacturer_detect(chip); } else { - nand_decode_id(mtd, chip, type); + nand_decode_id(chip, type); } /* Get chip options */ @@ -4723,7 +4725,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16); /* Read the flash type */ - type = nand_get_flash_type(mtd, chip, &nand_maf_id, + type = nand_get_flash_type(chip, &nand_maf_id, &nand_dev_id, table); if (IS_ERR(type)) { diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 57fe7fb47b..d8141cb4d1 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -29,8 +29,7 @@ struct nand_flash_dev; struct device_node; /* Get the flash and manufacturer id and lookup if the type is supported. */ -struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, - struct nand_chip *chip, +struct nand_flash_dev *nand_get_flash_type(struct nand_chip *chip, int *maf_id, int *dev_id, struct nand_flash_dev *type);