Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2abfeb2 authored by Boris Brezillon's avatar Boris Brezillon Committed by Miquel Raynal
Browse files

mtd: rawnand: Move the ->exec_op() method to nand_controller_ops 



->exec_op() is a controller method and has nothing to do in the
nand_chip struct. Let's move it to the nand_controller_ops struct and
adjust the core and drivers accordingly.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Tested-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 7d6c37e9

drivers/mtd/nand/raw/ams-delta.c

+5 −2
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ static int ams_delta_exec_op(struct nand_chip *this, 
	return ret;

}



static const struct nand_controller_ops ams_delta_ops = {

	.exec_op = ams_delta_exec_op,

};



/*

 * Main initialization routine

 */
@@ -216,8 +220,6 @@ static int ams_delta_init(struct platform_device *pdev) 
	priv->io_base = io_base;

	nand_set_controller_data(this, priv);



	this->exec_op = ams_delta_exec_op;



	priv->gpiod_rdy = devm_gpiod_get_optional(&pdev->dev, "rdy", GPIOD_IN);

	if (IS_ERR(priv->gpiod_rdy)) {

		err = PTR_ERR(priv->gpiod_rdy);
@@ -277,6 +279,7 @@ static int ams_delta_init(struct platform_device *pdev) 
	ams_delta_dir_input(priv, true);



	/* Initialize the NAND controller object embedded in ams_delta_nand. */

	priv->base.ops = &ams_delta_ops;

	nand_controller_init(&priv->base);

	this->controller = &priv->base;

drivers/mtd/nand/raw/fsmc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -995,6 +995,7 @@ static int fsmc_nand_attach_chip(struct nand_chip *nand) 


static const struct nand_controller_ops fsmc_nand_controller_ops = {

	.attach_chip = fsmc_nand_attach_chip,

	.exec_op = fsmc_exec_op,

};



/*
@@ -1082,7 +1083,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) 
	nand_set_flash_node(nand, pdev->dev.of_node);



	mtd->dev.parent = &pdev->dev;

	nand->exec_op = fsmc_exec_op;



	/*

	 * Setup default ECC mode. nand_dt_init() called from nand_scan_ident()

drivers/mtd/nand/raw/internals.h

+11 −2
Original line number Diff line number Diff line
@@ -95,16 +95,25 @@ void nand_decode_ext_id(struct nand_chip *chip); 
void panic_nand_wait(struct nand_chip *chip, unsigned long timeo);

void sanitize_string(uint8_t *s, size_t len);



static inline bool nand_has_exec_op(struct nand_chip *chip)

{

	if (!chip->controller || !chip->controller->ops ||

	    !chip->controller->ops->exec_op)

		return false;



	return true;

}



static inline int nand_exec_op(struct nand_chip *chip,

			       const struct nand_operation *op)

{

	if (!chip->exec_op)

	if (!nand_has_exec_op(chip))

		return -ENOTSUPP;



	if (WARN_ON(op->cs >= chip->numchips))

		return -EINVAL;



	return chip->exec_op(chip, op, false);

	return chip->controller->ops->exec_op(chip, op, false);

}



/* BBT functions */

drivers/mtd/nand/raw/marvell_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -2505,6 +2505,7 @@ static int marvell_nand_attach_chip(struct nand_chip *chip) 


static const struct nand_controller_ops marvell_nand_controller_ops = {

	.attach_chip = marvell_nand_attach_chip,

	.exec_op = marvell_nfc_exec_op,

};



static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc,
@@ -2627,7 +2628,6 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, 
	chip->controller = &nfc->controller;

	nand_set_flash_node(chip, np);



	chip->exec_op = marvell_nfc_exec_op;

	if (!of_property_read_bool(np, "marvell,nand-keep-config"))

		chip->setup_data_interface = marvell_nfc_setup_data_interface;

drivers/mtd/nand/raw/nand_base.c

+26 −25
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ int nand_soft_waitrdy(struct nand_chip *chip, unsigned long timeout_ms) 
	u8 status = 0;

	int ret;



	if (!chip->exec_op)

	if (!nand_has_exec_op(chip))

		return -ENOTSUPP;



	/* Wait tWB before polling the STATUS reg. */
@@ -1117,7 +1117,7 @@ int nand_read_page_op(struct nand_chip *chip, unsigned int page, 
	if (offset_in_page + len > mtd->writesize + mtd->oobsize)

		return -EINVAL;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		if (mtd->writesize > 512)

			return nand_lp_exec_read_page_op(chip, page,

							 offset_in_page, buf,
@@ -1156,7 +1156,7 @@ int nand_read_param_page_op(struct nand_chip *chip, u8 page, void *buf, 
	if (len && !buf)

		return -EINVAL;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1211,7 +1211,7 @@ int nand_change_read_column_op(struct nand_chip *chip, 
	if (mtd->writesize <= 512)

		return -ENOTSUPP;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		u8 addrs[2] = {};
@@ -1270,7 +1270,7 @@ int nand_read_oob_op(struct nand_chip *chip, unsigned int page, 
	if (offset_in_oob + len > mtd->oobsize)

		return -EINVAL;



	if (chip->exec_op)

	if (nand_has_exec_op(chip))

		return nand_read_page_op(chip, page,

					 mtd->writesize + offset_in_oob,

					 buf, len);
@@ -1383,7 +1383,7 @@ int nand_prog_page_begin_op(struct nand_chip *chip, unsigned int page, 
	if (offset_in_page + len > mtd->writesize + mtd->oobsize)

		return -EINVAL;



	if (chip->exec_op)

	if (nand_has_exec_op(chip))

		return nand_exec_prog_page_op(chip, page, offset_in_page, buf,

					      len, false);
@@ -1410,7 +1410,7 @@ int nand_prog_page_end_op(struct nand_chip *chip) 
	int ret;

	u8 status;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1469,7 +1469,7 @@ int nand_prog_page_op(struct nand_chip *chip, unsigned int page, 
	if (offset_in_page + len > mtd->writesize + mtd->oobsize)

		return -EINVAL;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		status = nand_exec_prog_page_op(chip, page, offset_in_page, buf,

						len, true);

	} else {
@@ -1517,7 +1517,7 @@ int nand_change_write_column_op(struct nand_chip *chip, 
	if (mtd->writesize <= 512)

		return -ENOTSUPP;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		u8 addrs[2];
@@ -1572,7 +1572,7 @@ int nand_readid_op(struct nand_chip *chip, u8 addr, void *buf, 
	if (len && !buf)

		return -EINVAL;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1611,7 +1611,7 @@ EXPORT_SYMBOL_GPL(nand_readid_op); 
 */

int nand_status_op(struct nand_chip *chip, u8 *status)

{

	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1648,7 +1648,7 @@ EXPORT_SYMBOL_GPL(nand_status_op); 
 */

int nand_exit_status_op(struct nand_chip *chip)

{

	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		struct nand_op_instr instrs[] = {

			NAND_OP_CMD(NAND_CMD_READ0, 0),

		};
@@ -1680,7 +1680,7 @@ int nand_erase_op(struct nand_chip *chip, unsigned int eraseblock) 
	int ret;

	u8 status;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		u8 addrs[3] = {	page, page >> 8, page >> 16 };
@@ -1739,7 +1739,7 @@ static int nand_set_features_op(struct nand_chip *chip, u8 feature, 
	const u8 *params = data;

	int i, ret;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1786,7 +1786,7 @@ static int nand_get_features_op(struct nand_chip *chip, u8 feature, 
	u8 *params = data;

	int i;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1812,7 +1812,7 @@ static int nand_get_features_op(struct nand_chip *chip, u8 feature, 
static int nand_wait_rdy_op(struct nand_chip *chip, unsigned int timeout_ms,

			    unsigned int delay_ns)

{

	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		struct nand_op_instr instrs[] = {

			NAND_OP_WAIT_RDY(PSEC_TO_MSEC(timeout_ms),

					 PSEC_TO_NSEC(delay_ns)),
@@ -1843,7 +1843,7 @@ static int nand_wait_rdy_op(struct nand_chip *chip, unsigned int timeout_ms, 
 */

int nand_reset_op(struct nand_chip *chip)

{

	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		const struct nand_sdr_timings *sdr =

			nand_get_sdr_timings(&chip->data_interface);

		struct nand_op_instr instrs[] = {
@@ -1880,7 +1880,7 @@ int nand_read_data_op(struct nand_chip *chip, void *buf, unsigned int len, 
	if (!len || !buf)

		return -EINVAL;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		struct nand_op_instr instrs[] = {

			NAND_OP_DATA_IN(len, buf, 0),

		};
@@ -1924,7 +1924,7 @@ int nand_write_data_op(struct nand_chip *chip, const void *buf, 
	if (!len || !buf)

		return -EINVAL;



	if (chip->exec_op) {

	if (nand_has_exec_op(chip)) {

		struct nand_op_instr instrs[] = {

			NAND_OP_DATA_OUT(len, buf, 0),

		};
@@ -4417,13 +4417,14 @@ static void nand_shutdown(struct mtd_info *mtd) 
/* Set default functions */

static void nand_set_defaults(struct nand_chip *chip)

{

	nand_legacy_set_defaults(chip);



	/* If no controller is provided, use the dummy one. */

	if (!chip->controller) {

		chip->controller = &chip->dummy_controller;

		nand_controller_init(chip->controller);

	}



	nand_legacy_set_defaults(chip);



	if (!chip->buf_align)

		chip->buf_align = 1;

}
@@ -5025,10 +5026,6 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips, 
	if (!mtd->name && mtd->dev.parent)

		mtd->name = dev_name(mtd->dev.parent);



	ret = nand_legacy_check_hooks(chip);

	if (ret)

		return ret;



	/*

	 * Start with chips->numchips = maxchips to let nand_select_target() do

	 * its job. chip->numchips will be adjusted after.
@@ -5038,6 +5035,10 @@ static int nand_scan_ident(struct nand_chip *chip, unsigned int maxchips, 
	/* Set the default functions */

	nand_set_defaults(chip);



	ret = nand_legacy_check_hooks(chip);

	if (ret)

		return ret;



	/* Read the flash type */

	ret = nand_detect(chip, table);

	if (ret) {