From patchwork Thu Jul 14 14:35:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 2169 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 336E53F066 for ; Thu, 14 Jul 2022 16:35:58 +0200 (CEST) Received: by mail-wm1-f70.google.com with SMTP id 83-20020a1c0256000000b003a2d01897e4sf730236wmc.9 for ; Thu, 14 Jul 2022 07:35:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657809358; cv=pass; d=google.com; s=arc-20160816; b=sHkUAANChPEHQYqDMX/3nE06Z1Ju7frS0BaHiLgJ+6eHAJI1sSLDvR+PI/BkrPDkeQ T21+TPrVz9nJ7wA4T79HNoZ9jhMDN8lE3EWaWoIXS83srpdzmyahly27HHO6T3K9hMYi AMpLaiaIA33UB1edlHdqQcu3sV7Qpv1QN/7c9xngKEQ5aHGwo6OUgG4/MzF2S5R81AZ3 kMTqVNXF6Zo1kbbzJ5nF4nhKzKOLZl+n6yH1MSe8WgNwrdROjf+1P3YLSI4z31H8wbZx lWBXzfK6hIlkRYRpkC/IAF5pxmdxWhYyXw9NMS3ixMZm70fwEZrhe9ouoUQ17PgXiTiv +Zmw== 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=Z+M1ItdFJHYx2BwAoYAsuhoRsY+QaBLWxfpo4/jPYQA=; b=VvWNEDw8LWFaEmLhGW/Wd2u/cVLhkjhfLc+00bocoCJfGjBtKotuQO3Mq8qWDpB0O9 eNQqeeqp1MjKg3hp11iNtOJxkwvDPqOVwNMAB1HECHgClWEDllIQgozqcUEajNXZmSU1 hOS9AZR2BcGjVczeHd1koyP+hDe/kex54QyspqUJspFUxjL+kuWopspdDkY+IYv6UEiB WnvEOjE7U4bny+zvJSs4hCaEqBz8268PTFn1EM1NgkeleH/739KEQMeZ3XO2He3c9j/3 mLHigE+JVzgavSZBCSa3B0VwF3EOZxl0XsvV2hsSMDTpS/l47zVoynPj8/cPYhQdlz8l T1hw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T7CT7Sgb; 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: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=Z+M1ItdFJHYx2BwAoYAsuhoRsY+QaBLWxfpo4/jPYQA=; b=iuC4rsE+28k8NfKVvKgXd+6Z0ZD4qwvoNvjiX0lwrmQFC8P8rRkLScGJ0IiTYnq67T P1DiPKx0SRjPrZJq11qHBI+nloYkpGtX7qHS/Npb3QaxWTttDLnwiHYAyvn0V5F9CQjU pQEpNV5ane3Dw3gwuM68kpMVC2MNVdgfd60Xo= 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=Z+M1ItdFJHYx2BwAoYAsuhoRsY+QaBLWxfpo4/jPYQA=; b=NQKnhXlWKc8eObZNxSFlSRXKptRcsGvSIQZ80ZBGx29T+LB06njfkvsJH+byKjHnpc yB/+BdwcB7EmTUfPX2BlwdVI0AAs1P9VifCsI7OaeJKuVx7u7bq34fRzw8XKhGct/1nZ rr1zYgWotjA/38Bw9H7Y1XrgUajlhsc29k4LCzcZ3NQpuySA7n87ZuQDXm1rbT/2lmhN 1sGjSBupq0mer+qJACZjZ1TFe7CDZGk+SH/GbNRmfGCiV/gEqI1EV9a+5ZMDKWEIL9Mv UAdOwyKvynekcMWcs09CS9sgbPezFY2lyaw2qj4lsemx7Em1nR2lV1sZdf1AvPxTm9x6 EM+A== X-Gm-Message-State: AJIora9gXDVz4khhM97qc8xSoyqL7pwx2tlofikrdYWS+n4lFc11ikxf tQFM/5pf7LlLp8EABNmz+ROxSPgo X-Google-Smtp-Source: AGRyM1tv9/Pff4zhfoj01IolvUbQ70aaU0gylQ8qwrIyDEIKPBlPD257pz78YhzDSocwiXyCqvzEUg== X-Received: by 2002:a05:600c:3b96:b0:3a2:e0ae:f127 with SMTP id n22-20020a05600c3b9600b003a2e0aef127mr15204639wms.64.1657809357892; Thu, 14 Jul 2022 07:35:57 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:34c6:b0:3a0:4f27:977f with SMTP id d6-20020a05600c34c600b003a04f27977fls4515698wmq.2.gmail; Thu, 14 Jul 2022 07:35:56 -0700 (PDT) X-Received: by 2002:a05:600c:4f14:b0:3a2:e8be:c184 with SMTP id l20-20020a05600c4f1400b003a2e8bec184mr15630844wmq.34.1657809356674; Thu, 14 Jul 2022 07:35:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657809356; cv=none; d=google.com; s=arc-20160816; b=KoR7Txw7eMgbIzY8jIoxcafPP5Lt/S1jzznWk49ZMRfT0mUzQ0c2gs9zW+kZkRDeWJ nflGyro34ovDOTeV9Mn7LJs7vUqVhyVoVkX8hpXiqFCk5lCQqaikxLRJAB57u1o/IM48 PwwHKdDDaU1uhChgIKUaOyOzFwZhRpKbcBYuM6Ivfk0R/6r2ndk4lNLkXNJBBjhYiJXE S0SncY7wT4aQ/uWM9hRmZ0ExqsDgNhmydhwAiuxxQC7iYRM/yqhPPjZRWOmOkd0vU6PP GZJX/jplQKZJzUentkkVxr/mvo9hEdFzwkBUwqMZjaR3yFhkGZQ5iR4dxl1uXKyUpTXP yu0Q== 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=7/o+mGV8ywUVtQz4G7CKHG/IM0njUkMjI+CMpXHKhCc=; b=Ny13K6YxviJX4Lo5AucFhCsLtwNpPNCUcWQDtum/bEzDm2u93swqMIXJ9deQ4aujLd VZKNAmOrrjHOiHrqdBXlnC8jrM4JKRTCmJAC/xNJR5A/bPOqnHSbihRW0gUfE6slJFc1 DahfUPcIJki5X8xfvbhafQ1C/ZeC5n78cS93sQMJElZrsHPeCkK9SR5uQmQ0us1V+wvX D7hLpKAmARQY4BTiL9/vEEB8eNG0Vu95ptzq5pEXsxALxhDz1oJ/ezHVhHioG+ZXRrjy oyQ/rTlWL6VkRb2MARpOjZ3idEncbRCfZjuKhogkMIy8Nsi07J31OHnxdUsrniB4DDrk XRpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T7CT7Sgb; 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 d27-20020adf9b9b000000b0021d6b86ee07sor898996wrc.28.2022.07.14.07.35.56 for (Google Transport Security); Thu, 14 Jul 2022 07:35:56 -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:adf:dd0d:0:b0:21d:666b:298e with SMTP id a13-20020adfdd0d000000b0021d666b298emr8703565wrm.412.1657809355910; Thu, 14 Jul 2022 07:35:55 -0700 (PDT) Received: from panicking.. ([2.198.242.86]) by smtp.gmail.com with ESMTPSA id u18-20020a05600c19d200b003973c54bd69sm5712357wmq.1.2022.07.14.07.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 07:35:55 -0700 (PDT) From: Michael Trimarchi To: linux-amarula@amarulasolutions.com, Dario Binacchi , Tommaso Merciai , Boris Brezillon , Richard Weinberger , Patrice Chotard , Marek Vasut , Wolfgang Denk , u-boot@lists.denx.de (open list) Cc: Boris Brezillon , u-boot@lists.denx.de (open list) Subject: [PATCH 03/11] mtd: nand: Add manufacturer specific initialization/detection steps Date: Thu, 14 Jul 2022 16:35:35 +0200 Message-Id: <20220714143543.448991-4-michael@amarulasolutions.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220714143543.448991-1-michael@amarulasolutions.com> References: <20220714143543.448991-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=T7CT7Sgb; 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 4a78770a25..3b9c78cb24 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4286,6 +4286,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 @@ -4383,6 +4416,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. */ @@ -4391,8 +4444,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; /* @@ -4433,6 +4486,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; @@ -4451,8 +4510,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)) @@ -4482,8 +4539,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); } @@ -4499,12 +4555,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; @@ -4516,7 +4566,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); @@ -4549,28 +4599,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[];