ARM: preparation for multiplatform iop32x
Subsystems (5)
cover ARM: preparation for multiplatform iop32x
I'm looking into converting some of the remaining ARMv5 platforms in arch/arm/ to work together in a single kernel binary.
IOP32x seems to be a fairly easy target for multiplatform by itself, but the way the plat-iop code interacts with three generations of the code, and how the dma-adma driver is configured at compile-time for each version gets in the way.
I considered adding more indirection layers for those two, but removing iop33x and iop13xx is much easier in comparison, so this is the first approach I'm posting.
If we conclude that iop33x and iop13xx are indeed not used any more, the remaining patches in this series are straightforward. The actual multiplatform conversion also requires changes to the irqchip driver that are not completely mechanic, and we can discuss those after deciding what to do with the first set.
Adding a few people to Cc that historically worked on IOP.
Arnd
Arnd Bergmann (7):
[RFC] ARM: remove Intel iop33x and iop13xx support
dma: iop-adma: include prefetch.h
dma: iop-adma: use correct printk format strings
dma: iop-adma: allow building without platform headers
ARM: xscale: fix multi-cpu compilation
ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h
ARM: iop32x: merge everything into mach-iop32x/
arch/arm/Kconfig | 30 -
arch/arm/Kconfig.debug | 8 +-
arch/arm/Makefile | 3 -
arch/arm/configs/iop13xx_defconfig | 118 --
arch/arm/configs/iop33x_defconfig | 85 --
arch/arm/mach-iop13xx/Kconfig | 21 -
arch/arm/mach-iop13xx/Makefile | 9 -
arch/arm/mach-iop13xx/Makefile.boot | 4 -
arch/arm/mach-iop13xx/include/mach/adma.h | 608 ---------
.../mach-iop13xx/include/mach/entry-macro.S | 29 -
arch/arm/mach-iop13xx/include/mach/hardware.h | 22 -
arch/arm/mach-iop13xx/include/mach/iop13xx.h | 508 --------
arch/arm/mach-iop13xx/include/mach/iq81340.h | 29 -
arch/arm/mach-iop13xx/include/mach/irqs.h | 195 ---
arch/arm/mach-iop13xx/include/mach/time.h | 127 --
.../mach-iop13xx/include/mach/uncompress.h | 23 -
arch/arm/mach-iop13xx/io.c | 77 --
arch/arm/mach-iop13xx/iq81340mc.c | 84 --
arch/arm/mach-iop13xx/iq81340sc.c | 86 --
arch/arm/mach-iop13xx/irq.c | 227 ----
arch/arm/mach-iop13xx/msi.c | 152 ---
arch/arm/mach-iop13xx/msi.h | 12 -
arch/arm/mach-iop13xx/pci.c | 1115 -----------------
arch/arm/mach-iop13xx/pci.h | 66 -
arch/arm/mach-iop13xx/setup.c | 595 ---------
arch/arm/mach-iop13xx/tpmi.c | 244 ----
arch/arm/mach-iop32x/Makefile | 10 +-
arch/arm/{plat-iop => mach-iop32x}/adma.c | 39 +-
arch/arm/{plat-iop => mach-iop32x}/cp6.c | 0
arch/arm/mach-iop32x/em7210.c | 5 +-
arch/arm/mach-iop32x/glantank.c | 5 +-
.../mach-iop32x/{include/mach => }/glantank.h | 2 -
.../mach-iop32x/{include/mach => }/hardware.h | 6 +-
arch/arm/{plat-iop => mach-iop32x}/i2c.c | 21 +-
arch/arm/mach-iop32x/include/mach/adma.h | 6 -
.../mach-iop32x/include/mach/entry-macro.S | 2 -
arch/arm/mach-iop32x/include/mach/iop32x.h | 31 -
arch/arm/mach-iop32x/include/mach/irqs.h | 33 -
arch/arm/mach-iop32x/include/mach/time.h | 5 -
.../arm/mach-iop32x/include/mach/uncompress.h | 18 +-
.../asm/hardware => mach-iop32x}/iop3xx.h | 18 +-
arch/arm/mach-iop32x/iq31244.c | 5 +-
.../mach-iop32x/{include/mach => }/iq31244.h | 2 -
arch/arm/mach-iop32x/iq80321.c | 5 +-
.../mach-iop32x/{include/mach => }/iq80321.h | 2 -
arch/arm/mach-iop32x/irq.c | 3 +-
arch/arm/mach-iop32x/irqs.h | 42 +
arch/arm/mach-iop32x/n2100.c | 5 +-
.../mach-iop32x/{include/mach => }/n2100.h | 2 -
arch/arm/{plat-iop => mach-iop32x}/pci.c | 4 +-
arch/arm/{plat-iop => mach-iop32x}/pmu.c | 8 +-
arch/arm/{plat-iop => mach-iop32x}/restart.c | 4 +-
arch/arm/{plat-iop => mach-iop32x}/setup.c | 2 +-
arch/arm/{plat-iop => mach-iop32x}/time.c | 7 +-
arch/arm/mach-iop33x/Kconfig | 22 -
arch/arm/mach-iop33x/Makefile | 9 -
arch/arm/mach-iop33x/Makefile.boot | 4 -
arch/arm/mach-iop33x/include/mach/adma.h | 6 -
.../mach-iop33x/include/mach/entry-macro.S | 34 -
arch/arm/mach-iop33x/include/mach/hardware.h | 44 -
arch/arm/mach-iop33x/include/mach/iop33x.h | 37 -
arch/arm/mach-iop33x/include/mach/iq80331.h | 17 -
arch/arm/mach-iop33x/include/mach/iq80332.h | 17 -
arch/arm/mach-iop33x/include/mach/irqs.h | 57 -
arch/arm/mach-iop33x/include/mach/time.h | 5 -
.../arm/mach-iop33x/include/mach/uncompress.h | 37 -
arch/arm/mach-iop33x/iq80331.c | 148 ---
arch/arm/mach-iop33x/iq80332.c | 148 ---
arch/arm/mach-iop33x/irq.c | 115 --
arch/arm/mach-iop33x/uart.c | 100 --
arch/arm/mm/copypage-xscale.c | 6 +-
arch/arm/plat-iop/Makefile | 28 -
drivers/dma/Kconfig | 4 +-
drivers/dma/iop-adma.c | 22 +-
.../iop3xx-adma.h => drivers/dma/iop-adma.h | 7 +-
drivers/gpio/Kconfig | 2 +-
drivers/i2c/busses/Kconfig | 2 +-
.../linux/platform_data/dma-iop32x.h | 4 +
78 files changed, 134 insertions(+), 5510 deletions(-)
delete mode 100644 arch/arm/configs/iop13xx_defconfig
delete mode 100644 arch/arm/configs/iop33x_defconfig
delete mode 100644 arch/arm/mach-iop13xx/Kconfig
delete mode 100644 arch/arm/mach-iop13xx/Makefile
delete mode 100644 arch/arm/mach-iop13xx/Makefile.boot
delete mode 100644 arch/arm/mach-iop13xx/include/mach/adma.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-iop13xx/include/mach/hardware.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/iop13xx.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/iq81340.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/irqs.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/time.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-iop13xx/io.c
delete mode 100644 arch/arm/mach-iop13xx/iq81340mc.c
delete mode 100644 arch/arm/mach-iop13xx/iq81340sc.c
delete mode 100644 arch/arm/mach-iop13xx/irq.c
delete mode 100644 arch/arm/mach-iop13xx/msi.c
delete mode 100644 arch/arm/mach-iop13xx/msi.h
delete mode 100644 arch/arm/mach-iop13xx/pci.c
delete mode 100644 arch/arm/mach-iop13xx/pci.h
delete mode 100644 arch/arm/mach-iop13xx/setup.c
delete mode 100644 arch/arm/mach-iop13xx/tpmi.c
rename arch/arm/{plat-iop => mach-iop32x}/adma.c (75%)
rename arch/arm/{plat-iop => mach-iop32x}/cp6.c (100%)
rename arch/arm/mach-iop32x/{include/mach => }/glantank.h (78%)
rename arch/arm/mach-iop32x/{include/mach => }/hardware.h (90%)
rename arch/arm/{plat-iop => mach-iop32x}/i2c.c (81%)
delete mode 100644 arch/arm/mach-iop32x/include/mach/adma.h
delete mode 100644 arch/arm/mach-iop32x/include/mach/iop32x.h
delete mode 100644 arch/arm/mach-iop32x/include/mach/time.h
rename arch/arm/{include/asm/hardware => mach-iop32x}/iop3xx.h (96%)
rename arch/arm/mach-iop32x/{include/mach => }/iq31244.h (89%)
rename arch/arm/mach-iop32x/{include/mach => }/iq80321.h (89%)
create mode 100644 arch/arm/mach-iop32x/irqs.h
rename arch/arm/mach-iop32x/{include/mach => }/n2100.h (89%)
rename arch/arm/{plat-iop => mach-iop32x}/pci.c (99%)
rename arch/arm/{plat-iop => mach-iop32x}/pmu.c (79%)
rename arch/arm/{plat-iop => mach-iop32x}/restart.c (82%)
rename arch/arm/{plat-iop => mach-iop32x}/setup.c (95%)
rename arch/arm/{plat-iop => mach-iop32x}/time.c (97%)
delete mode 100644 arch/arm/mach-iop33x/Kconfig
delete mode 100644 arch/arm/mach-iop33x/Makefile
delete mode 100644 arch/arm/mach-iop33x/Makefile.boot
delete mode 100644 arch/arm/mach-iop33x/include/mach/adma.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-iop33x/include/mach/hardware.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/iop33x.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80331.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80332.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/irqs.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/time.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-iop33x/iq80331.c
delete mode 100644 arch/arm/mach-iop33x/iq80332.c
delete mode 100644 arch/arm/mach-iop33x/irq.c
delete mode 100644 arch/arm/mach-iop33x/uart.c
delete mode 100644 arch/arm/plat-iop/Makefile
rename arch/arm/include/asm/hardware/iop3xx-adma.h => drivers/dma/iop-adma.h (99%)
rename arch/arm/include/asm/hardware/iop_adma.h => include/linux/platform_data/dma-iop32x.h (98%)Signature · 15 lines
2.20.0 Cc: Dan Williams <[email protected]> Cc: Dave Jiang <[email protected]> Cc: Russell King <[email protected]> Cc: Lennert Buytenhek <[email protected]> Cc: Linus Walleij <[email protected]> Cc: Martin Michlmayr <[email protected]> Cc: Imre Kaloz <[email protected]> Cc: [email protected] _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RFC PATCH 1/7 ARM: remove Intel iop33x and iop13xx support
There are three families of IOP machines we support in Linux: iop32x (which includes EP80219), iop33x and iop13xx (aka IOP34x aka WP8134x).
All products we support in the kernel are based on the first of these, iop32x, the other families only ever supported the Intel reference boards but no actual machine anyone could ever buy.
While one could clearly make them all three work in a single kernel with some work, this takes the easy way out, removing the later two platforms entirely, under the assumption that there are no remaining users.
Earlier versions of OpenWRT and Debian both had support for iop32x but not the others, and they both dropped iop32x as well in their 2015 releases.
---
I'm just guessing that iop32x is still needed, and the other two are not. If anyone disagrees with that assessment, let me know so we can come up with an alternative approach.
--- arch/arm/Kconfig | 30 - arch/arm/Kconfig.debug | 8 +- arch/arm/Makefile | 2 - arch/arm/configs/iop13xx_defconfig | 118 -- arch/arm/configs/iop33x_defconfig | 85 -- arch/arm/mach-iop13xx/Kconfig | 21 - arch/arm/mach-iop13xx/Makefile | 9 - arch/arm/mach-iop13xx/Makefile.boot | 4 - arch/arm/mach-iop13xx/include/mach/adma.h | 608 --------- .../mach-iop13xx/include/mach/entry-macro.S | 29 - arch/arm/mach-iop13xx/include/mach/hardware.h | 22 - arch/arm/mach-iop13xx/include/mach/iop13xx.h | 508 -------- arch/arm/mach-iop13xx/include/mach/iq81340.h | 29 - arch/arm/mach-iop13xx/include/mach/irqs.h | 195 --- arch/arm/mach-iop13xx/include/mach/time.h | 127 -- .../mach-iop13xx/include/mach/uncompress.h | 23 - arch/arm/mach-iop13xx/io.c | 77 -- arch/arm/mach-iop13xx/iq81340mc.c | 84 -- arch/arm/mach-iop13xx/iq81340sc.c | 86 -- arch/arm/mach-iop13xx/irq.c | 227 ---- arch/arm/mach-iop13xx/msi.c | 152 --- arch/arm/mach-iop13xx/msi.h | 12 - arch/arm/mach-iop13xx/pci.c | 1115 ----------------- arch/arm/mach-iop13xx/pci.h | 66 - arch/arm/mach-iop13xx/setup.c | 595 --------- arch/arm/mach-iop13xx/tpmi.c | 244 ---- arch/arm/mach-iop33x/Kconfig | 22 - arch/arm/mach-iop33x/Makefile | 9 - arch/arm/mach-iop33x/Makefile.boot | 4 - arch/arm/mach-iop33x/include/mach/adma.h | 6 - .../mach-iop33x/include/mach/entry-macro.S | 34 - arch/arm/mach-iop33x/include/mach/hardware.h | 44 - arch/arm/mach-iop33x/include/mach/iop33x.h | 37 - arch/arm/mach-iop33x/include/mach/iq80331.h | 17 - arch/arm/mach-iop33x/include/mach/iq80332.h | 17 - arch/arm/mach-iop33x/include/mach/irqs.h | 57 - arch/arm/mach-iop33x/include/mach/time.h | 5 - .../arm/mach-iop33x/include/mach/uncompress.h | 37 - arch/arm/mach-iop33x/iq80331.c | 148 --- arch/arm/mach-iop33x/iq80332.c | 148 --- arch/arm/mach-iop33x/irq.c | 115 -- arch/arm/mach-iop33x/uart.c | 100 -- arch/arm/plat-iop/Makefile | 14 - arch/arm/plat-iop/adma.c | 32 +- arch/arm/plat-iop/i2c.c | 17 +- arch/arm/plat-iop/pmu.c | 6 - drivers/dma/Kconfig | 2 +- drivers/gpio/Kconfig | 2 +- drivers/i2c/busses/Kconfig | 2 +- 49 files changed, 9 insertions(+), 5342 deletions(-) delete mode 100644 arch/arm/configs/iop13xx_defconfig delete mode 100644 arch/arm/configs/iop33x_defconfig delete mode 100644 arch/arm/mach-iop13xx/Kconfig delete mode 100644 arch/arm/mach-iop13xx/Makefile delete mode 100644 arch/arm/mach-iop13xx/Makefile.boot delete mode 100644 arch/arm/mach-iop13xx/include/mach/adma.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-iop13xx/include/mach/hardware.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/iop13xx.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/iq81340.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/irqs.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/time.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/uncompress.h delete mode 100644 arch/arm/mach-iop13xx/io.c delete mode 100644 arch/arm/mach-iop13xx/iq81340mc.c delete mode 100644 arch/arm/mach-iop13xx/iq81340sc.c delete mode 100644 arch/arm/mach-iop13xx/irq.c delete mode 100644 arch/arm/mach-iop13xx/msi.c delete mode 100644 arch/arm/mach-iop13xx/msi.h delete mode 100644 arch/arm/mach-iop13xx/pci.c delete mode 100644 arch/arm/mach-iop13xx/pci.h delete mode 100644 arch/arm/mach-iop13xx/setup.c delete mode 100644 arch/arm/mach-iop13xx/tpmi.c delete mode 100644 arch/arm/mach-iop33x/Kconfig delete mode 100644 arch/arm/mach-iop33x/Makefile delete mode 100644 arch/arm/mach-iop33x/Makefile.boot delete mode 100644 arch/arm/mach-iop33x/include/mach/adma.h delete mode 100644 arch/arm/mach-iop33x/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-iop33x/include/mach/hardware.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iop33x.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80331.h delete mode 100644 arch/arm/mach-iop33x/include/mach/iq80332.h delete mode 100644 arch/arm/mach-iop33x/include/mach/irqs.h delete mode 100644 arch/arm/mach-iop33x/include/mach/time.h delete mode 100644 arch/arm/mach-iop33x/include/mach/uncompress.h delete mode 100644 arch/arm/mach-iop33x/iq80331.c delete mode 100644 arch/arm/mach-iop33x/iq80332.c delete mode 100644 arch/arm/mach-iop33x/irq.c delete mode 100644 arch/arm/mach-iop33x/uart.c
arch/arm/Kconfig +0 -30
@@ -263,7 +263,6 @@ config PHYS_OFFSET default 0x00000000 if ARCH_EBSA110 || \ ARCH_FOOTBRIDGE || \ ARCH_INTEGRATOR || \ - ARCH_IOP13XX || \ ARCH_KS8695 || \ ARCH_REALVIEW default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
@@ -377,19 +376,6 @@ config ARCH_FOOTBRIDGE Support for systems based on the DC21285 companion chip ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. -config ARCH_IOP13XX - bool "IOP13xx-based" - depends on MMU - select CPU_XSC3 - select NEED_MACH_MEMORY_H - select NEED_RET_TO_USER - select FORCE_PCI - select PLAT_IOP - select VMSPLIT_1G - select SPARSE_IRQ - help - Support for Intel's IOP13XX (XScale) family of processors. - config ARCH_IOP32X bool "IOP32x-based" depends on MMU
@@ -403,18 +389,6 @@ config ARCH_IOP32X Support for Intel's 80219 and IOP32X (XScale) family of processors. -config ARCH_IOP33X - bool "IOP33x-based" - depends on MMU - select CPU_XSCALE - select GPIO_IOP - select GPIOLIB - select NEED_RET_TO_USER - select FORCE_PCI - select PLAT_IOP - help - Support for Intel's IOP33X (XScale) family of processors. - config ARCH_IXP4XX bool "IXP4xx-based" depends on MMU
@@ -734,12 +708,8 @@ source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-integrator/Kconfig" -source "arch/arm/mach-iop13xx/Kconfig" - source "arch/arm/mach-iop32x/Kconfig" -source "arch/arm/mach-iop33x/Kconfig" - source "arch/arm/mach-ixp4xx/Kconfig" source "arch/arm/mach-keystone/Kconfig"
arch/arm/Kconfig.debug +1 -7
@@ -1568,9 +1568,7 @@ config DEBUG_UART_PL01X # Compatibility options for 8250 config DEBUG_UART_8250 - def_bool ARCH_EBSA110 || \ - ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \ - ARCH_RPC + def_bool ARCH_EBSA110 || ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC config DEBUG_UART_PHYS hex "Physical base address of debug UART"
@@ -1683,7 +1681,6 @@ config DEBUG_UART_PHYS default 0xffc02000 if DEBUG_SOCFPGA_UART0 default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1 default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 - default 0xffd82340 if ARCH_IOP13XX default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0 default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2 default 0xfff36000 if DEBUG_HIGHBANK_UART
@@ -1693,7 +1690,6 @@ config DEBUG_UART_PHYS default 0xfffe8600 if DEBUG_BCM63XX_UART default 0xffffee00 if DEBUG_AT91_SAM9263_DBGU default 0xfffff200 if DEBUG_AT91_RM9200_DBGU - default 0xfffff700 if ARCH_IOP33X depends on ARCH_EP93XX || \ DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ DEBUG_LL_UART_EFM32 || \
@@ -1805,14 +1801,12 @@ config DEBUG_UART_VIRT default 0xfedc0000 if DEBUG_EP93XX default 0xfee003f8 if DEBUG_FOOTBRIDGE_COM1 default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART - default 0xfee82340 if ARCH_IOP13XX default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN default 0xfef36000 if DEBUG_HIGHBANK_UART default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 - default 0xfefff700 if ARCH_IOP33X default 0xff003000 if DEBUG_U300_UART default 0xffd01000 if DEBUG_HIP01_UART default DEBUG_UART_PHYS if !MMU
arch/arm/Makefile +0 -2
@@ -173,9 +173,7 @@ machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_HISI) += hisi machine-$(CONFIG_ARCH_INTEGRATOR) += integrator -machine-$(CONFIG_ARCH_IOP13XX) += iop13xx machine-$(CONFIG_ARCH_IOP32X) += iop32x -machine-$(CONFIG_ARCH_IOP33X) += iop33x machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx machine-$(CONFIG_ARCH_KEYSTONE) += keystone machine-$(CONFIG_ARCH_KS8695) += ks8695
arch/arm/configs/iop13xx_defconfig deleted +0 -118
118 lines not on this page · raw message
arch/arm/configs/iop33x_defconfig deleted +0 -85
85 lines not on this page · raw message
arch/arm/mach-iop13xx/Kconfig deleted +0 -21
@@ -1,21 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -if ARCH_IOP13XX - -menu "IOP13XX Implementation Options" - -comment "IOP13XX Platform Support" - -config MACH_IQ81340SC - bool "Enable IQ81340SC Hardware Support" - help - Say Y here if you want to support running on the Intel IQ81340SC - evaluation kit. - -config MACH_IQ81340MC - bool "Enable IQ81340MC Hardware Support" - help - Say Y here if you want to support running on the Intel IQ81340MC - evaluation kit. - -endmenu -endif
arch/arm/mach-iop13xx/Makefile deleted +0 -9
@@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_ARCH_IOP13XX) += setup.o -obj-$(CONFIG_ARCH_IOP13XX) += irq.o -obj-$(CONFIG_ARCH_IOP13XX) += pci.o -obj-$(CONFIG_ARCH_IOP13XX) += io.o -obj-$(CONFIG_ARCH_IOP13XX) += tpmi.o -obj-$(CONFIG_MACH_IQ81340SC) += iq81340sc.o -obj-$(CONFIG_MACH_IQ81340MC) += iq81340mc.o -obj-$(CONFIG_PCI_MSI) += msi.o
arch/arm/mach-iop13xx/Makefile.boot deleted +0 -4
@@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000
arch/arm/mach-iop13xx/include/mach/adma.h deleted +0 -608
608 lines not on this page · raw message
arch/arm/mach-iop13xx/include/mach/entry-macro.S deleted +0 -29
@@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * iop13xx low level irq macros - * Copyright (c) 2005-2006, Intel Corporation. - */ - .macro get_irqnr_preamble, base, tmp - mrc p15, 0, \tmp, c15, c1, 0 - orr \tmp, \tmp, #(1 << 6) - mcr p15, 0, \tmp, c15, c1, 0 @ Enable cp6 access - .endm - - /* - * Note: a 1-cycle window exists where iintvec will return the value - * of iintbase, so we explicitly check for "bad zeros" - */ - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - mrc p6, 0, \irqnr, c3, c2, 0 @ Read IINTVEC - cmp \irqnr, #0 - mrceq p6, 0, \irqnr, c3, c2, 0 @ Re-read on potentially bad zero - adds \irqstat, \irqnr, #1 @ Check for 0xffffffff - movne \irqnr, \irqnr, lsr #2 @ Convert to irqnr - .endm - - .macro arch_ret_to_user, tmp1, tmp2 - mrc p15, 0, \tmp1, c15, c1, 0 - ands \tmp2, \tmp1, #(1 << 6) - bicne \tmp1, \tmp1, #(1 << 6) - mcrne p15, 0, \tmp1, c15, c1, 0 @ Disable cp6 access - .endm
arch/arm/mach-iop13xx/include/mach/hardware.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_ARCH_HARDWARE_H -#define __ASM_ARCH_HARDWARE_H -#include <asm/types.h> - -#ifndef __ASSEMBLY__ -extern u16 iop13xx_dev_id (void ); -extern void iop13xx_set_atu_mmr_bases (void ); -#endif - -/* -* Generic chipset bits -* -*/ -#include "iop13xx.h" - -/* -* Board specific bits -*/ -#include "iq81340.h" - -#endif /* _ASM_ARCH_HARDWARE_H */
arch/arm/mach-iop13xx/include/mach/iop13xx.h deleted +0 -508
508 lines not on this page · raw message
arch/arm/mach-iop13xx/include/mach/iq81340.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _IQ81340_H_ -#define _IQ81340_H_ - -#define IQ81340_PCE_BAR0 IOP13XX_PBI_LOWER_MEM_RA -#define IQ81340_PCE_BAR1 (IQ81340_PCE_BAR0 + 0x02000000) - -#define IQ81340_FLASHBASE IQ81340_PCE_BAR0/* Flash */ - -#define IQ81340_PCE_BAR1_OFFSET (a) (IQ81340_PCE_BAR1 + (a)) - -#define IQ81340_PRD_CODE IQ81340_PCE_BAR1_OFFSET(0) -#define IQ81340_BRD_STEP IQ81340_PCE_BAR1_OFFSET(0x10000) -#define IQ81340_CPLD_REV IQ81340_PCE_BAR1_OFFSET(0x20000) -#define IQ81340_LED IQ81340_PCE_BAR1_OFFSET(0x30000) -#define IQ81340_LHEX IQ81340_PCE_BAR1_OFFSET(0x40000) -#define IQ81340_RHEX IQ81340_PCE_BAR1_OFFSET(0x50000) -#define IQ81340_BUZZER IQ81340_PCE_BAR1_OFFSET(0x60000) -#define IQ81340_32K_NVRAM IQ81340_PCE_BAR1_OFFSET(0x70000) -#define IQ81340_256K_NVRAM IQ81340_PCE_BAR1_OFFSET(0x80000) -#define IQ81340_ROTARY_SW IQ81340_PCE_BAR1_OFFSET(0xd0000) -#define IQ81340_BATT_STAT IQ81340_PCE_BAR1_OFFSET(0xf0000) -#define IQ81340_CMP_FLSH IQ81340_PCE_BAR1_OFFSET(0x1000000)/* 16MB */ - -#define PBI_CF_IDE_BASE (IQ81340_CMP_FLSH) -#define PBI_CF_BAR_ADDR (IOP13XX_PBI_BAR1) - - -#endif /* _IQ81340_H_ */
arch/arm/mach-iop13xx/include/mach/irqs.h deleted +0 -195
195 lines not on this page · raw message
arch/arm/mach-iop13xx/include/mach/time.h deleted +0 -127
127 lines not on this page · raw message
arch/arm/mach-iop13xx/include/mach/uncompress.h deleted +0 -23
@@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <asm/types.h> -#include <linux/serial_reg.h> -#include <mach/hardware.h> - -#define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS) -#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) - -static inline void putc (char c) -{ -while ((UART_BASE [UART_LSR ] &TX_DONE ) !=TX_DONE ) -barrier (); -UART_BASE [UART_TX ] = c; -} - -static inline void flush (void ) -{ -} - -/* -* nothing to do -*/ -#define arch_decomp_setup ()
arch/arm/mach-iop13xx/io.c deleted +0 -77
77 lines not on this page · raw message
arch/arm/mach-iop13xx/iq81340mc.c deleted +0 -84
84 lines not on this page · raw message
arch/arm/mach-iop13xx/iq81340sc.c deleted +0 -86
86 lines not on this page · raw message
arch/arm/mach-iop13xx/irq.c deleted +0 -227
227 lines not on this page · raw message
arch/arm/mach-iop13xx/msi.c deleted +0 -152
152 lines not on this page · raw message
arch/arm/mach-iop13xx/msi.h deleted +0 -12
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _IOP13XX_MSI_H_ -#define _IOP13XX_MSI_H_ -#ifdef CONFIG_PCI_MSI -void iop13xx_msi_init (void ); -#else -static inline void iop13xx_msi_init (void ) -{ -return ; -} -#endif -#endif
arch/arm/mach-iop13xx/pci.c deleted +0 -1115
481 lines not on this page · raw message
arch/arm/mach-iop13xx/pci.h deleted +0 -66
66 lines not on this page · raw message
arch/arm/mach-iop13xx/setup.c deleted +0 -595
595 lines not on this page · raw message
arch/arm/mach-iop13xx/tpmi.c deleted +0 -244
244 lines not on this page · raw message
arch/arm/mach-iop33x/Makefile.boot deleted +0 -4
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/adma.h deleted +0 -6
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/entry-macro.S deleted +0 -34
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/hardware.h deleted +0 -44
44 lines not on this page · raw message
arch/arm/mach-iop33x/include/mach/iop33x.h deleted +0 -37
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/iq80331.h deleted +0 -17
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/iq80332.h deleted +0 -17
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/irqs.h deleted +0 -57
57 lines not on this page · raw message
arch/arm/mach-iop33x/include/mach/time.h deleted +0 -5
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/include/mach/uncompress.h deleted +0 -37
Lines of this file are not shown. View the raw message.
arch/arm/mach-iop33x/iq80331.c deleted +0 -148
148 lines not on this page · raw message
arch/arm/mach-iop33x/iq80332.c deleted +0 -148
148 lines not on this page · raw message
arch/arm/mach-iop33x/irq.c deleted +0 -115
115 lines not on this page · raw message
arch/arm/mach-iop33x/uart.c deleted +0 -100
100 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.20.0
Part of the diff is not shown here. View the raw message.
PATCH 2/7 dma: iop-adma: include prefetch.h
Compile-testing this driver fails on m68k without the extra header inclusion.
--- drivers/dma/iop-adma.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/iop-adma.c +1 -0
@@ -16,6 +16,7 @@#include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/prefetch.h> #include <linux/memory.h> #include <linux/ioport.h> #include <linux/raid/pq.h>
Signature · 1 line
2.20.0
Re: [PATCH 2/7] dma: iop-adma: include prefetch.h
Quoted 2 lines · Arnd Bergmann
Compile-testing this driver fails on m68k without the extra header inclusion.
Please change title to "dmaengine: iop-adma: include prefetch.h"
After that:
Quoted 20 lines
Reported-by kbuild test robot <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- drivers/dma/iop-adma.c | 1 + 1 file changed, 1 insertion(+)drivers/dma/iop-adma.c +1
-0@@ -16,6 +16,7 @@#include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/platform_device.h> +#include <linux/prefetch.h> #include <linux/memory.h> #include <linux/ioport.h> #include <linux/raid/pq.h> Signature · 1 line
2.20.0
Signature · 1 line
~Vinod
Re: [PATCH 2/7] dma: iop-adma: include prefetch.h
Quoted 10 lines · Vinod Koul
Quoted 2 lines · Arnd Bergmann
Compile-testing this driver fails on m68k without the extra header inclusion.
Please change title to "dmaengine: iop-adma: include
prefetch.h"After that:
Acked-by Vinod Koul <[email protected]>
Ok, thanks!
One day I will remember all the subsystem prefixes. ;-)
Arnd
PATCH 3/7 dma: iop-adma: use correct printk format strings
In reply to Arnd BergmannWhen compile-testing on other architectures, we get lots of warnings about incorrect format strings, like:
drivers/dma/iop-adma.c: In function 'iop_adma_alloc_slots':
drivers/dma/iop-adma.c:307:6: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
drivers/dma/iop-adma.c: In function 'iop_adma_prep_dma_memcpy':
Quoted 1 line
Quoted 1 line
drivers/dma/iop-adma.c:518:40: warning: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'size_t{aka long unsigned int}' [-Wformat=]
Use %zu for printing size_t as required, and cast the dma_addr_t arguments to 'u64' for printing with %llx. Ideally this should use the %pad format string, but that requires an lvalue argument that doesn't work here.
--- drivers/dma/iop-adma.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/dma/iop-adma.c +9 -9
@@ -117,9 +117,9 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)list_for_each_entry_safe (iter, _iter, &iop_chan->chain, chain_node) {pr_debug ("\tcookie: %d slot: %d busy: %d " -"this_desc: %#x next_desc: %#x ack: %d\n" , +"this_desc: %#x next_desc: %#llx ack: %d\n" , iter->async_tx.cookie, iter->idx, busy, - iter->async_tx.phys,iop_desc_get_next_desc (iter), + iter->async_tx.phys, (u64 )iop_desc_get_next_desc (iter),async_tx_test_ack (&iter->async_tx));prefetch (_iter);prefetch (&_iter->async_tx);
@@ -307,9 +307,9 @@ iop_adma_alloc_slots(struct iop_adma_chan *iop_chan, int num_slots,int i;dev_dbg (iop_chan->device->common.dev,"allocated slot: %d " -"(desc %p phys: %#x) slots_per_op %d\n" , +"(desc %p phys: %#llx) slots_per_op %d\n" , iter->idx, iter->hw_desc, - iter->async_tx.phys, slots_per_op); + (u64 )iter->async_tx.phys, slots_per_op);/* pre-ack all but the last descriptor */ if (num_slots != slots_per_op)
@@ -517,7 +517,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,return NULL ;BUG_ON (len >IOP_ADMA_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s len: %zu\n" , __func__, len);spin_lock_bh (&iop_chan->lock);
@@ -550,7 +550,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);spin_lock_bh (&iop_chan->lock);
@@ -583,7 +583,7 @@ iop_adma_prep_dma_xor_val(struct dma_chan *chan, dma_addr_t *dma_src,if (unlikely (!len))return NULL ; -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);
@@ -621,7 +621,7 @@ iop_adma_prep_dma_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);if (dmaf_p_disabled_continue (flags))
@@ -684,7 +684,7 @@ iop_adma_prep_dma_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,return NULL ;BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);
Signature · 1 line
2.20.0
Re: [PATCH 3/7] dma: iop-adma: use correct printk format strings
Quoted 6 lines · Arnd Bergmann
When compile-testing on other architectures, we get lots of warnings about incorrect format strings, like:
drivers/dma/iop-adma.c: In function 'iop_adma_alloc_slots':
drivers/dma/iop-adma.c:307:6: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t{aka long long unsigned int}' [-Wformat=]
Quoted 7 lines
drivers/dma/iop-adma.c: In function 'iop_adma_prep_dma_memcpy':Quoted 1 line
Quoted 1 line
drivers/dma/iop-adma.c:518:40: warning: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'size_t{aka long unsigned int}' [-Wformat=]Use %zu for printing
size_tas required, and cast thedma_addr_targuments to 'u64' for printing with %llx. Ideally this should use the %pad format string, but that requires an lvalue argument that doesn't work here.
Please change title to "dmaengine: iop-adma: use correct printk format strings"
After that:
Quoted 81 lines
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/dma/iop-adma.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)drivers/dma/iop-adma.c +9
-9@@ -117,9 +117,9 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)list_for_each_entry_safe (iter, _iter, &iop_chan->chain, chain_node) {pr_debug ("\tcookie: %d slot: %d busy: %d " -"this_desc: %#x next_desc: %#x ack: %d\n" , +"this_desc: %#x next_desc: %#llx ack: %d\n" , iter->async_tx.cookie, iter->idx, busy, - iter->async_tx.phys,iop_desc_get_next_desc (iter), + iter->async_tx.phys, (u64 )iop_desc_get_next_desc (iter),async_tx_test_ack (&iter->async_tx));prefetch (_iter);prefetch (&_iter->async_tx);@@ -307,9 +307,9 @@ iop_adma_alloc_slots(struct iop_adma_chan *iop_chan, int num_slots,int i;dev_dbg (iop_chan->device->common.dev,"allocated slot: %d " -"(desc %p phys: %#x) slots_per_op %d\n" , +"(desc %p phys: %#llx) slots_per_op %d\n" , iter->idx, iter->hw_desc, - iter->async_tx.phys, slots_per_op); + (u64 )iter->async_tx.phys, slots_per_op);/* pre-ack all but the last descriptor */ if (num_slots != slots_per_op)@@ -517,7 +517,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,return NULL ;BUG_ON (len >IOP_ADMA_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s len: %zu\n" , __func__, len);spin_lock_bh (&iop_chan->lock);@@ -550,7 +550,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);spin_lock_bh (&iop_chan->lock);@@ -583,7 +583,7 @@ iop_adma_prep_dma_xor_val(struct dma_chan *chan, dma_addr_t *dma_src,if (unlikely (!len))return NULL ; -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);@@ -621,7 +621,7 @@ iop_adma_prep_dma_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);if (dmaf_p_disabled_continue (flags))@@ -684,7 +684,7 @@ iop_adma_prep_dma_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,return NULL ;BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);Signature · 1 line
2.20.0
Signature · 1 line
~Vinod
PATCH 4/7 dma: iop-adma: allow building without platform headers
In reply to Arnd BergmannNow that iop3xx and iop13xx are gone, the iop-adma driver no longer needs to deal with incompatible register layout defined in machine specific header files.
Move the iop32x specific definitions into drivers/dma/iop-adma.h and the platform_data into include/linux/platform_data/dma-iop32x.h, and change the machine code to no longer reference those.
The DMA0_ID/DMA1_ID/AAU_ID macros are required as part of the platform data interface and still need to be visible, so move those from one header to the other.
--- arch/arm/mach-iop32x/include/mach/adma.h | 6 ------ arch/arm/plat-iop/adma.c | 3 +-- drivers/dma/Kconfig | 4 ++-- drivers/dma/iop-adma.c | 3 +-- .../asm/hardware/iop3xx-adma.h => drivers/dma/iop-adma.h | 7 +------ .../iop_adma.h => include/linux/platform_data/dma-iop32x.h | 4 ++++ 6 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 arch/arm/mach-iop32x/include/mach/adma.h rename arch/arm/include/asm/hardware/iop3xx-adma.h => drivers/dma/iop-adma.h (99%) rename arch/arm/include/asm/hardware/iop_adma.h => include/linux/platform_data/dma-iop32x.h (98%)
arch/arm/mach-iop32x/include/mach/adma.h deleted +0 -6
@@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef IOP32X_ADMA_H -#define IOP32X_ADMA_H -#include <asm/hardware/iop3xx-adma.h> -#endif -
arch/arm/plat-iop/adma.c +1 -2
@@ -6,8 +6,7 @@#include <linux/platform_device.h> #include <asm/hardware/iop3xx.h> #include <linux/dma-mapping.h> -#include <mach/adma.h> -#include <asm/hardware/iop_adma.h> +#include <linux/platform_data/dma-iop32x.h> #define IRQ_DMA0_EOT IRQ_IOP32X_DMA0_EOT#define IRQ_DMA0_EOC IRQ_IOP32X_DMA0_EOC
drivers/dma/Kconfig +2 -2
@@ -294,8 +294,8 @@ config INTEL_IOATDMA If unsure, say N. config INTEL_IOP_ADMA - tristate "Intel IOP ADMA support" - depends on ARCH_IOP32X + tristate "Intel IOP32x ADMA support" + depends on ARCH_IOP32X || COMPILE_TEST select DMA_ENGINE select ASYNC_TX_ENABLE_CHANNEL_SWITCH help
drivers/dma/iop-adma.c +1 -2
@@ -22,8 +22,7 @@#include <linux/raid/pq.h> #include <linux/slab.h> -#include <mach/adma.h> - +#include "iop-adma.h" #include "dmaengine.h" #define to_iop_adma_chan (chan) container_of(chan, struct iop_adma_chan, common)
drivers/dma/iop-adma.h renamed from arch/arm/include/asm/hardware/iop3xx-adma.h +1 -6
@@ -6,8 +6,7 @@#define _ADMA_H#include <linux/types.h> #include <linux/io.h> -#include <mach/hardware.h> -#include <asm/hardware/iop_adma.h> +#include <linux/platform_data/dma-iop32x.h> /* Memory copy units */ #define DMA_CCR (chan) (chan->mmr_base + 0x0)
@@ -34,10 +33,6 @@#define AAU_EDCR1_IDX 17#define AAU_EDCR2_IDX 26 -#define DMA0_ID 0 -#define DMA1_ID 1 -#define AAU_ID 2 -struct iop3xx_aau_desc_ctrl {unsigned int int_en:1 ;unsigned int blk1_cmd_ctrl:3 ;
include/linux/platform_data/dma-iop32x.h renamed from arch/arm/include/asm/hardware/iop_adma.h +4 -0
@@ -17,6 +17,10 @@#endif #define iop_paranoia (x) BUG_ON(IOP_PARANOIA && (x)) +#define DMA0_ID 0 +#define DMA1_ID 1 +#define AAU_ID 2 +/** * struct iop_adma_device - internal representation of an ADMA device * @pdev: Platform device
Signature · 1 line
2.20.0
PATCH 5/7 ARM: xscale: fix multi-cpu compilation
In reply to Arnd BergmannBuilding a combined ARMv4+XScale kernel produces these and other build failures:
/tmp/copypage-xscale-3aa821.s: Assembler messages:/tmp/copypage-xscale-3aa821.s:167: Error: selected processor does not support pld [r7,#0]' in ARM mode /tmp/copypage-xscale-3aa821.s:168: Error: selected processor does not support pld [r7,#32]' in ARM mode /tmp/copypage-xscale-3aa821.s:169: Error: selected processor does not support pld [r1,#0]' in ARM mode /tmp/copypage-xscale-3aa821.s:170: Error: selected processor does not support pld [r1,#32]' in ARM mode /tmp/copypage-xscale-3aa821.s:171: Error: selected processor does not support pld [r7,#64]' in ARM mode /tmp/copypage-xscale-3aa821.s:176: Error: selected processor does not support ldrd r4,r5,[r7],#8' in ARM mode /tmp/copypage-xscale-3aa821.s:180: Error: selected processor does not support `strd r4,r5,[r1],#8' in ARM mode
Add an explict .arch armv5 in the inline assembly to allow the ARMv5 specific instructions regardless of the compiler -march= target.
--- arch/arm/mm/copypage-xscale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mm/copypage-xscale.c +4 -2
@@ -42,6 +42,7 @@ static void mc_copy_user_page(void *from, void *to)* when prefetching destination as well. (NP) */ asm volatile ("\ +.arch xscale \n\ pld [%0, #0] \n\ pld [%0, #32] \n\ pld [%1, #0] \n\
@@ -106,8 +107,9 @@ void xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr) { void *ptr, *kaddr = kmap_atomic(page); - asm volatile( - "mov r1, %2 \n\ + asm volatile("\ +.arch xscale \n\ + mov r1, %2 \n\ mov r2, #0 \n\ mov r3, #0 \n\ 1: mov ip, %0 \n\
Signature · 1 line
2.20.0
Re: [PATCH 5/7] ARM: xscale: fix multi-cpu compilation
Quoted 11 lines · Arnd Bergmann
Building a combined ARMv4+XScale kernel produces these and other build failures:
/tmp/copypage-xscale-3aa821.s: Assembler messages:/tmp/copypage-xscale-3aa821.s:167: Error: selected processor does not supportpld [r7,#0]' in ARM mode /tmp/copypage-xscale-3aa821.s:168: Error: selected processor does not supportpld [r7,#32]' in ARM mode/tmp/copypage-xscale-3aa821.s:169: Error: selected processor does not supportpld [r1,#0]' in ARM mode /tmp/copypage-xscale-3aa821.s:170: Error: selected processor does not supportpld [r1,#32]' in ARM mode/tmp/copypage-xscale-3aa821.s:171: Error: selected processor does not supportpld [r7,#64]' in ARM mode /tmp/copypage-xscale-3aa821.s:176: Error: selected processor does not supportldrd r4,r5,[r7],#8' in ARM mode/tmp/copypage-xscale-3aa821.s:180: Error: selected processor does not support `strd r4,r5,[r1],#8' in ARM mode
OK we certainly need this.
Quoted 2 lines
Add an explict .arch armv5 in the inline assembly to allow the ARMv5 specific instructions regardless of the compiler -march= target.
You probably mean...
Quoted 2 lines
+.arch xscale \n\
pld [%0, #0] \n\Explicit .arch xscale rather than .arch armv5.
Yours,
Linus Walleij
PATCH 6/7 ARM: iop32x: make mach/uncompress.h independent of mach/hardware.h
In reply to Arnd BergmannAll supported uarts use the same address: IQ80321_UART and IQ31244_UART are both defined to the default value of 0xfe800000. By using that as the address unconditionally, all dependencies on other machine headers can be avoided.
--- arch/arm/mach-iop32x/include/mach/uncompress.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
arch/arm/mach-iop32x/include/mach/uncompress.h +2 -16
@@ -6,9 +6,8 @@#include <asm/types.h> #include <asm/mach-types.h> #include <linux/serial_reg.h> -#include <mach/hardware.h> -volatile u8 *uart_base; +#define uart_base ((volatile u8 *)0xfe800000)#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
@@ -23,17 +22,4 @@ static inline void flush(void) { } -static __inline__void __arch_decomp_setup (unsigned long arch_id) -{ -if (machine_is_iq80321 ()) - uart_base = (volatile u8 *)IQ80321_UART ; -else if (machine_is_iq31244 () ||machine_is_em7210 ()) - uart_base = (volatile u8 *)IQ31244_UART ; -else - uart_base = (volatile u8 *)0xfe800000 ; -} - -/* -* nothing to do -*/ -#define arch_decomp_setup () __arch_decomp_setup(arch_id) +#define arch_decomp_setup () do { } while (0)
Signature · 1 line
2.20.0
PATCH 7/7 ARM: iop32x: merge everything into mach-iop32x/
In reply to Arnd BergmannVarious bits of iop32x are now in their traditional locations in plat-iop, mach-iop/include/mach/ and in include/asm/mach/hardware. As nothing outside of the iop32x mach code references these any more, this can all be moved into one place now.
The only remaining things in the include/mach/ directory are now the NR_IRQS definition, the entry-macros.S file and the the decompressor uart access. After the irqchip code has been converted to SPARSE_IRQ and GENERIC_IRQ_MULTI_HANDLER, it can be moved to ARCH_MULTIPLATFORM.
---
arch/arm/Makefile | 1 -
arch/arm/mach-iop32x/Makefile | 10 ++++-
arch/arm/{plat-iop => mach-iop32x}/adma.c | 4 +-
arch/arm/{plat-iop => mach-iop32x}/cp6.c | 0
arch/arm/mach-iop32x/em7210.c | 5 ++-
arch/arm/mach-iop32x/glantank.c | 5 ++-
.../mach-iop32x/{include/mach => }/glantank.h | 2 -
.../mach-iop32x/{include/mach => }/hardware.h | 6 +--
arch/arm/{plat-iop => mach-iop32x}/i2c.c | 6 ++-
.../mach-iop32x/include/mach/entry-macro.S | 2 -
arch/arm/mach-iop32x/include/mach/iop32x.h | 31 --------------
arch/arm/mach-iop32x/include/mach/irqs.h | 33 ---------------
arch/arm/mach-iop32x/include/mach/time.h | 5 ---
.../asm/hardware => mach-iop32x}/iop3xx.h | 18 +++++++-
arch/arm/mach-iop32x/iq31244.c | 5 ++-
.../mach-iop32x/{include/mach => }/iq31244.h | 2 -
arch/arm/mach-iop32x/iq80321.c | 5 ++-
.../mach-iop32x/{include/mach => }/iq80321.h | 2 -
arch/arm/mach-iop32x/irq.c | 3 +-
arch/arm/mach-iop32x/irqs.h | 42 +++++++++++++++++++
arch/arm/mach-iop32x/n2100.c | 5 ++-
.../mach-iop32x/{include/mach => }/n2100.h | 2 -
arch/arm/{plat-iop => mach-iop32x}/pci.c | 4 +-
arch/arm/{plat-iop => mach-iop32x}/pmu.c | 2 +-
arch/arm/{plat-iop => mach-iop32x}/restart.c | 4 +-
arch/arm/{plat-iop => mach-iop32x}/setup.c | 2 +-
arch/arm/{plat-iop => mach-iop32x}/time.c | 7 ++--
arch/arm/plat-iop/Makefile | 14 -------
28 files changed, 102 insertions(+), 125 deletions(-)
rename arch/arm/{plat-iop => mach-iop32x}/adma.c (98%)
rename arch/arm/{plat-iop => mach-iop32x}/cp6.c (100%)
rename arch/arm/mach-iop32x/{include/mach => }/glantank.h (78%)
rename arch/arm/mach-iop32x/{include/mach => }/hardware.h (90%)
rename arch/arm/{plat-iop => mach-iop32x}/i2c.c (96%)
delete mode 100644 arch/arm/mach-iop32x/include/mach/iop32x.h
delete mode 100644 arch/arm/mach-iop32x/include/mach/time.h
rename arch/arm/{include/asm/hardware => mach-iop32x}/iop3xx.h (96%)
rename arch/arm/mach-iop32x/{include/mach => }/iq31244.h (89%)
rename arch/arm/mach-iop32x/{include/mach => }/iq80321.h (89%)
create mode 100644 arch/arm/mach-iop32x/irqs.h
rename arch/arm/mach-iop32x/{include/mach => }/n2100.h (89%)
rename arch/arm/{plat-iop => mach-iop32x}/pci.c (99%)
rename arch/arm/{plat-iop => mach-iop32x}/pmu.c (96%)
rename arch/arm/{plat-iop => mach-iop32x}/restart.c (82%)
rename arch/arm/{plat-iop => mach-iop32x}/setup.c (95%)
rename arch/arm/{plat-iop => mach-iop32x}/time.c (97%)
delete mode 100644 arch/arm/plat-iop/Makefilearch/arm/Makefile +0 -1
@@ -231,7 +231,6 @@ plat-$(CONFIG_ARCH_EXYNOS) += samsung plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_S5PV210) += samsung -plat-$(CONFIG_PLAT_IOP) += iop plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_PXA) += pxa plat-$(CONFIG_PLAT_S3C24XX) += samsung
arch/arm/mach-iop32x/Makefile +9 -1
@@ -3,7 +3,15 @@ # Makefile for the linux kernel. # -obj-y := irq.o +obj-$(CONFIG_ARCH_IOP32X) += irq.o +obj-$(CONFIG_ARCH_IOP32X) += i2c.o +obj-$(CONFIG_ARCH_IOP32X) += pci.o +obj-$(CONFIG_ARCH_IOP32X) += setup.o +obj-$(CONFIG_ARCH_IOP32X) += time.o +obj-$(CONFIG_ARCH_IOP32X) += cp6.o +obj-$(CONFIG_ARCH_IOP32X) += adma.o +obj-$(CONFIG_ARCH_IOP32X) += pmu.o +obj-$(CONFIG_ARCH_IOP32X) += restart.o obj-$(CONFIG_MACH_GLANTANK) += glantank.o obj-$(CONFIG_ARCH_IQ80321) += iq80321.o
arch/arm/mach-iop32x/adma.c renamed from arch/arm/plat-iop/adma.c +3 -1
@@ -4,10 +4,12 @@* Copyright © 2006, Intel Corporation. */ #include <linux/platform_device.h> -#include <asm/hardware/iop3xx.h> #include <linux/dma-mapping.h> #include <linux/platform_data/dma-iop32x.h> +#include "iop3xx.h" +#include "irqs.h" +#define IRQ_DMA0_EOT IRQ_IOP32X_DMA0_EOT#define IRQ_DMA0_EOC IRQ_IOP32X_DMA0_EOC#define IRQ_DMA0_ERR IRQ_IOP32X_DMA0_ERR
arch/arm/mach-iop32x/cp6.c renamed from arch/arm/plat-iop/cp6.c +0 -0
arch/arm/mach-iop32x/em7210.c +3 -2
@@ -21,7 +21,6 @@#include <linux/i2c.h> #include <linux/gpio.h> #include <linux/gpio/machine.h> -#include <mach/hardware.h> #include <linux/io.h> #include <linux/irq.h> #include <asm/mach/arch.h>
@@ -29,8 +28,10 @@#include <asm/mach/pci.h> #include <asm/mach/time.h> #include <asm/mach-types.h> -#include <mach/time.h> + +#include "hardware.h" #include "gpio-iop32x.h" +#include "irqs.h" static void __init em7210_timer_init (void ) {
arch/arm/mach-iop32x/glantank.c +3 -2
@@ -22,7 +22,6 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/gpio/machine.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -30,8 +29,10 @@#include <asm/mach/time.h> #include <asm/mach-types.h> #include <asm/page.h> -#include <mach/time.h> + +#include "hardware.h" #include "gpio-iop32x.h" +#include "irqs.h" /* * GLAN Tank timer tick configuration.
arch/arm/mach-iop32x/glantank.h renamed from arch/arm/mach-iop32x/include/mach/glantank.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* arch/arm/mach-iop32x/include/mach/glantank.h -* * IO-Data GLAN Tank board registers */
arch/arm/mach-iop32x/hardware.h renamed from arch/arm/mach-iop32x/include/mach/hardware.h +1 -5
@@ -1,8 +1,4 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* -* arch/arm/mach-iop32x/include/mach/hardware.h -*/ -#ifndef __HARDWARE_H#define __HARDWARE_H
@@ -28,7 +24,7 @@ void iop32x_init_irq(void);/* * Generic chipset bits */ -#include "iop32x.h" +#include "iop3xx.h" /* * Board specific bits
arch/arm/mach-iop32x/i2c.c renamed from arch/arm/plat-iop/i2c.c +4 -2
@@ -22,10 +22,12 @@#include <asm/mach/map.h> #include <asm/setup.h> #include <asm/memory.h> -#include <mach/hardware.h> -#include <asm/hardware/iop3xx.h> #include <asm/mach/arch.h> +#include "hardware.h" +#include "iop3xx.h" +#include "irqs.h" +/* * Each of the I2C busses have corresponding GPIO lines, and the driver * need to access these directly to drive the bus low at times.
arch/arm/mach-iop32x/include/mach/entry-macro.S +0 -2
@@ -7,8 +7,6 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include <mach/iop32x.h> - .macro get_irqnr_preamble, base, tmp mrc p15, 0, \tmp, c15, c1, 0 orr \tmp, \tmp, #(1 << 6)
arch/arm/mach-iop32x/include/mach/iop32x.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* arch/arm/mach-iop32x/include/mach/iop32x.h -* -* Intel IOP32X Chip definitions -* -* Author: Rory Bolt <[email protected]> -* Copyright (C) 2002 Rory Bolt -* Copyright (C) 2004 Intel Corp. -*/ - -#ifndef __IOP32X_H -#define __IOP32X_H - -/* -* Peripherals that are shared between the iop32x and iop33x but -* located at different addresses. -*/ -#define IOP3XX_TIMER_REG (reg) (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07e0 + (reg)) - -#include <asm/hardware/iop3xx.h> - -/* ATU Parameters -* set up a 1:1 bus to physical ram relationship -* w/ physical ram on top of pci in the memory map -*/ -#define IOP32X_MAX_RAM_SIZE 0x40000000UL -#define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE -#define IOP3XX_PCI_LOWER_MEM_BA 0x80000000 - -#endif
arch/arm/mach-iop32x/include/mach/irqs.h +0 -33
@@ -9,39 +9,6 @@#ifndef __IRQS_H#define __IRQS_H -/* -* IOP80321 chipset interrupts -*/ -#define IRQ_IOP32X_DMA0_EOT 0 -#define IRQ_IOP32X_DMA0_EOC 1 -#define IRQ_IOP32X_DMA1_EOT 2 -#define IRQ_IOP32X_DMA1_EOC 3 -#define IRQ_IOP32X_AA_EOT 6 -#define IRQ_IOP32X_AA_EOC 7 -#define IRQ_IOP32X_CORE_PMON 8 -#define IRQ_IOP32X_TIMER0 9 -#define IRQ_IOP32X_TIMER1 10 -#define IRQ_IOP32X_I2C_0 11 -#define IRQ_IOP32X_I2C_1 12 -#define IRQ_IOP32X_MESSAGING 13 -#define IRQ_IOP32X_ATU_BIST 14 -#define IRQ_IOP32X_PERFMON 15 -#define IRQ_IOP32X_CORE_PMU 16 -#define IRQ_IOP32X_BIU_ERR 17 -#define IRQ_IOP32X_ATU_ERR 18 -#define IRQ_IOP32X_MCU_ERR 19 -#define IRQ_IOP32X_DMA0_ERR 20 -#define IRQ_IOP32X_DMA1_ERR 21 -#define IRQ_IOP32X_AA_ERR 23 -#define IRQ_IOP32X_MSG_ERR 24 -#define IRQ_IOP32X_SSP 25 -#define IRQ_IOP32X_XINT0 27 -#define IRQ_IOP32X_XINT1 28 -#define IRQ_IOP32X_XINT2 29 -#define IRQ_IOP32X_XINT3 30 -#define IRQ_IOP32X_HPI 31 -#define NR_IRQS 32 -#endif
arch/arm/mach-iop32x/include/mach/time.h deleted +0 -5
@@ -1,5 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _IOP32X_TIME_H_ -#define _IOP32X_TIME_H_ -#define IRQ_IOP_TIMER0 IRQ_IOP32X_TIMER0 -#endif
arch/arm/mach-iop32x/iop3xx.h renamed from arch/arm/include/asm/hardware/iop3xx.h +16 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* arch/arm/include/asm/hardware/iop3xx.h -* * Intel IOP32X and IOP33X register definitions * * Author: Rory Bolt <[email protected]>
@@ -12,6 +10,22 @@#ifndef __IOP3XX_H#define __IOP3XX_H +/* +* Peripherals that are shared between the iop32x and iop33x but +* located at different addresses. +*/ +#define IOP3XX_TIMER_REG (reg) (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07e0 + (reg)) + +#include "iop3xx.h" + +/* ATU Parameters +* set up a 1:1 bus to physical ram relationship +* w/ physical ram on top of pci in the memory map +*/ +#define IOP32X_MAX_RAM_SIZE 0x40000000UL +#define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE +#define IOP3XX_PCI_LOWER_MEM_BA 0x80000000 +/* * IOP3XX GPIO handling */
arch/arm/mach-iop32x/iq31244.c +3 -2
@@ -23,7 +23,6 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/gpio/machine.h> -#include <mach/hardware.h> #include <asm/cputype.h> #include <asm/irq.h> #include <asm/mach/arch.h>
@@ -33,7 +32,9 @@#include <asm/mach-types.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <mach/time.h> + +#include "hardware.h" +#include "irqs.h" #include "gpio-iop32x.h" /*
arch/arm/mach-iop32x/iq31244.h renamed from arch/arm/mach-iop32x/include/mach/iq31244.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* arch/arm/mach-iop32x/include/mach/iq31244.h -* * Intel IQ31244 evaluation board registers */
arch/arm/mach-iop32x/iq80321.c +3 -2
@@ -20,7 +20,6 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/gpio/machine.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -29,7 +28,9 @@#include <asm/mach-types.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <mach/time.h> + +#include "hardware.h" +#include "irqs.h" #include "gpio-iop32x.h" /*
arch/arm/mach-iop32x/iq80321.h renamed from arch/arm/mach-iop32x/include/mach/iq80321.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* arch/arm/mach-iop32x/include/mach/iq80321.h -* * Intel IQ80321 evaluation board registers */
arch/arm/mach-iop32x/irq.c +2 -1
@@ -13,9 +13,10 @@#include <linux/list.h> #include <asm/mach/irq.h> #include <asm/irq.h> -#include <mach/hardware.h> #include <asm/mach-types.h> +#include "hardware.h" +static u32 iop32x_mask;static void intctl_write (u32 val)
arch/arm/mach-iop32x/irqs.h new file +42 -0
42 lines not on this page · raw message
arch/arm/mach-iop32x/n2100.c +3 -2
@@ -28,7 +28,6 @@#include <linux/io.h> #include <linux/gpio.h> #include <linux/gpio/machine.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -37,7 +36,9 @@#include <asm/mach-types.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <mach/time.h> + +#include "hardware.h" +#include "irqs.h" #include "gpio-iop32x.h" /*
arch/arm/mach-iop32x/n2100.h renamed from arch/arm/mach-iop32x/include/mach/n2100.h +0 -2
@@ -1,7 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* arch/arm/mach-iop32x/include/mach/n2100.h -* * Thecus N2100 board registers */
arch/arm/mach-iop32x/pci.c renamed from arch/arm/plat-iop/pci.c +2 -2
@@ -17,9 +17,9 @@#include <linux/io.h> #include <asm/irq.h> #include <asm/signal.h> -#include <mach/hardware.h> #include <asm/mach/pci.h> -#include <asm/hardware/iop3xx.h> +#include "hardware.h" +#include "iop3xx.h" // #define DEBUG
arch/arm/mach-iop32x/pmu.c renamed from arch/arm/plat-iop/pmu.c +1 -1
@@ -5,7 +5,7 @@*/ #include <linux/platform_device.h> -#include <mach/irqs.h> +#include "irqs.h" static struct resource pmu_resource = { .start =IRQ_IOP32X_CORE_PMU ,
arch/arm/mach-iop32x/restart.c renamed from arch/arm/plat-iop/restart.c +2 -2
@@ -4,9 +4,9 @@* * Copyright (C) 2001 MontaVista Software, Inc. */ -#include <asm/hardware/iop3xx.h> #include <asm/system_misc.h> -#include <mach/hardware.h> +#include "hardware.h" +#include "iop3xx.h" void iop3xx_restart (enum reboot_mode mode,const char *cmd) {
arch/arm/mach-iop32x/setup.c renamed from arch/arm/plat-iop/setup.c +1 -1
@@ -10,7 +10,7 @@#include <linux/mm.h> #include <linux/init.h> #include <asm/mach/map.h> -#include <asm/hardware/iop3xx.h> +#include "iop3xx.h" /* * Standard IO mapping for all IOP3xx based systems. Note that
arch/arm/mach-iop32x/time.c renamed from arch/arm/plat-iop/time.c +4 -3
@@ -19,12 +19,13 @@#include <linux/clockchips.h> #include <linux/export.h> #include <linux/sched_clock.h> -#include <mach/hardware.h> #include <asm/irq.h> #include <linux/uaccess.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> -#include <mach/time.h> + +#include "hardware.h" +#include "irqs.h" /* * Minimum clocksource/clockevent timer range in seconds
@@ -167,7 +168,7 @@ void __init iop_init_time(unsigned long tick_rate)*/ write_tmr0 (timer_ctl & ~IOP_TMR_EN );write_tisr (1 ); -setup_irq (IRQ_IOP_TIMER0 , &iop_timer_irq); +setup_irq (IRQ_IOP32X_TIMER0 , &iop_timer_irq); iop_clockevent.cpumask =cpumask_of (0 );clockevents_config_and_register (&iop_clockevent, tick_rate,0xf ,0xfffffffe );
arch/arm/plat-iop/Makefile deleted +0 -14
@@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for the linux kernel. -# - -# IOP32X -obj-$(CONFIG_ARCH_IOP32X) += i2c.o -obj-$(CONFIG_ARCH_IOP32X) += pci.o -obj-$(CONFIG_ARCH_IOP32X) += setup.o -obj-$(CONFIG_ARCH_IOP32X) += time.o -obj-$(CONFIG_ARCH_IOP32X) += cp6.o -obj-$(CONFIG_ARCH_IOP32X) += adma.o -obj-$(CONFIG_ARCH_IOP32X) += pmu.o -obj-$(CONFIG_ARCH_IOP32X) += restart.o
Signature · 1 line
2.20.0
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
In reply to Arnd BergmannQuoted 12 lines · Arnd Bergmann
There are three families of IOP machines we support in Linux: iop32x (which includes EP80219), iop33x and iop13xx (aka IOP34x aka WP8134x).
All products we support in the kernel are based on the first of these, iop32x, the other families only ever supported the Intel reference boards but no actual machine anyone could ever buy.
While one could clearly make them all three work in a single kernel with some work, this takes the easy way out, removing the later two platforms entirely, under the assumption that there are no remaining users.
Quoted 5 lines
Earlier versions of OpenWRT and Debian both had support for iop32x but not the others, and they both dropped iop32x as well in their 2015 releases.
Signed-off-by Arnd Bergmann <[email protected]>
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
In reply to Arnd Bergmann[ add Martin (if cyrius.com address is still valid) ]
Quoted 17 lines · Arnd Bergmann
There are three families of IOP machines we support in Linux: iop32x (which includes EP80219), iop33x and iop13xx (aka IOP34x aka WP8134x).
All products we support in the kernel are based on the first of these, iop32x, the other families only ever supported the Intel reference boards but no actual machine anyone could ever buy.
While one could clearly make them all three work in a single kernel with some work, this takes the easy way out, removing the later two platforms entirely, under the assumption that there are no remaining users.
Earlier versions of OpenWRT and Debian both had support for iop32x but not the others, and they both dropped iop32x as well in their 2015 releases.
Quoted 5 lines
Signed-off-by Arnd Bergmann <[email protected]>---
I'm just guessing that iop32x is still needed, and the other two are not. If anyone disagrees with that assessment, let me know so we can come up with an alternative approach.
I'm not sure who would scream if iop32x support went away as well, but I have not followed this space in years hence copying Martin.
In any event:
Russell King - ARM Linux admin
maintainerRe: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
Quoted 26 lines · Dan Williams
[ add Martin (if cyrius.com address is still valid) ]
Quoted 17 lines · Arnd Bergmann
There are three families of IOP machines we support in Linux: iop32x (which includes EP80219), iop33x and iop13xx (aka IOP34x aka WP8134x).
All products we support in the kernel are based on the first of these, iop32x, the other families only ever supported the Intel reference boards but no actual machine anyone could ever buy.
While one could clearly make them all three work in a single kernel with some work, this takes the easy way out, removing the later two platforms entirely, under the assumption that there are no remaining users.
Earlier versions of OpenWRT and Debian both had support for iop32x but not the others, and they both dropped iop32x as well in their 2015 releases.
Quoted 5 lines
Signed-off-by Arnd Bergmann <[email protected]>---
I'm just guessing that iop32x is still needed, and the other two are not. If anyone disagrees with that assessment, let me know so we can come up with an alternative approach.
Quoted 6 lines
I'm not sure who would scream if iop32x support went away as well, but I have not followed this space in years hence copying Martin.
In any event:
Acked-by Dan Williams <[email protected]>
Those of us who have and still run Thecus N2100's, for example?
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
Quoted 28 lines · Russell King - ARM Linux admin
Quoted 26 lines · Dan Williams
[ add Martin (if cyrius.com address is still valid) ]
Quoted 22 lines · Arnd Bergmann
There are three families of IOP machines we support in Linux: iop32x (which includes EP80219), iop33x and iop13xx (aka IOP34x aka WP8134x).
All products we support in the kernel are based on the first of these, iop32x, the other families only ever supported the Intel reference boards but no actual machine anyone could ever buy.
While one could clearly make them all three work in a single kernel with some work, this takes the easy way out, removing the later two platforms entirely, under the assumption that there are no remaining users.
Earlier versions of OpenWRT and Debian both had support for iop32x but not the others, and they both dropped iop32x as well in their 2015 releases.
Signed-off-by Arnd Bergmann <[email protected]>---
I'm just guessing that iop32x is still needed, and the other two are not. If anyone disagrees with that assessment, let me know so we can come up with an alternative approach.
Quoted 8 lines
Quoted 6 lines
I'm not sure who would scream if iop32x support went away as well, but I have not followed this space in years hence copying Martin.
In any event:
Acked-by Dan Williams <[email protected]>Those of us who have and still run Thecus N2100's, for example?
Nice! Good to hear.
Martin Michlmayr
Acked-byRe: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
In reply to Dan WilliamsQuoted 4 lines · Dan Williams
Quoted 4 lines
Earlier versions of OpenWRT and Debian both had support for iop32x but not the others, and they both dropped iop32x as well in their 2015 releases.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Arnd Bergmann <[email protected]>---
I'm just guessing that iop32x is still needed, and the other two are not. If anyone disagrees with that assessment, let me know so we can come up with an alternative approach.I'm not sure who would scream if iop32x support went away as well, but I have not followed this space in years hence copying Martin.
I believe iop13xx were mostly Intel dev boards. I'm not aware of any major devices based on iop33x.
As Arnd points out, Debian used to have support for various iop32x devices. While Debian hasn't supported iop32x in a number of years, these devices are still usable and in use (RMK being a prime example).
So I think it's safe to drop iop33x/iop13xx while retaining support for iop32x.
As I was looking at my email archives, I saw an email from Peter Teichmann who was working on an iop33x based platform (around 2009) so I've copied him as well.
Quoted 3 lines
In any event:
Acked-by Dan Williams <[email protected]>
Signature · 2 lines
Martin Michlmayr https://www.cyrius.com/
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
Quoted 3 lines · Martin Michlmayr
As Arnd points out, Debian used to have support for various iop32x devices. While Debian hasn't supported iop32x in a number of years, these devices are still usable and in use (RMK being a prime example).
I suppose it could be a good idea to add support for iop32x to OpenWrt and/or OpenEmbedded, both of which support some pretty constrained systems. I am personally using these distributions to support elder ARM hardware these days.
Just my €0.01
Linus Walleij
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
Quoted 11 lines · Linus Walleij
Quoted 3 lines · Martin Michlmayr
As Arnd points out, Debian used to have support for various iop32x devices. While Debian hasn't supported iop32x in a number of years, these devices are still usable and in use (RMK being a prime example).
I suppose it could be a good idea to add support for iop32x to OpenWrt and/or OpenEmbedded, both of which support some pretty constrained systems. I am personally using these distributions to support elder ARM hardware these days.
OpenWRT also had support in the past and dropped it around the same time as Debian. The way I understand it, a couple of platforms including iop32x were moved out of the main openwrt source tree into https://github.com/openwrt/targets/ because there was little interest in keeping them running.
The idea was that any remaining users could add that feed to get minimal support, but I'm not sure if would still work. In particular, iop33x appears to be based on linux-3.3 plus three patches that are no longer needed in mainline. Building a mainline kernel without those patches may or may not work.
Arnd
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
In reply to Linus WalleijHi,
Quoted 8 lines · Linus Walleij
Quoted 3 lines · Martin Michlmayr
As Arnd points out, Debian used to have support for various iop32x devices. While Debian hasn't supported iop32x in a number of years, these devices are still usable and in use (RMK being a prime example).
I suppose it could be a good idea to add support for iop32x to OpenWrt and/or OpenEmbedded, both of which support some pretty constrained systems.
This platform is not really too constrained... E.g. on N2100 you have 512 MB RAM, SATA disks and gigabit ethernet. Not that different from mvebu that Debian currently (?) supports. Maybe with multiplatform they could support iop32x again.
A.
Russell King - ARM Linux admin
maintainerRe: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
Quoted 8 lines · Aaro Koskinen
Hi,
Quoted 5 lines · Linus Walleij
Quoted 3 lines · Martin Michlmayr
As Arnd points out, Debian used to have support for various iop32x devices. While Debian hasn't supported iop32x in a number of years, these devices are still usable and in use (RMK being a prime example).
Quoted 8 lines
Quoted 3 lines
I suppose it could be a good idea to add support for iop32x to OpenWrt and/or OpenEmbedded, both of which support some pretty constrained systems.
This platform is not really too constrained... E.g. on N2100 you have 512 MB RAM, SATA disks and gigabit ethernet. Not that different from mvebu that Debian currently (?) supports. Maybe with multiplatform they could support iop32x again.
Probably not. The kernel has a dividing line between ARMv5 and ARMv6 where it's not possible to multiplatform across that boundary, so you're already needing separate kernel images there.
Secondly, armhf distros won't be compatible with ARMv5, and to make them compatible will make performance on armhf suffer - you have to stop using barriers, exclusive load/store and a few other things. You have to rely on the kuser page exported by the kernel (which is now optional as it's deemed to be a security issue for ROP attacks) for some things that such a userspace requires - such as NPTL support.
Effectively, ARMv5 is an entirely separate userspace distro from armhf.
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Re: [PATCH 1/7] [RFC] ARM: remove Intel iop33x and iop13xx support
Hi,
Quoted 20 lines · Russell King - ARM Linux admin
Quoted 6 lines · Aaro Koskinen
Quoted 5 lines · Linus Walleij
Quoted 3 lines · Martin Michlmayr
As Arnd points out, Debian used to have support for various iop32x devices. While Debian hasn't supported iop32x in a number of years, these devices are still usable and in use (RMK being a prime example).
Quoted 8 lines
Quoted 3 lines
I suppose it could be a good idea to add support for iop32x to OpenWrt and/or OpenEmbedded, both of which support some pretty constrained systems.
This platform is not really too constrained... E.g. on N2100 you have 512 MB RAM, SATA disks and gigabit ethernet. Not that different from mvebu that Debian currently (?) supports. Maybe with multiplatform they could support iop32x again.
Probably not. The kernel has a dividing line between ARMv5 and ARMv6 where it's not possible to multiplatform across that boundary, so you're already needing separate kernel images there.
Quoted 8 lines
Secondly, armhf distros won't be compatible with ARMv5, and to make them compatible will make performance on armhf suffer - you have to stop using barriers, exclusive load/store and a few other things. You have to rely on the kuser page exported by the kernel (which is now optional as it's deemed to be a security issue for ROP attacks) for some things that such a userspace requires - such as NPTL support.
Effectively, ARMv5 is an entirely separate userspace distro from armhf.
I thought they still had armel for ARMv5 and mvebu (kirkwood).
A.
Quoted 14 lines · Arnd Bergmann
I'm looking into converting some of the remaining ARMv5 platforms in
arch/arm/to work together in a single kernel binary.IOP32x seems to be a fairly easy target for multiplatform by itself, but the way the plat-iop code interacts with three generations of the code, and how the dma-adma driver is configured at compile-time for each version gets in the way.
I considered adding more indirection layers for those two, but removing iop33x and iop13xx is much easier in comparison, so this is the first approach I'm posting.
Quoted 8 lines
If we conclude that iop33x and iop13xx are indeed not used any more, the remaining patches in this series are straightforward. The actual multiplatform conversion also requires changes to the irqchip driver that are not completely mechanic, and we can discuss those after deciding what to do with the first set.
Adding a few people to Cc that historically worked on IOP.
I haven't worked with any of these platforms for many years now, and I can't really say much about their current use.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Arnd Bergmann
AppliedQuoted 15 lines · Arnd Bergmann
I'm looking into converting some of the remaining ARMv5 platforms in
arch/arm/to work together in a single kernel binary.IOP32x seems to be a fairly easy target for multiplatform by itself, but the way the plat-iop code interacts with three generations of the code, and how the dma-adma driver is configured at compile-time for each version gets in the way.
I considered adding more indirection layers for those two, but removing iop33x and iop13xx is much easier in comparison, so this is the first approach I'm posting.
Quoted 8 lines
If we conclude that iop33x and iop13xx are indeed not used any more, the remaining patches in this series are straightforward. The actual multiplatform conversion also requires changes to the irqchip driver that are not completely mechanic, and we can discuss those after deciding what to do with the first set.
Adding a few people to Cc that historically worked on IOP.
I applied the IOP series to to the arm/soc branch now, thanks for the reviews!
Arnd
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel