Commit f6ca3fb6 authored by Rouven Czerwinski's avatar Rouven Czerwinski Committed by Miquel Raynal

mtd: rawnand: Ensure the nand chip supports cached reads

Both the JEDEC and ONFI specification say that read cache sequential
support is an optional command. This means that we not only need to
check whether the individual controller supports the command, we also
need to check the parameter pages for both ONFI and JEDEC NAND flashes
before enabling sequential cache reads.

This fixes support for NAND flashes which don't support enabling cache
reads, i.e. Samsung K9F4G08U0F or Toshiba TC58NVG0S3HTA00.

Sequential cache reads are now only available for ONFI and JEDEC
devices, if individual vendors implement this, it needs to be enabled
per vendor.

Tested on i.MX6Q with a Samsung NAND flash chip that doesn't support
sequential reads.

Fixes: 003fe4b9 ("mtd: rawnand: Support for sequential cache reads")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20230922141717.35977-1-r.czerwinski@pengutronix.de
parent 5279f4a9
...@@ -5110,6 +5110,9 @@ static void rawnand_check_cont_read_support(struct nand_chip *chip) ...@@ -5110,6 +5110,9 @@ static void rawnand_check_cont_read_support(struct nand_chip *chip)
{ {
struct mtd_info *mtd = nand_to_mtd(chip); struct mtd_info *mtd = nand_to_mtd(chip);
if (!chip->parameters.supports_read_cache)
return;
if (chip->read_retries) if (chip->read_retries)
return; return;
......
...@@ -94,6 +94,9 @@ int nand_jedec_detect(struct nand_chip *chip) ...@@ -94,6 +94,9 @@ int nand_jedec_detect(struct nand_chip *chip)
goto free_jedec_param_page; goto free_jedec_param_page;
} }
if (p->opt_cmd[0] & JEDEC_OPT_CMD_READ_CACHE)
chip->parameters.supports_read_cache = true;
memorg->pagesize = le32_to_cpu(p->byte_per_page); memorg->pagesize = le32_to_cpu(p->byte_per_page);
mtd->writesize = memorg->pagesize; mtd->writesize = memorg->pagesize;
......
...@@ -303,6 +303,9 @@ int nand_onfi_detect(struct nand_chip *chip) ...@@ -303,6 +303,9 @@ int nand_onfi_detect(struct nand_chip *chip)
ONFI_FEATURE_ADDR_TIMING_MODE, 1); ONFI_FEATURE_ADDR_TIMING_MODE, 1);
} }
if (le16_to_cpu(p->opt_cmd) & ONFI_OPT_CMD_READ_CACHE)
chip->parameters.supports_read_cache = true;
onfi = kzalloc(sizeof(*onfi), GFP_KERNEL); onfi = kzalloc(sizeof(*onfi), GFP_KERNEL);
if (!onfi) { if (!onfi) {
ret = -ENOMEM; ret = -ENOMEM;
......
...@@ -21,6 +21,9 @@ struct jedec_ecc_info { ...@@ -21,6 +21,9 @@ struct jedec_ecc_info {
/* JEDEC features */ /* JEDEC features */
#define JEDEC_FEATURE_16_BIT_BUS (1 << 0) #define JEDEC_FEATURE_16_BIT_BUS (1 << 0)
/* JEDEC Optional Commands */
#define JEDEC_OPT_CMD_READ_CACHE BIT(1)
struct nand_jedec_params { struct nand_jedec_params {
/* rev info and features block */ /* rev info and features block */
/* 'J' 'E' 'S' 'D' */ /* 'J' 'E' 'S' 'D' */
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#define ONFI_SUBFEATURE_PARAM_LEN 4 #define ONFI_SUBFEATURE_PARAM_LEN 4
/* ONFI optional commands SET/GET FEATURES supported? */ /* ONFI optional commands SET/GET FEATURES supported? */
#define ONFI_OPT_CMD_READ_CACHE BIT(1)
#define ONFI_OPT_CMD_SET_GET_FEATURES BIT(2) #define ONFI_OPT_CMD_SET_GET_FEATURES BIT(2)
struct nand_onfi_params { struct nand_onfi_params {
......
...@@ -225,6 +225,7 @@ struct gpio_desc; ...@@ -225,6 +225,7 @@ struct gpio_desc;
* struct nand_parameters - NAND generic parameters from the parameter page * struct nand_parameters - NAND generic parameters from the parameter page
* @model: Model name * @model: Model name
* @supports_set_get_features: The NAND chip supports setting/getting features * @supports_set_get_features: The NAND chip supports setting/getting features
* @supports_read_cache: The NAND chip supports read cache operations
* @set_feature_list: Bitmap of features that can be set * @set_feature_list: Bitmap of features that can be set
* @get_feature_list: Bitmap of features that can be get * @get_feature_list: Bitmap of features that can be get
* @onfi: ONFI specific parameters * @onfi: ONFI specific parameters
...@@ -233,6 +234,7 @@ struct nand_parameters { ...@@ -233,6 +234,7 @@ struct nand_parameters {
/* Generic parameters */ /* Generic parameters */
const char *model; const char *model;
bool supports_set_get_features; bool supports_set_get_features;
bool supports_read_cache;
DECLARE_BITMAP(set_feature_list, ONFI_FEATURE_NUMBER); DECLARE_BITMAP(set_feature_list, ONFI_FEATURE_NUMBER);
DECLARE_BITMAP(get_feature_list, ONFI_FEATURE_NUMBER); DECLARE_BITMAP(get_feature_list, ONFI_FEATURE_NUMBER);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment