hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ar71xx: fix mikrotik routerboard nand driver issues with linux 4.9

Browse Source 
The mtd device is now embedded inside the nand chip data structure

Signed-off-by: Felix Fietkau <nbd@nbd.name>
master
Felix Fietkau 7 years ago
parent 65da6f9ca1
commit 7c09fa4a74
3 changed files with 108 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 48
      target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
  2. 43
      target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
  3. 44
      target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c

48
target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
Unescape View File

@ -39,9 +39,31 @@
struct rb4xx_nand_info { struct rb4xx_nand_info {
struct nand_chip chip; struct nand_chip chip;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
struct mtd_info mtd; struct mtd_info mtd;
#endif
}; };
static inline struct rb4xx_nand_info *mtd_to_rbinfo(struct mtd_info *mtd)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
return container_of(mtd, struct rb4xx_nand_info, mtd);
#else
struct nand_chip *chip = mtd_to_nand(mtd);
return container_of(chip, struct rb4xx_nand_info, chip);
#endif
}
static struct mtd_info *rbinfo_to_mtd(struct rb4xx_nand_info *nfc)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
return &nfc->mtd;
#else
return nand_to_mtd(&nfc->chip);
#endif
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
/* /*
* We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
@ -191,6 +213,7 @@ static void rb4xx_nand_read_buf(struct mtd_info *mtd, unsigned char *buf,
static int rb4xx_nand_probe(struct platform_device *pdev) static int rb4xx_nand_probe(struct platform_device *pdev)
{ {
struct rb4xx_nand_info *info; struct rb4xx_nand_info *info;
struct mtd_info *mtd;
int ret; int ret;
printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n"); printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
@ -259,8 +282,12 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
} }
info->chip.priv = &info; info->chip.priv = &info;
info->mtd.priv = &info->chip; mtd = rbinfo_to_mtd(info);
info->mtd.owner = THIS_MODULE;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
mtd->priv = &info->chip;
#endif
mtd->owner = THIS_MODULE;
info->chip.cmd_ctrl = rb4xx_nand_cmd_ctrl; info->chip.cmd_ctrl = rb4xx_nand_cmd_ctrl;
info->chip.dev_ready = rb4xx_nand_dev_ready; info->chip.dev_ready = rb4xx_nand_dev_ready;
@ -270,30 +297,33 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
info->chip.chip_delay = 25; info->chip.chip_delay = 25;
info->chip.ecc.mode = NAND_ECC_SOFT; info->chip.ecc.mode = NAND_ECC_SOFT;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
info->chip.ecc.algo = NAND_ECC_HAMMING;
#endif
info->chip.options = NAND_NO_SUBPAGE_WRITE; info->chip.options = NAND_NO_SUBPAGE_WRITE;
platform_set_drvdata(pdev, info); platform_set_drvdata(pdev, info);
ret = nand_scan_ident(&info->mtd, 1, NULL); ret = nand_scan_ident(mtd, 1, NULL);
if (ret) { if (ret) {
ret = -ENXIO; ret = -ENXIO;
goto err_free_info; goto err_free_info;
} }
if (info->mtd.writesize == 512) if (mtd->writesize == 512)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
info->chip.ecc.layout = &rb4xx_nand_ecclayout; info->chip.ecc.layout = &rb4xx_nand_ecclayout;
#else #else
mtd_set_ooblayout(&info->mtd, &rb4xx_nand_ecclayout_ops); mtd_set_ooblayout(mtd, &rb4xx_nand_ecclayout_ops);
#endif #endif
ret = nand_scan_tail(&info->mtd); ret = nand_scan_tail(mtd);
if (ret) { if (ret) {
return -ENXIO; return -ENXIO;
goto err_set_drvdata; goto err_set_drvdata;
} }
mtd_device_register(&info->mtd, rb4xx_nand_partitions, mtd_device_register(mtd, rb4xx_nand_partitions,
ARRAY_SIZE(rb4xx_nand_partitions)); ARRAY_SIZE(rb4xx_nand_partitions));
if (ret) if (ret)
goto err_release_nand; goto err_release_nand;
@ -301,7 +331,7 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
return 0; return 0;
err_release_nand: err_release_nand:
nand_release(&info->mtd); nand_release(mtd);
err_set_drvdata: err_set_drvdata:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
err_free_info: err_free_info:
@ -322,7 +352,7 @@ static int rb4xx_nand_remove(struct platform_device *pdev)
{ {
struct rb4xx_nand_info *info = platform_get_drvdata(pdev); struct rb4xx_nand_info *info = platform_get_drvdata(pdev);
nand_release(&info->mtd); nand_release(rbinfo_to_mtd(info));
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(info); kfree(info);
gpio_free(RB4XX_NAND_GPIO_NCE); gpio_free(RB4XX_NAND_GPIO_NCE);

43
target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
Unescape View File

@ -41,13 +41,30 @@
struct rb750_nand_info { struct rb750_nand_info {
struct nand_chip chip; struct nand_chip chip;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
struct mtd_info mtd; struct mtd_info mtd;
#endif
struct rb7xx_nand_platform_data *pdata; struct rb7xx_nand_platform_data *pdata;
}; };
static inline struct rb750_nand_info *mtd_to_rbinfo(struct mtd_info *mtd) static inline struct rb750_nand_info *mtd_to_rbinfo(struct mtd_info *mtd)
{ {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
return container_of(mtd, struct rb750_nand_info, mtd); return container_of(mtd, struct rb750_nand_info, mtd);
#else
struct nand_chip *chip = mtd_to_nand(mtd);
return container_of(chip, struct rb750_nand_info, chip);
#endif
}
static struct mtd_info *rbinfo_to_mtd(struct rb750_nand_info *nfc)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
return &nfc->mtd;
#else
return nand_to_mtd(&nfc->chip);
#endif
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
@ -304,6 +321,7 @@ static int rb750_nand_probe(struct platform_device *pdev)
{ {
struct rb750_nand_info *info; struct rb750_nand_info *info;
struct rb7xx_nand_platform_data *pdata; struct rb7xx_nand_platform_data *pdata;
struct mtd_info *mtd;
int ret; int ret;
printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n"); printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
@ -317,8 +335,12 @@ static int rb750_nand_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
info->chip.priv = &info; info->chip.priv = &info;
info->mtd.priv = &info->chip;
info->mtd.owner = THIS_MODULE; mtd = rbinfo_to_mtd(info);
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
mtd->priv = &info->chip;
#endif
mtd->owner = THIS_MODULE;
info->chip.select_chip = rb750_nand_select_chip; info->chip.select_chip = rb750_nand_select_chip;
info->chip.cmd_ctrl = rb750_nand_cmd_ctrl; info->chip.cmd_ctrl = rb750_nand_cmd_ctrl;
@ -329,6 +351,9 @@ static int rb750_nand_probe(struct platform_device *pdev)
info->chip.chip_delay = 25; info->chip.chip_delay = 25;
info->chip.ecc.mode = NAND_ECC_SOFT; info->chip.ecc.mode = NAND_ECC_SOFT;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
info->chip.ecc.algo = NAND_ECC_HAMMING;
#endif
info->chip.options = NAND_NO_SUBPAGE_WRITE; info->chip.options = NAND_NO_SUBPAGE_WRITE;
info->pdata = pdata; info->pdata = pdata;
@ -337,26 +362,26 @@ static int rb750_nand_probe(struct platform_device *pdev)
rb750_nand_gpio_init(info); rb750_nand_gpio_init(info);
ret = nand_scan_ident(&info->mtd, 1, NULL); ret = nand_scan_ident(mtd, 1, NULL);
if (ret) { if (ret) {
ret = -ENXIO; ret = -ENXIO;
goto err_free_info; goto err_free_info;
} }
if (info->mtd.writesize == 512) if (mtd->writesize == 512)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
info->chip.ecc.layout = &rb750_nand_ecclayout; info->chip.ecc.layout = &rb750_nand_ecclayout;
#else #else
mtd_set_ooblayout(&info->mtd, &rb750_nand_ecclayout_ops); mtd_set_ooblayout(mtd, &rb750_nand_ecclayout_ops);
#endif #endif
ret = nand_scan_tail(&info->mtd); ret = nand_scan_tail(mtd);
if (ret) { if (ret) {
return -ENXIO; return -ENXIO;
goto err_set_drvdata; goto err_set_drvdata;
} }
ret = mtd_device_register(&info->mtd, rb750_nand_partitions, ret = mtd_device_register(mtd, rb750_nand_partitions,
ARRAY_SIZE(rb750_nand_partitions)); ARRAY_SIZE(rb750_nand_partitions));
if (ret) if (ret)
goto err_release_nand; goto err_release_nand;
@ -364,7 +389,7 @@ static int rb750_nand_probe(struct platform_device *pdev)
return 0; return 0;
err_release_nand: err_release_nand:
nand_release(&info->mtd); nand_release(mtd);
err_set_drvdata: err_set_drvdata:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
err_free_info: err_free_info:
@ -376,7 +401,7 @@ static int rb750_nand_remove(struct platform_device *pdev)
{ {
struct rb750_nand_info *info = platform_get_drvdata(pdev); struct rb750_nand_info *info = platform_get_drvdata(pdev);
nand_release(&info->mtd); nand_release(rbinfo_to_mtd(info));
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(info); kfree(info);

44
target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
Unescape View File

@ -40,7 +40,9 @@
struct rb91x_nand_info { struct rb91x_nand_info {
struct nand_chip chip; struct nand_chip chip;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
struct mtd_info mtd; struct mtd_info mtd;
#endif
struct device *dev; struct device *dev;
int gpio_nce; int gpio_nce;
@ -54,9 +56,25 @@ struct rb91x_nand_info {
static inline struct rb91x_nand_info *mtd_to_rbinfo(struct mtd_info *mtd) static inline struct rb91x_nand_info *mtd_to_rbinfo(struct mtd_info *mtd)
{ {
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
return container_of(mtd, struct rb91x_nand_info, mtd); return container_of(mtd, struct rb91x_nand_info, mtd);
#else
struct nand_chip *chip = mtd_to_nand(mtd);
return container_of(chip, struct rb91x_nand_info, chip);
#endif
} }
static struct mtd_info *rbinfo_to_mtd(struct rb91x_nand_info *nfc)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
return &nfc->mtd;
#else
return nand_to_mtd(&nfc->chip);
#endif
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
/* /*
* We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
@ -340,6 +358,7 @@ static int rb91x_nand_probe(struct platform_device *pdev)
{ {
struct rb91x_nand_info *rbni; struct rb91x_nand_info *rbni;
struct rb91x_nand_platform_data *pdata; struct rb91x_nand_platform_data *pdata;
struct mtd_info *mtd;
int ret; int ret;
pr_info(DRV_DESC "\n"); pr_info(DRV_DESC "\n");
@ -362,8 +381,12 @@ static int rb91x_nand_probe(struct platform_device *pdev)
rbni->gpio_nle = pdata->gpio_nle; rbni->gpio_nle = pdata->gpio_nle;
rbni->chip.priv = &rbni; rbni->chip.priv = &rbni;
rbni->mtd.priv = &rbni->chip; mtd = rbinfo_to_mtd(rbni);
rbni->mtd.owner = THIS_MODULE;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
mtd->priv = &rbni->chip;
#endif
mtd->owner = THIS_MODULE;
rbni->chip.cmd_ctrl = rb91x_nand_cmd_ctrl; rbni->chip.cmd_ctrl = rb91x_nand_cmd_ctrl;
rbni->chip.dev_ready = rb91x_nand_dev_ready; rbni->chip.dev_ready = rb91x_nand_dev_ready;
@ -373,6 +396,9 @@ static int rb91x_nand_probe(struct platform_device *pdev)
rbni->chip.chip_delay = 25; rbni->chip.chip_delay = 25;
rbni->chip.ecc.mode = NAND_ECC_SOFT; rbni->chip.ecc.mode = NAND_ECC_SOFT;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
rbni->chip.ecc.algo = NAND_ECC_HAMMING;
#endif
rbni->chip.options = NAND_NO_SUBPAGE_WRITE; rbni->chip.options = NAND_NO_SUBPAGE_WRITE;
platform_set_drvdata(pdev, rbni); platform_set_drvdata(pdev, rbni);
@ -381,22 +407,22 @@ static int rb91x_nand_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
ret = nand_scan_ident(&rbni->mtd, 1, NULL); ret = nand_scan_ident(mtd, 1, NULL);
if (ret) if (ret)
return ret; return ret;
if (rbni->mtd.writesize == 512) if (mtd->writesize == 512)
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
rbni->chip.ecc.layout = &rb91x_nand_ecclayout; rbni->chip.ecc.layout = &rb91x_nand_ecclayout;
#else #else
mtd_set_ooblayout(&rbni->mtd, &rb91x_nand_ecclayout_ops); mtd_set_ooblayout(mtd, &rb91x_nand_ecclayout_ops);
#endif #endif
ret = nand_scan_tail(&rbni->mtd); ret = nand_scan_tail(mtd);
if (ret) if (ret)
return ret; return ret;
ret = mtd_device_register(&rbni->mtd, rb91x_nand_partitions, ret = mtd_device_register(mtd, rb91x_nand_partitions,
ARRAY_SIZE(rb91x_nand_partitions)); ARRAY_SIZE(rb91x_nand_partitions));
if (ret) if (ret)
goto err_release_nand; goto err_release_nand;
@ -404,7 +430,7 @@ static int rb91x_nand_probe(struct platform_device *pdev)
return 0; return 0;
err_release_nand: err_release_nand:
nand_release(&rbni->mtd); nand_release(mtd);
return ret; return ret;
} }
@ -412,7 +438,7 @@ static int rb91x_nand_remove(struct platform_device *pdev)
{ {
struct rb91x_nand_info *info = platform_get_drvdata(pdev); struct rb91x_nand_info *info = platform_get_drvdata(pdev);
nand_release(&info->mtd); nand_release(rbinfo_to_mtd(info));
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save