diff options
author | Luka Perkov <luka@openwrt.org> | 2013-09-27 01:52:28 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-09-27 01:52:28 +0000 |
commit | e0e36cb5d987c6515f2b9c6ed4e4df6c84f18541 (patch) | |
tree | 90b32b568e37dd68264a916ebdcdb807897b2451 /target/linux/mvebu/patches-3.8/032-arm_plat_orion_introduce_orion_alloc_free_cpu_win.patch | |
parent | 896a6277b51daa7f253d849a7a501959dfcf705e (diff) | |
download | master-187ad058-e0e36cb5d987c6515f2b9c6ed4e4df6c84f18541.tar.gz master-187ad058-e0e36cb5d987c6515f2b9c6ed4e4df6c84f18541.tar.bz2 master-187ad058-e0e36cb5d987c6515f2b9c6ed4e4df6c84f18541.zip |
mvebu: drop 3.8 support
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38225 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.8/032-arm_plat_orion_introduce_orion_alloc_free_cpu_win.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.8/032-arm_plat_orion_introduce_orion_alloc_free_cpu_win.patch | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/target/linux/mvebu/patches-3.8/032-arm_plat_orion_introduce_orion_alloc_free_cpu_win.patch b/target/linux/mvebu/patches-3.8/032-arm_plat_orion_introduce_orion_alloc_free_cpu_win.patch deleted file mode 100644 index 91ed678b27..0000000000 --- a/target/linux/mvebu/patches-3.8/032-arm_plat_orion_introduce_orion_alloc_free_cpu_win.patch +++ /dev/null @@ -1,96 +0,0 @@ -In the address decoding code, we implement two new functions: -orion_alloc_cpu_win() and orion_free_cpu_win(). The first function -finds an unused address decoding window, and configures it according -to the given arguments (in terms of base address, size, target, -attributes). The second function frees an address decoding window, -given a physical base address. - -Those two new functions will be used by the PCIe code, which needs to -dynamically register address decoding windows depending on the PCIe -devices that are detected. - -The orion_free_cpu_win() function is only here to handle error cases -in the PCIe devices initialization, in the normal case, address -decoding windows are never freed. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - arch/arm/plat-orion/addr-map.c | 50 +++++++++++++++++++++++++++ - arch/arm/plat-orion/include/plat/addr-map.h | 7 ++++ - 2 files changed, 57 insertions(+) - ---- a/arch/arm/plat-orion/addr-map.c -+++ b/arch/arm/plat-orion/addr-map.c -@@ -109,6 +109,56 @@ static void __init orion_disable_cpu_win - } - - /* -+ * Find an unused address decoding window, and enable it according to -+ * the arguments passed (base, size, target, attributes, remap). -+ */ -+int __init orion_alloc_cpu_win(const struct orion_addr_map_cfg *cfg, -+ const u32 base, const u32 size, -+ const u8 target, const u8 attr, const int remap) -+{ -+ int win; -+ -+ for (win = 0; win < cfg->num_wins; win++) { -+ void __iomem *addr = cfg->win_cfg_base(cfg, win); -+ u32 ctrl = readl(addr + WIN_CTRL_OFF); -+ if (!(ctrl & WIN_CTRL_ENABLE)) -+ break; -+ } -+ -+ /* No more windows available */ -+ if (win == cfg->num_wins) -+ return -ENOMEM; -+ -+ orion_setup_cpu_win(cfg, win, base, size, target, attr, remap); -+ return 0; -+} -+ -+/* -+ * Free an address decoding window, given its base address. -+ */ -+int __init orion_free_cpu_win(const struct orion_addr_map_cfg *cfg, -+ const u32 base) -+{ -+ int win; -+ -+ for (win = 0; win < cfg->num_wins; win++) { -+ void __iomem *addr = cfg->win_cfg_base(cfg, win); -+ u32 winbase = readl(addr + WIN_BASE_OFF); -+ u32 ctrl = readl(addr + WIN_CTRL_OFF); -+ -+ if (!(ctrl & WIN_CTRL_ENABLE)) -+ continue; -+ -+ if (winbase == (base & 0xffff0000)) { -+ orion_disable_cpu_win(cfg, win); -+ return 0; -+ } -+ } -+ -+ return -EINVAL; -+} -+ -+/* - * Configure a number of windows. - */ - static void __init orion_setup_cpu_wins(const struct orion_addr_map_cfg * cfg, ---- a/arch/arm/plat-orion/include/plat/addr-map.h -+++ b/arch/arm/plat-orion/include/plat/addr-map.h -@@ -49,6 +49,13 @@ void __init orion_setup_cpu_win(const st - const u32 size, const u8 target, - const u8 attr, const int remap); - -+int __init orion_alloc_cpu_win(const struct orion_addr_map_cfg *cfg, -+ const u32 base, const u32 size, -+ const u8 target, const u8 attr, const int remap); -+ -+int __init orion_free_cpu_win(const struct orion_addr_map_cfg *cfg, -+ const u32 base); -+ - void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg, - const void __iomem *ddr_window_cpu_base); - #endif |