Skip to content

Commit b36bf0a

Browse files
committed
mtd: rawnand: socrates: Move the ECC initialization to ->attach_chip()
The probe function is only supposed to initialize the controller hardware but not the ECC engine. Indeed, we don't know anything about the NAND chip(s) at this stage. Let's move the logic initializing the ECC engine, even pretty simple, to the ->attach_chip() hook which gets called during nand_scan() routine, after the NAND chip discovery. As the previously mentioned logic is supposed to parse the DT for us, it is likely that the chip->ecc.* entries be overwritten. So let's avoid this by moving these lines to ->attach_chip(). Fixes: d7157ff ("mtd: rawnand: Use the ECC framework user input parsing bits") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20201113123424.32233-20-miquel.raynal@bootlin.com
1 parent 1ac6870 commit b36bf0a

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

drivers/mtd/nand/raw/socrates_nand.c

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#define FPGA_NAND_DATA_SHIFT 16
2323

2424
struct socrates_nand_host {
25+
struct nand_controller controller;
2526
struct nand_chip nand_chip;
2627
void __iomem *io_base;
2728
struct device *dev;
@@ -116,6 +117,18 @@ static int socrates_nand_device_ready(struct nand_chip *nand_chip)
116117
return 1;
117118
}
118119

120+
static int socrates_attach_chip(struct nand_chip *chip)
121+
{
122+
chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
123+
chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
124+
125+
return 0;
126+
}
127+
128+
static const struct nand_controller_ops socrates_ops = {
129+
.attach_chip = socrates_attach_chip,
130+
};
131+
119132
/*
120133
* Probe for the NAND device.
121134
*/
@@ -141,6 +154,10 @@ static int socrates_nand_probe(struct platform_device *ofdev)
141154
mtd = nand_to_mtd(nand_chip);
142155
host->dev = &ofdev->dev;
143156

157+
nand_controller_init(&host->controller);
158+
host->controller.ops = &socrates_ops;
159+
nand_chip->controller = &host->controller;
160+
144161
/* link the private data structures */
145162
nand_set_controller_data(nand_chip, host);
146163
nand_set_flash_node(nand_chip, ofdev->dev.of_node);
@@ -153,10 +170,6 @@ static int socrates_nand_probe(struct platform_device *ofdev)
153170
nand_chip->legacy.read_buf = socrates_nand_read_buf;
154171
nand_chip->legacy.dev_ready = socrates_nand_device_ready;
155172

156-
/* enable ECC */
157-
nand_chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
158-
nand_chip->ecc.algo = NAND_ECC_ALGO_HAMMING;
159-
160173
/* TODO: I have no idea what real delay is. */
161174
nand_chip->legacy.chip_delay = 20; /* 20us command delay time */
162175

0 commit comments

Comments
 (0)