From 2d8b2454d42ad7661162a4d1eef619d8c8606bb3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Aug 2013 23:05:44 -0700 Subject: [PATCH] 3.10-stable patches added patches: mips-expose-missing-pci_io-map-unmap-declarations.patch mtd-omap2-allow-bulding-as-a-module.patch scsi-nsp32-use-mdelay-instead-of-large-udelay-constants.patch --- ...issing-pci_io-map-unmap-declarations.patch | 67 +++++++++++++++++++ .../mtd-omap2-allow-bulding-as-a-module.patch | 42 ++++++++++++ ...ay-instead-of-large-udelay-constants.patch | 34 ++++++++++ queue-3.10/series | 3 + 4 files changed, 146 insertions(+) create mode 100644 queue-3.10/mips-expose-missing-pci_io-map-unmap-declarations.patch create mode 100644 queue-3.10/mtd-omap2-allow-bulding-as-a-module.patch create mode 100644 queue-3.10/scsi-nsp32-use-mdelay-instead-of-large-udelay-constants.patch diff --git a/queue-3.10/mips-expose-missing-pci_io-map-unmap-declarations.patch b/queue-3.10/mips-expose-missing-pci_io-map-unmap-declarations.patch new file mode 100644 index 00000000000..1917377b1d2 --- /dev/null +++ b/queue-3.10/mips-expose-missing-pci_io-map-unmap-declarations.patch @@ -0,0 +1,67 @@ +From 78857614104a26cdada4c53eea104752042bf5a1 Mon Sep 17 00:00:00 2001 +From: Markos Chandras +Date: Mon, 17 Jun 2013 08:09:00 +0000 +Subject: MIPS: Expose missing pci_io{map,unmap} declarations + +From: Markos Chandras + +commit 78857614104a26cdada4c53eea104752042bf5a1 upstream. + +The GENERIC_PCI_IOMAP does not depend on CONFIG_PCI so move +it to the CONFIG_MIPS symbol so it's always selected for MIPS. +This fixes the missing pci_iomap declaration for MIPS. +Moreover, the pci_iounmap function was not defined in the +io.h header file if the CONFIG_PCI symbol is not set, +but it should since MIPS is not using CONFIG_GENERIC_IOMAP. + +This fixes the following problem on a allyesconfig: + +drivers/net/ethernet/3com/3c59x.c:1031:2: error: implicit declaration of +function 'pci_iomap' [-Werror=implicit-function-declaration] +drivers/net/ethernet/3com/3c59x.c:1044:3: error: implicit declaration of +function 'pci_iounmap' [-Werror=implicit-function-declaration] + +Signed-off-by: Markos Chandras +Acked-by: Steven J. Hill +Patchwork: https://patchwork.linux-mips.org/patch/5478/ +Signed-off-by: Ralf Baechle +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/io.h | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -27,6 +27,7 @@ config MIPS + select HAVE_GENERIC_HARDIRQS + select GENERIC_IRQ_PROBE + select GENERIC_IRQ_SHOW ++ select GENERIC_PCI_IOMAP + select HAVE_ARCH_JUMP_LABEL + select ARCH_WANT_IPC_PARSE_VERSION + select IRQ_FORCED_THREADING +@@ -2412,7 +2413,6 @@ config PCI + bool "Support for PCI controller" + depends on HW_HAS_PCI + select PCI_DOMAINS +- select GENERIC_PCI_IOMAP + select NO_GENERIC_PCI_IOPORT_MAP + help + Find out whether you have a PCI motherboard. PCI is the name of a +--- a/arch/mips/include/asm/io.h ++++ b/arch/mips/include/asm/io.h +@@ -170,6 +170,11 @@ static inline void * isa_bus_to_virt(uns + extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags); + extern void __iounmap(const volatile void __iomem *addr); + ++#ifndef CONFIG_PCI ++struct pci_dev; ++static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} ++#endif ++ + static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, + unsigned long flags) + { diff --git a/queue-3.10/mtd-omap2-allow-bulding-as-a-module.patch b/queue-3.10/mtd-omap2-allow-bulding-as-a-module.patch new file mode 100644 index 00000000000..af32d046892 --- /dev/null +++ b/queue-3.10/mtd-omap2-allow-bulding-as-a-module.patch @@ -0,0 +1,42 @@ +From 930d800bded771b26d9944c47810829130ff7c8c Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Tue, 23 Apr 2013 15:47:50 +0200 +Subject: mtd: omap2: allow bulding as a module + +From: Arnd Bergmann + +commit 930d800bded771b26d9944c47810829130ff7c8c upstream. + +The omap2 nand device driver calls into the the elm code, which can +be a loadable module, and in that case it cannot be built-in itself. +I can see no reason why the omap2 driver cannot also be a module, +so let's make the option "tristate" in Kconfig to fix this allmodconfig +build error: + +ERROR: "elm_config" [drivers/mtd/nand/omap2.ko] undefined! +ERROR: "elm_decode_bch_error_page" [drivers/mtd/nand/omap2.ko] undefined! + +Signed-off-by: Arnd Bergmann +Acked-by: Tony Lindgren +Cc: David Woodhouse +Cc: Artem Bityutskiy +Cc: Afzal Mohammed +Cc: Russell King +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/mtd/nand/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/nand/Kconfig ++++ b/drivers/mtd/nand/Kconfig +@@ -95,7 +95,7 @@ config MTD_NAND_OMAP2 + + config MTD_NAND_OMAP_BCH + depends on MTD_NAND && MTD_NAND_OMAP2 && ARCH_OMAP3 +- bool "Enable support for hardware BCH error correction" ++ tristate "Enable support for hardware BCH error correction" + default n + select BCH + select BCH_CONST_PARAMS diff --git a/queue-3.10/scsi-nsp32-use-mdelay-instead-of-large-udelay-constants.patch b/queue-3.10/scsi-nsp32-use-mdelay-instead-of-large-udelay-constants.patch new file mode 100644 index 00000000000..5eacd8f2393 --- /dev/null +++ b/queue-3.10/scsi-nsp32-use-mdelay-instead-of-large-udelay-constants.patch @@ -0,0 +1,34 @@ +From b497ceb964a80ebada3b9b3cea4261409039e25a Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Thu, 14 Mar 2013 15:21:36 +0100 +Subject: SCSI: nsp32: use mdelay instead of large udelay constants + +From: Arnd Bergmann + +commit b497ceb964a80ebada3b9b3cea4261409039e25a upstream. + +ARM cannot handle udelay for more than 2 miliseconds, so we +should use mdelay instead for those. + +Signed-off-by: Arnd Bergmann +Acked-by: GOTO Masanori +Cc: YOKOTA Hiroshi +Cc: "James E.J. Bottomley" +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/nsp32.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/nsp32.c ++++ b/drivers/scsi/nsp32.c +@@ -2899,7 +2899,7 @@ static void nsp32_do_bus_reset(nsp32_hw_ + * reset SCSI bus + */ + nsp32_write1(base, SCSI_BUS_CONTROL, BUSCTL_RST); +- udelay(RESET_HOLD_TIME); ++ mdelay(RESET_HOLD_TIME / 1000); + nsp32_write1(base, SCSI_BUS_CONTROL, 0); + for(i = 0; i < 5; i++) { + intrdat = nsp32_read2(base, IRQ_STATUS); /* dummy read */ diff --git a/queue-3.10/series b/queue-3.10/series index fc92fae3d5e..36442b62a52 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -55,3 +55,6 @@ drm-i915-initialize-gt_lock-early-with-other-spin-locks.patch drm-radeon-fix-halting-uvd.patch drm-radeon-only-save-uvd-bo-when-we-have-open-handles.patch drm-radeon-always-program-the-mc-on-startup.patch +scsi-nsp32-use-mdelay-instead-of-large-udelay-constants.patch +mtd-omap2-allow-bulding-as-a-module.patch +mips-expose-missing-pci_io-map-unmap-declarations.patch -- 2.47.3