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

Commit 6a3cec64 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: rawnand: qcom: convert driver to nand_scan() 



Two helpers have been added to the core to do all kind of controller
side configuration/initialization between the detection phase and the
final NAND scan. Implement these hooks so that we can convert the driver
to just use nand_scan() instead of the nand_scan_ident() +
nand_scan_tail() pair.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent fe13ae02

drivers/mtd/nand/raw/qcom_nandc.c

+24 −47
Original line number Diff line number Diff line
@@ -2475,10 +2475,10 @@ qcom_nandc_calc_ecc_bytes(int step_size, int strength) 
NAND_ECC_CAPS_SINGLE(qcom_nandc_ecc_caps, qcom_nandc_calc_ecc_bytes,

		     NANDC_STEP_SIZE, 4, 8);



static int qcom_nand_host_setup(struct qcom_nand_host *host)

static int qcom_nand_attach_chip(struct nand_chip *chip)

{

	struct nand_chip *chip = &host->chip;

	struct mtd_info *mtd = nand_to_mtd(chip);

	struct qcom_nand_host *host = to_qcom_nand_host(chip);

	struct nand_ecc_ctrl *ecc = &chip->ecc;

	struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);

	int cwperpage, bad_block_byte, ret;
@@ -2640,6 +2640,10 @@ static int qcom_nand_host_setup(struct qcom_nand_host *host) 
	return 0;

}



static const struct nand_controller_ops qcom_nandc_ops = {

	.attach_chip = qcom_nand_attach_chip,

};



static int qcom_nandc_alloc(struct qcom_nand_controller *nandc)

{

	int ret;
@@ -2729,6 +2733,7 @@ static int qcom_nandc_alloc(struct qcom_nand_controller *nandc) 
	INIT_LIST_HEAD(&nandc->host_list);



	nand_controller_init(&nandc->controller);

	nandc->controller.ops = &qcom_nandc_ops;



	return 0;

}
@@ -2781,7 +2786,7 @@ static int qcom_nandc_setup(struct qcom_nand_controller *nandc) 
	return 0;

}



static int qcom_nand_host_init(struct qcom_nand_controller *nandc,

static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc,

					    struct qcom_nand_host *host,

					    struct device_node *dn)

{
@@ -2830,30 +2835,13 @@ static int qcom_nand_host_init(struct qcom_nand_controller *nandc, 
	/* set up initial status value */

	host->status = NAND_STATUS_READY | NAND_STATUS_WP;



	ret = nand_scan_ident(mtd, 1, NULL);

	if (ret)

		return ret;



	ret = qcom_nand_host_setup(host);



	return ret;

}



static int qcom_nand_mtd_register(struct qcom_nand_controller *nandc,

				  struct qcom_nand_host *host,

				  struct device_node *dn)

{

	struct nand_chip *chip = &host->chip;

	struct mtd_info *mtd = nand_to_mtd(chip);

	int ret;



	ret = nand_scan_tail(mtd);

	ret = nand_scan(mtd, 1);

	if (ret)

		return ret;



	ret = mtd_device_register(mtd, NULL, 0);

	if (ret)

		nand_cleanup(mtd_to_nand(mtd));

		nand_cleanup(chip);



	return ret;

}
@@ -2862,28 +2850,9 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc) 
{

	struct device *dev = nandc->dev;

	struct device_node *dn = dev->of_node, *child;

	struct qcom_nand_host *host, *tmp;

	struct qcom_nand_host *host;

	int ret;



	for_each_available_child_of_node(dn, child) {

		host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

		if (!host) {

			of_node_put(child);

			return -ENOMEM;

		}



		ret = qcom_nand_host_init(nandc, host, child);

		if (ret) {

			devm_kfree(dev, host);

			continue;

		}



		list_add_tail(&host->node, &nandc->host_list);

	}



	if (list_empty(&nandc->host_list))

		return -ENODEV;



	if (nandc->props->is_bam) {

		free_bam_transaction(nandc);

		nandc->bam_txn = alloc_bam_transaction(nandc);
@@ -2894,12 +2863,20 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc) 
		}

	}



	list_for_each_entry_safe(host, tmp, &nandc->host_list, node) {

		ret = qcom_nand_mtd_register(nandc, host, child);

	for_each_available_child_of_node(dn, child) {

		host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

		if (!host) {

			of_node_put(child);

			return -ENOMEM;

		}



		ret = qcom_nand_host_init_and_register(nandc, host, child);

		if (ret) {

			list_del(&host->node);

			devm_kfree(dev, host);

			continue;

		}



		list_add_tail(&host->node, &nandc->host_list);

	}



	if (list_empty(&nandc->host_list))