Commit fddddb52 authored Mar 21, 2013 by Thomas Petazzoni Committed by Jason Cooper Mar 28, 2013

bus: introduce an Marvell EBU MBus driver



The 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.

Ealier versions of this driver had a DT binding, but since those were
not yet agreed upon, they were removed. The driver still uses
of_device_id to find the SoC specific details according to the string
passed to mvebu_mbus_init(). The plan is to re-introduce a proper DT
binding as a followup set of patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent 8bb96604

drivers/bus/Kconfig

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,13 @@

	menu "Bus devices"		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		config OMAP_OCP2SCP
	tristate "OMAP OCP2SCP DRIVER"		tristate "OMAP OCP2SCP DRIVER"
	depends on ARCH_OMAP2PLUS		depends on ARCH_OMAP2PLUS

drivers/bus/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,7 @@
	# Makefile for the bus drivers.		# Makefile for the bus drivers.
	#		#

			obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
	obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o		obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o

	# Interconnect bus driver for OMAP SoCs.		# Interconnect bus driver for OMAP SoCs.

drivers/bus/mvebu-mbus.c

0 → 100644

+867 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/mbus.h

+23 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,17 @@ struct mbus_dram_target_info
	} cs[4];		} 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		* The Marvell mbus is to be found only on SOCs from the Orion family
	* at the moment. Provide a dummy stub for other architectures.		* at the moment. Provide a dummy stub for other architectures.
	@@ -44,4 +55,15 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info(void)
	return NULL;		return NULL;
	}		}
	#endif		#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);

			#endif /* __LINUX_MBUS_H */

Admin message