Introduce a Marvell EBU MBus driver
Subsystems (5)
PATCH v2 1/1 Introduce a Marvell EBU MBus driver
Hello,
As part of the work to write a DT-powered PCIe driver for Marvell SoCs that sits in drivers/pci/host/, it appeared that including <mach/addr-map.h> from the PCIe driver to get access to address decoding windows functions was not acceptable.
In order to fix this problem, this patch set introduces a driver for the Marvell EBU MBus driver in drivers/bus/mvebu-mbus.c. It consolidates into a single driver the address decoding code that was spread in mach-{mvebu,kirkwood,orion5x,mv78xx0,dove}/addr-map.c and plat-orion/addr-map.c. The driver provides two APIs:
* A mv_mbus_dram_info() that is used by many Marvell device drivers throughout the tree to get the list of DRAM address decoding windows they have to set up. This API was previously implemented in plat-orion/addr-map.c and is kept unchanged in order to not change the drivers.
* mvebu_mbus_add_window() / mvebu_mbus_del_window() functions to add and remove address decoding windows for a given device. Those functions have to be called either from the platform code, or from device drivers.
The driver can be probed either using Device Tree informations, or using a legacy mvbus_mbus_init() function call. This allows us to migrate the five families of Marvell EBU SoCs to use this driver.
Note that this driver is only a consolidation, and that further improvements to the address decoding handling could be done in the future (dynamically allocating the physical range using request_resource(), describing some of the static windows in DT, etc.). We intentionally do not want those improvements to be done right now, in order to keep the amount of changes reasonable. The driver as it is is sufficient to cover the existing needs, and the needs of the upcoming PCIe driver and Device Bus driver.
Summary of the patch set:
* Patch 1 makes the compilation of plat-orion/addr-map.c conditional on a per-SoC family basis. This allows patches 5 to 9 to progressively move each SoC family to use the mvebu-mbus driver instead of the mach-<foo>/addr-map.c + plat-orion/addr-map.c code. Notice that the plat-orion/addr-map.c code cannot be compiled in a kernel that has the mvebu-mbus, due to the namespace conflict on the mv_mbus_dram_info() function.
* Patch 2 and 3 ensures that all places that need to have access to the list of DRAM address decoding windows do so by using the public mv_mbus_dram_info() rather than directly accessing an internal structure.
* Patch 4 introduces the mvebu-mbus driver itself, with the support for all 5 Marvell EBU SoC families. Note that the driver is compiled through a blind option, because we don't want the driver to be compiled in unless the corresponding sub-architecture has been migrated to use it: as explained above, compiling the driver conflicts with compiling the plat-orion/addr-map.c code.
* Patch 5 to 9 moves each Marvell EBU sub-architecture to use the mvebu-mbus driver.
* Patch 10 removes the now unused plat-orion/addr-map.c code.
Changes since v1:
* Fix the compatible string used in armada-370.dtsi: it was incorrectly using marvell,armadaxp-mbus instead of marvell,armada370-mbus.
* Fix the reg = <...> property for Kirkwood and Dove, the address for the devices address decoding windows was not correct.
* Fix a 'git rebase -i' mistake that lead to have some code that should have been in PATCH 4 (the driver code) into PATCH 5 (switching mach-mvebu to use the driver).
* Fix the Device Tree documentation of the driver, which was giving a wrong address.
* And since I didn't want to do a v2 just to fix my stupid mistakes, I also added a big comment at the beginning of the driver's code that explains what the driver is doing.
The code has been tested on Armada 370 and Armada XP platforms (by me), on Kirkwood DT and non-DT platforms (by Andrew Lunn), on Dove DT platforms (by Sebastian Hesselbarth) and on Orion5x non-DT platforms (by me).
The code applies on top of the marvell-3.9-fixes-tag I have sent at
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-March/152999.html. For easier testing, I've pushed a branch at:
https://github.com/MISL-EBU-System-SW/mainline-public/commits/marvell-mvebu-mbus-v1
Since other drivers will depend on this one, I'd appreciate if this code could be merged early in the 3.10 cycle.
Thanks for your reviews,
Thomas
Thomas Petazzoni (10):
arm: plat-orion: only build addr-map.c when needed
arm: plat-orion: use mv_mbus_dram_info() in PCIe code
arm: mach-orion5x: use mv_mbus_dram_info() in PCI code
bus: introduce an Marvell EBU MBus driver
arm: mach-mvebu: convert to use mvebu-mbus driver
arm: mach-kirkwood: convert to use mvebu-mbus driver
arm: mach-dove: convert to use mvebu-mbus driver
arm: mach-orion5x: convert to use mvebu-mbus driver
arm: mach-mv78xx0: convert to use the mvebu-mbus driver
arm: plat-orion: remove addr-map code
.../devicetree/bindings/arm/mvebu-mbus.txt | 39 + arch/arm/Kconfig | 4 + arch/arm/boot/dts/armada-370-xp.dtsi | 5 - arch/arm/boot/dts/armada-370.dtsi | 3 + arch/arm/boot/dts/armada-xp.dtsi | 3 + arch/arm/boot/dts/dove.dtsi | 3 +- arch/arm/boot/dts/kirkwood.dtsi | 3 +- arch/arm/boot/dts/orion5x-88f5182.dtsi | 19 + .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- arch/arm/mach-dove/Makefile | 2 +- arch/arm/mach-dove/addr-map.c | 125 --- arch/arm/mach-dove/board-dt.c | 13 +- arch/arm/mach-dove/common.c | 39 +- arch/arm/mach-dove/common.h | 2 +- arch/arm/mach-dove/include/mach/dove.h | 5 + arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/addr-map.c | 91 -- arch/arm/mach-kirkwood/board-dt.c | 19 +- arch/arm/mach-kirkwood/common.c | 38 +- arch/arm/mach-kirkwood/common.h | 2 +- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +- arch/arm/mach-kirkwood/pcie.c | 1 - arch/arm/mach-mv78xx0/Makefile | 2 +- arch/arm/mach-mv78xx0/addr-map.c | 93 -- arch/arm/mach-mv78xx0/common.c | 10 +- arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 8 +- arch/arm/mach-mv78xx0/pcie.c | 21 +- arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/addr-map.c | 137 --- arch/arm/mach-mvebu/armada-370-xp.c | 2 + arch/arm/mach-mvebu/platsmp.c | 2 + arch/arm/mach-orion5x/Makefile | 2 +- arch/arm/mach-orion5x/addr-map.c | 155 ---- arch/arm/mach-orion5x/board-dt.c | 24 +- arch/arm/mach-orion5x/common.c | 49 +- arch/arm/mach-orion5x/common.h | 13 +- arch/arm/mach-orion5x/d2net-setup.c | 4 +- arch/arm/mach-orion5x/db88f5281-setup.c | 13 +- arch/arm/mach-orion5x/dns323-setup.c | 3 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +- arch/arm/mach-orion5x/ls-chl-setup.c | 4 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +- arch/arm/mach-orion5x/lsmini-setup.c | 4 +- arch/arm/mach-orion5x/mss2-setup.c | 3 +- arch/arm/mach-orion5x/mv2120-setup.c | 3 +- arch/arm/mach-orion5x/net2big-setup.c | 4 +- arch/arm/mach-orion5x/pci.c | 14 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +- arch/arm/mach-orion5x/ts209-setup.c | 4 +- arch/arm/mach-orion5x/ts409-setup.c | 4 +- arch/arm/mach-orion5x/wnr854t-setup.c | 4 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +- arch/arm/plat-orion/Makefile | 2 - arch/arm/plat-orion/addr-map.c | 178 ---- arch/arm/plat-orion/pcie.c | 10 +- drivers/bus/Kconfig | 7 + drivers/bus/Makefile | 1 + drivers/bus/mvebu-mbus.c | 906 ++++++++++++++++++++ include/linux/mbus.h | 28 +- 65 files changed, 1302 insertions(+), 887 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mvebu-mbus.txt create mode 100644 arch/arm/boot/dts/orion5x-88f5182.dtsi delete mode 100644 arch/arm/mach-dove/addr-map.c delete mode 100644 arch/arm/mach-kirkwood/addr-map.c delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c delete mode 100644 arch/arm/mach-mvebu/addr-map.c delete mode 100644 arch/arm/mach-orion5x/addr-map.c delete mode 100644 arch/arm/plat-orion/addr-map.c create mode 100644 drivers/bus/mvebu-mbus.c
Signature · 1 line
1.7.9.5
PATCH 1/10 arm: plat-orion: only build addr-map.c when needed
For now, addr-map.c is needed by all 5 Marvell EBU sub-architectures. However, we are going to introduce the orion-mbus driver, which will replace the address decoding code from addr-map.c. In order to ease the migration process, we will do that one sub-architecture at a time, which will require us to remove the compilation of addr-map.c one sub-architecture at a time.
Therefore, we split the unconditional obj-y inclusion of addr-map.c into 5 conditionals obj-$(CONFIG_...) lines, one per sub-architecture.
--- arch/arm/plat-orion/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/plat-orion/Makefile +5 -1
@@ -3,7 +3,11 @@ # ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-y += addr-map.o +obj-$(CONFIG_ARCH_MVEBU) += addr-map.o +obj-$(CONFIG_ARCH_KIRKWOOD) += addr-map.o +obj-$(CONFIG_ARCH_DOVE) += addr-map.o +obj-$(CONFIG_ARCH_ORION5X) += addr-map.o +obj-$(CONFIG_ARCH_MV78XX0) += addr-map.o orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o
Signature · 1 line
1.7.9.5
PATCH 2/10 arm: plat-orion: use mv_mbus_dram_info() in PCIe code
In reply to Thomas PetazzoniThe PCIe code was directly accessing the orion_mbus_dram_info structure to get access to a description of the SDRAM chip selects in order to configure the PCIe -> SDRAM address decoding windows.
However, with the introduction of the orion-mbus driver, we are going to remove this global structure and instead leave only the exported mv_mbus_dram_info() function to access this description of the SDRAM chip selects. Therefore, we simply switch to using this API.
--- arch/arm/plat-orion/pcie.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm/plat-orion/pcie.c +6 -4
@@ -120,12 +120,14 @@ void __init orion_pcie_reset(void __iomem *base)* BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks * WIN[0-3] -> DRAM bank[0-3] */ -static void __init orion_pcie_setup_wins (void __iomem *base, -struct mbus_dram_target_info *dram) +static void __init orion_pcie_setup_wins (void __iomem *base) { +const struct mbus_dram_target_info *dram;u32 size;int i; + dram =mv_mbus_dram_info (); +/* * First, disable and clear BARs and windows. */
@@ -150,7 +152,7 @@ static void __init orion_pcie_setup_wins(void __iomem *base,*/ size =0 ;for (i =0 ; i < dram->num_cs; i++) { -struct mbus_dram_window *cs = dram->cs + i; +const struct mbus_dram_window *cs = dram->cs + i;writel (cs->base &0xffff0000 , base +PCIE_WIN04_BASE_OFF (i));writel (0 , base +PCIE_WIN04_REMAP_OFF (i));
@@ -184,7 +186,7 @@ void __init orion_pcie_setup(void __iomem *base)/* * Point PCIe unit MBUS decode windows to DRAM space. */ -orion_pcie_setup_wins (base, &orion_mbus_dram_info); +orion_pcie_setup_wins (base);/* * Master + slave enable.
Signature · 1 line
1.7.9.5
PATCH 3/10 arm: mach-orion5x: use mv_mbus_dram_info() in PCI code
In reply to Thomas PetazzoniThe PCI code was directly accessing the orion_mbus_dram_info structure to get access to a description of the SDRAM chip selects in order to configure the PCIe -> SDRAM address decoding windows.
However, with the introduction of the mvebu-mbus driver, we are going to remove this global structure and instead leave only the exported mv_mbus_dram_info() function to access this description of the SDRAM chip selects. Therefore, we simply switch to using this API.
--- arch/arm/mach-orion5x/pci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-orion5x/pci.c +4 -3
@@ -402,8 +402,9 @@ static void __init orion5x_pci_master_slave_enable(void)orion5x_pci_hw_wr_conf (bus_nr,0 , func, reg,4 , val |0x7 ); } -static void __init orion5x_setup_pci_wins (struct mbus_dram_target_info *dram) +static void __init orion5x_setup_pci_wins (void ) { +const struct mbus_dram_target_info *dram =mv_mbus_dram_info ();u32 win_enable;int bus;int i;
@@ -420,7 +421,7 @@ static void __init orion5x_setup_pci_wins(struct mbus_dram_target_info *dram) bus =orion5x_pci_local_bus_nr ();for (i =0 ; i < dram->num_cs; i++) { -struct mbus_dram_window *cs = dram->cs + i; +const struct mbus_dram_window *cs = dram->cs + i;u32 func =PCI_CONF_FUNC_BAR_CS (cs->cs_index);u32 reg;u32 val;
@@ -467,7 +468,7 @@ static int __init pci_setup(struct pci_sys_data *sys)/* * Point PCI unit MBUS decode windows to DRAM space. */ -orion5x_setup_pci_wins (&orion_mbus_dram_info); +orion5x_setup_pci_wins ();/* * Master + Slave enable
Signature · 1 line
1.7.9.5
PATCH 4/10 bus: introduce an Marvell EBU MBus driver
In reply to Thomas PetazzoniThe Marvell EBU SoCs have a configurable physical address space
layout: the physical ranges of memory used to address PCI(e) interfaces, NOR flashes, SRAM and various other types of memory are configurable by software, through a mechanism of so-called 'address decoding windows'.
This new driver mvebu-mbus consolidates the existing code to address the configuration of these memory ranges, which is spread into mach-mvebu, mach-orion5x, mach-mv78xx0, mach-dove and mach-kirkwood.
Following patches convert each Marvell EBU SoC family to use this driver, therefore removing the old code that was configuring the address decoding windows.
It is worth mentioning that the MVEBU_MBUS Kconfig option is intentionally added as a blind option. The new driver implements and exports the mv_mbus_dram_info() function, which is used by various Marvell drivers throughout the tree to get access to window configuration parameters that they require. This function is also implemented in arch/arm/plat-orion/addr-map.c, which ultimately gets removed at the end of this patch series. So, in order to preserve bisectability, we want to ensure that *either* this new driver, *or* the legacy code in plat-orion/addr-map.c gets compiled in.
By making MVEBU_MBUS a blind option, we are sure that only a platform that does 'select MVEBU_MBUS' will get this new driver compiled in. Therefore, throughout the next patches that convert the Marvell sub-architectures one after the other to this new driver, we add the 'select MVEBU_MBUS' and also ensure to remove plat-orion/addr-map.c from the build for this specific sub-architecture. This ensures that bisectability is preserved.
--- .../devicetree/bindings/arm/mvebu-mbus.txt | 39 + drivers/bus/Kconfig | 7 + drivers/bus/Makefile | 1 + drivers/bus/mvebu-mbus.c | 906 ++++++++++++++++++++ include/linux/mbus.h | 25 +- 5 files changed, 977 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/arm/mvebu-mbus.txt create mode 100644 drivers/bus/mvebu-mbus.c
Documentation/devicetree/bindings/arm/mvebu-mbus.txt new file +39 -0
@@ -0,0 +1,39 @@ +MVEBU MBUS driver +----------------- + +This is the Device Tree binding documentation for the mvebu-mbus +driver, that takes care of configuration the CPU-side address decoding +windows that allows to access the SDRAM and the devices. This driver +is used on all Marvell EBU SoCs (Armada 370/XP, Dove, Kirkwood, +Orion5x and MV78xx0). + +Required properties: + +- compatible: one of: + - marvell,armada370-mbus + - marvell,armadaxp-mbus + - marvell,kirkwood-mbus + - marvell,dove-mbus + - marvell,orion5x-88f5281-mbus + - marvell,orion5x-88f5182-mbus + - marvell,orion5x-88f5181-mbus + - marvell,orion5x-88f6183-mbus + - marvell,mv78xx0-mbus + +- reg: should contain two sets of register ranges. + - first range describing the registers used to configure the MBus + address decoding windows. + - second range describing the registers used to configure the SDRAM + address decoding windows. + +Example: + + soc at f1000000 { + compatible = "marvell,dove-mbus", "simple-bus"; + reg = <0xf1020000 0x80>, <0xf1800100 0x8>; + #address-cells = <1>; + #size-cells = <1>; + + [... devices on mbus ...] + + };
drivers/bus/Kconfig +7 -0
@@ -4,6 +4,13 @@ menu "Bus devices" +config MVEBU_MBUS + bool + depends on PLAT_ORION + help + Driver needed for the MBus configuration on Marvell EBU SoCs + (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP). + config OMAP_OCP2SCP tristate "OMAP OCP2SCP DRIVER" depends on ARCH_OMAP2PLUS
drivers/bus/Makefile +1 -0
@@ -2,6 +2,7 @@ # Makefile for the bus drivers. # +obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o # Interconnect bus driver for OMAP SoCs.
drivers/bus/mvebu-mbus.c new file +906 -0
906 lines not on this page · raw message
include/linux/mbus.h +24 -1
@@ -32,6 +32,17 @@ struct mbus_dram_target_info } cs[4 ]; }; +/* Flags for PCI/PCIe address decoding regions */ +#define MVEBU_MBUS_PCI_IO 0x1 +#define MVEBU_MBUS_PCI_MEM 0x2 +#define MVEBU_MBUS_PCI_WA 0x3 + +/* +* Magic value that explicits that we don't need a remapping-capable +* address decoding window. +*/ +#define MVEBU_MBUS_NO_REMAP (0xffffffff) +/* * The Marvell mbus is to be found only on SOCs from the Orion family * at the moment. Provide a dummy stub for other architectures.
@@ -44,4 +55,16 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info(void)return NULL ; }#endif -#endif + +int mvebu_mbus_add_window_remap_flags (const char *devname,phys_addr_t base, +size_t size,phys_addr_t remap, +unsigned int flags); +int mvebu_mbus_add_window (const char *devname,phys_addr_t base, +size_t size); +int mvebu_mbus_del_window (phys_addr_t base,size_t size); +int mvebu_mbus_init (const char *soc,phys_addr_t mbus_phys_base, +size_t mbus_size,phys_addr_t sdram_phys_base, +size_t sdram_size); +int mvebu_mbus_dt_init (void ); + +#endif /* __LINUX_MBUS_H */
Signature · 1 line
1.7.9.5
PATCH 5/10 arm: mach-mvebu: convert to use mvebu-mbus driver
In reply to Thomas PetazzoniThe changes needed to migrate the mach-mvebu (Armada 370 and Armada XP) to the mvebu-mbus driver are fairly minimal, since not many devices currently supported on those SoCs use address decoding windows. The only one being the BootROM window, used to bring up secondary CPUs.
However, this BootROM window needed for SMP brings an important
requirement: the mvebu-mbus driver must be initialized at the ->early_init() time, otherwise the BootROM window cannot be setup early enough to be ready before the secondary CPUs are started.
--- arch/arm/boot/dts/armada-370-xp.dtsi | 5 -- arch/arm/boot/dts/armada-370.dtsi | 3 + arch/arm/boot/dts/armada-xp.dtsi | 3 + arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/addr-map.c | 137 ---------------------------------- arch/arm/mach-mvebu/armada-370-xp.c | 2 + arch/arm/mach-mvebu/platsmp.c | 2 + arch/arm/plat-orion/Makefile | 1 - 9 files changed, 12 insertions(+), 144 deletions(-) delete mode 100644 arch/arm/mach-mvebu/addr-map.c
arch/arm/boot/dts/armada-370-xp.dtsi +0 -5
@@ -73,11 +73,6 @@ clocks = <&coreclk 2>; }; - addr-decoding at d0020000 { - compatible = "marvell,armada-addr-decoding-controller"; - reg = <0xd0020000 0x258>; - }; - sata at d00a0000 { compatible = "marvell,orion-sata"; reg = <0xd00a0000 0x2400>;
arch/arm/boot/dts/armada-370.dtsi +3 -0
@@ -39,6 +39,9 @@ }; soc { + compatible = "marvell,armada370-mbus", "simple-bus"; + reg = <0xd0020000 0x100>, <0xd0020180 0x20>; + system-controller at d0018200 { compatible = "marvell,armada-370-xp-system-controller"; reg = <0xd0018200 0x100>;
arch/arm/boot/dts/armada-xp.dtsi +3 -0
@@ -41,6 +41,9 @@ }; soc { + compatible = "marvell,armadaxp-mbus", "simple-bus"; + reg = <0xd0020000 0x100>, <0xd0020180 0x20>; + serial at d0012200 { compatible = "snps,dw-apb-uart"; reg = <0xd0012200 0x100>;
arch/arm/mach-mvebu/Kconfig +1 -0
@@ -13,6 +13,7 @@ config ARCH_MVEBU select MVEBU_CLK_CORE select MVEBU_CLK_CPU select MVEBU_CLK_GATING + select MVEBU_MBUS if ARCH_MVEBU
arch/arm/mach-mvebu/Makefile +1 -1
@@ -5,6 +5,6 @@ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a obj-y += system-controller.o obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o -obj-$(CONFIG_ARCH_MVEBU) += addr-map.o coherency.o coherency_ll.o pmsu.o irq-armada-370-xp.o +obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o irq-armada-370-xp.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
arch/arm/mach-mvebu/addr-map.c deleted +0 -137
137 lines not on this page · raw message
arch/arm/mach-mvebu/armada-370-xp.c +2 -0
@@ -19,6 +19,7 @@#include <linux/time-armada-370-xp.h> #include <linux/clk/mvebu.h> #include <linux/dma-mapping.h> +#include <linux/mbus.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/time.h>
@@ -54,6 +55,7 @@ void __init armada_370_xp_init_early(void)* to make sure such the allocations won't fail. */ init_dma_coherent_pool_size (SZ_1M ); +mvebu_mbus_dt_init (); }static void __init armada_370_xp_dt_init (void )
arch/arm/mach-mvebu/platsmp.c +2 -0
@@ -21,6 +21,7 @@#include <linux/smp.h> #include <linux/clk.h> #include <linux/of.h> +#include <linux/mbus.h> #include <asm/cacheflush.h> #include <asm/smp_plat.h> #include "common.h"
@@ -109,6 +110,7 @@ void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)set_secondary_cpus_clock ();flush_cache_all ();set_cpu_coherent (cpu_logical_map (smp_processor_id ()),0 ); +mvebu_mbus_add_window ("bootrom" ,0xfff00000 ,SZ_1M ); }struct smp_operations armada_xp_smp_ops__initdata = {
arch/arm/plat-orion/Makefile +0 -1
@@ -3,7 +3,6 @@ # ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-$(CONFIG_ARCH_MVEBU) += addr-map.o obj-$(CONFIG_ARCH_KIRKWOOD) += addr-map.o obj-$(CONFIG_ARCH_DOVE) += addr-map.o obj-$(CONFIG_ARCH_ORION5X) += addr-map.o
Signature · 1 line
1.7.9.5
PATCH 6/10 arm: mach-kirkwood: convert to use mvebu-mbus driver
In reply to Thomas PetazzoniThis commit migrates the mach-kirkwood platforms to use the mvebu-mbus driver and therefore removes the Kirkwood-specific addr-map code.
In order to do this, we have to introduce a separate kirkwood_dt_init_early() function. It continues to be quite similar to kirkwood_init_early(), except that it does a DT-based initialization of the mvebu-mbus driver. On the other hand, the kirkwood_init_early() function does a legacy initialization of the mvebu-mbus driver (which will be removed once all boards have been migrated to the Device Tree).
The address decoding windows are now registered in the kirkwood_setup_wins() function. It is worth noting that the four PCIe address decoding windows will ultimately no longer have to be registered here: it will be done automatically by the PCIe driver once Kirkwood has been migrated to use the upcoming mvebu PCIe driver.
--- arch/arm/Kconfig | 1 + arch/arm/boot/dts/kirkwood.dtsi | 3 +- arch/arm/mach-kirkwood/Makefile | 2 +- arch/arm/mach-kirkwood/addr-map.c | 91 ------------------------ arch/arm/mach-kirkwood/board-dt.c | 19 ++++- arch/arm/mach-kirkwood/common.c | 38 +++++++++- arch/arm/mach-kirkwood/common.h | 2 +- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 7 +- arch/arm/mach-kirkwood/pcie.c | 1 - arch/arm/plat-orion/Makefile | 1 - 10 files changed, 63 insertions(+), 102 deletions(-) delete mode 100644 arch/arm/mach-kirkwood/addr-map.c
arch/arm/Kconfig +1 -0
@@ -577,6 +577,7 @@ config ARCH_KIRKWOOD select PINCTRL select PINCTRL_KIRKWOOD select PLAT_ORION_LEGACY + select MVEBU_MBUS help Support for the following Marvell Kirkwood series SoCs: 88F6180, 88F6192 and 88F6281.
arch/arm/boot/dts/kirkwood.dtsi +2 -1
@@ -17,7 +17,8 @@ }; ocp at f1000000 { - compatible = "simple-bus"; + compatible = "marvell,kirkwood-mbus", "simple-bus"; + reg = <0xf1020000 0x80>, <0xf1001500 0x20>; ranges = <0x00000000 0xf1000000 0x4000000 0xf5000000 0xf5000000 0x0000400>; #address-cells = <1>;
arch/arm/mach-kirkwood/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-y += common.o addr-map.o irq.o pcie.o mpp.o +obj-y += common.o irq.o pcie.o mpp.o obj-$(CONFIG_MACH_DB88F6281_BP) += db88f6281-bp-setup.o obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o
arch/arm/mach-kirkwood/addr-map.c deleted +0 -91
91 lines not on this page · raw message
arch/arm/mach-kirkwood/board-dt.c +17 -2
@@ -17,12 +17,14 @@#include <linux/clk-provider.h> #include <linux/clk/mvebu.h> #include <linux/kexec.h> +#include <linux/dma-mapping.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <mach/bridge-regs.h> #include <linux/platform_data/usb-ehci-orion.h> #include <plat/irq.h> #include <plat/common.h> +#include <plat/time.h> #include "common.h" static struct of_device_id kirkwood_dt_match_table[]__initdata = {
@@ -70,6 +72,19 @@ static void __init kirkwood_of_clk_init(void)kirkwood_legacy_clk_init (); } +static void __init kirkwood_dt_init_early (void ) +{ +orion_time_set_base (TIMER_VIRT_BASE ); + +/* +* Some Kirkwood devices allocate their coherent buffers from atomic +* context. Increase size of atomic coherent pool to make sure such +* the allocations won't fail. +*/ +init_dma_coherent_pool_size (SZ_1M ); +mvebu_mbus_dt_init (); +} +static void __init kirkwood_dt_init (void ) {pr_info ("Kirkwood: %s, TCLK=%d.\n" ,kirkwood_id (), kirkwood_tclk);
@@ -82,7 +97,7 @@ static void __init kirkwood_dt_init(void)*/ writel (readl (CPU_CONFIG ) & ~CPU_CONFIG_ERROR_PROP ,CPU_CONFIG ); -kirkwood_setup_cpu_mbus (); +kirkwood_setup_wins ();kirkwood_l2_init ();
@@ -175,7 +190,7 @@ static const char * const kirkwood_dt_board_compat[] = {DT_MACHINE_START (KIRKWOOD_DT ,"Marvell Kirkwood (Flattened Device Tree)" )/* Maintainer: Jason Cooper <[email protected]> */ .map_io = kirkwood_map_io, - .init_early = kirkwood_init_early, + .init_early = kirkwood_dt_init_early, .init_irq = orion_dt_init_irq, .init_time = kirkwood_timer_init, .init_machine = kirkwood_dt_init,
arch/arm/mach-kirkwood/common.c +36 -2
@@ -33,7 +33,6 @@#include <linux/platform_data/usb-ehci-orion.h> #include <plat/common.h> #include <plat/time.h> -#include <plat/addr-map.h> #include <linux/platform_data/dma-mv_xor.h> #include "common.h"
@@ -535,6 +534,9 @@ void __init kirkwood_init_early(void)* the allocations won't fail. */ init_dma_coherent_pool_size (SZ_1M ); +mvebu_mbus_init ("marvell,kirkwood-mbus" , +BRIDGE_WINS_BASE ,BRIDGE_WINS_SZ , +DDR_WINDOW_CPU_BASE ,DDR_WINDOW_CPU_SZ ); }int kirkwood_tclk;
@@ -650,6 +652,38 @@ char * __init kirkwood_id(void) } } +void __init kirkwood_setup_wins (void ) +{ +/* +* The PCIe windows will no longer be statically allocated +* here once Kirkwood is migrated to the pci-mvebu driver. +*/ +mvebu_mbus_add_window_remap_flags ("pcie0.0" , +KIRKWOOD_PCIE_IO_PHYS_BASE , +KIRKWOOD_PCIE_IO_SIZE , +KIRKWOOD_PCIE_IO_BUS_BASE , +MVEBU_MBUS_PCI_IO ); +mvebu_mbus_add_window_remap_flags ("pcie0.0" , +KIRKWOOD_PCIE_MEM_PHYS_BASE , +KIRKWOOD_PCIE_MEM_SIZE , +MVEBU_MBUS_NO_REMAP , +MVEBU_MBUS_PCI_MEM ); +mvebu_mbus_add_window_remap_flags ("pcie1.0" , +KIRKWOOD_PCIE1_IO_PHYS_BASE , +KIRKWOOD_PCIE1_IO_SIZE , +KIRKWOOD_PCIE1_IO_BUS_BASE , +MVEBU_MBUS_PCI_IO ); +mvebu_mbus_add_window_remap_flags ("pcie1.0" , +KIRKWOOD_PCIE1_MEM_PHYS_BASE , +KIRKWOOD_PCIE1_MEM_SIZE , +MVEBU_MBUS_NO_REMAP , +MVEBU_MBUS_PCI_MEM ); +mvebu_mbus_add_window ("nand" ,KIRKWOOD_NAND_MEM_PHYS_BASE , +KIRKWOOD_NAND_MEM_SIZE ); +mvebu_mbus_add_window ("sram" ,KIRKWOOD_SRAM_PHYS_BASE , +KIRKWOOD_SRAM_SIZE ); +} +void __init kirkwood_l2_init (void ) {#ifdef CONFIG_CACHE_FEROCEON_L2
@@ -675,7 +709,7 @@ void __init kirkwood_init(void)*/ writel (readl (CPU_CONFIG ) & ~CPU_CONFIG_ERROR_PROP ,CPU_CONFIG ); -kirkwood_setup_cpu_mbus (); +kirkwood_setup_wins ();kirkwood_l2_init ();
arch/arm/mach-kirkwood/common.h +1 -1
@@ -30,7 +30,7 @@ void kirkwood_init(void);void kirkwood_init_early (void );void kirkwood_init_irq (void ); -void kirkwood_setup_cpu_mbus (void ); +void kirkwood_setup_wins (void );void kirkwood_enable_pcie (void );void kirkwood_pcie_id (u32 *dev,u32 *rev);
arch/arm/mach-kirkwood/include/mach/kirkwood.h +5 -2
@@ -60,8 +60,9 @@* Register Map */ #define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE + 0x00000) -#define DDR_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x00000) -#define DDR_WINDOW_CPU_BASE (DDR_VIRT_BASE + 0x1500) +#define DDR_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x00000) +#define DDR_WINDOW_CPU_BASE (DDR_PHYS_BASE + 0x1500) +#define DDR_WINDOW_CPU_SZ (0x20)#define DDR_OPERATION_BASE (DDR_PHYS_BASE + 0x1418)#define DEV_BUS_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x10000)
@@ -80,6 +81,8 @@#define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE + 0x20000)#define BRIDGE_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x20000) +#define BRIDGE_WINS_BASE (BRIDGE_PHYS_BASE) +#define BRIDGE_WINS_SZ (0x80)#define CRYPTO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE + 0x30000)
arch/arm/mach-kirkwood/pcie.c +0 -1
@@ -17,7 +17,6 @@#include <asm/mach/pci.h> #include <plat/pcie.h> #include <mach/bridge-regs.h> -#include <plat/addr-map.h> #include "common.h" static void kirkwood_enable_pcie_clk (const char *port)
arch/arm/plat-orion/Makefile +0 -1
@@ -3,7 +3,6 @@ # ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-$(CONFIG_ARCH_KIRKWOOD) += addr-map.o obj-$(CONFIG_ARCH_DOVE) += addr-map.o obj-$(CONFIG_ARCH_ORION5X) += addr-map.o obj-$(CONFIG_ARCH_MV78XX0) += addr-map.o
Signature · 1 line
1.7.9.5
PATCH 7/10 arm: mach-dove: convert to use mvebu-mbus driver
In reply to Thomas PetazzoniThis commit migrates the mach-dove platforms to use the mvebu-mbus driver and therefore removes the Dove-specific addr-map code.
In order to do this, we have to introduce a separate dove_dt_init_early() function. It continues to be quite similar to dove_init_early(), except that it does a DT-based initialization of the mvebu-mbus driver. On the other hand, the dove_init_early() function does a legacy initialization of the mvebu-mbus driver (which will be removed once all boards have been migrated to the Device Tree).
The address decoding windows are now registered in the dove_setup_cpu_wins() function. It is worth noting that the four PCIe address decoding windows will ultimately no longer have to be registered here: it will be done automatically by the PCIe driver once Dove has been migrated to use the upcoming mvebu PCIe driver.
--- arch/arm/Kconfig | 1 + arch/arm/boot/dts/dove.dtsi | 3 +- arch/arm/mach-dove/Makefile | 2 +- arch/arm/mach-dove/addr-map.c | 125 -------------------------------- arch/arm/mach-dove/board-dt.c | 13 +++- arch/arm/mach-dove/common.c | 39 +++++++++- arch/arm/mach-dove/common.h | 2 +- arch/arm/mach-dove/include/mach/dove.h | 5 ++ arch/arm/plat-orion/Makefile | 1 - 9 files changed, 59 insertions(+), 132 deletions(-) delete mode 100644 arch/arm/mach-dove/addr-map.c
arch/arm/Kconfig +1 -0
@@ -564,6 +564,7 @@ config ARCH_DOVE select PINCTRL_DOVE select PLAT_ORION_LEGACY select USB_ARCH_HAS_EHCI + select MVEBU_MBUS help Support for the Marvell Dove SoC 88AP510
arch/arm/boot/dts/dove.dtsi +2 -1
@@ -11,7 +11,8 @@ }; soc at f1000000 { - compatible = "simple-bus"; + compatible = "marvell,dove-mbus", "simple-bus"; + reg = <0xf1020000 0x80>, <0xf1800100 0x8>; #address-cells = <1>; #size-cells = <1>; interrupt-parent = <&intc>;
arch/arm/mach-dove/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-y += common.o addr-map.o irq.o +obj-y += common.o irq.o obj-$(CONFIG_DOVE_LEGACY) += mpp.o obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o
arch/arm/mach-dove/addr-map.c deleted +0 -125
125 lines not on this page · raw message
arch/arm/mach-dove/board-dt.c +11 -2
@@ -16,9 +16,12 @@#include <linux/platform_data/usb-ehci-orion.h> #include <asm/hardware/cache-tauros2.h> #include <asm/mach/arch.h> +#include <asm/mach/map.h> #include <mach/pm.h> +#include <mach/bridge-regs.h> #include <plat/common.h> #include <plat/irq.h> +#include <plat/time.h> #include "common.h" /*
@@ -53,6 +56,12 @@ static void __init dove_of_clk_init(void)dove_legacy_clk_init (); } +static void __init dove_dt_init_early (void ) +{ +orion_time_set_base (TIMER_VIRT_BASE ); +mvebu_mbus_dt_init (); +} +static struct mv643xx_eth_platform_data dove_dt_ge00_data = { .phy_addr =MV643XX_ETH_PHY_ADDR_DEFAULT , };
@@ -64,7 +73,7 @@ static void __init dove_dt_init(void)#ifdef CONFIG_CACHE_TAUROS2 tauros2_init (0 );#endif -dove_setup_cpu_mbus (); +dove_setup_cpu_wins ();/* Setup root of clk tree */ dove_of_clk_init ();
@@ -83,7 +92,7 @@ static const char * const dove_dt_board_compat[] = {DT_MACHINE_START (DOVE_DT ,"Marvell Dove (Flattened Device Tree)" ) .map_io = dove_map_io, - .init_early = dove_init_early, + .init_early = dove_dt_init_early, .init_irq = orion_dt_init_irq, .init_time = dove_timer_init, .init_machine = dove_dt_init,
arch/arm/mach-dove/common.c +38 -1
@@ -224,6 +224,9 @@ void __init dove_i2c_init(void)void __init dove_init_early (void ) {orion_time_set_base (TIMER_VIRT_BASE ); +mvebu_mbus_init ("marvell,dove-mbus" , +BRIDGE_WINS_BASE ,BRIDGE_WINS_SZ , +DOVE_MC_WINS_BASE ,DOVE_MC_WINS_SZ ); }static int __init dove_find_tclk (void )
@@ -326,6 +329,40 @@ void __init dove_sdio1_init(void)platform_device_register (&dove_sdio1); } +void __init dove_setup_cpu_wins (void ) +{ +/* +* The PCIe windows will no longer be statically allocated +* here once Dove is migrated to the pci-mvebu driver. +*/ +mvebu_mbus_add_window_remap_flags ("pcie0.0" , +DOVE_PCIE0_IO_PHYS_BASE , +DOVE_PCIE0_IO_SIZE , +DOVE_PCIE0_IO_BUS_BASE , +MVEBU_MBUS_PCI_IO ); +mvebu_mbus_add_window_remap_flags ("pcie1.0" , +DOVE_PCIE1_IO_PHYS_BASE , +DOVE_PCIE1_IO_SIZE , +DOVE_PCIE1_IO_BUS_BASE , +MVEBU_MBUS_PCI_IO ); +mvebu_mbus_add_window_remap_flags ("pcie0.0" , +DOVE_PCIE0_MEM_PHYS_BASE , +DOVE_PCIE0_MEM_SIZE , +MVEBU_MBUS_NO_REMAP , +MVEBU_MBUS_PCI_MEM ); +mvebu_mbus_add_window_remap_flags ("pcie1.0" , +DOVE_PCIE1_MEM_PHYS_BASE , +DOVE_PCIE1_MEM_SIZE , +MVEBU_MBUS_NO_REMAP , +MVEBU_MBUS_PCI_MEM ); +mvebu_mbus_add_window ("cesa" ,DOVE_CESA_PHYS_BASE , +DOVE_CESA_SIZE ); +mvebu_mbus_add_window ("bootrom" ,DOVE_BOOTROM_PHYS_BASE , +DOVE_BOOTROM_SIZE ); +mvebu_mbus_add_window ("scratchpad" ,DOVE_SCRATCHPAD_PHYS_BASE , +DOVE_SCRATCHPAD_SIZE ); +} +void __init dove_init (void ) { pr_info("Dove 88AP510 SoC, TCLK = %d MHz.\n",
@@ -334,7 +371,7 @@ void __init dove_init(void)#ifdef CONFIG_CACHE_TAUROS2 tauros2_init (0 );#endif -dove_setup_cpu_mbus (); +dove_setup_cpu_wins ();/* Setup root of clk tree */ dove_clk_init ();
arch/arm/mach-dove/common.h +1 -1
@@ -23,7 +23,7 @@ void dove_map_io(void);void dove_init (void );void dove_init_early (void );void dove_init_irq (void ); -void dove_setup_cpu_mbus (void ); +void dove_setup_cpu_wins (void );void dove_ge00_init (struct mv643xx_eth_platform_data *eth_data);void dove_sata_init (struct mv_sata_platform_data *sata_data);#ifdef CONFIG_PCI
arch/arm/mach-dove/include/mach/dove.h +5 -0
@@ -77,6 +77,8 @@/* North-South Bridge */ #define BRIDGE_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE + 0x20000)#define BRIDGE_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE + 0x20000) +#define BRIDGE_WINS_BASE (BRIDGE_PHYS_BASE) +#define BRIDGE_WINS_SZ (0x80)/* Cryptographic Engine */ #define DOVE_CRYPT_PHYS_BASE (DOVE_SB_REGS_PHYS_BASE + 0x30000)
@@ -168,6 +170,9 @@#define DOVE_SSP_CLOCK_ENABLE (1 << 1)#define DOVE_SSP_BPB_CLOCK_SRC_SSP (1 << 11)/* Memory Controller */ +#define DOVE_MC_PHYS_BASE (DOVE_NB_REGS_PHYS_BASE + 0x00000) +#define DOVE_MC_WINS_BASE (DOVE_MC_PHYS_BASE + 0x100) +#define DOVE_MC_WINS_SZ (0x8)#define DOVE_MC_VIRT_BASE (DOVE_NB_REGS_VIRT_BASE + 0x00000)/* LCD Controller */
arch/arm/plat-orion/Makefile +0 -1
@@ -3,7 +3,6 @@ # ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-$(CONFIG_ARCH_DOVE) += addr-map.o obj-$(CONFIG_ARCH_ORION5X) += addr-map.o obj-$(CONFIG_ARCH_MV78XX0) += addr-map.o
Signature · 1 line
1.7.9.5
PATCH 8/10 arm: mach-orion5x: convert to use mvebu-mbus driver
In reply to Thomas PetazzoniThis commit migrates the mach-orion5x platforms to use the mvebu-mbus driver and therefore removes the Orion5x-specific addr-map code.
In order to do this, we have to do a number of things:
* introduce a separate dove_dt_init_early() function. It continues to be quite similar to dove_init_early(), except that it does a DT-based initialization of the mvebu-mbus driver. On the other hand, the dove_init_early() function does a legacy initialization of the mvebu-mbus driver (which will be removed once all boards have been migrated to the Device Tree).
* introduce a orion5x-88f5182.dtsi file, which is used as an intermediate dtsi include between the board .dts (currently only orion5x-lacie-ethernet-disk-mini-v2.dts) and the common orion5x.dtsi. This is needed because the Orion5x SoCs have many things in common (described in orion5x.dtsi), but they are still some differences between 5182, 5281, etc, especially when it comes to address decoding windows. We therefore need to use a different compatible string for the different SoCs in the mbus DT node.
* convert a number of orion5x_setup_xyz_win() calls to the appropriate mvebu_mbus_add_window() calls, as each board was doing its own setup for the NOR window or other devices. Ultimately, those devices will be probed from the DT.
* the common address decoding windows are now registered in the orion5x_setup_wins() function. It is worth noting that the four PCIe address decoding windows will ultimately no longer have to be registered here: it will be done automatically by the PCIe driver once Dove has been migrated to use the upcoming mvebu PCIe driver.
--- arch/arm/Kconfig | 1 + arch/arm/boot/dts/orion5x-88f5182.dtsi | 19 +++ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- arch/arm/mach-orion5x/Makefile | 2 +- arch/arm/mach-orion5x/addr-map.c | 155 -------------------- arch/arm/mach-orion5x/board-dt.c | 24 ++- arch/arm/mach-orion5x/common.c | 49 ++++++- arch/arm/mach-orion5x/common.h | 13 +- arch/arm/mach-orion5x/d2net-setup.c | 4 +- arch/arm/mach-orion5x/db88f5281-setup.c | 13 +- arch/arm/mach-orion5x/dns323-setup.c | 3 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 4 +- arch/arm/mach-orion5x/include/mach/orion5x.h | 6 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 8 +- arch/arm/mach-orion5x/ls-chl-setup.c | 4 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 4 +- arch/arm/mach-orion5x/lsmini-setup.c | 4 +- arch/arm/mach-orion5x/mss2-setup.c | 3 +- arch/arm/mach-orion5x/mv2120-setup.c | 3 +- arch/arm/mach-orion5x/net2big-setup.c | 4 +- arch/arm/mach-orion5x/pci.c | 7 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 4 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 7 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 4 +- arch/arm/mach-orion5x/ts209-setup.c | 4 +- arch/arm/mach-orion5x/ts409-setup.c | 4 +- arch/arm/mach-orion5x/wnr854t-setup.c | 4 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 4 +- arch/arm/plat-orion/Makefile | 1 - 30 files changed, 149 insertions(+), 219 deletions(-) create mode 100644 arch/arm/boot/dts/orion5x-88f5182.dtsi delete mode 100644 arch/arm/mach-orion5x/addr-map.c
arch/arm/Kconfig +1 -0
@@ -602,6 +602,7 @@ config ARCH_ORION5X select GENERIC_CLOCKEVENTS select PCI select PLAT_ORION_LEGACY + select MVEBU_MBUS help Support for the following Marvell Orion 5x series SoCs: Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
arch/arm/boot/dts/orion5x-88f5182.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +/* + * Copyright (C) 2012 Thomas Petazzoni <[email protected]> + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +/dts-v1/; +/include/ "orion5x.dtsi" + +/ { + compatible = "marvell,orion5x-88f5182", "marvell,orion5x"; + + ocp at f1000000 { + compatible = "marvell,orion5x-88f5182-mbus", "simple-bus"; + regs = <0xf1020000 0x100>, <0xf1001500 0x10>; + }; +};
arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts +1 -1
@@ -7,7 +7,7 @@ */ /dts-v1/; -/include/ "orion5x.dtsi" +/include/ "orion5x-88f5182.dtsi" / { model = "LaCie Ethernet Disk mini V2";
arch/arm/mach-orion5x/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-y += common.o addr-map.o pci.o irq.o mpp.o +obj-y += common.o pci.o irq.o mpp.o obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o
arch/arm/mach-orion5x/addr-map.c deleted +0 -155
155 lines not on this page · raw message
arch/arm/mach-orion5x/board-dt.c +22 -2
@@ -14,10 +14,15 @@#include <linux/init.h> #include <linux/of.h> #include <linux/of_platform.h> +#include <linux/dma-mapping.h> +#include <linux/mbus.h> #include <asm/system_misc.h> #include <asm/mach/arch.h> +#include <asm/mach/map.h> +#include <mach/bridge-regs.h> #include <mach/orion5x.h> #include <plat/irq.h> +#include <plat/time.h> #include "common.h" struct of_dev_auxdata orion5x_auxdata_lookup[]__initdata = {
@@ -30,6 +35,21 @@ struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = { {}, }; +void __init orion5x_dt_init_early (void ) +{ +orion_time_set_base (TIMER_VIRT_BASE ); + +/* +* Some Orion5x devices allocate their coherent buffers from atomic +* context. Increase size of atomic coherent pool to make sure such +* the allocations won't fail. +*/ +init_dma_coherent_pool_size (SZ_1M ); + +/* Initialize the MBUS driver */ +mvebu_mbus_dt_init (); +} +static void __init orion5x_dt_init (void ) {char *dev_name;
@@ -41,7 +61,7 @@ static void __init orion5x_dt_init(void)/* * Setup Orion address map */ -orion5x_setup_cpu_mbus_bridge (); +orion5x_setup_wins ();/* Setup root of clk tree */ clk_init ();
@@ -70,7 +90,7 @@ static const char *orion5x_dt_compat[] = {DT_MACHINE_START (ORION5X_DT ,"Marvell Orion5x (Flattened Device Tree)" )/* Maintainer: Thomas Petazzoni <[email protected]> */ .map_io = orion5x_map_io, - .init_early = orion5x_init_early, + .init_early = orion5x_dt_init_early, .init_irq = orion_dt_init_irq, .init_time = orion5x_timer_init, .init_machine = orion5x_dt_init,
arch/arm/mach-orion5x/common.c +46 -3
79 lines not on this page · raw message
arch/arm/mach-orion5x/common.h +1 -12
@@ -17,18 +17,7 @@ void clk_init(void);extern int orion5x_tclk;extern void orion5x_timer_init (void ); -/* -* Enumerations and functions for Orion windows mapping. Used by Orion core -* functions to map its interfaces and by the machine-setup to map its on- -* board devices. Details in /mach-orion/addr-map.c -*/ -void orion5x_setup_cpu_mbus_bridge (void ); -void orion5x_setup_dev_boot_win (u32 base,u32 size); -void orion5x_setup_dev0_win (u32 base,u32 size); -void orion5x_setup_dev1_win (u32 base,u32 size); -void orion5x_setup_dev2_win (u32 base,u32 size); -void orion5x_setup_pcie_wa_win (u32 base,u32 size); -void orion5x_setup_sram_win (void ); +void orion5x_setup_wins (void );void orion5x_ehci0_init (void );void orion5x_ehci1_init (void );
arch/arm/mach-orion5x/d2net-setup.c +2 -2
@@ -317,8 +317,8 @@ static void __init d2net_init(void)d2net_sata_power_init ();orion5x_sata_init (&d2net_sata_data); -orion5x_setup_dev_boot_win (D2NET_NOR_BOOT_BASE , -D2NET_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,D2NET_NOR_BOOT_BASE , +D2NET_NOR_BOOT_SIZE );platform_device_register (&d2net_nor_flash);platform_device_register (&d2net_gpio_buttons);
arch/arm/mach-orion5x/db88f5281-setup.c +8 -5
@@ -340,16 +340,19 @@ static void __init db88f5281_init(void)orion5x_uart0_init ();orion5x_uart1_init (); -orion5x_setup_dev_boot_win (DB88F5281_NOR_BOOT_BASE , -DB88F5281_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,DB88F5281_NOR_BOOT_BASE , +DB88F5281_NOR_BOOT_SIZE );platform_device_register (&db88f5281_boot_flash); -orion5x_setup_dev0_win (DB88F5281_7SEG_BASE ,DB88F5281_7SEG_SIZE ); +mvebu_mbus_add_window ("devbus-cs0" ,DB88F5281_7SEG_BASE , +DB88F5281_7SEG_SIZE ); -orion5x_setup_dev1_win (DB88F5281_NOR_BASE ,DB88F5281_NOR_SIZE ); +mvebu_mbus_add_window ("devbus-cs1" ,DB88F5281_NOR_BASE , +DB88F5281_NOR_SIZE );platform_device_register (&db88f5281_nor_flash); -orion5x_setup_dev2_win (DB88F5281_NAND_BASE ,DB88F5281_NAND_SIZE ); +mvebu_mbus_add_window ("devbus-cs2" ,DB88F5281_NAND_BASE , +DB88F5281_NAND_SIZE );platform_device_register (&db88f5281_nand_flash);i2c_register_board_info (0 , &db88f5281_i2c_rtc,1 );
arch/arm/mach-orion5x/dns323-setup.c +2 -1
@@ -611,7 +611,8 @@ static void __init dns323_init(void)/* setup flash mapping * CS3 holds a 8 MB Spansion S29GL064M90TFIR4 */ -orion5x_setup_dev_boot_win (DNS323_NOR_BOOT_BASE ,DNS323_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,DNS323_NOR_BOOT_BASE , +DNS323_NOR_BOOT_SIZE );platform_device_register (&dns323_nor_flash);/* Sort out LEDs, Buttons and i2c devices */
arch/arm/mach-orion5x/edmini_v2-setup.c +2 -2
@@ -154,8 +154,8 @@ void __init edmini_v2_init(void)orion5x_ehci0_init ();orion5x_eth_init (&edmini_v2_eth_data); -orion5x_setup_dev_boot_win (EDMINI_V2_NOR_BOOT_BASE , -EDMINI_V2_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,EDMINI_V2_NOR_BOOT_BASE , +EDMINI_V2_NOR_BOOT_SIZE );platform_device_register (&edmini_v2_nor_flash); pr_notice("edmini_v2: USB device port, flash write and power-off "
arch/arm/mach-orion5x/include/mach/orion5x.h +5 -1
@@ -66,8 +66,10 @@* Orion Registers Map ******************************************************************************/ +#define ORION5X_DDR_PHYS_BASE (ORION5X_REGS_PHYS_BASE + 0x00000) +#define ORION5X_DDR_WINS_BASE (ORION5X_DDR_PHYS_BASE + 0x1500) +#define ORION5X_DDR_WINS_SZ (0x10)#define ORION5X_DDR_VIRT_BASE (ORION5X_REGS_VIRT_BASE + 0x00000) -#define ORION5X_DDR_WINDOW_CPU_BASE (ORION5X_DDR_VIRT_BASE + 0x1500)#define ORION5X_DEV_BUS_PHYS_BASE (ORION5X_REGS_PHYS_BASE + 0x10000)#define ORION5X_DEV_BUS_VIRT_BASE (ORION5X_REGS_VIRT_BASE + 0x10000)#define ORION5X_DEV_BUS_REG (x) (ORION5X_DEV_BUS_VIRT_BASE + (x))
@@ -81,6 +83,8 @@#define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE + 0x20000)#define ORION5X_BRIDGE_PHYS_BASE (ORION5X_REGS_PHYS_BASE + 0x20000) +#define ORION5X_BRIDGE_WINS_BASE (ORION5X_BRIDGE_PHYS_BASE) +#define ORION5X_BRIDGE_WINS_SZ (0x80)#define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE + 0x30000)
arch/arm/mach-orion5x/kurobox_pro-setup.c +4 -4
@@ -359,13 +359,13 @@ static void __init kurobox_pro_init(void)orion5x_uart1_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (KUROBOX_PRO_NOR_BOOT_BASE , -KUROBOX_PRO_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,KUROBOX_PRO_NOR_BOOT_BASE , +KUROBOX_PRO_NOR_BOOT_SIZE );platform_device_register (&kurobox_pro_nor_flash);if (machine_is_kurobox_pro ()) { -orion5x_setup_dev0_win (KUROBOX_PRO_NAND_BASE , -KUROBOX_PRO_NAND_SIZE ); +mvebu_mbus_add_window ("devbus-cs0" ,KUROBOX_PRO_NAND_BASE , +KUROBOX_PRO_NAND_SIZE );platform_device_register (&kurobox_pro_nand_flash); }
arch/arm/mach-orion5x/ls-chl-setup.c +2 -2
@@ -294,8 +294,8 @@ static void __init lschl_init(void)orion5x_uart0_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (LSCHL_NOR_BOOT_BASE , -LSCHL_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,LSCHL_NOR_BOOT_BASE , +LSCHL_NOR_BOOT_SIZE );platform_device_register (&lschl_nor_flash);platform_device_register (&lschl_leds);
arch/arm/mach-orion5x/ls_hgl-setup.c +2 -2
@@ -243,8 +243,8 @@ static void __init ls_hgl_init(void)orion5x_uart0_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (LS_HGL_NOR_BOOT_BASE , -LS_HGL_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,LS_HGL_NOR_BOOT_BASE , +LS_HGL_NOR_BOOT_SIZE );platform_device_register (&ls_hgl_nor_flash);platform_device_register (&ls_hgl_button_device);
arch/arm/mach-orion5x/lsmini-setup.c +2 -2
@@ -244,8 +244,8 @@ static void __init lsmini_init(void)orion5x_uart0_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (LSMINI_NOR_BOOT_BASE , -LSMINI_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,LSMINI_NOR_BOOT_BASE , +LSMINI_NOR_BOOT_SIZE );platform_device_register (&lsmini_nor_flash);platform_device_register (&lsmini_button_device);
arch/arm/mach-orion5x/mss2-setup.c +2 -1
@@ -241,7 +241,8 @@ static void __init mss2_init(void)orion5x_uart0_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (MSS2_NOR_BOOT_BASE ,MSS2_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,MSS2_NOR_BOOT_BASE , +MSS2_NOR_BOOT_SIZE );platform_device_register (&mss2_nor_flash);platform_device_register (&mss2_button_device);
arch/arm/mach-orion5x/mv2120-setup.c +2 -1
@@ -204,7 +204,8 @@ static void __init mv2120_init(void)orion5x_uart0_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (MV2120_NOR_BOOT_BASE ,MV2120_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,MV2120_NOR_BOOT_BASE , +MV2120_NOR_BOOT_SIZE );platform_device_register (&mv2120_nor_flash);platform_device_register (&mv2120_button_device);
arch/arm/mach-orion5x/net2big-setup.c +2 -2
@@ -397,8 +397,8 @@ static void __init net2big_init(void)net2big_sata_power_init ();orion5x_sata_init (&net2big_sata_data); -orion5x_setup_dev_boot_win (NET2BIG_NOR_BOOT_BASE , -NET2BIG_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,NET2BIG_NOR_BOOT_BASE , +NET2BIG_NOR_BOOT_SIZE );platform_device_register (&net2big_nor_flash);platform_device_register (&net2big_gpio_buttons);
arch/arm/mach-orion5x/pci.c +5 -2
@@ -157,8 +157,11 @@ static int __init pcie_setup(struct pci_sys_data *sys)if (dev ==MV88F5181_DEV_ID || dev ==MV88F5182_DEV_ID ) {printk (KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config " "read transaction workaround\n" ); -orion5x_setup_pcie_wa_win (ORION5X_PCIE_WA_PHYS_BASE , -ORION5X_PCIE_WA_SIZE ); +mvebu_mbus_add_window_remap_flags ("pcie0.0" , +ORION5X_PCIE_WA_PHYS_BASE , +ORION5X_PCIE_WA_SIZE , +MVEBU_MBUS_NO_REMAP , +MVEBU_MBUS_PCI_WA ); pcie_ops.read = pcie_rd_conf_wa; }
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c +2 -2
@@ -123,8 +123,8 @@ static void __init rd88f5181l_fxo_init(void)orion5x_eth_switch_init (&rd88f5181l_fxo_switch_plat_data,NO_IRQ );orion5x_uart0_init (); -orion5x_setup_dev_boot_win (RD88F5181L_FXO_NOR_BOOT_BASE , -RD88F5181L_FXO_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,RD88F5181L_FXO_NOR_BOOT_BASE , +RD88F5181L_FXO_NOR_BOOT_SIZE );platform_device_register (&rd88f5181l_fxo_nor_boot_flash); }
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +2 -2
@@ -130,8 +130,8 @@ static void __init rd88f5181l_ge_init(void)orion5x_i2c_init ();orion5x_uart0_init (); -orion5x_setup_dev_boot_win (RD88F5181L_GE_NOR_BOOT_BASE , -RD88F5181L_GE_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,RD88F5181L_GE_NOR_BOOT_BASE , +RD88F5181L_GE_NOR_BOOT_SIZE );platform_device_register (&rd88f5181l_ge_nor_boot_flash);i2c_register_board_info (0 , &rd88f5181l_ge_i2c_rtc,1 );
arch/arm/mach-orion5x/rd88f5182-setup.c +4 -3
@@ -264,10 +264,11 @@ static void __init rd88f5182_init(void)orion5x_uart0_init ();orion5x_xor_init (); -orion5x_setup_dev_boot_win (RD88F5182_NOR_BOOT_BASE , -RD88F5182_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,RD88F5182_NOR_BOOT_BASE , +RD88F5182_NOR_BOOT_SIZE ); -orion5x_setup_dev1_win (RD88F5182_NOR_BASE ,RD88F5182_NOR_SIZE ); +mvebu_mbus_add_window ("devbus-cs1" ,RD88F5182_NOR_BASE , +RD88F5182_NOR_SIZE );platform_device_register (&rd88f5182_nor_flash);platform_device_register (&rd88f5182_gpio_leds);
arch/arm/mach-orion5x/terastation_pro2-setup.c +2 -2
@@ -329,8 +329,8 @@ static void __init tsp2_init(void)/* * Configure peripherals. */ -orion5x_setup_dev_boot_win (TSP2_NOR_BOOT_BASE , -TSP2_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,TSP2_NOR_BOOT_BASE , +TSP2_NOR_BOOT_SIZE );platform_device_register (&tsp2_nor_flash);orion5x_ehci0_init ();
arch/arm/mach-orion5x/ts209-setup.c +2 -2
@@ -286,8 +286,8 @@ static void __init qnap_ts209_init(void)/* * Configure peripherals. */ -orion5x_setup_dev_boot_win (QNAP_TS209_NOR_BOOT_BASE , -QNAP_TS209_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,QNAP_TS209_NOR_BOOT_BASE , +QNAP_TS209_NOR_BOOT_SIZE );platform_device_register (&qnap_ts209_nor_flash);orion5x_ehci0_init ();
arch/arm/mach-orion5x/ts409-setup.c +2 -2
@@ -277,8 +277,8 @@ static void __init qnap_ts409_init(void)/* * Configure peripherals. */ -orion5x_setup_dev_boot_win (QNAP_TS409_NOR_BOOT_BASE , -QNAP_TS409_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,QNAP_TS409_NOR_BOOT_BASE , +QNAP_TS409_NOR_BOOT_SIZE );platform_device_register (&qnap_ts409_nor_flash);orion5x_ehci0_init ();
arch/arm/mach-orion5x/wnr854t-setup.c +2 -2
@@ -127,8 +127,8 @@ static void __init wnr854t_init(void)orion5x_eth_switch_init (&wnr854t_switch_plat_data,NO_IRQ );orion5x_uart0_init (); -orion5x_setup_dev_boot_win (WNR854T_NOR_BOOT_BASE , -WNR854T_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,WNR854T_NOR_BOOT_BASE , +WNR854T_NOR_BOOT_SIZE );platform_device_register (&wnr854t_nor_flash); }
arch/arm/mach-orion5x/wrt350n-v2-setup.c +2 -2
@@ -213,8 +213,8 @@ static void __init wrt350n_v2_init(void)orion5x_eth_switch_init (&wrt350n_v2_switch_plat_data,NO_IRQ );orion5x_uart0_init (); -orion5x_setup_dev_boot_win (WRT350N_V2_NOR_BOOT_BASE , -WRT350N_V2_NOR_BOOT_SIZE ); +mvebu_mbus_add_window ("devbus-boot" ,WRT350N_V2_NOR_BOOT_BASE , +WRT350N_V2_NOR_BOOT_SIZE );platform_device_register (&wrt350n_v2_nor_flash);platform_device_register (&wrt350n_v2_leds);platform_device_register (&wrt350n_v2_button_device);
arch/arm/plat-orion/Makefile +0 -1
@@ -3,7 +3,6 @@ # ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-$(CONFIG_ARCH_ORION5X) += addr-map.o obj-$(CONFIG_ARCH_MV78XX0) += addr-map.o orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o
Signature · 1 line
1.7.9.5
PATCH 9/10 arm: mach-mv78xx0: convert to use the mvebu-mbus driver
In reply to Thomas PetazzoniThis commit convers the mach-mv78xx0 sub-architecture to use the mvebu-mbus driver. mv78xx0 has not been converted to the Device Tree yet, so we simply have to call mvebu_mbus_init() in the ->init_early() function, and modify the PCIe code so that it uses the new functions provided by mvebu-mbus to create the needed PCIe windows.
--- arch/arm/Kconfig | 1 + arch/arm/mach-mv78xx0/Makefile | 2 +- arch/arm/mach-mv78xx0/addr-map.c | 93 -------------------------- arch/arm/mach-mv78xx0/common.c | 10 ++- arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 8 ++- arch/arm/mach-mv78xx0/pcie.c | 21 +++--- arch/arm/plat-orion/Makefile | 2 - include/linux/mbus.h | 3 + 8 files changed, 32 insertions(+), 108 deletions(-) delete mode 100644 arch/arm/mach-mv78xx0/addr-map.c
arch/arm/Kconfig +1 -0
@@ -590,6 +590,7 @@ config ARCH_MV78XX0 select GENERIC_CLOCKEVENTS select PCI select PLAT_ORION_LEGACY + select MVEBU_MBUS help Support for the following Marvell MV78xx0 series SoCs: MV781x0, MV782x0.
arch/arm/mach-mv78xx0/Makefile +1 -1
@@ -1,4 +1,4 @@ -obj-y += common.o addr-map.o mpp.o irq.o pcie.o +obj-y += common.o mpp.o irq.o pcie.o obj-$(CONFIG_MACH_DB78X00_BP) += db78x00-bp-setup.o obj-$(CONFIG_MACH_RD78X00_MASA) += rd78x00-masa-setup.o obj-$(CONFIG_MACH_TERASTATION_WXL) += buffalo-wxl-setup.o
arch/arm/mach-mv78xx0/addr-map.c deleted +0 -93
93 lines not on this page · raw message
arch/arm/mach-mv78xx0/common.c +8 -2
@@ -334,6 +334,14 @@ void __init mv78xx0_uart3_init(void)void __init mv78xx0_init_early (void ) {orion_time_set_base (TIMER_VIRT_BASE ); +if (mv78xx0_core_index () ==0 ) +mvebu_mbus_init ("marvell,mv78xx0-mbus" , +BRIDGE_WINS_BASE ,BRIDGE_WINS_SZ , +DDR_WINDOW_CPU0_BASE ,DDR_WINDOW_CPU_SZ ); +else +mvebu_mbus_init ("marvell,mv78xx0-mbus" , +BRIDGE_WINS_BASE ,BRIDGE_WINS_SZ , +DDR_WINDOW_CPU1_BASE ,DDR_WINDOW_CPU_SZ ); } void __init_refok mv78xx0_timer_init(void)
@@ -397,8 +405,6 @@ void __init mv78xx0_init(void)printk ("HCLK = %dMHz, " , (hclk +499999 ) /1000000 );printk ("TCLK = %dMHz\n" , (get_tclk () +499999 ) /1000000 ); -mv78xx0_setup_cpu_mbus (); -#ifdef CONFIG_CACHE_FEROCEON_L2 feroceon_l2_init (is_l2_writethrough ());#endif
arch/arm/mach-mv78xx0/include/mach/mv78xx0.h +6 -2
@@ -60,13 +60,17 @@*/ #define BRIDGE_VIRT_BASE (MV78XX0_CORE_REGS_VIRT_BASE)#define BRIDGE_PHYS_BASE (MV78XX0_CORE_REGS_PHYS_BASE) +#define BRIDGE_WINS_BASE (BRIDGE_PHYS_BASE) +#define BRIDGE_WINS_SZ (0xA000)/* * Register Map */ #define DDR_VIRT_BASE (MV78XX0_REGS_VIRT_BASE + 0x00000) -#define DDR_WINDOW_CPU0_BASE (DDR_VIRT_BASE + 0x1500) -#define DDR_WINDOW_CPU1_BASE (DDR_VIRT_BASE + 0x1570) +#define DDR_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x00000) +#define DDR_WINDOW_CPU0_BASE (DDR_PHYS_BASE + 0x1500) +#define DDR_WINDOW_CPU1_BASE (DDR_PHYS_BASE + 0x1570) +#define DDR_WINDOW_CPU_SZ (0x20)#define DEV_BUS_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x10000)#define DEV_BUS_VIRT_BASE (MV78XX0_REGS_VIRT_BASE + 0x10000)
arch/arm/mach-mv78xx0/pcie.c +13 -8
@@ -10,11 +10,11 @@#include <linux/kernel.h> #include <linux/pci.h> +#include <linux/mbus.h> #include <video/vga.h> #include <asm/irq.h> #include <asm/mach/pci.h> #include <plat/pcie.h> -#include <plat/addr-map.h> #include <mach/mv78xx0.h> #include "common.h"
@@ -54,7 +54,6 @@ static void __init mv78xx0_pcie_preinit(void)int i;u32 size_each;u32 start; -int win =0 ; pcie_io_space.name ="PCIe I/O Space" ; pcie_io_space.start =MV78XX0_PCIE_IO_PHYS_BASE (0 );
@@ -72,6 +71,7 @@ static void __init mv78xx0_pcie_preinit(void) start =MV78XX0_PCIE_MEM_PHYS_BASE ;for (i =0 ; i < num_pcie_ports; i++) {struct pcie_port *pp = pcie_port + i; +char winname[MVEBU_MBUS_MAX_WINNAME_SZ ];snprintf (pp->mem_space_name,sizeof (pp->mem_space_name),"PCIe %d.%d MEM" , pp->maj, pp->min);
@@ -85,12 +85,17 @@ static void __init mv78xx0_pcie_preinit(void)if (request_resource (&iomem_resource, &pp->res))panic ("can't allocate PCIe MEM sub-space" ); -mv78xx0_setup_pcie_mem_win (win + i +8 , pp->res.start, -resource_size (&pp->res), - pp->maj, pp->min); - -mv78xx0_setup_pcie_io_win (win + i, i *SZ_64K ,SZ_64K , - pp->maj, pp->min); +snprintf (winname,sizeof (winname),"pcie%d.%d" , + pp->maj, pp->min); + +mvebu_mbus_add_window_remap_flags (winname, + pp->res.start, +resource_size (&pp->res), +MVEBU_MBUS_NO_REMAP , +MVEBU_MBUS_PCI_MEM ); +mvebu_mbus_add_window_remap_flags (winname, + i *SZ_64K ,SZ_64K , +0 ,MVEBU_MBUS_PCI_IO ); } }
arch/arm/plat-orion/Makefile +0 -2
@@ -3,8 +3,6 @@ # ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -obj-$(CONFIG_ARCH_MV78XX0) += addr-map.o - orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y)
include/linux/mbus.h +3 -0
@@ -43,6 +43,9 @@ struct mbus_dram_target_info*/ #define MVEBU_MBUS_NO_REMAP (0xffffffff) +/* Maximum size of a mbus window name */ +#define MVEBU_MBUS_MAX_WINNAME_SZ 32 +/* * The Marvell mbus is to be found only on SOCs from the Orion family * at the moment. Provide a dummy stub for other architectures.
Signature · 1 line
1.7.9.5
PATCH 10/10 arm: plat-orion: remove addr-map code
In reply to Thomas PetazzoniNow that all Marvell EBU platforms have been converted to use the mvebu-mbus driver, we can remove the common plat-orion/addr-map.c code that isn't compiled anymore.
--- arch/arm/plat-orion/addr-map.c | 178 ---------------------------------------- 1 file changed, 178 deletions(-) delete mode 100644 arch/arm/plat-orion/addr-map.c
arch/arm/plat-orion/addr-map.c deleted +0 -178
@@ -1,178 +0,0 @@ -/* -* arch/arm/plat-orion/addr-map.c -* -* Address map functions for Marvell Orion based SoCs -* -* This file is licensed under the terms of the GNU General Public -* License version 2. This program is licensed "as is" without any -* warranty of any kind, whether express or implied. -*/ - -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/mbus.h> -#include <linux/io.h> -#include <plat/addr-map.h> - -struct mbus_dram_target_info orion_mbus_dram_info; - -const struct mbus_dram_target_info *mv_mbus_dram_info (void ) -{ -return &orion_mbus_dram_info; -} -EXPORT_SYMBOL_GPL (mv_mbus_dram_info); - -/* -* DDR target is the same on all Orion platforms. -*/ -#define TARGET_DDR 0 - -/* -* Helpers to get DDR bank info -*/ -#define DDR_BASE_CS_OFF (n) (0x0000 + ((n) << 3)) -#define DDR_SIZE_CS_OFF (n) (0x0004 + ((n) << 3)) - -/* -* CPU Address Decode Windows registers -*/ -#define WIN_CTRL_OFF 0x0000 -#define WIN_BASE_OFF 0x0004 -#define WIN_REMAP_LO_OFF 0x0008 -#define WIN_REMAP_HI_OFF 0x000c - -#define ATTR_HW_COHERENCY (0x1 << 4) - -/* -* Default implementation -*/ -static void __init __iomem * -orion_win_cfg_base (const struct orion_addr_map_cfg *cfg,int win) -{ -return cfg->bridge_virt_base + (win <<4 ); -} - -/* -* Default implementation -*/ -static int __init orion_cpu_win_can_remap (const struct orion_addr_map_cfg *cfg, -const int win) -{ -if (win < cfg->remappable_wins) -return 1 ; - -return 0 ; -} - -void __init orion_setup_cpu_win (const struct orion_addr_map_cfg *cfg, -const int win,const u32 base, -const u32 size,const u8 target, -const u8 attr,const int remap) -{ -void __iomem *addr = cfg->win_cfg_base (cfg, win); -u32 ctrl, base_high, remap_addr; - -if (win >= cfg->num_wins) { -printk (KERN_ERR "setup_cpu_win: trying to allocate window " -"%d when only %d allowed\n" , win, cfg->num_wins); - } - - base_high = base &0xffff0000 ; - ctrl = ((size -1 ) &0xffff0000 ) | (attr <<8 ) | (target <<4 ) |1 ; - -writel (base_high, addr +WIN_BASE_OFF ); -writel (ctrl, addr +WIN_CTRL_OFF ); -if (cfg->cpu_win_can_remap (cfg, win)) { -if (remap <0 ) - remap_addr = base; -else - remap_addr = remap; -writel (remap_addr &0xffff0000 , addr +WIN_REMAP_LO_OFF ); -writel (0 , addr +WIN_REMAP_HI_OFF ); - } -} - -/* -* Configure a number of windows. -*/ -static void __init orion_setup_cpu_wins (const struct orion_addr_map_cfg * cfg, -const struct orion_addr_map_info *info) -{ -while (info->win !=-1 ) { -orion_setup_cpu_win (cfg, info->win, info->base, info->size, - info->target, info->attr, info->remap); - info++; - } -} - -static void __init orion_disable_wins (const struct orion_addr_map_cfg * cfg) -{ -void __iomem *addr; -int i; - -for (i =0 ; i < cfg->num_wins; i++) { - addr = cfg->win_cfg_base (cfg, i); - -writel (0 , addr +WIN_BASE_OFF ); -writel (0 , addr +WIN_CTRL_OFF ); -if (cfg->cpu_win_can_remap (cfg, i)) { -writel (0 , addr +WIN_REMAP_LO_OFF ); -writel (0 , addr +WIN_REMAP_HI_OFF ); - } - } -} - -/* -* Disable, clear and configure windows. -*/ -void __init orion_config_wins (struct orion_addr_map_cfg * cfg, -const struct orion_addr_map_info *info) -{ -if (!cfg->cpu_win_can_remap) - cfg->cpu_win_can_remap = orion_cpu_win_can_remap; - -if (!cfg->win_cfg_base) - cfg->win_cfg_base = orion_win_cfg_base; - -orion_disable_wins (cfg); - -if (info) -orion_setup_cpu_wins (cfg, info); -} - -/* -* Setup MBUS dram target info. -*/ -void __init orion_setup_cpu_mbus_target (const struct orion_addr_map_cfg *cfg, -const void __iomem *ddr_window_cpu_base) -{ -int i; -int cs; - - orion_mbus_dram_info.mbus_dram_target_id =TARGET_DDR ; - -for (i =0 , cs =0 ; i <4 ; i++) { -u32 base =readl (ddr_window_cpu_base +DDR_BASE_CS_OFF (i)); -u32 size =readl (ddr_window_cpu_base +DDR_SIZE_CS_OFF (i)); - -/* -* We only take care of entries for which the chip -* select is enabled, and that don't have high base -* address bits set (devices can only access the first -* 32 bits of the memory). -*/ -if ((size &1 ) && !(base &0xF )) { -struct mbus_dram_window *w; - - w = &orion_mbus_dram_info.cs[cs++]; - w->cs_index = i; - w->mbus_attr =0xf & ~(1 << i); -if (cfg->hw_io_coherency) - w->mbus_attr |=ATTR_HW_COHERENCY ; - w->base = base &0xffff0000 ; - w->size = (size |0x0000ffff ) +1 ; - } - } - orion_mbus_dram_info.num_cs = cs; -}
Signature · 1 line
1.7.9.5
PATCH v2 1/1 Introduce a Marvell EBU MBus driver
In reply to Thomas PetazzoniQuoted 89 lines · Thomas Petazzoni
Hello,
As part of the work to write a DT-powered PCIe driver for Marvell SoCs that sits in
drivers/pci/host/, it appeared that including <mach/addr-map.h> from the PCIe driver to get access to address decoding windows functions was not acceptable.In order to fix this problem, this patch set introduces a driver for the Marvell EBU MBus driver in
drivers/bus/mvebu-mbus.c. It consolidates into a single driver the address decoding code that was spread inmach-{mvebu,kirkwood,orion5x,mv78xx0,dove}/addr-map.candplat-orion/addr-map.c. The driver provides two APIs:* A
mv_mbus_dram_info()that is used by many Marvell device drivers throughout the tree to get the list of DRAM address decoding windows they have to set up. This API was previously implemented inplat-orion/addr-map.cand is kept unchanged in order to not change the drivers.*
mvebu_mbus_add_window()/mvebu_mbus_del_window()functions to add and remove address decoding windows for a given device. Those functions have to be called either from the platform code, or from device drivers.The driver can be probed either using Device Tree informations, or using a legacy
mvbus_mbus_init()function call. This allows us to migrate the five families of Marvell EBU SoCs to use this driver.Note that this driver is only a consolidation, and that further improvements to the address decoding handling could be done in the future (dynamically allocating the physical range using
request_resource(), describing some of the static windows in DT, etc.). We intentionally do not want those improvements to be done right now, in order to keep the amount of changes reasonable. The driver as it is is sufficient to cover the existing needs, and the needs of the upcoming PCIe driver and Device Bus driver.Summary of the patch set:
* Patch 1 makes the compilation of
plat-orion/addr-map.cconditional on a per-SoC family basis. This allows patches 5 to 9 to progressively move each SoC family to use the mvebu-mbus driver instead of the mach-<foo>/addr-map.c +plat-orion/addr-map.ccode. Notice that theplat-orion/addr-map.ccode cannot be compiled in a kernel that has the mvebu-mbus, due to the namespace conflict on themv_mbus_dram_info()function.* Patch 2 and 3 ensures that all places that need to have access to the list of DRAM address decoding windows do so by using the public
mv_mbus_dram_info()rather than directly accessing an internal structure.* Patch 4 introduces the mvebu-mbus driver itself, with the support for all 5 Marvell EBU SoC families. Note that the driver is compiled through a blind option, because we don't want the driver to be compiled in unless the corresponding sub-architecture has been migrated to use it: as explained above, compiling the driver conflicts with compiling the
plat-orion/addr-map.ccode.* Patch 5 to 9 moves each Marvell EBU sub-architecture to use the mvebu-mbus driver.
* Patch 10 removes the now unused
plat-orion/addr-map.ccode.Changes since v1:
* Fix the compatible string used in
armada-370.dtsi: it was incorrectly using marvell,armadaxp-mbus instead of marvell,armada370-mbus.* Fix the reg = <...> property for Kirkwood and Dove, the address for the devices address decoding windows was not correct.
* Fix a 'git rebase -i' mistake that lead to have some code that should have been in PATCH 4 (the driver code) into PATCH 5 (switching mach-mvebu to use the driver).
* Fix the Device Tree documentation of the driver, which was giving a wrong address.
* And since I didn't want to do a v2 just to fix my stupid mistakes, I also added a big comment at the beginning of the driver's code that explains what the driver is doing.
The code has been tested on Armada 370 and Armada XP platforms (by me), on Kirkwood DT and non-DT platforms (by Andrew Lunn), on Dove DT platforms (by Sebastian Hesselbarth) and on Orion5x non-DT platforms (by me).
Quoted 8 lines
The code applies on top of the marvell-3.9-fixes-tag I have sent at
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-March/152999.html. For easier testing, I've pushed a branch at:https://github.com/MISL-EBU-System-SW/mainline-public/commits/marvell-mvebu-mbus-v1
Since other drivers will depend on this one, I'd appreciate if this code could be merged early in the 3.10 cycle.
Jason, Andrew, Arnd, Olof,
Will you agree to take this patch set as is ?(modulo some fixes needed for the not yet tested platforms).
This patch set is a great step in the right way to move code outside arch/arm. I know that Arnd would like a greater step and a more radical approach to have a more accurate device tree bindings. However the purpose of this patch set was initially to ease the merge of the PCIe support not to delay it! And I fear that the large number of files to change and the resulting conflicts will prevent this patch set to be merged in a single release.
I agree that the bindings could be improve but can we consider this patch set as a first step ?
Once all the other mvebu have been converted to the DT (and I think that we are pretty close to achieve it), it will be easier to improve this driver.
Thanks,
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 1/1 Introduce a Marvell EBU MBus driver
Quoted 11 lines · Gregory CLEMENT
Will you agree to take this patch set as is ?(modulo some fixes needed for the not yet tested platforms).
This patch set is a great step in the right way to move code outside
arch/arm. I know that Arnd would like a greater step and a more radical approach to have a more accurate device tree bindings. However the purpose of this patch set was initially to ease the merge of the PCIe support not to delay it! And I fear that the large number of files to change and the resulting conflicts will prevent this patch set to be merged in a single release.
Quoted 2 lines
I agree that the bindings could be improve but can we consider this patch set as a first step ?
I would prefer not to merge the DT binding, but I'm fine with the current implementation, as in the pull request that Jason sent me. How about this:
* You remove the Documentation/devicetree/bindings/arm/mvebu-mbus.txt file that is the main source of disagreement, along with the mvebu_mbus_dt_init function.
* All conversion patches get changed to not add properties to the soc node but instead call mvebu_mbus_init directly. That code is there already.
I can take those patches, and we can work on a better DT binding for a later release without having to hold up other conversions.
Arnd
PATCH v2 1/1 Introduce a Marvell EBU MBus driver
Dear Arnd Bergmann,
Quoted 11 lines · Arnd Bergmann
I would prefer not to merge the DT binding, but I'm fine with the current implementation, as in the pull request that Jason sent me. How about this:
* You remove the
Documentation/devicetree/bindings/arm/mvebu-mbus.txtfile that is the main source of disagreement, along with themvebu_mbus_dt_initfunction.
* All conversion patches get changed to not add properties to the soc node but instead callmvebu_mbus_initdirectly. That code is there already.
Quoted 2 lines
I can take those patches, and we can work on a better DT binding for a later release without having to hold up other conversions.
So even the DT-only sub-architecture (such as mvebu) should hard-code the register base addresses?
The proposed DT binding in the current patch is very minimal, and I don't see why the more elaborate DT binding that you proposed could not be implemented as an improvement of it: the DT binding you proposed seems backward compatible with the one currently implemented, no?
Anyway, whatever your decision is, I can submit an updated patch set that implements this, and also fix the mv78xx0 patch (my colleague Gregory Clement found a problem with the mv78xx0 when testing on real hardware).
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v2 1/1 Introduce a Marvell EBU MBus driver
Quoted 7 lines · Thomas Petazzoni
So even the DT-only sub-architecture (such as mvebu) should hard-code the register base addresses?
The proposed DT binding in the current patch is very minimal, and I don't see why the more elaborate DT binding that you proposed could not be implemented as an improvement of it: the DT binding you proposed seems backward compatible with the one currently implemented, no?
It's quite possible that it could be done in a backward compatible way, I just like to be on the safe side in case it's not.
Quoted 4 lines
Anyway, whatever your decision is, I can submit an updated patch set that implements this, and also fix the mv78xx0 patch (my colleague Gregory Clement found a problem with the mv78xx0 when testing on real hardware).
Ok, please do that. I already pulled the first set of patches from "[GIT PULL 1/3] ARM: mvebu: cleanup for v3.10", so make sure you don't rebase anything that is already part of 3e762c86b337f.
Arnd
PATCH v2 1/1 Introduce a Marvell EBU MBus driver
Arnd,
Quoted 11 lines · Arnd Bergmann
Quoted 7 lines · Thomas Petazzoni
So even the DT-only sub-architecture (such as mvebu) should hard-code the register base addresses?
The proposed DT binding in the current patch is very minimal, and I don't see why the more elaborate DT binding that you proposed could not be implemented as an improvement of it: the DT binding you proposed seems backward compatible with the one currently implemented, no?
It's quite possible that it could be done in a backward compatible way, I just like to be on the safe side in case it's not.
We do have a bit more latitude here. There isn't a single shipping mvebu device with a fdt enabled bootloader. So, as long as we aren't impacting other SoCs/drivers, I'm comfortable with taking a release or two to shake it out. I understand we prefer not to do that, but in this case, I don't want to hold up everything else in the pipeline.
thx,
Jason.
Jason Cooper
AppliedPATCH v2 1/1 Introduce a Marvell EBU MBus driver
In reply to Thomas PetazzoniThomas,
On Wed, Mar 06, 2013 at 05:59:55PM +0100, Thomas Petazzoni wrote:
...
Quoted 10 lines
Summary of the patch set:
* Patch 1 makes the compilation of
plat-orion/addr-map.cconditional on a per-SoC family basis. This allows patches 5 to 9 to progressively move each SoC family to use the mvebu-mbus driver instead of the mach-<foo>/addr-map.c +plat-orion/addr-map.ccode. Notice that theplat-orion/addr-map.ccode cannot be compiled in a kernel that has the mvebu-mbus, due to the namespace conflict on themv_mbus_dram_info()function.
Quoted 4 lines
* Patch 2 and 3 ensures that all places that need to have access to the list of DRAM address decoding windows do so by using the public
mv_mbus_dram_info()rather than directly accessing an internal structure.
applied to mvebu/cleanup
Quoted 6 lines
* Patch 4 introduces the mvebu-mbus driver itself, with the support for all 5 Marvell EBU SoC families. Note that the driver is compiled through a blind option, because we don't want the driver to be compiled in unless the corresponding sub-architecture has been migrated to use it: as explained above, compiling the driver conflicts with compiling the
plat-orion/addr-map.ccode.
applied to mvebu/drivers as there doesn't appear to be a drivers/bus maintainer other than arm-soc contributions...
Quoted 2 lines
* Patch 5 to 9 moves each Marvell EBU sub-architecture to use the mvebu-mbus driver.
small note: I had to remove line 9 '/dts-v1/;' from orion5x-88f5182.dtsi in order to get orion5x-lacie-ethernet-disk-mini-v2.dts to build.
I squashed this change into:
arm: mach-orion5x: convert to use mvebu-mbus driver
Quoted 1 line
* Patch 10 removes the now unused
plat-orion/addr-map.ccode.
applied patches 5-10 to mvebu/soc
Very well organized to facilitate import and reduce dependency headaches, Thanks!
thx,
Jason.