Commit 8f1ab524 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-4.1-3' of git://git.infradead.org/linux-mvebu into fixes 

Merge "mvebu fixes for 4.1 (part 3)" from Gregory CLEMENT:

Disable unused internal RTC for Mamba from linksys (Armada XP)
And 2 commits fixing regressions on mvebu-mbus:
- the first one for Kirkwood or Orion SoC
- the second one for DMA when the platform have more than 4GB (only
  possible on Armada XP as far as I know)

* tag 'mvebu-fixes-4.1-3' of git://git.infradead.org/linux-mvebu:
  Revert "bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window"
  bus: mvebu-mbus: do not set WIN_CTRL_SYNCBARRIER on non io-coherent platforms.
  ARM: mvebu: armada-xp-linksys-mamba: Disable internal RTC
parents e9d57102 885dbd15

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ 


		internal-regs {



			rtc@10300 {

				/* No crystal connected to the internal RTC */

				status = "disabled";

			};



			/* J10: VCC, NC, RX, NC, TX, GND  */

			serial@12000 {

				status = "okay";

drivers/bus/mvebu-mbus.c

+19 −90
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include <linux/debugfs.h>

#include <linux/log2.h>

#include <linux/syscore_ops.h>

#include <linux/memblock.h>



/*

 * DDR target is the same on all platforms.
@@ -70,6 +69,7 @@ 
 */

#define WIN_CTRL_OFF		0x0000

#define   WIN_CTRL_ENABLE       BIT(0)

/* Only on HW I/O coherency capable platforms */

#define   WIN_CTRL_SYNCBARRIER  BIT(1)

#define   WIN_CTRL_TGT_MASK     0xf0

#define   WIN_CTRL_TGT_SHIFT    4
@@ -102,9 +102,7 @@ 


/* Relative to mbusbridge_base */

#define MBUS_BRIDGE_CTRL_OFF	0x0

#define  MBUS_BRIDGE_SIZE_MASK  0xffff0000

#define MBUS_BRIDGE_BASE_OFF	0x4

#define  MBUS_BRIDGE_BASE_MASK  0xffff0000



/* Maximum number of windows, for all known platforms */

#define MBUS_WINS_MAX           20
@@ -323,8 +321,9 @@ static int mvebu_mbus_setup_window(struct mvebu_mbus_state *mbus, 
	ctrl = ((size - 1) & WIN_CTRL_SIZE_MASK) |

		(attr << WIN_CTRL_ATTR_SHIFT)    |

		(target << WIN_CTRL_TGT_SHIFT)   |

		WIN_CTRL_SYNCBARRIER             |

		WIN_CTRL_ENABLE;

	if (mbus->hw_io_coherency)

		ctrl |= WIN_CTRL_SYNCBARRIER;



	writel(base & WIN_BASE_LOW, addr + WIN_BASE_OFF);

	writel(ctrl, addr + WIN_CTRL_OFF);
@@ -577,106 +576,36 @@ static unsigned int armada_xp_mbus_win_remap_offset(int win) 
		return MVEBU_MBUS_NO_REMAP;

}



/*

 * Use the memblock information to find the MBus bridge hole in the

 * physical address space.

 */

static void __init

mvebu_mbus_find_bridge_hole(uint64_t *start, uint64_t *end)

{

	struct memblock_region *r;

	uint64_t s = 0;



	for_each_memblock(memory, r) {

		/*

		 * This part of the memory is above 4 GB, so we don't

		 * care for the MBus bridge hole.

		 */

		if (r->base >= 0x100000000)

			continue;



		/*

		 * The MBus bridge hole is at the end of the RAM under

		 * the 4 GB limit.

		 */

		if (r->base + r->size > s)

			s = r->base + r->size;

	}



	*start = s;

	*end = 0x100000000;

}



static void __init

mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)

{

	int i;

	int cs;

	uint64_t mbus_bridge_base, mbus_bridge_end;



	mvebu_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;



	mvebu_mbus_find_bridge_hole(&mbus_bridge_base, &mbus_bridge_end);



	for (i = 0, cs = 0; i < 4; i++) {

		u64 base = readl(mbus->sdramwins_base + DDR_BASE_CS_OFF(i));

		u64 size = readl(mbus->sdramwins_base + DDR_SIZE_CS_OFF(i));

		u64 end;

		struct mbus_dram_window *w;



		/* Ignore entries that are not enabled */

		if (!(size & DDR_SIZE_ENABLED))

			continue;



		/*

		 * Ignore entries whose base address is above 2^32,

		 * since devices cannot DMA to such high addresses

		 */

		if (base & DDR_BASE_CS_HIGH_MASK)

			continue;



		base = base & DDR_BASE_CS_LOW_MASK;

		size = (size | ~DDR_SIZE_MASK) + 1;

		end = base + size;



		/*

		 * Adjust base/size of the current CS to make sure it

		 * doesn't overlap with the MBus bridge hole. This is

		 * particularly important for devices that do DMA from

		 * DRAM to a SRAM mapped in a MBus window, such as the

		 * CESA cryptographic engine.

		 */



		/*

		 * The CS is fully enclosed inside the MBus bridge

		 * area, so ignore it.

		 */

		if (base >= mbus_bridge_base && end <= mbus_bridge_end)

			continue;



		/*

		 * Beginning of CS overlaps with end of MBus, raise CS

		 * base address, and shrink its size.

		 */

		if (base >= mbus_bridge_base && end > mbus_bridge_end) {

			size -= mbus_bridge_end - base;

			base = mbus_bridge_end;

		}

		u32 base = readl(mbus->sdramwins_base + DDR_BASE_CS_OFF(i));

		u32 size = readl(mbus->sdramwins_base + DDR_SIZE_CS_OFF(i));



		/*

		 * End of CS overlaps with beginning of MBus, shrink

		 * CS size.

		 * 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 (base < mbus_bridge_base && end > mbus_bridge_base)

			size -= end - mbus_bridge_base;

		if ((size & DDR_SIZE_ENABLED) &&

		    !(base & DDR_BASE_CS_HIGH_MASK)) {

			struct mbus_dram_window *w;



			w = &mvebu_mbus_dram_info.cs[cs++];

			w->cs_index = i;

			w->mbus_attr = 0xf & ~(1 << i);

			if (mbus->hw_io_coherency)

				w->mbus_attr |= ATTR_HW_COHERENCY;

		w->base = base;

		w->size = size;

			w->base = base & DDR_BASE_CS_LOW_MASK;

			w->size = (size | ~DDR_SIZE_MASK) + 1;

		}

	}

	mvebu_mbus_dram_info.num_cs = cs;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE