Add support to handle prefetchable memory
v2 cover Add support to handle prefetchable memory
This patch series adds support for configuring the DesignWare IP's ATU region for prefetchable memory translations.
It first starts by flagging a warning if the size of non-prefetchable aperture goes beyond 32-bit as PCIe spec doesn't allow it. And then adds required support for programming the ATU to handle higher (i.e. >4GB) sizes.
V2:
* Dropped third patch from the series as Rob's patch
(commit: 9fff3256f93d PCI: dwc: Restore ATU memory resource setup to use last entry) is already accepted
* Rebased first two patches on top of Rob's latest patch
http://patchwork.ozlabs.org/project/linux-pci/patch/[email protected]/
Vidya Sagar (2):
PCI: of: Warn if non-prefetchable memory aperture size is > 32-bit
PCI: dwc: Add support to program ATU for >4GB memory
drivers/pci/controller/dwc/pcie-designware.c | 12 +++++++----- drivers/pci/controller/dwc/pcie-designware.h | 3 ++- drivers/pci/of.c | 5 +++++ 3 files changed, 14 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 PCI: of: Warn if non-prefetchable memory aperture size is > 32-bit
As per PCIe spec r5.0, sec 7.5.1.3.8 only 32-bit BAR registers are defined for non-prefetchable memory and hence a warning should be reported when the size of them go beyond 32-bits.
---
V2:
* Added 'Tested-by' and 'Reviewed-by'
drivers/pci/of.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/pci/of.c +5 -0
@@ -556,6 +556,11 @@ static int pci_parse_request_of_pci_ranges(struct device *dev,break ;case IORESOURCE_MEM : res_valid |= !(res->flags &IORESOURCE_PREFETCH ); + +if (!(res->flags &IORESOURCE_PREFETCH )) +if (upper_32_bits (resource_size (res))) +dev_warn (dev,"Memory resource size exceeds max for 32 bits\n" ); +break ; } }
Signature · 1 line
2.17.1
PATCH v2 2/2 PCI: dwc: Add support to program ATU for >4GB memory
In reply to Vidya SagarAdd support to program the ATU to enable translations for >4GB sizes of the prefetchable memory apertures.
---
V2:
* Added 'Tested-by', 'Reviewed-by' and 'Acked-by'
drivers/pci/controller/dwc/pcie-designware.c | 12 +++++++----- drivers/pci/controller/dwc/pcie-designware.h | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/pci/controller/dwc/pcie-designware.c +7 -5
@@ -228,7 +228,7 @@ static void dw_pcie_writel_ob_unroll(struct dw_pcie *pci, u32 index, u32 reg,static void dw_pcie_prog_outbound_atu_unroll (struct dw_pcie *pci,u8 func_no,int index,int type,u64 cpu_addr,u64 pci_addr, -u32 size) +u64 size) {u32 retries, val;u64 limit_addr = cpu_addr + size -1 ;
@@ -245,8 +245,10 @@ static void dw_pcie_prog_outbound_atu_unroll(struct dw_pcie *pci, u8 func_no, lower_32_bits(pci_addr));dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_TARGET ,upper_32_bits (pci_addr)); -dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL1 , - type |PCIE_ATU_FUNC_NUM (func_no)); + val = type |PCIE_ATU_FUNC_NUM (func_no); + val =upper_32_bits (size -1 ) ? + val |PCIE_ATU_INCREASE_REGION_SIZE : val; +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL1 , val);dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL2 ,PCIE_ATU_ENABLE );
@@ -267,7 +269,7 @@ static void dw_pcie_prog_outbound_atu_unroll(struct dw_pcie *pci, u8 func_no,static void __dw_pcie_prog_outbound_atu (struct dw_pcie *pci,u8 func_no,int index,int type,u64 cpu_addr, -u64 pci_addr,u32 size) +u64 pci_addr,u64 size) {u32 retries, val;
@@ -311,7 +313,7 @@ static void __dw_pcie_prog_outbound_atu(struct dw_pcie *pci, u8 func_no, }void dw_pcie_prog_outbound_atu (struct dw_pcie *pci,int index,int type, -u64 cpu_addr,u64 pci_addr,u32 size) +u64 cpu_addr,u64 pci_addr,u64 size) {__dw_pcie_prog_outbound_atu (pci,0 , index, type, cpu_addr, pci_addr, size);
drivers/pci/controller/dwc/pcie-designware.h +2 -1
@@ -81,6 +81,7 @@#define PCIE_ATU_REGION_INBOUND BIT(31)#define PCIE_ATU_REGION_OUTBOUND 0#define PCIE_ATU_CR1 0x904 +#define PCIE_ATU_INCREASE_REGION_SIZE BIT(13)#define PCIE_ATU_TYPE_MEM 0x0#define PCIE_ATU_TYPE_IO 0x2#define PCIE_ATU_TYPE_CFG0 0x4
@@ -293,7 +294,7 @@ void dw_pcie_upconfig_setup(struct dw_pcie *pci);int dw_pcie_wait_for_link (struct dw_pcie *pci);void dw_pcie_prog_outbound_atu (struct dw_pcie *pci,int index,int type,u64 cpu_addr,u64 pci_addr, -u32 size); +u64 size);void dw_pcie_prog_ep_outbound_atu (struct dw_pcie *pci,u8 func_no,int index,int type,u64 cpu_addr,u64 pci_addr,u32 size);
Signature · 1 line
2.17.1
Lorenzo Pieralisi
AppliedQuoted 8 lines · Vidya Sagar
This patch series adds support for configuring the DesignWare IP's ATU region for prefetchable memory translations.
It first starts by flagging a warning if the size of non-prefetchable aperture goes beyond 32-bit as PCIe spec doesn't allow it. And then adds required support for programming the ATU to handle higher (i.e. >4GB) sizes.[...]
Applied to pci/dwc, thanks!
[1/2] PCI: of: Warn if non-prefetchable memory aperture size is > 32-bit
https://git.kernel.org/lpieralisi/pci/c/fede8526cc [2/2] PCI: dwc: Add support to program ATU for >4GB memory https://git.kernel.org/lpieralisi/pci/c/74081de4a1
Thanks,
Lorenzo