forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920 
 kernel/drivers/mtd/nand/raw/txx9ndfmc.c
....@@ -1,10 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * TXx9 NAND flash memory controller driver
34  * Based on RBTX49xx patch from CELF patch archive.
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License version 2 as
7
- * published by the Free Software Foundation.
85  *
96  * (C) Copyright TOSHIBA CORPORATION 2004-2007
107  * All Rights Reserved.
....@@ -102,17 +99,17 @@
10299 	__raw_writel(val, ndregaddr(dev, reg));
103100 }
104101 
105
-static uint8_t txx9ndfmc_read_byte(struct mtd_info *mtd)
102
+static uint8_t txx9ndfmc_read_byte(struct nand_chip *chip)
106103 {
107
-	struct platform_device *dev = mtd_to_platdev(mtd);
104
+	struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
108105 
109106 	return txx9ndfmc_read(dev, TXX9_NDFDTR);
110107 }
111108 
112
-static void txx9ndfmc_write_buf(struct mtd_info *mtd, const uint8_t *buf,
109
+static void txx9ndfmc_write_buf(struct nand_chip *chip, const uint8_t *buf,
113110 				int len)
114111 {
115
-	struct platform_device *dev = mtd_to_platdev(mtd);
112
+	struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
116113 	void __iomem *ndfdtr = ndregaddr(dev, TXX9_NDFDTR);
117114 	u32 mcr = txx9ndfmc_read(dev, TXX9_NDFMCR);
118115 
....@@ -122,19 +119,18 @@
122119 	txx9ndfmc_write(dev, mcr, TXX9_NDFMCR);
123120 }
124121 
125
-static void txx9ndfmc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
122
+static void txx9ndfmc_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
126123 {
127
-	struct platform_device *dev = mtd_to_platdev(mtd);
124
+	struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
128125 	void __iomem *ndfdtr = ndregaddr(dev, TXX9_NDFDTR);
129126 
130127 	while (len--)
131128 		*buf++ = __raw_readl(ndfdtr);
132129 }
133130 
134
-static void txx9ndfmc_cmd_ctrl(struct mtd_info *mtd, int cmd,
131
+static void txx9ndfmc_cmd_ctrl(struct nand_chip *chip, int cmd,
135132 			       unsigned int ctrl)
136133 {
137
-	struct nand_chip *chip = mtd_to_nand(mtd);
138134 	struct txx9ndfmc_priv *txx9_priv = nand_get_controller_data(chip);
139135 	struct platform_device *dev = txx9_priv->dev;
140136 	struct txx9ndfmc_platform_data *plat = dev_get_platdata(&dev->dev);
....@@ -160,21 +156,19 @@
160156 		if ((ctrl & NAND_CTRL_CHANGE) && cmd == NAND_CMD_NONE)
161157 			txx9ndfmc_write(dev, 0, TXX9_NDFDTR);
162158 	}
163
-	mmiowb();
164159 }
165160 
166
-static int txx9ndfmc_dev_ready(struct mtd_info *mtd)
161
+static int txx9ndfmc_dev_ready(struct nand_chip *chip)
167162 {
168
-	struct platform_device *dev = mtd_to_platdev(mtd);
163
+	struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
169164 
170165 	return !(txx9ndfmc_read(dev, TXX9_NDFSR) & TXX9_NDFSR_BUSY);
171166 }
172167 
173
-static int txx9ndfmc_calculate_ecc(struct mtd_info *mtd, const uint8_t *dat,
168
+static int txx9ndfmc_calculate_ecc(struct nand_chip *chip, const uint8_t *dat,
174169 				   uint8_t *ecc_code)
175170 {
176
-	struct platform_device *dev = mtd_to_platdev(mtd);
177
-	struct nand_chip *chip = mtd_to_nand(mtd);
171
+	struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
178172 	int eccbytes;
179173 	u32 mcr = txx9ndfmc_read(dev, TXX9_NDFMCR);
180174 
....@@ -191,16 +185,17 @@
191185 	return 0;
192186 }
193187 
194
-static int txx9ndfmc_correct_data(struct mtd_info *mtd, unsigned char *buf,
195
-		unsigned char *read_ecc, unsigned char *calc_ecc)
188
+static int txx9ndfmc_correct_data(struct nand_chip *chip, unsigned char *buf,
189
+				  unsigned char *read_ecc,
190
+				  unsigned char *calc_ecc)
196191 {
197
-	struct nand_chip *chip = mtd_to_nand(mtd);
198192 	int eccsize;
199193 	int corrected = 0;
200194 	int stat;
201195 
202196 	for (eccsize = chip->ecc.size; eccsize > 0; eccsize -= 256) {
203
-		stat = __nand_correct_data(buf, read_ecc, calc_ecc, 256);
197
+		stat = __nand_correct_data(buf, read_ecc, calc_ecc, 256,
198
+					   false);
204199 		if (stat < 0)
205200 			return stat;
206201 		corrected += stat;
....@@ -211,9 +206,9 @@
211206 	return corrected;
212207 }
213208 
214
-static void txx9ndfmc_enable_hwecc(struct mtd_info *mtd, int mode)
209
+static void txx9ndfmc_enable_hwecc(struct nand_chip *chip, int mode)
215210 {
216
-	struct platform_device *dev = mtd_to_platdev(mtd);
211
+	struct platform_device *dev = mtd_to_platdev(nand_to_mtd(chip));
217212 	u32 mcr = txx9ndfmc_read(dev, TXX9_NDFMCR);
218213 
219214 	mcr &= ~TXX9_NDFMCR_ECC_ALL;
....@@ -258,6 +253,11 @@
258253 {
259254 	struct mtd_info *mtd = nand_to_mtd(chip);
260255 
256
+	if (chip->ecc.engine_type != NAND_ECC_ENGINE_TYPE_ON_HOST)
257
+		return 0;
258
+
259
+	chip->ecc.strength = 1;
260
+
261261 	if (mtd->writesize >= 512) {
262262 		chip->ecc.size = 512;
263263 		chip->ecc.bytes = 6;
....@@ -265,6 +265,10 @@
265265 		chip->ecc.size = 256;
266266 		chip->ecc.bytes = 3;
267267 	}
268
+
269
+	chip->ecc.calculate = txx9ndfmc_calculate_ecc;
270
+	chip->ecc.correct = txx9ndfmc_correct_data;
271
+	chip->ecc.hwctl = txx9ndfmc_enable_hwecc;
268272 
269273 	return 0;
270274 }
....@@ -326,17 +330,12 @@
326330 		mtd = nand_to_mtd(chip);
327331 		mtd->dev.parent = &dev->dev;
328332 
329
-		chip->read_byte = txx9ndfmc_read_byte;
330
-		chip->read_buf = txx9ndfmc_read_buf;
331
-		chip->write_buf = txx9ndfmc_write_buf;
332
-		chip->cmd_ctrl = txx9ndfmc_cmd_ctrl;
333
-		chip->dev_ready = txx9ndfmc_dev_ready;
334
-		chip->ecc.calculate = txx9ndfmc_calculate_ecc;
335
-		chip->ecc.correct = txx9ndfmc_correct_data;
336
-		chip->ecc.hwctl = txx9ndfmc_enable_hwecc;
337
-		chip->ecc.mode = NAND_ECC_HW;
338
-		chip->ecc.strength = 1;
339
-		chip->chip_delay = 100;
333
+		chip->legacy.read_byte = txx9ndfmc_read_byte;
334
+		chip->legacy.read_buf = txx9ndfmc_read_buf;
335
+		chip->legacy.write_buf = txx9ndfmc_write_buf;
336
+		chip->legacy.cmd_ctrl = txx9ndfmc_cmd_ctrl;
337
+		chip->legacy.dev_ready = txx9ndfmc_dev_ready;
338
+		chip->legacy.chip_delay = 100;
340339 		chip->controller = &drvdata->controller;
341340 
342341 		nand_set_controller_data(chip, txx9_priv);
....@@ -376,7 +375,7 @@
376375 static int __exit txx9ndfmc_remove(struct platform_device *dev)
377376 {
378377 	struct txx9ndfmc_drvdata *drvdata = platform_get_drvdata(dev);
379
-	int i;
378
+	int ret, i;
380379 
381380 	if (!drvdata)
382381 		return 0;
....@@ -390,7 +389,9 @@
390389 		chip = mtd_to_nand(mtd);
391390 		txx9_priv = nand_get_controller_data(chip);
392391 
393
-		nand_release(chip);
392
+		ret = mtd_device_unregister(nand_to_mtd(chip));
393
+		WARN_ON(ret);
394
+		nand_cleanup(chip);
394395 		kfree(txx9_priv->mtdname);
395396 		kfree(txx9_priv);
396397 	}