Device Bus support for Marvell EBU SoC
Subsystems (3)
v2 cover Device Bus support for Marvell EBU SoC
Now that the mbus driver has been added to manage address decoding windows it's possible to introduce the Device Bus driver. This driver allows to access several memories and I/O devices such as NOR, NAND, SRAM and FPGAs.
Currently the SoCs that include this Device Bus controller are:
* Discovery: mv78100, mv78200 * Armada XP: mv78230, mv78260, mv78460 * Armada 370: 88f6710. 88f6707, 88f6w11 * Orion 5x: 88f5182, 88f5181, 88f5281
Please note that this patchset adds proper support for Armada XP and Armada 370 SoC only.
This applies on top of v3.9-rc5 with mbus patches applied, which can be found in Jason Cooper's mvebus/soc branch.
If anyone wants to try this, there's a public branch available at:
https://github.com/MISL-EBU-System-SW/mainline-public/tree/mvebu-devbus-v2
There has been a 'byzantine' discussion regarding the mbus driver DT binding and the way to describe address windows, and this discussion is still not settled.
However, since I'd like to see this in v3.10, and the only thing left to solve seems to be the device tree binding for the mbus window, this current patchset attempts a temporary workaround.
The decoding windows are handled by the devbus driver, through the mbus API, using the information present in the 'ranges' property. For instance:
device-bus at d0010400 {
ranges = <0 0 0xf0000000 0x8000000>;
/* ... */
}In the above example, when the device bus driver finds a child node for chip select '0', he will request the mbus driver to allocate a window as described by the 'ranges' property, starting at address 0xf0000000.
As this approach has been explicitly rejected by the maintainers, it will be completely removed, as soon as the mbus bindings are decided and the address windows are statically describe in the dts files.
Tested on an Armada XP GP board and Plathome Openblocks AX3.
In particular I'd like to know what's the chance of having this included for v3.10. If the driver looks good and the temporary window handling is accepted, then I can prepare a v3 rebased on top of Gregory's LPAE work, or on top of any other required patches.
Changes from v1:
* Added a remove() function to unregister childs and remove address windows, as suggested by Thomas Petazzoni.
* Remove unneeded 'inline' prefix on functions as suggested by Thomas Petazzoni.
* Timings parameters are now mandatory and expressed in picoseconds, as requested by Jason Gunthorpe.
This is consistent with OMAP's GPMC dts binding.
* Fix documentation as suggested by Jason Gunthorpe.
(Please note that I've droped Thomas' Tested-by since the driver has changed quite a lot since v1).
Thanks!
Ezequiel Garcia (5):
drivers: memory: Introduce Marvell EBU Device Bus driver
ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
.../bindings/memory-controllers/mvebu-devbus.txt | 151 ++++++++++ arch/arm/boot/dts/armada-370.dtsi | 8 + arch/arm/boot/dts/armada-xp-gp.dts | 29 ++ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 29 ++ arch/arm/boot/dts/armada-xp.dtsi | 8 + arch/arm/configs/mvebu_defconfig | 7 + drivers/memory/Kconfig | 10 + drivers/memory/Makefile | 1 + drivers/memory/mvebu-devbus.c | 330 +++++++++++++++++++++ 9 files changed, 573 insertions(+) create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt create mode 100644 drivers/memory/mvebu-devbus.c
Signature · 1 line
1.8.1.5
PATCH v2 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver
Marvell EBU SoCs such as Armada 370/XP, Orion5x (88f5xxx) and Discovery (mv78xx0) supports a Device Bus controller to access several kinds of memories and I/O devices (NOR, NAND, SRAM, FPGA).
This commit adds a driver to handle this controller. So far only Armada 370, Armada XP SoCs are supported.
The driver must be registered through a device tree node; as explained in the binding document.
For each child node in the device tree, this driver will:
* set timing parameters
* register a child device
* setup an address decoding window, using the mbus driver
Keep in mind the address decoding window setup is only a temporary hack. This code will be removed from this devbus driver as soon as a proper device tree binding for the mbus driver is added.
--- .../bindings/memory-controllers/mvebu-devbus.txt | 151 ++++++++++ drivers/memory/Kconfig | 10 + drivers/memory/Makefile | 1 + drivers/memory/mvebu-devbus.c | 330 +++++++++++++++++++++ 4 files changed, 492 insertions(+) create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt create mode 100644 drivers/memory/mvebu-devbus.c
Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt new file +151 -0
@@ -0,0 +1,151 @@ +Device tree bindings for MVEBU Device Bus controllers + +The Device Bus controller available in some Marvell's SoC allows to control +different types of standard memory and I/O devices such as NOR, NAND, and FPGA. +The actual devices are instantiated from the child nodes of a Device Bus node. + +Required properties: + + - compatible: Should be set to one of the following: + + marvell,armada370-devbus + marvell,armadaxp-devbus + marvell,mv78xx0-devbus + + - reg: A resource specifier for the register space + (see the example below) + - #address-cells: Must be set to 2 to allow memory address translation + - #size-cells: Must be set to 1 to allow CS address passing + - ranges: Must be set up to reflect the memory layout with four + integer values for each chip-select line in use: + <cs-number> 0 <physical address of mapping> <size> + +Mandatory timing properties for child nodes: + +Read parameters: + + - devbus,turn-off-ps: Defines the time during which the controller does not + drive the AD bus after the completion of a device read. + This prevents contentions on the Device Bus after a read + cycle from a slow device. + + - devbus,dev-width: 0x0 = 8-bit + 0x1 = 16-bit + 0x2 = 32-bit + 0x3 = Reserved + + - devbus,badr-skew-ps: Defines the time delay from from A[2:0] toggle, + to read data sample. This parameter is useful for + synchronous pipelined devices, where the address + precedes the read data by one or two cycles. + + - devbus,acc-first-ps: Defines the time delay from the negation of + ALE[0] to the cycle that the first read data is sampled + by the controller. + + - devbus,acc-next-ps: Defines the time delay between the cycle that + samples data N and the cycle that samples data N+1 + (in burst accesses). + + - devbus,rd-setup-ps: Defines the time delay between DEV_CSn assertion to + DEV_OEn assertion. If set to 0 (default), + DEV_OEn and DEV_CSn are asserted at the same cycle. + This parameter has no affect on <acc-first-ps> parameter + (no affect on first data sample). Set <rd-setup-ps> + to a value smaller than <acc-first-ps>. + + - devbus,rd-hold-ps: Defines the time between the last data sample to the + de-assertion of DEV_CSn. If set to 0 (default), + DEV_OEn and DEV_CSn are de-asserted at the same cycle + (the cycle of the last data sample). + This parameter has no affect on DEV_OEn de-assertion. + DEV_OEn is always de-asserted the next cycle after + last data sampled. Also this parameter has no + affect on <turn-off-ps> parameter. + Set <rd-hold-ps> to a value smaller than <turn-off-ps>. + +Write parameters: + + - devbus,ale-wr-ps: Defines the time delay from the ALE[0] negation cycle + to the DEV_WEn assertion. + + - devbus,wr-low-ps: Defines the time during which DEV_WEn is active. + A[2:0] and Data are kept valid as long as DEV_WEn + is active. This parameter defines the setup time of + address and data to DEV_WEn rise. + + - devbus,wr-high-ps: Defines the time during which DEV_WEn is kept + inactive (high) between data beats of a burst write. + DEV_A[2:0] and Data are kept valid (do not toggle) for + <wr-high-ps> - <tick> ps. + This parameter defines the hold time of address and + data after DEV_WEn rise. + + - devbus,sync-enable: Synchronous device enable. + 1: True + 0: False + +An example for an Armada XP GP board, with a 16 MiB NOR device as child +is showed below. Note that the Device Bus driver is in charge of allocating +the mbus address decoding window for each of its child devices. +The window is created using the chip select specified in the child +device node together with the base address and size specified in the ranges +property. For instance, in the example below the allocated decoding window +will start at base address 0xf0000000, with a size 0x1000000 (16 MiB) +for chip select 0 (a.k.a DEV_BOOTCS). + +This address window handling is done in this mvebu-devbus only as a temporary +solution. It will be removed when the support for mbus device tree binding is +added. + +The reg property must specify the chip select as: + + 0: DEV_BOOTCS + 1: DEV_CS0 + 2: DEV_CS1 + 3: DEV_CS2 + 4: DEV_CS3 + +Example: + + device-bus at d0010400 { + status = "okay"; + ranges = <0 0 0xf0000000 0x1000000>; /* CS0 @addr 0xf0000000, size 0x1000000 */ + #address-cells = <2>; + #size-cells = <1>; + + nor at 0 { + compatible = "cfi-flash"; + + /* CS0, 16 MiB */ + reg = <0 0 0x1000000>; + bank-width = <2>; + #address-cells = <1>; + #size-cells = <1>; + + /* Device Bus parameters are required */ + devbus,dev-width = <1>; + + /* Read parameters */ + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* + * We split the 16 MiB in two partitions, + * just as an example. + */ + partition at 0 { + label = "First"; + reg = <0 0x800000>; + }; + + partition at 800000 { + label = "Second"; + reg = <0x800000 0x800000>; + }; + }; + };
drivers/memory/Kconfig +10 -0
@@ -20,6 +20,16 @@ config TI_EMIF parameters and other settings during frequency, voltage and temperature changes +config MVEBU_DEVBUS + tristate "Marvell EBU Device Bus Controller" + default y + depends on PLAT_ORION && OF + help + This driver is for the Device Bus controller available in some + Marvell EBU SoCs such as Discovery (mv78xx0), Orion (88f5xxx) and + Armada 370 and Armada XP. This controller allows to handle flash + devices such as NOR, NAND, SRAM, and FPGA. + config TEGRA20_MC bool "Tegra20 Memory Controller(MC) driver" default y
drivers/memory/Makefile +1 -0
@@ -6,5 +6,6 @@ ifeq ($(CONFIG_DDR),y) obj-$(CONFIG_OF) += of_memory.o endif obj-$(CONFIG_TI_EMIF) += emif.o +obj-$(CONFIG_MVEBU_DEVBUS) += mvebu-devbus.o obj-$(CONFIG_TEGRA20_MC) += tegra20-mc.o obj-$(CONFIG_TEGRA30_MC) += tegra30-mc.o
drivers/memory/mvebu-devbus.c new file +330 -0
330 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH v2 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver
Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt line 107
Quoted 7 lines · Ezequiel Garcia
Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt new file +7
-0+The reg property must specify the chip select as: + + 0: DEV_BOOTCS + 1: DEV_CS0 + 2: DEV_CS1 + 3: DEV_CS2 + 4: DEV_CS3
I look at this and sort of go 'hmm'. These are basically register offsets into the block starting at 0xd0010400. I don't see any registers that are shared between targets. It would be simpler to keep each target as a seperate node and seperate driver instance.
Combining that idea with the suggestion for target-id centric mbus DT binding:
bootcs at d0010400 {
compatible = "marvell,armada370-devbus";
ranges = <0 MAPDEF_BOOTCS 0x1000>
reg = <MAPDEF_INTERNAL + 0x10400 0x8>; // boot cs register set devbus,dev-width = <1>;
[..] etc
rom at 0 {
reg = <0 0x1000> }
}
bus_cs3 at d0010400 {
compatible = "marvell,armada370-devbus";
ranges = <0 MAPDEF_BUS_CS3 0x1000>
reg = <MAPDEF_INTERNAL + 0x10408 0x8>; // cs3 register set devbus,dev-width = <1>;
[..] etc
device at 0 {
reg = <0 0x1000> }
}
Which follows the usual DT convention that the parent bus sets up properties that apply to all children.
This isn't a major point, but give it a think :)
Quoted 4 lines
drivers/memory/mvebu-devbus.c new file +4
-0+static void get_timing_param_ps (struct devbus *devbus, +struct device_node *node, +const char *name, +u32 *ticks)
drivers/memory/mvebu-devbus.c line 100
Quoted 10 lines
drivers/memory/mvebu-devbus.c new file +10
-0+{ +u32 time_ps; + +of_property_read_u32 (node, name, &time_ps); + + *ticks = (time_ps + devbus->tick_ps -1 ) / devbus->tick_ps; + +dev_dbg (devbus->dev,"%s: %u ps -> 0x%x\n" , + name, time_ps, *ticks); +}
It looks like there is a problem here, if the properties are not present then what value will be in time_ps?
The driver should probably fail to load if any timing parameter is missing from the DT??
drivers/memory/mvebu-devbus.c line 266
Quoted 6 lines
drivers/memory/mvebu-devbus.c new file +6
-0+/* +* We probe NOR/NAND with different functions, because +* we expect them to have some different parameters. +* If this turns out not to be the case, we'll be able +* to use any name for the child, and rename to devbus_probe_child(). +*/
This statement seems confusing, all this driver does is set READ_PARAM_OFFSET/WRITE_PARAM_OFFSET - are there other NAND specific registers? What NOR/NAND difference do you imagine?
I gave it all a quick look over and it looks broadly OK to me otherwise.
Regards,
Jason
PATCH v2 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver
Hi Jason,
Thanks for the review.
Quoted 15 lines · Jason Gunthorpe
Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt line 107
Quoted 7 lines · Ezequiel Garcia
Documentation/devicetree/bindings/memory-controllers/mvebu-devbus.txt new file +7
-0+The reg property must specify the chip select as: + + 0: DEV_BOOTCS + 1: DEV_CS0 + 2: DEV_CS1 + 3: DEV_CS2 + 4: DEV_CS3I look at this and sort of go 'hmm'. These are basically register offsets into the block starting at
0xd0010400. I don't see any registers that are shared between targets. It would be simpler to keep each target as a seperate node and seperate driver instance.
Mmm.. sounds sensible.
Quoted 27 lines
Combining that idea with the suggestion for target-id centric mbus DT binding:
bootcs at d0010400 { compatible = "marvell,armada370-devbus"; ranges = <0 MAPDEF_BOOTCS 0x1000> reg = <MAPDEF_INTERNAL + 0x10400 0x8>; // boot cs register set devbus,dev-width = <1>; [..] etc rom at 0 { reg = <0 0x1000> } }bus_cs3 at d0010400 { compatible = "marvell,armada370-devbus"; ranges = <0 MAPDEF_BUS_CS3 0x1000> reg = <MAPDEF_INTERNAL + 0x10408 0x8>; // cs3 register set devbus,dev-width = <1>; [..] etc device at 0 { reg = <0 0x1000> } }
Quoted 5 lines
Which follows the usual DT convention that the parent bus sets up properties that apply to all children.
This isn't a major point, but give it a think :)
Okey, I will.
Quoted 18 lines
Quoted 4 lines
drivers/memory/mvebu-devbus.c new file +4
-0+static void get_timing_param_ps (struct devbus *devbus, +struct device_node *node, +const char *name, +u32 *ticks)drivers/memory/mvebu-devbus.c line 100
Quoted 10 lines
drivers/memory/mvebu-devbus.c new file +10
-0+{ +u32 time_ps; + +of_property_read_u32 (node, name, &time_ps); + + *ticks = (time_ps + devbus->tick_ps -1 ) / devbus->tick_ps; + +dev_dbg (devbus->dev,"%s: %u ps -> 0x%x\n" , + name, time_ps, *ticks); +}It looks like there is a problem here, if the properties are not present then what value will be in
time_ps?
Quoted 3 lines
The driver should probably fail to load if any timing parameter is missing from the DT??
Of course, I knew I was forgeting something. We should at least zero every timing parameter by default.
I'll fix this in a soon to come v3.
Do you think it's also important/necessary to fail if *any* parameter is missing? I guess it makes sense if we are making these parameters mandatory.
Quoted 11 lines
drivers/memory/mvebu-devbus.c line 266
Quoted 6 lines
drivers/memory/mvebu-devbus.c new file +6
-0+/* +* We probe NOR/NAND with different functions, because +* we expect them to have some different parameters. +* If this turns out not to be the case, we'll be able +* to use any name for the child, and rename to devbus_probe_child(). +*/ This statement seems confusing, all this driver does is set READ_PARAM_OFFSET/WRITE_PARAM_OFFSET - are there other NAND specific registers? What NOR/NAND difference do you imagine?
Yes, you're probably right. Let me fix that too.
Quoted 3 lines
I gave it all a quick look over and it looks broadly OK to me otherwise.
Great, thanks!
Signature · 3 lines
Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com
PATCH v2 1/5 drivers: memory: Introduce Marvell EBU Device Bus driver
In reply to Jason GunthorpeQuoted 8 lines · Jason Gunthorpe
I look at this and sort of go 'hmm'. These are basically register offsets into the block starting at
0xd0010400. I don't see any registers that are shared between targets. It would be simpler to keep each target as a seperate node and seperate driver instance.Combining that idea with the suggestion for target-id centric mbus DT binding:
Quoted 11 lines
bootcs at d0010400 {
compatible = "marvell,armada370-devbus";
ranges = <0 MAPDEF_BOOTCS 0x1000>
reg = <MAPDEF_INTERNAL + 0x10400 0x8>; // boot cs register set
devbus,dev-width = <1>;
[..] etc
rom at 0 {
reg = <0 0x1000>
}
}+1
Good idea
Arnd
PATCH v2 2/5 ARM: mvebu: Add Device Bus support for Armada 370/XP SoC
In reply to Ezequiel GarciaArmada 370 and Armada XP SoC have a Device Bus controller to handle NOR, NAND, SRAM and FPGA devices.
This patch adds the device tree node to enable the controller.
--- arch/arm/boot/dts/armada-370.dtsi | 8 ++++++++ arch/arm/boot/dts/armada-xp.dtsi | 8 ++++++++ 2 files changed, 16 insertions(+)
arch/arm/boot/dts/armada-370.dtsi +8 -0
@@ -153,5 +153,13 @@ clocks = <&coreclk 0>; }; + device-bus at d0010400 { + compatible = "marvell,armada370-devbus"; + reg = <0xd0010400 0xe0>; + #address-cells = <2>; + #size-cells = <1>; + clocks = <&coreclk 0>; + status = "disabled"; + }; }; };
arch/arm/boot/dts/armada-xp.dtsi +8 -0
@@ -151,5 +151,13 @@ status = "disabled"; }; + device-bus at d0010400 { + compatible = "marvell,armadaxp-devbus"; + reg = <0xd0010400 0xe0>; + #address-cells = <2>; + #size-cells = <1>; + clocks = <&coreclk 0>; + status = "disabled"; + }; }; };
Signature · 1 line
1.8.1.5
PATCH v2 3/5 ARM: mvebu: Add support for NOR flash device on Armada XP-GP board
In reply to Ezequiel GarciaThe Armada XP Development Board DB-MV784MP-GP has a NOR flash device connected to the Device Bus. This commit adds the device tree node to support this device.
This SoC supports a flexible and dynamic decoding window allocation scheme; but since this feature is still not implemented we need to specify the window base address in the device tree node itself.
This base address has been selected in a completely arbitrary fashion.
--- arch/arm/boot/dts/armada-xp-gp.dts | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
arch/arm/boot/dts/armada-xp-gp.dts +29 -0
@@ -109,5 +109,34 @@ spi-max-frequency = <108000000>; }; }; + + device-bus at d0010400 { + status = "okay"; + ranges = <0 0 0xf0000000 0x01000000>; /* CS0 @addr 0xf000000, size 0x1000000 */ + + /* CS0, 16 MiB */ + nor at 0 { + compatible = "cfi-flash"; + reg = <0 0 0x01000000>; + bank-width = <2>; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,dev-width = <1>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; + }; + }; }; };
Signature · 1 line
1.8.1.5
PATCH v2 4/5 ARM: mvebu: Add support for NOR flash device on Openblocks AX3 board
In reply to Ezequiel GarciaThe Plat'home Openblocks AX3 has a 128 MiB NOR flash device connected to the Device Bus. This commit adds the device tree node to support this device.
The SoC supports a flexible and dynamic decoding window allocation scheme; but since this feature is still not implemented we need to specify the window base address in the device tree node itself.
This base address has been selected in a completely arbitrary fashion.
--- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +29 -0
@@ -139,5 +139,34 @@ usb at d0051000 { status = "okay"; }; + + device-bus at d0010400 { + status = "okay"; + ranges = <0 0 0xf0000000 0x8000000>; /* CS0 @addr 0xf000000, size 0x8000000 */ + + /* CS0, 128 MiB */ + nor at 0 { + compatible = "cfi-flash"; + reg = <0 0 0x8000000>; + bank-width = <2>; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,dev-width = <1>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; + }; + }; }; };
Signature · 1 line
1.8.1.5
PATCH v2 5/5 ARM: mvebu: Add Device Bus and CFI flash memory support to defconfig
In reply to Ezequiel GarciaThis patch selects the devbus driver as part of the mvebu default config, along with the required options to detect and support CFI flash memories.
--- arch/arm/configs/mvebu_defconfig | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/configs/mvebu_defconfig +7 -0
@@ -46,6 +46,11 @@ CONFIG_I2C_MV64XXX=y CONFIG_MTD=y CONFIG_MTD_CHAR=y CONFIG_MTD_M25P80=y +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP_OF=y CONFIG_SERIAL_8250_DW=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y
@@ -65,6 +70,8 @@ CONFIG_RTC_DRV_S35390A=y CONFIG_RTC_DRV_MV=y CONFIG_DMADEVICES=y CONFIG_MV_XOR=y +CONFIG_MEMORY=y +CONFIG_MVEBU_DEVBUS=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y
Signature · 1 line
1.8.1.5