From: Luka Perkov Date: Thu, 19 Dec 2013 02:03:16 +0000 (+0000) Subject: imx6: proper fix for io-remap X-Git-Tag: reboot~8325 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1e9161528bacf3a2db47198cc9d033a0bca2bf61;p=oweals%2Fopenwrt.git imx6: proper fix for io-remap The previous patch was not the proper fix for PCI devices that require io resources. The new patch is the proper fix backported from mainline. Signed-off-by: Tim Harvey SVN-Revision: 39133 --- diff --git a/target/linux/imx6/patches-3.10/0030-PCI-imx6-remove-outbound-io-mem-ATU-region-mapping.patch b/target/linux/imx6/patches-3.10/0030-PCI-imx6-remove-outbound-io-mem-ATU-region-mapping.patch deleted file mode 100644 index bc9ad3c7a7..0000000000 --- a/target/linux/imx6/patches-3.10/0030-PCI-imx6-remove-outbound-io-mem-ATU-region-mapping.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 93d2b52fe73294d59bbce3a6d4da031647b1f3b2 Mon Sep 17 00:00:00 2001 -From: Tim Harvey -Date: Tue, 22 Oct 2013 15:56:40 -0700 -Subject: [PATCH] PCI: imx6: remove outbound io/mem ATU region mapping - -The IMX6 iATU is used for address translation between the AXI bus -address space and PCI address space. This is used for type0 and type1 -config cycles but is not necessary for outbound io/mem regions. - -This patch removes the calls that inappropriately re-configures the ATU -viewport for outbound memory and IO after config cycles and removes them -altogether as they are not necessary. - -This resolves issues with PCI devices behind switches and has been tested with -a Gige device behind a PLX PEX860x switch. - -Signed-off-by: Tim Harvey ---- - drivers/pci/host/pcie-designware.c | 41 +++--------------------------------- - 1 file changed, 3 insertions(+), 38 deletions(-) - ---- a/drivers/pci/host/pcie-designware.c -+++ b/drivers/pci/host/pcie-designware.c -@@ -43,7 +43,6 @@ - #define PCIE_ATU_VIEWPORT 0x900 - #define PCIE_ATU_REGION_INBOUND (0x1 << 31) - #define PCIE_ATU_REGION_OUTBOUND (0x0 << 31) --#define PCIE_ATU_REGION_INDEX1 (0x1 << 0) - #define PCIE_ATU_REGION_INDEX0 (0x0 << 0) - #define PCIE_ATU_CR1 0x904 - #define PCIE_ATU_TYPE_MEM (0x0 << 0) -@@ -264,8 +263,8 @@ static void dw_pcie_prog_viewport_cfg0(s - - static void dw_pcie_prog_viewport_cfg1(struct pcie_port *pp, u32 busdev) - { -- /* Program viewport 1 : OUTBOUND : CFG1 */ -- dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX1, -+ /* Program viewport 0 : OUTBOUND : CFG1 */ -+ dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX0, - PCIE_ATU_VIEWPORT); - dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_CFG1, PCIE_ATU_CR1); - dw_pcie_writel_rc(pp, PCIE_ATU_ENABLE, PCIE_ATU_CR2); -@@ -275,38 +274,8 @@ static void dw_pcie_prog_viewport_cfg1(s - PCIE_ATU_LIMIT); - dw_pcie_writel_rc(pp, busdev, PCIE_ATU_LOWER_TARGET); - dw_pcie_writel_rc(pp, 0, PCIE_ATU_UPPER_TARGET); --} -- --static void dw_pcie_prog_viewport_mem_outbound(struct pcie_port *pp) --{ -- /* Program viewport 0 : OUTBOUND : MEM */ -- dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX0, -- PCIE_ATU_VIEWPORT); -- dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_MEM, PCIE_ATU_CR1); -- dw_pcie_writel_rc(pp, PCIE_ATU_ENABLE, PCIE_ATU_CR2); -- dw_pcie_writel_rc(pp, pp->mem_base, PCIE_ATU_LOWER_BASE); -- dw_pcie_writel_rc(pp, (pp->mem_base >> 32), PCIE_ATU_UPPER_BASE); -- dw_pcie_writel_rc(pp, pp->mem_base + pp->config.mem_size - 1, -- PCIE_ATU_LIMIT); -- dw_pcie_writel_rc(pp, pp->config.mem_bus_addr, PCIE_ATU_LOWER_TARGET); -- dw_pcie_writel_rc(pp, upper_32_bits(pp->config.mem_bus_addr), -- PCIE_ATU_UPPER_TARGET); --} -- --static void dw_pcie_prog_viewport_io_outbound(struct pcie_port *pp) --{ -- /* Program viewport 1 : OUTBOUND : IO */ -- dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX1, -- PCIE_ATU_VIEWPORT); -- dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_IO, PCIE_ATU_CR1); -+ dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_CFG1, PCIE_ATU_CR1); - dw_pcie_writel_rc(pp, PCIE_ATU_ENABLE, PCIE_ATU_CR2); -- dw_pcie_writel_rc(pp, pp->io_base, PCIE_ATU_LOWER_BASE); -- dw_pcie_writel_rc(pp, (pp->io_base >> 32), PCIE_ATU_UPPER_BASE); -- dw_pcie_writel_rc(pp, pp->io_base + pp->config.io_size - 1, -- PCIE_ATU_LIMIT); -- dw_pcie_writel_rc(pp, pp->config.io_bus_addr, PCIE_ATU_LOWER_TARGET); -- dw_pcie_writel_rc(pp, upper_32_bits(pp->config.io_bus_addr), -- PCIE_ATU_UPPER_TARGET); - } - - static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, -@@ -322,11 +291,9 @@ static int dw_pcie_rd_other_conf(struct - if (bus->parent->number == pp->root_bus_nr) { - dw_pcie_prog_viewport_cfg0(pp, busdev); - ret = cfg_read(pp->va_cfg0_base + address, where, size, val); -- dw_pcie_prog_viewport_mem_outbound(pp); - } else { - dw_pcie_prog_viewport_cfg1(pp, busdev); - ret = cfg_read(pp->va_cfg1_base + address, where, size, val); -- dw_pcie_prog_viewport_io_outbound(pp); - } - - return ret; -@@ -345,11 +312,9 @@ static int dw_pcie_wr_other_conf(struct - if (bus->parent->number == pp->root_bus_nr) { - dw_pcie_prog_viewport_cfg0(pp, busdev); - ret = cfg_write(pp->va_cfg0_base + address, where, size, val); -- dw_pcie_prog_viewport_mem_outbound(pp); - } else { - dw_pcie_prog_viewport_cfg1(pp, busdev); - ret = cfg_write(pp->va_cfg1_base + address, where, size, val); -- dw_pcie_prog_viewport_io_outbound(pp); - } - - return ret; diff --git a/target/linux/imx6/patches-3.10/0030-pcie-designware-fix-io-transfers.patch b/target/linux/imx6/patches-3.10/0030-pcie-designware-fix-io-transfers.patch new file mode 100644 index 0000000000..2445bc7a5d --- /dev/null +++ b/target/linux/imx6/patches-3.10/0030-pcie-designware-fix-io-transfers.patch @@ -0,0 +1,59 @@ +From: Pratyush Anand + +pp->io_base which is the input of the outbound IO address translation +unit should be the cpu address, it was programmed wrongly to realio +address. + +We should pass global_io_offset rather than sys->io_offset to +pci_ioremap_io, so we map the new window into the first available spot +in the Linux view of the I/O space. + +We must also pass cpu address instead of realio address to +pci_ioremap_io. + +This patch fixes above issue. It has been tested with Lecroy PTC in AIC +mode and Pericom PI7C9X2G303EL PCIe switch, which does not work +otherwise. + +Signed-off-by: Pratyush Anand +Tested-by: Mohit Kumar +Tested-by: Tim Harvey +Cc: Arnd Bergmann +Cc: Marek Vasut +Cc: Richard Zhu +Cc: linux-pci@vger.kernel.org +Cc: spear-devel@list.st.com +--- + drivers/pci/host/pcie-designware.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +http://thread.gmane.org/gmane.linux.kernel.pci/27204 + +diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c +--- a/drivers/pci/host/pcie-designware.c ++++ b/drivers/pci/host/pcie-designware.c +@@ -177,6 +177,7 @@ int __init dw_pcie_host_init(struct pcie + + global_io_offset); + pp->config.io_size = resource_size(&pp->io); + pp->config.io_bus_addr = range.pci_addr; ++ pp->io_base = range.cpu_addr; + } + if (restype == IORESOURCE_MEM) { + of_pci_range_to_resource(&range, np, &pp->mem); +@@ -202,7 +203,6 @@ int __init dw_pcie_host_init(struct pcie + + pp->cfg0_base = pp->cfg.start; + pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; +- pp->io_base = pp->io.start; + pp->mem_base = pp->mem.start; + + pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, +@@ -449,7 +449,7 @@ int dw_pcie_setup(int nr, struct pci_sys + + if (global_io_offset < SZ_1M && pp->config.io_size > 0) { + sys->io_offset = global_io_offset - pp->config.io_bus_addr; +- pci_ioremap_io(sys->io_offset, pp->io.start); ++ pci_ioremap_io(global_io_offset, pp->io_base); + global_io_offset += SZ_64K; + pci_add_resource_offset(&sys->resources, &pp->io, + sys->io_offset); diff --git a/target/linux/imx6/patches-3.12/0030-PCI-imx6-remove-outbound-io-mem-ATU-region-mapping.patch b/target/linux/imx6/patches-3.12/0030-PCI-imx6-remove-outbound-io-mem-ATU-region-mapping.patch deleted file mode 100644 index de93ac8f42..0000000000 --- a/target/linux/imx6/patches-3.12/0030-PCI-imx6-remove-outbound-io-mem-ATU-region-mapping.patch +++ /dev/null @@ -1,104 +0,0 @@ -From: Tim Harvey -Subject: [PATCH] PCI: imx6: remove outbound io/mem ATU region mapping - -The IMX6 iATU is used for address translation between the AXI bus -address space and PCI address space. This is used for type0 and type1 -config cycles but is not necessary for outbound io/mem regions. - -This patch removes the calls that inappropriately re-configures the ATU -viewport for outbound memory and IO after config cycles and removes them -altogether as they are not necessary. - -This resolves issues with PCI devices behind switches and has been tested with -a Gige device behind a PLX PEX860x switch. - -Signed-off-by: Tim Harvey ---- - drivers/pci/host/pcie-designware.c | 41 +++--------------------------------- - 1 file changed, 3 insertions(+), 38 deletions(-) - ---- a/drivers/pci/host/pcie-designware.c -+++ b/drivers/pci/host/pcie-designware.c -@@ -43,7 +43,6 @@ - #define PCIE_ATU_VIEWPORT 0x900 - #define PCIE_ATU_REGION_INBOUND (0x1 << 31) - #define PCIE_ATU_REGION_OUTBOUND (0x0 << 31) --#define PCIE_ATU_REGION_INDEX1 (0x1 << 0) - #define PCIE_ATU_REGION_INDEX0 (0x0 << 0) - #define PCIE_ATU_CR1 0x904 - #define PCIE_ATU_TYPE_MEM (0x0 << 0) -@@ -264,8 +263,8 @@ static void dw_pcie_prog_viewport_cfg0(s - - static void dw_pcie_prog_viewport_cfg1(struct pcie_port *pp, u32 busdev) - { -- /* Program viewport 1 : OUTBOUND : CFG1 */ -- dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX1, -+ /* Program viewport 0 : OUTBOUND : CFG1 */ -+ dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX0, - PCIE_ATU_VIEWPORT); - dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_CFG1, PCIE_ATU_CR1); - dw_pcie_writel_rc(pp, PCIE_ATU_ENABLE, PCIE_ATU_CR2); -@@ -275,38 +274,8 @@ static void dw_pcie_prog_viewport_cfg1(s - PCIE_ATU_LIMIT); - dw_pcie_writel_rc(pp, busdev, PCIE_ATU_LOWER_TARGET); - dw_pcie_writel_rc(pp, 0, PCIE_ATU_UPPER_TARGET); --} -- --static void dw_pcie_prog_viewport_mem_outbound(struct pcie_port *pp) --{ -- /* Program viewport 0 : OUTBOUND : MEM */ -- dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX0, -- PCIE_ATU_VIEWPORT); -- dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_MEM, PCIE_ATU_CR1); -- dw_pcie_writel_rc(pp, PCIE_ATU_ENABLE, PCIE_ATU_CR2); -- dw_pcie_writel_rc(pp, pp->mem_base, PCIE_ATU_LOWER_BASE); -- dw_pcie_writel_rc(pp, (pp->mem_base >> 32), PCIE_ATU_UPPER_BASE); -- dw_pcie_writel_rc(pp, pp->mem_base + pp->config.mem_size - 1, -- PCIE_ATU_LIMIT); -- dw_pcie_writel_rc(pp, pp->config.mem_bus_addr, PCIE_ATU_LOWER_TARGET); -- dw_pcie_writel_rc(pp, upper_32_bits(pp->config.mem_bus_addr), -- PCIE_ATU_UPPER_TARGET); --} -- --static void dw_pcie_prog_viewport_io_outbound(struct pcie_port *pp) --{ -- /* Program viewport 1 : OUTBOUND : IO */ -- dw_pcie_writel_rc(pp, PCIE_ATU_REGION_OUTBOUND | PCIE_ATU_REGION_INDEX1, -- PCIE_ATU_VIEWPORT); -- dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_IO, PCIE_ATU_CR1); -+ dw_pcie_writel_rc(pp, PCIE_ATU_TYPE_CFG1, PCIE_ATU_CR1); - dw_pcie_writel_rc(pp, PCIE_ATU_ENABLE, PCIE_ATU_CR2); -- dw_pcie_writel_rc(pp, pp->io_base, PCIE_ATU_LOWER_BASE); -- dw_pcie_writel_rc(pp, (pp->io_base >> 32), PCIE_ATU_UPPER_BASE); -- dw_pcie_writel_rc(pp, pp->io_base + pp->config.io_size - 1, -- PCIE_ATU_LIMIT); -- dw_pcie_writel_rc(pp, pp->config.io_bus_addr, PCIE_ATU_LOWER_TARGET); -- dw_pcie_writel_rc(pp, upper_32_bits(pp->config.io_bus_addr), -- PCIE_ATU_UPPER_TARGET); - } - - static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, -@@ -322,11 +291,9 @@ static int dw_pcie_rd_other_conf(struct - if (bus->parent->number == pp->root_bus_nr) { - dw_pcie_prog_viewport_cfg0(pp, busdev); - ret = cfg_read(pp->va_cfg0_base + address, where, size, val); -- dw_pcie_prog_viewport_mem_outbound(pp); - } else { - dw_pcie_prog_viewport_cfg1(pp, busdev); - ret = cfg_read(pp->va_cfg1_base + address, where, size, val); -- dw_pcie_prog_viewport_io_outbound(pp); - } - - return ret; -@@ -345,11 +312,9 @@ static int dw_pcie_wr_other_conf(struct - if (bus->parent->number == pp->root_bus_nr) { - dw_pcie_prog_viewport_cfg0(pp, busdev); - ret = cfg_write(pp->va_cfg0_base + address, where, size, val); -- dw_pcie_prog_viewport_mem_outbound(pp); - } else { - dw_pcie_prog_viewport_cfg1(pp, busdev); - ret = cfg_write(pp->va_cfg1_base + address, where, size, val); -- dw_pcie_prog_viewport_io_outbound(pp); - } - - return ret; diff --git a/target/linux/imx6/patches-3.12/0030-pcie-designware-fix-io-transfers.patch b/target/linux/imx6/patches-3.12/0030-pcie-designware-fix-io-transfers.patch new file mode 100644 index 0000000000..2445bc7a5d --- /dev/null +++ b/target/linux/imx6/patches-3.12/0030-pcie-designware-fix-io-transfers.patch @@ -0,0 +1,59 @@ +From: Pratyush Anand + +pp->io_base which is the input of the outbound IO address translation +unit should be the cpu address, it was programmed wrongly to realio +address. + +We should pass global_io_offset rather than sys->io_offset to +pci_ioremap_io, so we map the new window into the first available spot +in the Linux view of the I/O space. + +We must also pass cpu address instead of realio address to +pci_ioremap_io. + +This patch fixes above issue. It has been tested with Lecroy PTC in AIC +mode and Pericom PI7C9X2G303EL PCIe switch, which does not work +otherwise. + +Signed-off-by: Pratyush Anand +Tested-by: Mohit Kumar +Tested-by: Tim Harvey +Cc: Arnd Bergmann +Cc: Marek Vasut +Cc: Richard Zhu +Cc: linux-pci@vger.kernel.org +Cc: spear-devel@list.st.com +--- + drivers/pci/host/pcie-designware.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +http://thread.gmane.org/gmane.linux.kernel.pci/27204 + +diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c +--- a/drivers/pci/host/pcie-designware.c ++++ b/drivers/pci/host/pcie-designware.c +@@ -177,6 +177,7 @@ int __init dw_pcie_host_init(struct pcie + + global_io_offset); + pp->config.io_size = resource_size(&pp->io); + pp->config.io_bus_addr = range.pci_addr; ++ pp->io_base = range.cpu_addr; + } + if (restype == IORESOURCE_MEM) { + of_pci_range_to_resource(&range, np, &pp->mem); +@@ -202,7 +203,6 @@ int __init dw_pcie_host_init(struct pcie + + pp->cfg0_base = pp->cfg.start; + pp->cfg1_base = pp->cfg.start + pp->config.cfg0_size; +- pp->io_base = pp->io.start; + pp->mem_base = pp->mem.start; + + pp->va_cfg0_base = devm_ioremap(pp->dev, pp->cfg0_base, +@@ -449,7 +449,7 @@ int dw_pcie_setup(int nr, struct pci_sys + + if (global_io_offset < SZ_1M && pp->config.io_size > 0) { + sys->io_offset = global_io_offset - pp->config.io_bus_addr; +- pci_ioremap_io(sys->io_offset, pp->io.start); ++ pci_ioremap_io(global_io_offset, pp->io_base); + global_io_offset += SZ_64K; + pci_add_resource_offset(&sys->resources, &pp->io, + sys->io_offset);