Skip to content

Commit

Permalink
mtd: rawnand: Check the data only read pattern only once
Browse files Browse the repository at this point in the history
Instead of checking if a pattern is supported each time we need it,
let's create a bitfield that only the core would be allowed to fill at
startup time. The core and the individual drivers may then use it in
order to check what operation they should use. This bitfield is supposed
to grow over time.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Tested-by: Liao Jaime <jaimeliao.tw@gmail.com>
Link: https://lore.kernel.org/linux-mtd/20230112093637.987838-2-miquel.raynal@bootlin.com
  • Loading branch information
Miquel Raynal committed Jan 13, 2023
1 parent 568494d commit 9f820fc
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 4 deletions.
20 changes: 20 additions & 0 deletions drivers/mtd/nand/raw/nand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -4991,6 +4991,24 @@ nand_manufacturer_name(const struct nand_manufacturer_desc *manufacturer_desc)
return manufacturer_desc ? manufacturer_desc->name : "Unknown";
}

static void rawnand_check_data_only_read_support(struct nand_chip *chip)
{
/* Use an arbitrary size for the check */
if (!nand_read_data_op(chip, NULL, SZ_512, true, true))
chip->controller->supported_op.data_only_read = 1;
}

static void rawnand_early_check_supported_ops(struct nand_chip *chip)
{
/* The supported_op fields should not be set by individual drivers */
WARN_ON_ONCE(chip->controller->supported_op.data_only_read);

if (!nand_has_exec_op(chip))
return;

rawnand_check_data_only_read_support(chip);
}

/*
* Get the flash and manufacturer id and lookup if the type is supported.
*/
Expand Down Expand Up @@ -5023,6 +5041,8 @@ static int nand_detect(struct nand_chip *chip, struct nand_flash_dev *type)
/* Select the device */
nand_select_target(chip, 0);

rawnand_early_check_supported_ops(chip);

/* Send the command for reading device ID */
ret = nand_readid_op(chip, 0, id_data, 2);
if (ret)
Expand Down
3 changes: 1 addition & 2 deletions drivers/mtd/nand/raw/nand_jedec.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ int nand_jedec_detect(struct nand_chip *chip)
if (!p)
return -ENOMEM;

if (!nand_has_exec_op(chip) ||
!nand_read_data_op(chip, p, sizeof(*p), true, true))
if (!nand_has_exec_op(chip) || chip->controller->supported_op.data_only_read)
use_datain = true;

for (i = 0; i < JEDEC_PARAM_PAGES; i++) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/mtd/nand/raw/nand_onfi.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ int nand_onfi_detect(struct nand_chip *chip)
if (!pbuf)
return -ENOMEM;

if (!nand_has_exec_op(chip) ||
!nand_read_data_op(chip, &pbuf[0], sizeof(*pbuf), true, true))
if (!nand_has_exec_op(chip) || chip->controller->supported_op.data_only_read)
use_datain = true;

for (i = 0; i < ONFI_PARAM_PAGES; i++) {
Expand Down
8 changes: 8 additions & 0 deletions include/linux/mtd/rawnand.h
Original file line number Diff line number Diff line change
Expand Up @@ -1094,10 +1094,18 @@ struct nand_controller_ops {
*
* @lock: lock used to serialize accesses to the NAND controller
* @ops: NAND controller operations.
* @supported_op: NAND controller known-to-be-supported operations,
* only writable by the core after initial checking.
* @supported_op.data_only_read: The controller supports reading more data from
* the bus without restarting an entire read operation nor
* changing the column.
*/
struct nand_controller {
struct mutex lock;
const struct nand_controller_ops *ops;
struct {
unsigned int data_only_read: 1;
} supported_op;
};

static inline void nand_controller_init(struct nand_controller *nfc)
Expand Down

0 comments on commit 9f820fc

Please sign in to comment.