renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

Soc patches for mvebu for v3.20, part #2.

Browse Source 
Note these depend on mvebu-fixes-3.19-4, which in turn depends on
 v3.19-rc4.
 
 bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window
 bus: mvebu-mbus: fix support of MBus window 13 on Armada XP/375/38x
 ARM: mvebu: use arm_coherent_dma_ops and re-enable hardware I/O coherency
 bus: mvebu-mbus: use automatic I/O synchronization barriers
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJUwDYpAAoJEOa/DcumaUyEz8UP/RMj8w8R+xWJbrmo6/NiC0vb
 SSYjxMtAMMAi9gwrAHRT9nUuyIbwVEUAr2XF7VF9rfEPbZ3IUENRe0KT1EaRQ7G2
 e8C4EVJCMx6s6qVeXYEW+xlYg9ygnC2FdeapFlbmdhFGyV3v4yinpC7U2XG31TfU
 iHnDu8meeqwxnXjk29OFn7MOlUn52uovExLaKi3iYuFISVDgnl8vxh/YXlFlilkV
 6ELCOwaaH1i+ys+27/TtagiP0pl7x30rVTBqClrg0+iPM9KaOgmc6uPvMo6HeXST
 i4lRE1Wrcd9KrZdBPicraUKcZTzjY1YeJOC0chQRbrwFBGxFFbcFpl7kljiendjY
 Yic46cGzjhKp138t9xLebsQVSgqJg/a5xQb3dP7XfcKYODBi+hFVPBFn/ICa/Lv1
 NfSnvwh3ZpxcbgfdX3CWBERP6W3/Mbj2fbjeT5sJj6lQMqKjLFduOty74CwfLefi
 wu3Xm6FEOh+f7oyjtRbn3aWv45Eyp3g/NVE9S1KLl5c6S5Epj/9s47aSatgKbzSt
 jEl4MoWkFhEccaiMDeAtKiNrnTiDlbaDFpLUBkDp5Zaqb50qG+mJqtSnawzUrpCK
 V4ql7n4EKZp+qZRl5YwmX97oN1tqu8IrkghUCtIDgUzIMdu2Bc400GCYLjdeRGSJ
 zebFAxpOBqS9gPfDbuTF
 =Bkue
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu into next/soc

Merge "mvebu/soc #2" from Andrew Lunn:

Soc patches for mvebu for v3.20, part #2.

* tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu:
  bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window
  bus: mvebu-mbus: fix support of MBus window 13 on Armada XP/375/38x
  ARM: mvebu: use arm_coherent_dma_ops and re-enable hardware I/O coherency
  bus: mvebu-mbus: use automatic I/O synchronization barriers
  bus: mvebu-mbus: fix support of MBus window 13
  ARM: mvebu: completely disable hardware I/O coherency

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-01-23 14:13:15 -08:00
commit 8a333cc7be
2 changed files with 224 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
arch/arm/mach-mvebu/coherency.c
View File

@ -33,6 +33,7 @@
#include <asm/smp_plat.h> #include <asm/smp_plat.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/dma-mapping.h>
#include "coherency.h" #include "coherency.h"
#include "mvebu-soc-id.h" #include "mvebu-soc-id.h"
@ -76,54 +77,6 @@ int set_cpu_coherent(void)
return ll_enable_coherency(); return ll_enable_coherency();
} }
static inline void mvebu_hwcc_sync_io_barrier(void)
{
writel(0x1, coherency_cpu_base + IO_SYNC_BARRIER_CTL_OFFSET);
while (readl(coherency_cpu_base + IO_SYNC_BARRIER_CTL_OFFSET) & 0x1);
}
static dma_addr_t mvebu_hwcc_dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size,
enum dma_data_direction dir,
struct dma_attrs *attrs)
{
if (dir != DMA_TO_DEVICE)
mvebu_hwcc_sync_io_barrier();
return pfn_to_dma(dev, page_to_pfn(page)) + offset;
}
static void mvebu_hwcc_dma_unmap_page(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction dir,
struct dma_attrs *attrs)
{
if (dir != DMA_TO_DEVICE)
mvebu_hwcc_sync_io_barrier();
}
static void mvebu_hwcc_dma_sync(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction dir)
{
if (dir != DMA_TO_DEVICE)
mvebu_hwcc_sync_io_barrier();
}
static struct dma_map_ops mvebu_hwcc_dma_ops = {
.alloc = arm_dma_alloc,
.free = arm_dma_free,
.mmap = arm_dma_mmap,
.map_page = mvebu_hwcc_dma_map_page,
.unmap_page = mvebu_hwcc_dma_unmap_page,
.get_sgtable = arm_dma_get_sgtable,
.map_sg = arm_dma_map_sg,
.unmap_sg = arm_dma_unmap_sg,
.sync_single_for_cpu = mvebu_hwcc_dma_sync,
.sync_single_for_device = mvebu_hwcc_dma_sync,
.sync_sg_for_cpu = arm_dma_sync_sg_for_cpu,
.sync_sg_for_device = arm_dma_sync_sg_for_device,
.set_dma_mask = arm_dma_set_mask,
};
static int mvebu_hwcc_notifier(struct notifier_block *nb, static int mvebu_hwcc_notifier(struct notifier_block *nb,
unsigned long event, void *__dev) unsigned long event, void *__dev)
{ {
@ -131,7 +84,7 @@ static int mvebu_hwcc_notifier(struct notifier_block *nb,
if (event != BUS_NOTIFY_ADD_DEVICE) if (event != BUS_NOTIFY_ADD_DEVICE)
return NOTIFY_DONE; return NOTIFY_DONE;
set_dma_ops(dev, &mvebu_hwcc_dma_ops); set_dma_ops(dev, &arm_coherent_dma_ops);
return NOTIFY_OK; return NOTIFY_OK;
} }

279
drivers/bus/mvebu-mbus.c
View File

@ -58,6 +58,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/syscore_ops.h> #include <linux/syscore_ops.h>
#include <linux/memblock.h>
/* /*
* DDR target is the same on all platforms. * DDR target is the same on all platforms.
@ -69,6 +70,7 @@
*/ */
#define WIN_CTRL_OFF 0x0000 #define WIN_CTRL_OFF 0x0000
#define WIN_CTRL_ENABLE BIT(0) #define WIN_CTRL_ENABLE BIT(0)
#define WIN_CTRL_SYNCBARRIER BIT(1)
#define WIN_CTRL_TGT_MASK 0xf0 #define WIN_CTRL_TGT_MASK 0xf0
#define WIN_CTRL_TGT_SHIFT 4 #define WIN_CTRL_TGT_SHIFT 4
#define WIN_CTRL_ATTR_MASK 0xff00 #define WIN_CTRL_ATTR_MASK 0xff00
@ -82,6 +84,9 @@
#define WIN_REMAP_LOW 0xffff0000 #define WIN_REMAP_LOW 0xffff0000
#define WIN_REMAP_HI_OFF 0x000c #define WIN_REMAP_HI_OFF 0x000c
#define UNIT_SYNC_BARRIER_OFF 0x84
#define UNIT_SYNC_BARRIER_ALL 0xFFFF
#define ATTR_HW_COHERENCY (0x1 << 4) #define ATTR_HW_COHERENCY (0x1 << 4)
#define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3)) #define DDR_BASE_CS_OFF(n) (0x0000 + ((n) << 3))
@ -97,7 +102,9 @@
/* Relative to mbusbridge_base */ /* Relative to mbusbridge_base */
#define MBUS_BRIDGE_CTRL_OFF 0x0 #define MBUS_BRIDGE_CTRL_OFF 0x0
#define MBUS_BRIDGE_SIZE_MASK 0xffff0000
#define MBUS_BRIDGE_BASE_OFF 0x4 #define MBUS_BRIDGE_BASE_OFF 0x4
#define MBUS_BRIDGE_BASE_MASK 0xffff0000
/* Maximum number of windows, for all known platforms */ /* Maximum number of windows, for all known platforms */
#define MBUS_WINS_MAX 20 #define MBUS_WINS_MAX 20
@ -106,9 +113,9 @@ struct mvebu_mbus_state;
struct mvebu_mbus_soc_data { struct mvebu_mbus_soc_data {
unsigned int num_wins; unsigned int num_wins;
unsigned int num_remappable_wins;
bool has_mbus_bridge; bool has_mbus_bridge;
unsigned int (*win_cfg_offset)(const int win); unsigned int (*win_cfg_offset)(const int win);
unsigned int (*win_remap_offset)(const int win);
void (*setup_cpu_target)(struct mvebu_mbus_state *s); void (*setup_cpu_target)(struct mvebu_mbus_state *s);
int (*save_cpu_target)(struct mvebu_mbus_state *s, int (*save_cpu_target)(struct mvebu_mbus_state *s,
u32 *store_addr); u32 *store_addr);
@ -154,6 +161,13 @@ const struct mbus_dram_target_info *mv_mbus_dram_info(void)
} }
EXPORT_SYMBOL_GPL(mv_mbus_dram_info); EXPORT_SYMBOL_GPL(mv_mbus_dram_info);
/* Checks whether the given window has remap capability */
static bool mvebu_mbus_window_is_remappable(struct mvebu_mbus_state *mbus,
const int win)
{
return mbus->soc->win_remap_offset(win) != MVEBU_MBUS_NO_REMAP;
}
/* /*
* Functions to manipulate the address decoding windows * Functions to manipulate the address decoding windows
*/ */
@ -185,9 +199,12 @@ static void mvebu_mbus_read_window(struct mvebu_mbus_state *mbus,
*attr = (ctrlreg & WIN_CTRL_ATTR_MASK) >> WIN_CTRL_ATTR_SHIFT; *attr = (ctrlreg & WIN_CTRL_ATTR_MASK) >> WIN_CTRL_ATTR_SHIFT;
if (remap) { if (remap) {
if (win < mbus->soc->num_remappable_wins) { if (mvebu_mbus_window_is_remappable(mbus, win)) {
u32 remap_low = readl(addr + WIN_REMAP_LO_OFF); u32 remap_low, remap_hi;
u32 remap_hi = readl(addr + WIN_REMAP_HI_OFF); void __iomem *addr_rmp = mbus->mbuswins_base +
mbus->soc->win_remap_offset(win);
remap_low = readl(addr_rmp + WIN_REMAP_LO_OFF);
remap_hi = readl(addr_rmp + WIN_REMAP_HI_OFF);
*remap = ((u64)remap_hi << 32) | remap_low; *remap = ((u64)remap_hi << 32) | remap_low;
} else } else
*remap = 0; *remap = 0;
@ -200,22 +217,25 @@ static void mvebu_mbus_disable_window(struct mvebu_mbus_state *mbus,
void __iomem *addr; void __iomem *addr;
addr = mbus->mbuswins_base + mbus->soc->win_cfg_offset(win); addr = mbus->mbuswins_base + mbus->soc->win_cfg_offset(win);
writel(0, addr + WIN_BASE_OFF); writel(0, addr + WIN_BASE_OFF);
writel(0, addr + WIN_CTRL_OFF); writel(0, addr + WIN_CTRL_OFF);
if (win < mbus->soc->num_remappable_wins) {
if (mvebu_mbus_window_is_remappable(mbus, win)) {
addr = mbus->mbuswins_base + mbus->soc->win_remap_offset(win);
writel(0, addr + WIN_REMAP_LO_OFF); writel(0, addr + WIN_REMAP_LO_OFF);
writel(0, addr + WIN_REMAP_HI_OFF); writel(0, addr + WIN_REMAP_HI_OFF);
} }
} }
/* Checks whether the given window number is available */ /* Checks whether the given window number is available */
static int mvebu_mbus_window_is_free(struct mvebu_mbus_state *mbus, static int mvebu_mbus_window_is_free(struct mvebu_mbus_state *mbus,
const int win) const int win)
{ {
void __iomem *addr = mbus->mbuswins_base + void __iomem *addr = mbus->mbuswins_base +
mbus->soc->win_cfg_offset(win); mbus->soc->win_cfg_offset(win);
u32 ctrl = readl(addr + WIN_CTRL_OFF); u32 ctrl = readl(addr + WIN_CTRL_OFF);
return !(ctrl & WIN_CTRL_ENABLE); return !(ctrl & WIN_CTRL_ENABLE);
} }
@ -303,17 +323,22 @@ static int mvebu_mbus_setup_window(struct mvebu_mbus_state *mbus,
ctrl = ((size - 1) & WIN_CTRL_SIZE_MASK) | ctrl = ((size - 1) & WIN_CTRL_SIZE_MASK) |
(attr << WIN_CTRL_ATTR_SHIFT) | (attr << WIN_CTRL_ATTR_SHIFT) |
(target << WIN_CTRL_TGT_SHIFT) | (target << WIN_CTRL_TGT_SHIFT) |
WIN_CTRL_SYNCBARRIER |
WIN_CTRL_ENABLE; WIN_CTRL_ENABLE;
writel(base & WIN_BASE_LOW, addr + WIN_BASE_OFF); writel(base & WIN_BASE_LOW, addr + WIN_BASE_OFF);
writel(ctrl, addr + WIN_CTRL_OFF); writel(ctrl, addr + WIN_CTRL_OFF);
if (win < mbus->soc->num_remappable_wins) {
if (mvebu_mbus_window_is_remappable(mbus, win)) {
void __iomem *addr_rmp = mbus->mbuswins_base +
mbus->soc->win_remap_offset(win);
if (remap == MVEBU_MBUS_NO_REMAP) if (remap == MVEBU_MBUS_NO_REMAP)
remap_addr = base; remap_addr = base;
else else
remap_addr = remap; remap_addr = remap;
writel(remap_addr & WIN_REMAP_LOW, addr + WIN_REMAP_LO_OFF); writel(remap_addr & WIN_REMAP_LOW, addr_rmp + WIN_REMAP_LO_OFF);
writel(0, addr + WIN_REMAP_HI_OFF); writel(0, addr_rmp + WIN_REMAP_HI_OFF);
} }
return 0; return 0;
@ -327,19 +352,27 @@ static int mvebu_mbus_alloc_window(struct mvebu_mbus_state *mbus,
int win; int win;
if (remap == MVEBU_MBUS_NO_REMAP) { if (remap == MVEBU_MBUS_NO_REMAP) {
for (win = mbus->soc->num_remappable_wins; for (win = 0; win < mbus->soc->num_wins; win++) {
win < mbus->soc->num_wins; win++) if (mvebu_mbus_window_is_remappable(mbus, win))
continue;
if (mvebu_mbus_window_is_free(mbus, win)) if (mvebu_mbus_window_is_free(mbus, win))
return mvebu_mbus_setup_window(mbus, win, base, return mvebu_mbus_setup_window(mbus, win, base,
size, remap, size, remap,
target, attr); target, attr);
}
} }
for (win = 0; win < mbus->soc->num_wins; win++) {
/* Skip window if need remap but is not supported */
if ((remap != MVEBU_MBUS_NO_REMAP) &&
!mvebu_mbus_window_is_remappable(mbus, win))
continue;
for (win = 0; win < mbus->soc->num_wins; win++)
if (mvebu_mbus_window_is_free(mbus, win)) if (mvebu_mbus_window_is_free(mbus, win))
return mvebu_mbus_setup_window(mbus, win, base, size, return mvebu_mbus_setup_window(mbus, win, base, size,
remap, target, attr); remap, target, attr);
}
return -ENOMEM; return -ENOMEM;
} }
@ -451,7 +484,7 @@ static int mvebu_devs_debug_show(struct seq_file *seq, void *v)
((wbase & (u64)(wsize - 1)) != 0)) ((wbase & (u64)(wsize - 1)) != 0))
seq_puts(seq, " (Invalid base/size!!)"); seq_puts(seq, " (Invalid base/size!!)");
if (win < mbus->soc->num_remappable_wins) { if (mvebu_mbus_window_is_remappable(mbus, win)) {
seq_printf(seq, " (remap %016llx)\n", seq_printf(seq, " (remap %016llx)\n",
(unsigned long long)wremap); (unsigned long long)wremap);
} else } else
@ -477,12 +510,12 @@ static const struct file_operations mvebu_devs_debug_fops = {
* SoC-specific functions and definitions * SoC-specific functions and definitions
*/ */
static unsigned int orion_mbus_win_offset(int win) static unsigned int generic_mbus_win_cfg_offset(int win)
{ {
return win << 4; return win << 4;
} }
static unsigned int armada_370_xp_mbus_win_offset(int win) static unsigned int armada_370_xp_mbus_win_cfg_offset(int win)
{ {
/* The register layout is a bit annoying and the below code /* The register layout is a bit annoying and the below code
* tries to cope with it. * tries to cope with it.
@ -502,7 +535,7 @@ static unsigned int armada_370_xp_mbus_win_offset(int win)
return 0x90 + ((win - 8) << 3); return 0x90 + ((win - 8) << 3);
} }
static unsigned int mv78xx0_mbus_win_offset(int win) static unsigned int mv78xx0_mbus_win_cfg_offset(int win)
{ {
if (win < 8) if (win < 8)
return win << 4; return win << 4;
@ -510,36 +543,140 @@ static unsigned int mv78xx0_mbus_win_offset(int win)
return 0x900 + ((win - 8) << 4); return 0x900 + ((win - 8) << 4);
} }
static unsigned int generic_mbus_win_remap_2_offset(int win)
{
if (win < 2)
return generic_mbus_win_cfg_offset(win);
else
return MVEBU_MBUS_NO_REMAP;
}
static unsigned int generic_mbus_win_remap_4_offset(int win)
{
if (win < 4)
return generic_mbus_win_cfg_offset(win);
else
return MVEBU_MBUS_NO_REMAP;
}
static unsigned int generic_mbus_win_remap_8_offset(int win)
{
if (win < 8)
return generic_mbus_win_cfg_offset(win);
else
return MVEBU_MBUS_NO_REMAP;
}
static unsigned int armada_xp_mbus_win_remap_offset(int win)
{
if (win < 8)
return generic_mbus_win_cfg_offset(win);
else if (win == 13)
return 0xF0 - WIN_REMAP_LO_OFF;
else
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 static void __init
mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus) mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
{ {
int i; int i;
int cs; int cs;
uint64_t mbus_bridge_base, mbus_bridge_end;
mvebu_mbus_dram_info.mbus_dram_target_id = TARGET_DDR; 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++) { for (i = 0, cs = 0; i < 4; i++) {
u32 base = readl(mbus->sdramwins_base + DDR_BASE_CS_OFF(i)); u64 base = readl(mbus->sdramwins_base + DDR_BASE_CS_OFF(i));
u32 size = readl(mbus->sdramwins_base + DDR_SIZE_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;
/* /*
* We only take care of entries for which the chip * Ignore entries whose base address is above 2^32,
* select is enabled, and that don't have high base * since devices cannot DMA to such high addresses
* address bits set (devices can only access the first
* 32 bits of the memory).
*/ */
if ((size & DDR_SIZE_ENABLED) && if (base & DDR_BASE_CS_HIGH_MASK)
!(base & DDR_BASE_CS_HIGH_MASK)) { continue;
struct mbus_dram_window *w;
w = &mvebu_mbus_dram_info.cs[cs++]; base = base & DDR_BASE_CS_LOW_MASK;
w->cs_index = i; size = (size | ~DDR_SIZE_MASK) + 1;
w->mbus_attr = 0xf & ~(1 << i); end = base + size;
if (mbus->hw_io_coherency)
w->mbus_attr |= ATTR_HW_COHERENCY; /*
w->base = base & DDR_BASE_CS_LOW_MASK; * Adjust base/size of the current CS to make sure it
w->size = (size | ~DDR_SIZE_MASK) + 1; * 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;
} }
/*
* End of CS overlaps with beginning of MBus, shrink
* CS size.
*/
if (base < mbus_bridge_base && end > mbus_bridge_base)
size -= end - mbus_bridge_base;
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;
} }
mvebu_mbus_dram_info.num_cs = cs; mvebu_mbus_dram_info.num_cs = cs;
} }
@ -619,30 +756,40 @@ int mvebu_mbus_save_cpu_target(u32 *store_addr)
return mbus_state.soc->save_cpu_target(&mbus_state, store_addr); return mbus_state.soc->save_cpu_target(&mbus_state, store_addr);
} }
static const struct mvebu_mbus_soc_data armada_370_xp_mbus_data = { static const struct mvebu_mbus_soc_data armada_370_mbus_data = {
.num_wins = 20, .num_wins = 20,
.num_remappable_wins = 8,
.has_mbus_bridge = true, .has_mbus_bridge = true,
.win_cfg_offset = armada_370_xp_mbus_win_offset, .win_cfg_offset = armada_370_xp_mbus_win_cfg_offset,
.save_cpu_target = mvebu_mbus_default_save_cpu_target, .win_remap_offset = generic_mbus_win_remap_8_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target, .setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion, .show_cpu_target = mvebu_sdram_debug_show_orion,
.save_cpu_target = mvebu_mbus_default_save_cpu_target,
};
static const struct mvebu_mbus_soc_data armada_xp_mbus_data = {
.num_wins = 20,
.has_mbus_bridge = true,
.win_cfg_offset = armada_370_xp_mbus_win_cfg_offset,
.win_remap_offset = armada_xp_mbus_win_remap_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion,
.save_cpu_target = mvebu_mbus_default_save_cpu_target,
}; };
static const struct mvebu_mbus_soc_data kirkwood_mbus_data = { static const struct mvebu_mbus_soc_data kirkwood_mbus_data = {
.num_wins = 8, .num_wins = 8,
.num_remappable_wins = 4, .win_cfg_offset = generic_mbus_win_cfg_offset,
.win_cfg_offset = orion_mbus_win_offset,
.save_cpu_target = mvebu_mbus_default_save_cpu_target, .save_cpu_target = mvebu_mbus_default_save_cpu_target,
.win_remap_offset = generic_mbus_win_remap_4_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target, .setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion, .show_cpu_target = mvebu_sdram_debug_show_orion,
}; };
static const struct mvebu_mbus_soc_data dove_mbus_data = { static const struct mvebu_mbus_soc_data dove_mbus_data = {
.num_wins = 8, .num_wins = 8,
.num_remappable_wins = 4, .win_cfg_offset = generic_mbus_win_cfg_offset,
.win_cfg_offset = orion_mbus_win_offset,
.save_cpu_target = mvebu_mbus_dove_save_cpu_target, .save_cpu_target = mvebu_mbus_dove_save_cpu_target,
.win_remap_offset = generic_mbus_win_remap_4_offset,
.setup_cpu_target = mvebu_mbus_dove_setup_cpu_target, .setup_cpu_target = mvebu_mbus_dove_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_dove, .show_cpu_target = mvebu_sdram_debug_show_dove,
}; };
@ -653,36 +800,40 @@ static const struct mvebu_mbus_soc_data dove_mbus_data = {
*/ */
static const struct mvebu_mbus_soc_data orion5x_4win_mbus_data = { static const struct mvebu_mbus_soc_data orion5x_4win_mbus_data = {
.num_wins = 8, .num_wins = 8,
.num_remappable_wins = 4, .win_cfg_offset = generic_mbus_win_cfg_offset,
.win_cfg_offset = orion_mbus_win_offset,
.save_cpu_target = mvebu_mbus_default_save_cpu_target, .save_cpu_target = mvebu_mbus_default_save_cpu_target,
.win_remap_offset = generic_mbus_win_remap_4_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target, .setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion, .show_cpu_target = mvebu_sdram_debug_show_orion,
}; };
static const struct mvebu_mbus_soc_data orion5x_2win_mbus_data = { static const struct mvebu_mbus_soc_data orion5x_2win_mbus_data = {
.num_wins = 8, .num_wins = 8,
.num_remappable_wins = 2, .win_cfg_offset = generic_mbus_win_cfg_offset,
.win_cfg_offset = orion_mbus_win_offset,
.save_cpu_target = mvebu_mbus_default_save_cpu_target, .save_cpu_target = mvebu_mbus_default_save_cpu_target,
.win_remap_offset = generic_mbus_win_remap_2_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target, .setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion, .show_cpu_target = mvebu_sdram_debug_show_orion,
}; };
static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = { static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = {
.num_wins = 14, .num_wins = 14,
.num_remappable_wins = 8, .win_cfg_offset = mv78xx0_mbus_win_cfg_offset,
.win_cfg_offset = mv78xx0_mbus_win_offset,
.save_cpu_target = mvebu_mbus_default_save_cpu_target, .save_cpu_target = mvebu_mbus_default_save_cpu_target,
.win_remap_offset = generic_mbus_win_remap_8_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target, .setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion, .show_cpu_target = mvebu_sdram_debug_show_orion,
}; };
static const struct of_device_id of_mvebu_mbus_ids[] = { static const struct of_device_id of_mvebu_mbus_ids[] = {
{ .compatible = "marvell,armada370-mbus", { .compatible = "marvell,armada370-mbus",
.data = &armada_370_xp_mbus_data, }, .data = &armada_370_mbus_data, },
{ .compatible = "marvell,armada375-mbus",
.data = &armada_xp_mbus_data, },
{ .compatible = "marvell,armada380-mbus",
.data = &armada_xp_mbus_data, },
{ .compatible = "marvell,armadaxp-mbus", { .compatible = "marvell,armadaxp-mbus",
.data = &armada_370_xp_mbus_data, }, .data = &armada_xp_mbus_data, },
{ .compatible = "marvell,kirkwood-mbus", { .compatible = "marvell,kirkwood-mbus",
.data = &kirkwood_mbus_data, }, .data = &kirkwood_mbus_data, },
{ .compatible = "marvell,dove-mbus", { .compatible = "marvell,dove-mbus",
@ -789,15 +940,19 @@ static int mvebu_mbus_suspend(void)
for (win = 0; win < s->soc->num_wins; win++) { for (win = 0; win < s->soc->num_wins; win++) {
void __iomem *addr = s->mbuswins_base + void __iomem *addr = s->mbuswins_base +
s->soc->win_cfg_offset(win); s->soc->win_cfg_offset(win);
void __iomem *addr_rmp;
s->wins[win].base = readl(addr + WIN_BASE_OFF); s->wins[win].base = readl(addr + WIN_BASE_OFF);
s->wins[win].ctrl = readl(addr + WIN_CTRL_OFF); s->wins[win].ctrl = readl(addr + WIN_CTRL_OFF);
if (win >= s->soc->num_remappable_wins) if (!mvebu_mbus_window_is_remappable(s, win))
continue; continue;
s->wins[win].remap_lo = readl(addr + WIN_REMAP_LO_OFF); addr_rmp = s->mbuswins_base +
s->wins[win].remap_hi = readl(addr + WIN_REMAP_HI_OFF); s->soc->win_remap_offset(win);
s->wins[win].remap_lo = readl(addr_rmp + WIN_REMAP_LO_OFF);
s->wins[win].remap_hi = readl(addr_rmp + WIN_REMAP_HI_OFF);
} }
s->mbus_bridge_ctrl = readl(s->mbusbridge_base + s->mbus_bridge_ctrl = readl(s->mbusbridge_base +
@ -821,15 +976,19 @@ static void mvebu_mbus_resume(void)
for (win = 0; win < s->soc->num_wins; win++) { for (win = 0; win < s->soc->num_wins; win++) {
void __iomem *addr = s->mbuswins_base + void __iomem *addr = s->mbuswins_base +
s->soc->win_cfg_offset(win); s->soc->win_cfg_offset(win);
void __iomem *addr_rmp;
writel(s->wins[win].base, addr + WIN_BASE_OFF); writel(s->wins[win].base, addr + WIN_BASE_OFF);
writel(s->wins[win].ctrl, addr + WIN_CTRL_OFF); writel(s->wins[win].ctrl, addr + WIN_CTRL_OFF);
if (win >= s->soc->num_remappable_wins) if (!mvebu_mbus_window_is_remappable(s, win))
continue; continue;
writel(s->wins[win].remap_lo, addr + WIN_REMAP_LO_OFF); addr_rmp = s->mbuswins_base +
writel(s->wins[win].remap_hi, addr + WIN_REMAP_HI_OFF); s->soc->win_remap_offset(win);
writel(s->wins[win].remap_lo, addr_rmp + WIN_REMAP_LO_OFF);
writel(s->wins[win].remap_hi, addr_rmp + WIN_REMAP_HI_OFF);
} }
} }
@ -844,7 +1003,8 @@ static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,
phys_addr_t sdramwins_phys_base, phys_addr_t sdramwins_phys_base,
size_t sdramwins_size, size_t sdramwins_size,
phys_addr_t mbusbridge_phys_base, phys_addr_t mbusbridge_phys_base,
size_t mbusbridge_size) size_t mbusbridge_size,
bool is_coherent)
{ {
int win; int win;
@ -876,6 +1036,10 @@ static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,
mbus->soc->setup_cpu_target(mbus); mbus->soc->setup_cpu_target(mbus);
if (is_coherent)
writel(UNIT_SYNC_BARRIER_ALL,
mbus->mbuswins_base + UNIT_SYNC_BARRIER_OFF);
register_syscore_ops(&mvebu_mbus_syscore_ops); register_syscore_ops(&mvebu_mbus_syscore_ops);
return 0; return 0;
@ -903,7 +1067,7 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
mbuswins_phys_base, mbuswins_phys_base,
mbuswins_size, mbuswins_size,
sdramwins_phys_base, sdramwins_phys_base,
sdramwins_size, 0, 0); sdramwins_size, 0, 0, false);
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
@ -1105,7 +1269,8 @@ int __init mvebu_mbus_dt_init(bool is_coherent)
sdramwins_res.start, sdramwins_res.start,
resource_size(&sdramwins_res), resource_size(&sdramwins_res),
mbusbridge_res.start, mbusbridge_res.start,
resource_size(&mbusbridge_res)); resource_size(&mbusbridge_res),
is_coherent);
if (ret) if (ret)
return ret; return ret;