@@ -1174,7 +1174,8 @@ int nand_get_features(struct nand_chip *chip, int addr,
{
struct mtd_info *mtd = nand_to_mtd(chip);
- if (!chip->parameters.supports_set_get_features)
+ if (!chip->parameters.supports_set_get_features ||
+ !test_bit(addr, chip->parameters.get_feature_list))
return -ENOTSUPP;
return chip->get_features(mtd, chip, addr, subfeature_param);
@@ -1195,7 +1196,8 @@ int nand_set_features(struct nand_chip *chip, int addr,
{
struct mtd_info *mtd = nand_to_mtd(chip);
- if (!chip->parameters.supports_set_get_features)
+ if (!chip->parameters.supports_set_get_features ||
+ !test_bit(addr, chip->parameters.set_feature_list))
return -ENOTSUPP;
return chip->set_features(mtd, chip, addr, subfeature_param);
@@ -5196,8 +5198,13 @@ static int nand_flash_detect_onfi(struct nand_chip *chip)
}
/* Save some parameters from the parameter page for future use */
- if (le16_to_cpu(p->opt_cmd) & ONFI_OPT_CMD_SET_GET_FEATURES)
+ if (le16_to_cpu(p->opt_cmd) & ONFI_OPT_CMD_SET_GET_FEATURES) {
chip->parameters.supports_set_get_features = true;
+ bitmap_set(chip->parameters.get_feature_list,
+ ONFI_FEATURE_ADDR_TIMING_MODE, 1);
+ bitmap_set(chip->parameters.set_feature_list,
+ ONFI_FEATURE_ADDR_TIMING_MODE, 1);
+ }
chip->parameters.onfi_params.t_prog = le16_to_cpu(p->t_prog);
chip->parameters.onfi_params.t_bers = le16_to_cpu(p->t_bers);
chip->parameters.onfi_params.t_r = le16_to_cpu(p->t_r);
@@ -64,6 +64,10 @@ static int micron_nand_onfi_init(struct nand_chip *chip)
chip->setup_read_retry = micron_nand_setup_read_retry;
}
+ if (p->supports_set_get_features) {
+ set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->set_feature_list);
+ set_bit(ONFI_FEATURE_ADDR_READ_RETRY, p->get_feature_list);
+ }
return 0;
}
@@ -21,6 +21,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/flashchip.h>
#include <linux/mtd/bbm.h>
+#include <linux/types.h>
struct mtd_info;
struct nand_flash_dev;
@@ -235,7 +236,8 @@ struct nand_chip;
#define ONFI_TIMING_MODE_5 (1 << 5)
#define ONFI_TIMING_MODE_UNKNOWN (1 << 6)
-/* ONFI feature address */
+/* ONFI feature number/address */
+#define ONFI_FEATURE_NUMBER 256
#define ONFI_FEATURE_ADDR_TIMING_MODE 0x1
/* Vendor-specific feature address (Micron) */
@@ -443,6 +445,8 @@ struct nand_parameters {
/* Generic parameters */
char model[100];
bool supports_set_get_features;
+ DECLARE_BITMAP(set_feature_list, ONFI_FEATURE_NUMBER);
+ DECLARE_BITMAP(get_feature_list, ONFI_FEATURE_NUMBER);
/* ONFI parameters */
struct onfi_params onfi_params;
If SET/GET_FEATURES is available (from the parameter page), use a bitmap to declare what feature is actually supported. Initialize the bitmap in the core to support timing changes (only feature used by the core), also add support for Micron specific features used in Micron initialization code (in the init routine). Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mtd/nand/raw/nand_base.c | 13 ++++++++++--- drivers/mtd/nand/raw/nand_micron.c | 4 ++++ include/linux/mtd/rawnand.h | 6 +++++- 3 files changed, 19 insertions(+), 4 deletions(-)