Commit ac5f0f3f authored by Marcin Wojtas's avatar Marcin Wojtas Committed by Vinod Koul
Browse files

dmaengine: mv_xor: add support for Armada 3700 SoC 



Armada 3700 SoC comprise a single XOR engine compliant with the ones used
in older Marvell SoC's like Armada XP or 38x. The only thing that needs
modification is the Mbus configuration, which has to be done on two
levels: global and in device. The first one is inherited from the
bootloader. The latter can be opened in a default way, leaving
arbitration to the bus controller. Hence filled mbus_dram_target_info
structure is not needed.

Patch "dmaengine: mv_xor: optimize performance by using a subset
of the XOR channels" introduced limitation for using XOR engines and
channels vs number of available CPU's. Those constraints do not however
fit Armada 3700 architecture with two possible CPU's and single,
dual-channel engine. Hence in this commit an adjustment for setting
maximum available channels is added.

This patch enables XOR access to DRAM by opening default window to 4GB
space with specific attribute.

Signed-off-by: default avatarMarcin Wojtas <mw@semihalf.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent dd130c65

Documentation/devicetree/bindings/dma/mv-xor.txt

+4 −1
Original line number Diff line number Diff line 
* Marvell XOR engines



Required properties:

- compatible: Should be "marvell,orion-xor" or "marvell,armada-380-xor"

- compatible: Should be one of the following:

  - "marvell,orion-xor"

  - "marvell,armada-380-xor"

  - "marvell,armada-3700-xor".

- reg: Should contain registers location and length (two sets)

    the first set is the low registers, the second set the high

    registers for the XOR engine.

drivers/dma/mv_xor.c

+49 −7
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
enum mv_xor_type {

	XOR_ORION,

	XOR_ARMADA_38X,

	XOR_ARMADA_37XX,

};



enum mv_xor_mode {
@@ -1093,6 +1094,33 @@ mv_xor_conf_mbus_windows(struct mv_xor_device *xordev, 
	writel(0, base + WINDOW_OVERRIDE_CTRL(1));

}



static void

mv_xor_conf_mbus_windows_a3700(struct mv_xor_device *xordev)

{

	void __iomem *base = xordev->xor_high_base;

	u32 win_enable = 0;

	int i;



	for (i = 0; i < 8; i++) {

		writel(0, base + WINDOW_BASE(i));

		writel(0, base + WINDOW_SIZE(i));

		if (i < 4)

			writel(0, base + WINDOW_REMAP_HIGH(i));

	}

	/*

	 * For Armada3700 open default 4GB Mbus window. The dram

	 * related configuration are done at AXIS level.

	 */

	writel(0xffff0000, base + WINDOW_SIZE(0));

	win_enable |= 1;

	win_enable |= 3 << 16;



	writel(win_enable, base + WINDOW_BAR_ENABLE(0));

	writel(win_enable, base + WINDOW_BAR_ENABLE(1));

	writel(0, base + WINDOW_OVERRIDE_CTRL(0));

	writel(0, base + WINDOW_OVERRIDE_CTRL(1));

}



/*

 * Since this XOR driver is basically used only for RAID5, we don't

 * need to care about synchronizing ->suspend with DMA activity,
@@ -1137,6 +1165,11 @@ static int mv_xor_resume(struct platform_device *dev) 
			       XOR_INTR_MASK(mv_chan));

	}



	if (xordev->xor_type == XOR_ARMADA_37XX) {

		mv_xor_conf_mbus_windows_a3700(xordev);

		return 0;

	}



	dram = mv_mbus_dram_info();

	if (dram)

		mv_xor_conf_mbus_windows(xordev, dram);
@@ -1147,6 +1180,7 @@ static int mv_xor_resume(struct platform_device *dev) 
static const struct of_device_id mv_xor_dt_ids[] = {

	{ .compatible = "marvell,orion-xor", .data = (void *)XOR_ORION },

	{ .compatible = "marvell,armada-380-xor", .data = (void *)XOR_ARMADA_38X },

	{ .compatible = "marvell,armada-3700-xor", .data = (void *)XOR_ARMADA_37XX },

	{},

};
@@ -1204,9 +1238,13 @@ static int mv_xor_probe(struct platform_device *pdev) 
	/*

	 * (Re-)program MBUS remapping windows if we are asked to.

	 */

	if (xordev->xor_type == XOR_ARMADA_37XX) {

		mv_xor_conf_mbus_windows_a3700(xordev);

	} else {

		dram = mv_mbus_dram_info();

		if (dram)

			mv_xor_conf_mbus_windows(xordev, dram);

	}



	/* Not all platforms can gate the clock, so it is not

	 * an error if the clock does not exists.
@@ -1220,9 +1258,13 @@ static int mv_xor_probe(struct platform_device *pdev) 
	 * order for async_tx to perform well. So we limit the number

	 * of engines and channels so that we take into account this

	 * constraint. Note that we also want to use channels from

	 * separate engines when possible.

	 * separate engines when possible.  For dual-CPU Armada 3700

	 * SoC with single XOR engine allow using its both channels.

	 */

	max_engines = num_present_cpus();

	if (xordev->xor_type == XOR_ARMADA_37XX)

		max_channels =	num_present_cpus();

	else

		max_channels = min_t(unsigned int,

				     MV_XOR_MAX_CHANNELS,

				     DIV_ROUND_UP(num_present_cpus(), 2));

CRA Git | Maintained and supported by SUSTech CRA and CCSE