* [PATCH V3 06/10] MIPS: lantiq: add NOR flash support [not found] <1299146626-17428-1-git-send-email-blogic@openwrt.org> @ 2011-03-03 10:03 ` John Crispin 2011-03-04 12:41 ` Sergei Shtylyov 0 siblings, 1 reply; 4+ messages in thread From: John Crispin @ 2011-03-03 10:03 UTC (permalink / raw) To: Ralf Baechle Cc: linux-mips, Ralph Hempel, linux-mtd, Daniel Schwierzeck, David Woodhouse, John Crispin NOR flash is attached to the same EBU (External Bus Unit) as PCI. As described in the PCI patch, the EBU is a little buggy, resulting in the upper and lower 16 bit of the data on a 32 bit read are swapped. (essentially we have a addr^=2) To work around this we do a addr^=2 during the probe. Once probed we adapt cfi->addr_unlock1 and cfi->addr_unlock2 to represent the endianess bug. Signed-off-by: John Crispin <blogic@openwrt.org> Signed-off-by: Ralph Hempel <ralph.hempel@lantiq.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Cc: linux-mips@linux-mips.org Cc: linux-mtd@lists.infradead.org --- Changes in V2 * handle the endianess bug inside the map code and not in the generic cfi code * remove the addr swizzle patch Changes in V3 * whitespace * change __iomem void to void __iomem drivers/mtd/maps/Kconfig | 7 ++ drivers/mtd/maps/Makefile | 1 + drivers/mtd/maps/lantiq.c | 190 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 0 deletions(-) create mode 100644 drivers/mtd/maps/lantiq.c diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 5d37d31..587468e 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -260,6 +260,13 @@ config MTD_BCM963XX Support for parsing CFE image tag and creating MTD partitions on Broadcom BCM63xx boards. +config MTD_LANTIQ + bool "Lantiq SoC NOR support" + depends on LANTIQ && MTD_PARTITIONS + help + Support for NOR flash chips on Lantiq SoC. The Chips are connected + to the SoCs EBU (External Bus Unit) + config MTD_DILNETPC tristate "CFI Flash device mapped on DIL/Net PC" depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index c7869c7..bb2ce2f 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -59,3 +59,4 @@ obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o obj-$(CONFIG_MTD_VMU) += vmu-flash.o obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o +obj-$(CONFIG_MTD_LANTIQ) += lantiq.o diff --git a/drivers/mtd/maps/lantiq.c b/drivers/mtd/maps/lantiq.c new file mode 100644 index 0000000..674be0a --- /dev/null +++ b/drivers/mtd/maps/lantiq.c @@ -0,0 +1,190 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + * + * Copyright (C) 2004 Liu Peng Infineon IFAP DC COM CPE + * Copyright (C) 2010 John Crispin <blogic@openwrt.org> + */ + +#include <linux/module.h> +#include <linux/types.h> +#include <linux/kernel.h> +#include <linux/io.h> +#include <linux/init.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/map.h> +#include <linux/mtd/partitions.h> +#include <linux/mtd/cfi.h> +#include <linux/platform_device.h> +#include <linux/mtd/physmap.h> + +#include <lantiq_soc.h> +#include <lantiq_platform.h> + +/* the NOR flash is connected to the same external bus unit (EBU) as PCI + * to make PCI work we need to enable the endianess swapping of the addr + * written to the EBU. this however has some limitations and breaks when + * using NOR. it does not really matter if the onflash data is in a swapped + * order, however cfi sequences also fail. to workaround this we need to use + * a complex map. We essentially software swap all addresses during probe + * and then swizzle the unlock addresses. + */ +static int ltq_mtd_probing; + +static map_word +ltq_read16(struct map_info *map, unsigned long adr) +{ + unsigned long flags; + + map_word temp; + if (ltq_mtd_probing) + adr ^= 2; + spin_lock_irqsave(&ebu_lock, flags); + temp.x[0] = *((__u16 *)(map->virt + adr)); + spin_unlock_irqrestore(&ebu_lock, flags); + return temp; +} + +static void +ltq_write16(struct map_info *map, map_word d, unsigned long adr) +{ + unsigned long flags; + + if (ltq_mtd_probing) + adr ^= 2; + spin_lock_irqsave(&ebu_lock, flags); + *((__u16 *)(map->virt + adr)) = d.x[0]; + spin_unlock_irqrestore(&ebu_lock, flags); +} + +void +ltq_copy_from(struct map_info *map, void *to, + unsigned long from, ssize_t len) +{ + unsigned char *p; + unsigned char *to_8; + unsigned long flags; + + spin_lock_irqsave(&ebu_lock, flags); + from = (unsigned long) (map->virt + from); + p = (unsigned char *) from; + to_8 = (unsigned char *) to; + while (len--) + *to_8++ = *p++; + spin_unlock_irqrestore(&ebu_lock, flags); +} + +void +ltq_copy_to(struct map_info *map, unsigned long to, + const void *from, ssize_t len) +{ + unsigned char *p = (unsigned char *)from; + unsigned char *to_8; + unsigned long flags; + + spin_lock_irqsave(&ebu_lock, flags); + to += (unsigned long) map->virt; + to_8 = (unsigned char *)to; + while (len--) + *p++ = *to_8++; + spin_unlock_irqrestore(&ebu_lock, flags); +} + +static const char *part_probe_types[] = { + "cmdlinepart", NULL }; + +static struct map_info ltq_map = { + .name = "ltq_nor", + .bankwidth = 2, + .read = ltq_read16, + .write = ltq_write16, + .copy_from = ltq_copy_from, + .copy_to = ltq_copy_to, +}; + +static int +ltq_mtd_probe(struct platform_device *pdev) +{ + struct physmap_flash_data *ltq_mtd_data = + (struct physmap_flash_data *) dev_get_platdata(&pdev->dev); + struct mtd_info *ltq_mtd = NULL; + struct mtd_partition *parts = NULL; + struct resource *res = 0; + int nr_parts = 0; + struct cfi_private *cfi; + +#ifdef CONFIG_SOC_TYPE_XWAY + ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0); +#endif + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "failed to get memory resource"); + return -ENOENT; + } + res = devm_request_mem_region(&pdev->dev, res->start, + resource_size(res), dev_name(&pdev->dev)); + if (!res) { + dev_err(&pdev->dev, "failed to request mem resource"); + return -EBUSY; + } + + ltq_map.phys = res->start; + ltq_map.size = resource_size(res); + ltq_map.virt = devm_ioremap_nocache(&pdev->dev, ltq_map.phys, + ltq_map.size); + if (!ltq_map.virt) { + dev_err(&pdev->dev, "failed to ioremap!\n"); + return -EIO; + } + + ltq_mtd_probing = 1; + ltq_mtd = (struct mtd_info *) do_map_probe("cfi_probe", <q_map); + ltq_mtd_probing = 0; + if (!ltq_mtd) { + iounmap(ltq_map.virt); + dev_err(&pdev->dev, "probing failed\n"); + return -ENXIO; + } + ltq_mtd->owner = THIS_MODULE; + + cfi = (struct cfi_private *)ltq_map.fldrv_priv; + cfi->addr_unlock1 ^= 1; + cfi->addr_unlock2 ^= 1; + + nr_parts = parse_mtd_partitions(ltq_mtd, part_probe_types, &parts, 0); + if (nr_parts > 0) { + dev_info(&pdev->dev, + "using %d partitions from cmdline", nr_parts); + } else { + nr_parts = ltq_mtd_data->nr_parts; + parts = ltq_mtd_data->parts; + } + + add_mtd_partitions(ltq_mtd, parts, nr_parts); + return 0; +} + +static struct platform_driver ltq_mtd_driver = { + .probe = ltq_mtd_probe, + .driver = { + .name = "ltq_nor", + .owner = THIS_MODULE, + }, +}; + +int __init +init_ltq_mtd(void) +{ + int ret = platform_driver_register(<q_mtd_driver); + + if (ret) + printk(KERN_INFO "ltq_nor: error registering platfom driver"); + return ret; +} + +module_init(init_ltq_mtd); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_DESCRIPTION("Lantiq SoC NOR"); -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V3 06/10] MIPS: lantiq: add NOR flash support 2011-03-03 10:03 ` [PATCH V3 06/10] MIPS: lantiq: add NOR flash support John Crispin @ 2011-03-04 12:41 ` Sergei Shtylyov 2011-03-04 15:10 ` Sergei Shtylyov 2011-03-04 20:13 ` John Crispin 0 siblings, 2 replies; 4+ messages in thread From: Sergei Shtylyov @ 2011-03-04 12:41 UTC (permalink / raw) To: John Crispin Cc: linux-mips, Ralf Baechle, Ralph Hempel, linux-mtd, Daniel Schwierzeck, David Woodhouse Hello. On 03-03-2011 13:03, John Crispin wrote: > NOR flash is attached to the same EBU (External Bus Unit) as PCI. As described > in the PCI patch, the EBU is a little buggy, resulting in the upper and lower > 16 bit of the data on a 32 bit read are swapped. (essentially we have a addr^=2) "Are" not needed. > To work around this we do a addr^=2 during the probe. Once probed we adapt > cfi->addr_unlock1 and cfi->addr_unlock2 to represent the endianess bug. > Signed-off-by: John Crispin<blogic@openwrt.org> > Signed-off-by: Ralph Hempel<ralph.hempel@lantiq.com> > Cc: David Woodhouse<dwmw2@infradead.org> > Cc: Daniel Schwierzeck<daniel.schwierzeck@googlemail.com> > Cc: linux-mips@linux-mips.org > Cc: linux-mtd@lists.infradead.org [...] > diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig > index 5d37d31..587468e 100644 > --- a/drivers/mtd/maps/Kconfig > +++ b/drivers/mtd/maps/Kconfig > @@ -260,6 +260,13 @@ config MTD_BCM963XX > Support for parsing CFE image tag and creating MTD partitions on > Broadcom BCM63xx boards. > > +config MTD_LANTIQ > + bool "Lantiq SoC NOR support" > + depends on LANTIQ && MTD_PARTITIONS Maybe you should select MTD_PARTITIONS instead? [...] > diff --git a/drivers/mtd/maps/lantiq.c b/drivers/mtd/maps/lantiq.c > new file mode 100644 > index 0000000..674be0a > --- /dev/null > +++ b/drivers/mtd/maps/lantiq.c > @@ -0,0 +1,190 @@ > +/* > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published > + * by the Free Software Foundation. > + * > + * Copyright (C) 2004 Liu Peng Infineon IFAP DC COM CPE > + * Copyright (C) 2010 John Crispin <blogic@openwrt.org> > + */ > + > +#include<linux/module.h> > +#include<linux/types.h> > +#include<linux/kernel.h> > +#include<linux/io.h> > +#include<linux/init.h> > +#include<linux/mtd/mtd.h> > +#include<linux/mtd/map.h> > +#include<linux/mtd/partitions.h> > +#include<linux/mtd/cfi.h> > +#include<linux/platform_device.h> > +#include<linux/mtd/physmap.h> > + > +#include<lantiq_soc.h> > +#include<lantiq_platform.h> > + > +/* the NOR flash is connected to the same external bus unit (EBU) as PCI Period at end of statment missing? > + * to make PCI work we need to enable the endianess swapping of the addr > + * written to the EBU. this however has some limitations and breaks when > + * using NOR. it does not really matter if the onflash data is in a swapped > + * order, however cfi sequences also fail. to workaround this we need to use > + * a complex map. We essentially software swap all addresses during probe > + * and then swizzle the unlock addresses. > + */ > +static int ltq_mtd_probing; > + > +static map_word > +ltq_read16(struct map_info *map, unsigned long adr) > +{ > + unsigned long flags; > + > + map_word temp; Empty line should be here, not above. > + if (ltq_mtd_probing) > + adr ^= 2; > + spin_lock_irqsave(&ebu_lock, flags); > + temp.x[0] = *((__u16 *)(map->virt + adr)); > + spin_unlock_irqrestore(&ebu_lock, flags); Hm, what does this lock gain, if the read is atomic anyway? > +void > +ltq_copy_from(struct map_info *map, void *to, > + unsigned long from, ssize_t len) Shouldn't it be static? > +{ > + unsigned char *p; > + unsigned char *to_8; > + unsigned long flags; > + > + spin_lock_irqsave(&ebu_lock, flags); > + from = (unsigned long) (map->virt + from); Why not: from += (unsigned long) map->virt; like you do in ltq_copy_to()? > + p = (unsigned char *) from; Could be done in initializer, like in ltq_copy_to(). > + to_8 = (unsigned char *) to; > + while (len--) > + *to_8++ = *p++; BTW, you could use memcpy_fromio(). > + spin_unlock_irqrestore(&ebu_lock, flags); > +} > + > +void > +ltq_copy_to(struct map_info *map, unsigned long to, > + const void *from, ssize_t len) Shouldn't it be static? > +{ > + unsigned char *p = (unsigned char *)from; > + unsigned char *to_8; > + unsigned long flags; > + > + spin_lock_irqsave(&ebu_lock, flags); > + to += (unsigned long) map->virt; > + to_8 = (unsigned char *)to; > + while (len--) > + *p++ = *to_8++; I think you have this backwards. It should be: *to_8++ = *p++; BTW, you could use memcpy_toio(). > + spin_unlock_irqrestore(&ebu_lock, flags); > +} [...] > +static int > +ltq_mtd_probe(struct platform_device *pdev) > +{ > + struct physmap_flash_data *ltq_mtd_data = > + (struct physmap_flash_data *) dev_get_platdata(&pdev->dev); Cast from 'void *' is automatic -- no need for explicit one. > +#ifdef CONFIG_SOC_TYPE_XWAY > + ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0); > +#endif Hm, can't you do this in the platform code? > + ltq_map.phys = res->start; > + ltq_map.size = resource_size(res); > + ltq_map.virt = devm_ioremap_nocache(&pdev->dev, ltq_map.phys, > + ltq_map.size); Hm, could you indent the last line more to the right? > + if (!ltq_map.virt) { > + dev_err(&pdev->dev, "failed to ioremap!\n"); > + return -EIO; > + } > + > + ltq_mtd_probing = 1; > + ltq_mtd = (struct mtd_info *) do_map_probe("cfi_probe",<q_map); do_map_probe() already returns that type, why cast to it? > + ltq_mtd_probing = 0; > + if (!ltq_mtd) { > + iounmap(ltq_map.virt); > + dev_err(&pdev->dev, "probing failed\n"); > + return -ENXIO; > + } > + ltq_mtd->owner = THIS_MODULE; > + > + cfi = (struct cfi_private *)ltq_map.fldrv_priv; Cast from 'void *' is automatic -- no need for explicit one. > +int __init > +init_ltq_mtd(void) > +{ > + int ret = platform_driver_register(<q_mtd_driver); Use platform_driver_probe() instead, as the device is not a hotplug one. Then ltq_mtd_probe() can become '__init'. WBR, Sergei ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V3 06/10] MIPS: lantiq: add NOR flash support 2011-03-04 12:41 ` Sergei Shtylyov @ 2011-03-04 15:10 ` Sergei Shtylyov 2011-03-04 20:13 ` John Crispin 1 sibling, 0 replies; 4+ messages in thread From: Sergei Shtylyov @ 2011-03-04 15:10 UTC (permalink / raw) To: John Crispin Cc: linux-mips, Ralf Baechle, Ralph Hempel, linux-mtd, Daniel Schwierzeck, David Woodhouse I wrote: >> NOR flash is attached to the same EBU (External Bus Unit) as PCI. As >> described >> in the PCI patch, the EBU is a little buggy, resulting in the upper >> and lower >> 16 bit of the data on a 32 bit read are swapped. (essentially we have >> a addr^=2) > "Are" not needed. >> To work around this we do a addr^=2 during the probe. Once probed we >> adapt >> cfi->addr_unlock1 and cfi->addr_unlock2 to represent the endianess bug. >> Signed-off-by: John Crispin<blogic@openwrt.org> >> Signed-off-by: Ralph Hempel<ralph.hempel@lantiq.com> >> Cc: David Woodhouse<dwmw2@infradead.org> >> Cc: Daniel Schwierzeck<daniel.schwierzeck@googlemail.com> >> Cc: linux-mips@linux-mips.org >> Cc: linux-mtd@lists.infradead.org > [...] >> diff --git a/drivers/mtd/maps/lantiq.c b/drivers/mtd/maps/lantiq.c >> new file mode 100644 >> index 0000000..674be0a >> --- /dev/null >> +++ b/drivers/mtd/maps/lantiq.c >> @@ -0,0 +1,190 @@ [...] >> +void >> +ltq_copy_from(struct map_info *map, void *to, > > + unsigned long from, ssize_t len) > Shouldn't it be static? >> +{ >> + unsigned char *p; >> + unsigned char *to_8; >> + unsigned long flags; >> + >> + spin_lock_irqsave(&ebu_lock, flags); >> + from = (unsigned long) (map->virt + from); > Why not: > from += (unsigned long) map->virt; > like you do in ltq_copy_to()? >> + p = (unsigned char *) from; > Could be done in initializer, like in ltq_copy_to(). >> + to_8 = (unsigned char *) to; >> + while (len--) >> + *to_8++ = *p++; > BTW, you could use memcpy_fromio(). Actually not, as on MIPS it's implemented via memcpy(). On ARM it doesn byte-by-byte copying -- that's why I remembered about it... WBR, Sergei ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V3 06/10] MIPS: lantiq: add NOR flash support 2011-03-04 12:41 ` Sergei Shtylyov 2011-03-04 15:10 ` Sergei Shtylyov @ 2011-03-04 20:13 ` John Crispin 1 sibling, 0 replies; 4+ messages in thread From: John Crispin @ 2011-03-04 20:13 UTC (permalink / raw) To: Sergei Shtylyov Cc: linux-mips, Ralf Baechle, Ralph Hempel, linux-mtd, Daniel Schwierzeck, David Woodhouse Hi, >> + if (ltq_mtd_probing) >> + adr ^= 2; >> + spin_lock_irqsave(&ebu_lock, flags); >> + temp.x[0] = *((__u16 *)(map->virt + adr)); >> + spin_unlock_irqrestore(&ebu_lock, flags); > > Hm, what does this lock gain, if the read is atomic anyway? the SoC has a hardware arbitor for the EBU. I have so far not been able to activate it properly and the lock is needed to protect from PCI and NOR i/o clashing with eachother. i know that the arbitor works when using lantiqs 2.6.28. i will provide a follow up patch once i figured how to bring up the arbitor properly. until that time we need to use the lock. thanks, John ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-04 20:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1299146626-17428-1-git-send-email-blogic@openwrt.org>
2011-03-03 10:03 ` [PATCH V3 06/10] MIPS: lantiq: add NOR flash support John Crispin
2011-03-04 12:41 ` Sergei Shtylyov
2011-03-04 15:10 ` Sergei Shtylyov
2011-03-04 20:13 ` John Crispin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox