pci: xgene: Enable huge outbound bar support
PATCH 1/1 pci: xgene: Enable huge outbound bar support
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 33 +++++++++++++++++++-------------- drivers/pci/host/pci-xgene.c | 6 +++++- 2 files changed, 24 insertions(+), 15 deletions(-)
arch/arm64/boot/dts/apm/apm-storm.dtsi +19 -14
@@ -404,10 +404,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2b0000 0x0 0x00010000 /* Controller registers */ - 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xe0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */ + 0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -428,10 +429,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2c0000 0x0 0x00010000 /* Controller registers */ - 0xd0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xd0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xd0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xd1 0x80000000 0x00 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xd0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xd1 0x80000000 0x00 0x80000000 /* mem */ + 0x02000000 0x08 0x00000000 0xd8 0x00000000 0x08 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -452,10 +454,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2d0000 0x0 0x00010000 /* Controller registers */ - 0x90 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0x90 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0x90 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0x91 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0x90 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0x91 0x80000000 0x00 0x80000000 /* mem */ + 0x02000000 0x04 0x00000000 0x94 0x00000000 0x04 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -476,10 +479,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f500000 0x0 0x00010000 /* Controller registers */ - 0xa0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xa0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xa0 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xa1 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xa0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xa1 0x80000000 0x00 0x80000000 /* mem */ + 0x02000000 0x10 0x00000000 0xb0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -500,10 +504,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f510000 0x0 0x00010000 /* Controller registers */ - 0xc0 0xd0000000 0x0 0x00200000>; /* PCI config space */ + 0xc0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xc0 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xc1 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xc0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xc1 0x80000000 0x00 0x80000000 /* mem */ + 0x02000000 0x08 0x00000000 0xc8 0x00000000 0x08 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
drivers/pci/host/pci-xgene.c +5 -1
@@ -305,6 +305,7 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,struct resource_entry *window;struct device *dev = port->dev;int ret; +u32 omr_idx =0 ;resource_list_for_each_entry (window, res) {struct resource *res = window->res;
@@ -321,8 +322,11 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,return ret;break ;case IORESOURCE_MEM : -xgene_pcie_setup_ob_reg (port, res,OMR1BARL , res->start, +xgene_pcie_setup_ob_reg (port, res, +OMR1BARL + (omr_idx *0x18 ), + res->start, res->start - window->offset); + omr_idx++;break ;case IORESOURCE_BUS :break ;
Signature · 1 line
1.9.1
Quoted 6 lines · On Thursday 25 June 2015 18:05:56 Duc Dang wrote:
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
Quoted 6 lines
Signed-off-by Duc Dang <[email protected]>Signed-off-by Tanmay Inamdar <[email protected]>--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 33 +++++++++++++++++++-------------- drivers/pci/host/pci-xgene.c | 6 +++++- 2 files changed, 24 insertions(+), 15 deletions(-)
It seems you do multiple things here:
- add an entry in the ranges
- move the config space
- fix driver to handle multiple memory ranges
but your description only mentions the first one. Please submit separate patches for these and explain for each patch why it is required, so we can pick them up into the arm-soc and pci git repositories separately, and make sure that each patch works by itself to guarantee we don't get incompatible binding changes.
Quoted 8 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +0
-0@@ -404,10 +404,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2b0000 0x0 0x00010000 /* Controller registers */
arch/arm64/boot/dts/apm/apm-storm.dtsi line 414
Quoted 10 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +3
-2- 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xe0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */ + 0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
What is the reason for picking the 0x10.00000000 address? We normally try to use an identity mapping (mem_offset=0) on the bus, or fall back to starting at zero (mem_offset=cpu_offset), but you use seemingly random mem_offset values.
Could you get the same effect by extending the 0x80000000 mapping to a length of 58GB (just before the start of the second window)?
Can you configure one of the two windows as prefetchable for improved performance?
I also notice that the 0x80000000-0xffffffff bus range is list both in ranges and dma-ranges. Does that mean that devices on this host cannot access MMIO ranges of other devices, or should you exclude this range from the dma-ranges property?
Style-wise, it would be nice to submit an extra patch that groups entries in the ranges and reg lists like
ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000>, /* io */ <0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>, /* mem */ <0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */
but that is just a cosmetic change and should be kept separate.
arch/arm64/boot/dts/apm/apm-storm.dtsi static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, · line 332
Quoted 13 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +4
-1@@ -321,8 +322,11 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, return ret; break; case IORESOURCE_MEM: - xgene_pcie_setup_ob_reg(port, res, OMR1BARL, res->start, + xgene_pcie_setup_ob_reg(port, res, + OMR1BARL + (omr_idx * 0x18), + res->start, res->start - window->offset); + omr_idx++; break; case IORESOURCE_BUS: break;
Can you describe what happens when you boot an older kernel with the new dt file, or vice versa? Will that simply ignore the first ranges entries and use only the last one, or does it break in interesting ways?
Arnd
Hi Arnd,
Quoted 20 lines · Arnd Bergmann
Quoted 6 lines · On Thursday 25 June 2015 18:05:56 Duc Dang wrote:
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
Quoted 6 lines
Signed-off-by Duc Dang <[email protected]>Signed-off-by Tanmay Inamdar <[email protected]>--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 33 +++++++++++++++++++-------------- drivers/pci/host/pci-xgene.c | 6 +++++- 2 files changed, 24 insertions(+), 15 deletions(-)It seems you do multiple things here:
- add an entry in the ranges
- move the config space
- fix driver to handle multiple memory ranges
Quoted 5 lines
but your description only mentions the first one. Please submit separate patches for these and explain for each patch why it is required, so we can pick them up into the arm-soc and pci git repositories separately, and make sure that each patch works by itself to guarantee we don't get incompatible binding changes.
Move config space can be in a separate patch. But it is not absolutely necessary to move the configuration space. The reason I change it is to have config space starting from the beginning of SoC PCIe physical address space. I will drop it in next patch.
But add 'an entry in the ranges' and 'fix driver to handle multiple memory ranges' should go together as single patch because the old driver will break when it sees multiple ranges.
Quoted 15 lines
Quoted 15 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +2
-2@@ -404,10 +404,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2b0000 0x0 0x00010000 /* Controller registers */ - 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xe0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */
Quoted 9 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi line 414
Quoted 4 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +1
-0+ 0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;What is the reason for picking the 0x10.00000000 address? We normally try to use an identity mapping (mem_offset=0) on the bus, or fall back to starting at zero (mem_offset=cpu_offset), but you use seemingly random
mem_offsetvalues.
I just randomly pick 0x10 00000000 as it is not used. I will change to use 0xf0 00000000:0x02000000 0xf0 0x00000000 0xf0 0x00000000 0x10 0x00000000
Quoted 2 lines
Could you get the same effect by extending the
0x80000000mapping to a length of 58GB (just before the start of the second window)?
I don't think so. It will break with the PCIe device that requires 32-bit BAR.
Quoted 3 lines
Can you configure one of the two windows as prefetchable for improved performance?
The new huge window will be prefetchable.
Quoted 5 lines
I also notice that the 0x80000000-0xffffffff bus range is list both in ranges and dma-ranges. Does that mean that devices on this host cannot access MMIO ranges of other devices, or should you exclude this range from the dma-ranges property?
As I understand, the mem entries in 'ranges' are for controller to access remote PCIe devices (EP) BAR; while the entries in 'dma-ranges'
are for remote PCIe devices (EP) to access controller memory. So they are different. Or are you asking about something else?
Quoted 8 lines
Style-wise, it would be nice to submit an extra patch that groups entries in the ranges and reg lists like
ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000>, /* io */ <0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>, /* mem */ <0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */but that is just a cosmetic change and should be kept separate.
Would you mind if I make this change as well and include in next patch?
Quoted 10 lines
Quoted 10 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +3
-1@@ -321,8 +322,11 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, return ret; break; case IORESOURCE_MEM: - xgene_pcie_setup_ob_reg(port, res, OMR1BARL, res->start, + xgene_pcie_setup_ob_reg(port, res, + OMR1BARL + (omr_idx * 0x18), + res->start, res->start - window->offset);
Quoted 8 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, · line 332
Quoted 4 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +1
-0+ omr_idx++; break; case IORESOURCE_BUS: break;Can you describe what happens when you boot an older kernel with the new dt file, or vice versa? Will that simply ignore the first ranges entries and use only the last one, or does it break in interesting ways?
Older kernel and new dtb: the new entry in 'ranges' will overwrite the old entry, so device that requires 32-bit BAR will break. New kernel and old dtb: works fine but without huge bar support.
Quoted 2 lines
Arnd
Signature · 2 lines
Regards, Duc Dang.
Quoted 63 lines · On Friday 26 June 2015 11:56:47 Duc Dang wrote:
Hi Arnd,
Quoted 20 lines · Arnd Bergmann
Quoted 6 lines · On Thursday 25 June 2015 18:05:56 Duc Dang wrote:
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
Quoted 6 lines
Signed-off-by Duc Dang <[email protected]>Signed-off-by Tanmay Inamdar <[email protected]>--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 33 +++++++++++++++++++-------------- drivers/pci/host/pci-xgene.c | 6 +++++- 2 files changed, 24 insertions(+), 15 deletions(-)It seems you do multiple things here:
- add an entry in the ranges
- move the config space
- fix driver to handle multiple memory rangesQuoted 5 lines
but your description only mentions the first one. Please submit separate patches for these and explain for each patch why it is required, so we can pick them up into the arm-soc and pci git repositories separately, and make sure that each patch works by itself to guarantee we don't get incompatible binding changes.
Move config space can be in a separate patch. But it is not absolutely necessary to move the configuration space. The reason I change it is to have config space starting from the beginning of SoC PCIe physical address space. I will drop it in next patch.
But add 'an entry in the ranges' and 'fix driver to handle multiple memory ranges' should go together as single patch because the old driver will break when it sees multiple ranges.
Quoted 15 lines
Quoted 15 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +2
-2@@ -404,10 +404,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2b0000 0x0 0x00010000 /* Controller registers */ - 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xe0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */Quoted 9 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi line 414
Quoted 4 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +1
-0+ 0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;What is the reason for picking the 0x10.00000000 address? We normally try to use an identity mapping (mem_offset=0) on the bus, or fall back to starting at zero (mem_offset=cpu_offset), but you use seemingly random
mem_offsetvalues.
Quoted 3 lines
I just randomly pick
0x1000000000 as it is not used. I will change to use0xf000000000:0x020000000xf00x000000000xf00x000000000x100x00000000
Ok
Quoted 4 lines
Quoted 2 lines
Could you get the same effect by extending the
0x80000000mapping to a length of 58GB (just before the start of the second window)?I don't think so. It will break with the PCIe device that requires 32-bit BAR.
Are you sure? If this is true, maybe this should be fixed in the PCI core.
Quoted 4 lines
Quoted 3 lines
Can you configure one of the two windows as prefetchable for improved performance?
The new huge window will be prefetchable.
The DT marks it as non-prefetchable, so the kernel will now try to allocate space for non-prefetchable BARs from this area, which is a bug. If the second memory window is always prefetchable, you have to mark it accordingly in DT, to prevent it from being used for normal 64 bit BARs.
Quoted 11 lines
Quoted 5 lines
I also notice that the 0x80000000-0xffffffff bus range is list both in ranges and dma-ranges. Does that mean that devices on this host cannot access MMIO ranges of other devices, or should you exclude this range from the dma-ranges property?
As I understand, the mem entries in 'ranges' are for controller to access remote PCIe devices (EP) BAR; while the entries in 'dma-ranges'
are for remote PCIe devices (EP) to access controller memory. So they are different. Or are you asking about something else?
Your understanding is correct, but from the perspective of a PCI device the two are the same: when a device issues a bus master transaction, the target can either be an MMIO BAR on the same PCI host, or it can get turned into a DMA that ends up in RAM. The way you list the ranges, it is a bit ambiguous about what happens when a transaction is targetted at address 0x80000000: does your PCI host send that to a device with a BAR at that address (CPU address 0xe1.80000000), or upstream to the parent bus for CPU address 0x00.80000000?
Quoted 11 lines
Quoted 9 lines
Style-wise, it would be nice to submit an extra patch that groups entries in the ranges and reg lists like
ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000>, /* io */ <0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>, /* mem */ <0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */but that is just a cosmetic change and should be kept separate.
Would you mind if I make this change as well and include in next patch?
It's normally better to keep cleanups and functional changes separate, so better do two patches.
Quoted 18 lines
Quoted 9 lines
Quoted 9 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +3
-1@@ -321,8 +322,11 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, return ret; break; case IORESOURCE_MEM: - xgene_pcie_setup_ob_reg(port, res, OMR1BARL, res->start, + xgene_pcie_setup_ob_reg(port, res, + OMR1BARL + (omr_idx * 0x18), + res->start, res->start - window->offset);Quoted 8 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, · line 332
Quoted 4 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +1
-0+ omr_idx++; break; case IORESOURCE_BUS: break;Can you describe what happens when you boot an older kernel with the new dt file, or vice versa? Will that simply ignore the first ranges entries and use only the last one, or does it break in interesting ways?
Quoted 3 lines
Older kernel and new dtb: the new entry in 'ranges' will overwrite the old entry, so device that requires 32-bit BAR will break. New kernel and old dtb: works fine but without huge bar support.
Ok, so the patches cannot trivially get merged through separate trees, but have to be ordered. Please split up the driver change from the DT change anyway, and then we can decide whether to take both through arm-soc or the PCI tree.
Regarding the functional change, I suppose you should take prefetchable/ non-prefetchable settings into account here. My guess is that the first window is always non-prefetchable, while the second one is always prefetchable. If that is the case, it would be more robust to replace the counter with another conditional that looks at the IORESOURCE_PREFETCH flag to decide which register to program.
If you have more than two windows, better do both and use a total of four windows for all combinations of 32/64 bit addressing and prefetch.
Arnd
Quoted 9 lines · On Friday 26 June 2015 22:35:08 Arnd Bergmann wrote:
Quoted 4 lines
Quoted 3 lines
Can you configure one of the two windows as prefetchable for improved performance?
The new huge window will be prefetchable.
The DT marks it as non-prefetchable, so the kernel will now try to allocate space for non-prefetchable BARs from this area, which is a bug. If the second memory window is always prefetchable, you have to mark it accordingly in DT, to prevent it from being used for normal 64 bit BARs.
Forget what I wrote here, I just remembered that 64-bit BARs are by definition prefetchable. You should still mark the range accordingly in DT for correct operation, but it won't be used for non-prefetchable 64-bit BARs if you don't because they do not exist.
Arnd
Quoted 68 lines · Arnd Bergmann
Quoted 63 lines · On Friday 26 June 2015 11:56:47 Duc Dang wrote:
Hi Arnd,
Quoted 20 lines · Arnd Bergmann
Quoted 6 lines · On Thursday 25 June 2015 18:05:56 Duc Dang wrote:
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
Quoted 6 lines
Signed-off-by Duc Dang <[email protected]>Signed-off-by Tanmay Inamdar <[email protected]>--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 33 +++++++++++++++++++-------------- drivers/pci/host/pci-xgene.c | 6 +++++- 2 files changed, 24 insertions(+), 15 deletions(-)It seems you do multiple things here:
- add an entry in the ranges
- move the config space
- fix driver to handle multiple memory rangesQuoted 5 lines
but your description only mentions the first one. Please submit separate patches for these and explain for each patch why it is required, so we can pick them up into the arm-soc and pci git repositories separately, and make sure that each patch works by itself to guarantee we don't get incompatible binding changes.
Move config space can be in a separate patch. But it is not absolutely necessary to move the configuration space. The reason I change it is to have config space starting from the beginning of SoC PCIe physical address space. I will drop it in next patch.
But add 'an entry in the ranges' and 'fix driver to handle multiple memory ranges' should go together as single patch because the old driver will break when it sees multiple ranges.
Quoted 15 lines
Quoted 15 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +2
-2@@ -404,10 +404,11 @@ #size-cells = <2>; #address-cells = <3>; reg = < 0x00 0x1f2b0000 0x0 0x00010000 /* Controller registers */ - 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ + 0xe0 0x00000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */Quoted 9 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi line 414
Quoted 4 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +1
-0+ 0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;What is the reason for picking the 0x10.00000000 address? We normally try to use an identity mapping (mem_offset=0) on the bus, or fall back to starting at zero (mem_offset=cpu_offset), but you use seemingly random
mem_offsetvalues.Quoted 3 lines
I just randomly pick
0x1000000000 as it is not used. I will change to use0xf000000000:0x020000000xf00x000000000xf00x000000000x100x00000000
Quoted 8 lines
Ok
Quoted 4 lines
Quoted 2 lines
Could you get the same effect by extending the
0x80000000mapping to a length of 58GB (just before the start of the second window)?I don't think so. It will break with the PCIe device that requires 32-bit BAR.
Are you sure? If this is true, maybe this should be fixed in the PCI core.
The controller requires the size of windows must be in power of 2, so programing the size as 58GB will cause
transaction failures.
Quoted 23 lines
Quoted 5 lines
Quoted 4 lines
Can you configure one of the two windows as prefetchable for improved performance?
The new huge window will be prefetchable.
The DT marks it as non-prefetchable, so the kernel will now try to allocate space for non-prefetchable BARs from this area, which is a bug. If the second memory window is always prefetchable, you have to mark it accordingly in DT, to prevent it from being used for normal 64 bit BARs.
Quoted 11 lines
Quoted 5 lines
I also notice that the 0x80000000-0xffffffff bus range is list both in ranges and dma-ranges. Does that mean that devices on this host cannot access MMIO ranges of other devices, or should you exclude this range from the dma-ranges property?
As I understand, the mem entries in 'ranges' are for controller to access remote PCIe devices (EP) BAR; while the entries in 'dma-ranges'
are for remote PCIe devices (EP) to access controller memory. So they are different. Or are you asking about something else?
Quoted 8 lines
Your understanding is correct, but from the perspective of a PCI device the two are the same: when a device issues a bus master transaction, the target can either be an MMIO BAR on the same PCI host, or it can get turned into a DMA that ends up in RAM. The way you list the ranges, it is a bit ambiguous about what happens when a transaction is targetted at address
0x80000000: does your PCI host send that to a device with a BAR at that address (CPU address 0xe1.80000000), or upstream to the parent bus for CPU address 0x00.80000000?
The PCIe devices connecting to this host cannot access MMIO ranges on other devices, so when the host receives transaction
that targets address 0x80000000 from device, it will translate it to CPU address 0x80000000.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Style-wise, it would be nice to submit an extra patch that groups entries in the ranges and reg lists like
ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000>, /* io */ <0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>, /* mem */ <0x02000000 0x10 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
but that is just a cosmetic change and should be kept separate.
Would you mind if I make this change as well and include in next patch?
It's normally better to keep cleanups and functional changes separate, so better do two patches.
Sure, I will post a cleanup patch later.
Quoted 19 lines
Quoted 19 lines
Quoted 18 lines
Quoted 4 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +0
-0@@ -321,8 +322,11 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, return ret; break;arch/arm64/boot/dts/apm/apm-storm.dtsi static int xgene_pcie_map_ranges(struct xgene_pcie_port *port, · line 332
Quoted 10 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi +4
-1case IORESOURCE_MEM: - xgene_pcie_setup_ob_reg(port, res, OMR1BARL, res->start, + xgene_pcie_setup_ob_reg(port, res, + OMR1BARL + (omr_idx * 0x18), + res->start, res->start - window->offset); + omr_idx++; break; case IORESOURCE_BUS: break;Can you describe what happens when you boot an older kernel with the new dt file, or vice versa? Will that simply ignore the first ranges entries and use only the last one, or does it break in interesting ways?
Quoted 8 lines
Quoted 3 lines
Older kernel and new dtb: the new entry in 'ranges' will overwrite the old entry, so device that requires 32-bit BAR will break. New kernel and old dtb: works fine but without huge bar support.
Ok, so the patches cannot trivially get merged through separate trees, but have to be ordered. Please split up the driver change from the DT change anyway, and then we can decide whether to take both through arm-soc or the PCI tree.
I will do that.
Quoted 8 lines
Regarding the functional change, I suppose you should take prefetchable/ non-prefetchable settings into account here. My guess is that the first window is always non-prefetchable, while the second one is always prefetchable. If that is the case, it would be more robust to replace the counter with another conditional that looks at the
IORESOURCE_PREFETCHflag to decide which register to program.
I will look into using IORESOURCE_PREFETCH flag in next patch.
Quoted 4 lines
If you have more than two windows, better do both and use a total of four windows for all combinations of 32/64 bit addressing and prefetch.
Arnd
Signature · 2 lines
Regards, Duc Dang.
v2 cover pci: xgene: Add multiple memory ranges support
In reply to Arnd BergmannThis patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that has huge BAR.
v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts
3. Use IORESOURCE_PREFETCH flag to determine which PCIe controller register to be used to configure the memory ranges.
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/2 arm64: dts: Add 1 more window with large size for X-Gene PCIe nodes
This patch adds 1 additional window with large size (up to 64GB) for X-Gene PCIe nodes to support devices that require huge BAR.
--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/apm/apm-storm.dtsi +14 -9
@@ -407,7 +407,8 @@ 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xf0 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -430,8 +431,9 @@ reg = < 0x00 0x1f2c0000 0x0 0x00010000 /* Controller registers */ 0xd0 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xd0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xd1 0x80000000 0x00 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xd0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xd1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xd8 0x00000000 0xd8 0x00000000 0x08 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -454,8 +456,9 @@ reg = < 0x00 0x1f2d0000 0x0 0x00010000 /* Controller registers */ 0x90 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0x90 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0x91 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0x90 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0x91 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0x94 0x00000000 0x94 0x00000000 0x04 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -478,8 +481,9 @@ reg = < 0x00 0x1f500000 0x0 0x00010000 /* Controller registers */ 0xa0 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xa0 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xa1 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xa0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xa1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xb0 0x00000000 0xb0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -502,8 +506,9 @@ reg = < 0x00 0x1f510000 0x0 0x00010000 /* Controller registers */ 0xc0 0xd0000000 0x0 0x00200000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xc0 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xc1 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xc0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xc1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xc8 0x00000000 0xc8 0x00000000 0x08 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
Signature · 1 line
1.9.1
PATCH v2 2/2 pci: xgene: Fix driver to handle multiple memory ranges
In reply to Duc DangX-Gene PCIe controller has registers to support multiple memory ranges. This patch implement addtional register configuration required for the driver to support 1 additional huge 64-bit prefetch memory window.
--- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/pci/host/pci-xgene.c +10 -2
@@ -321,8 +321,16 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,return ret;break ;case IORESOURCE_MEM : -xgene_pcie_setup_ob_reg (port, res,OMR1BARL , res->start, - res->start - window->offset); +if (res->flags &IORESOURCE_PREFETCH ) +xgene_pcie_setup_ob_reg (port, res,OMR2BARL , + res->start, + res->start - + window->offset); +else +xgene_pcie_setup_ob_reg (port, res,OMR1BARL , + res->start, + res->start - + window->offset);break ;case IORESOURCE_BUS :break ;
Signature · 1 line
1.9.1
Re: [PATCH v2 0/2] pci: xgene: Add multiple memory ranges support
In reply to Duc DangQuoted 12 lines · Duc Dang
This patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that has huge BAR.
v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts
3. UseIORESOURCE_PREFETCHflag to determine which PCIe controller register to be used to configure the memory ranges.
Quoted 3 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)
Hi Arnd, Bjorn,
Do you have additional comment on this v2 patch set?
Quoted 4 lines
--
1.9.1
Signature · 2 lines
Regards, Duc Dang.
Re: [PATCH v2 0/2] pci: xgene: Add multiple memory ranges support
Quoted 13 lines · On Monday 06 July 2015 16:28:43 Duc Dang wrote:
Quoted 12 lines · Duc Dang
This patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that has huge BAR.
v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts
3. UseIORESOURCE_PREFETCHflag to determine which PCIe controller register to be used to configure the memory ranges.
Quoted 9 lines
Quoted 3 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)Hi Arnd, Bjorn,
Do you have additional comment on this v2 patch set?
The changes look ok to me now, but I'd mention in the changelog about the fact that one of the windows is prefetchable and the other one is not, and that only prefetchable BARs are now using the 64-bit window.
Arnd
v3 cover pci: xgene: Add multiple memory ranges support
This patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that have huge BAR.
v3 changes:
1. Explicitly mention in change log that: Each PCIe node in dts will have 1 32-bit non-prefetchable memory window and 1 64-bit prefetchable memory window.
v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts.
3. Use IORESOURCE_PREFETCH flag to determine which PCIe controller register to be used to configure the memory ranges.
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)
Signature · 1 line
1.9.1
PATCH v3 1/2 arm64: dts: Add 1 more window with large size for X-Gene PCIe nodes
This patch adds 1 additional window with large size (up to 64GB) for X-Gene PCIe nodes to support devices that require huge BAR.
Each X-Gene PCIe node now will have 2 memory windows:1 non-prefetchable 32-bit window and 1 prefetchable 64-bit window.
--- arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/apm/apm-storm.dtsi +14 -9
@@ -407,7 +407,8 @@ 0xe0 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; ranges = <0x01000000 0x00 0x00000000 0xe0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000>; /* mem */ + 0x02000000 0x00 0x80000000 0xe1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xf0 0x00000000 0xf0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -430,8 +431,9 @@ reg = < 0x00 0x1f2c0000 0x0 0x00010000 /* Controller registers */ 0xd0 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xd0 0x10000000 0x00 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xd1 0x80000000 0x00 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xd0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xd1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xd8 0x00000000 0xd8 0x00000000 0x08 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -454,8 +456,9 @@ reg = < 0x00 0x1f2d0000 0x0 0x00010000 /* Controller registers */ 0x90 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0x90 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0x91 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0x90 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0x91 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0x94 0x00000000 0x94 0x00000000 0x04 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -478,8 +481,9 @@ reg = < 0x00 0x1f500000 0x0 0x00010000 /* Controller registers */ 0xa0 0xd0000000 0x0 0x00040000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xa0 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xa1 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xa0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xa1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xb0 0x00000000 0xb0 0x00000000 0x10 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
@@ -502,8 +506,9 @@ reg = < 0x00 0x1f510000 0x0 0x00010000 /* Controller registers */ 0xc0 0xd0000000 0x0 0x00200000>; /* PCI config space */ reg-names = "csr", "cfg"; - ranges = <0x01000000 0x0 0x00000000 0xc0 0x10000000 0x0 0x00010000 /* io */ - 0x02000000 0x0 0x80000000 0xc1 0x80000000 0x0 0x80000000>; /* mem */ + ranges = <0x01000000 0x00 0x00000000 0xc0 0x10000000 0x00 0x00010000 /* io */ + 0x02000000 0x00 0x80000000 0xc1 0x80000000 0x00 0x80000000 /* mem */ + 0x43000000 0xc8 0x00000000 0xc8 0x00000000 0x08 0x00000000>; /* mem */ dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
Signature · 1 line
1.9.1
PATCH v3 2/2 pci: xgene: Fix driver to handle multiple memory ranges
In reply to Duc DangX-Gene PCIe controller has registers to support multiple memory ranges. This patch implement addtional register configuration required for the driver to support 1 additional huge 64-bit prefetch memory window.
--- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/pci/host/pci-xgene.c +10 -2
@@ -321,8 +321,16 @@ static int xgene_pcie_map_ranges(struct xgene_pcie_port *port,return ret;break ;case IORESOURCE_MEM : -xgene_pcie_setup_ob_reg (port, res,OMR1BARL , res->start, - res->start - window->offset); +if (res->flags &IORESOURCE_PREFETCH ) +xgene_pcie_setup_ob_reg (port, res,OMR2BARL , + res->start, + res->start - + window->offset); +else +xgene_pcie_setup_ob_reg (port, res,OMR1BARL , + res->start, + res->start - + window->offset);break ;case IORESOURCE_BUS :break ;
Signature · 1 line
1.9.1
Re: [PATCH v3 0/2] pci: xgene: Add multiple memory ranges support
In reply to Duc DangQuoted 17 lines · Duc Dang
This patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that have huge BAR.
v3 changes:
1. Explicitly mention in change log that: Each PCIe node in dts will have 1 32-bit non-prefetchable memory window and 1 64-bit prefetchable memory window.v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts.
3. UseIORESOURCE_PREFETCHflag to determine which PCIe controller register to be used to configure the memory ranges.
Quoted 3 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)
Applied to pci/host-xgene for v4.3, with changelogs as follows, thanks!
commit 80bb3eda7475eb38b688d2e915c191ce6ad20df1
Author: Duc Dang <[email protected]> Date: Thu Jul 9 14:20:11 2015 -0700
arm64: dts: Add APM X-Gene PCIe 64-bit prefetchable window
Add a large window (up to 64GB) for X-Gene PCIe nodes to support devices that require huge BARs.
Each X-Gene PCIe node will now have two memory windows: a 32-bit non-prefetchable window and a 64-bit prefetchable window.
commit 8ef54f27f6f425fa8deedc237d99b9daf41d68d2
Author: Duc Dang <[email protected]> Date: Thu Jul 9 14:20:12 2015 -0700
PCI: xgene: Add support for a 64-bit prefetchable memory window
X-Gene PCIe controller has registers to support multiple memory ranges.
Add support for a 64-bit prefetchable memory window.
Re: [PATCH v3 0/2] pci: xgene: Add multiple memory ranges support
Quoted 18 lines · Bjorn Helgaas
Quoted 17 lines · Duc Dang
This patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that have huge BAR.
v3 changes:
1. Explicitly mention in change log that: Each PCIe node in dts will have 1 32-bit non-prefetchable memory window and 1 64-bit prefetchable memory window.v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts.
3. UseIORESOURCE_PREFETCHflag to determine which PCIe controller register to be used to configure the memory ranges.
Quoted 5 lines
Quoted 3 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)Applied to pci/host-xgene for v4.3, with changelogs as follows, thanks!
Thanks a lot, Bjorn.
Quoted 33 lines
commit
80bb3eda7475eb38b688d2e915c191ce6ad20df1Author: Duc Dang <[email protected]> Date: Thu Jul 9 14:20:11 2015 -0700arm64: dts: Add APM X-Gene PCIe 64-bit prefetchable window
Add a large window (up to 64GB) for X-Gene PCIe nodes to support devices that require huge BARs.
Each X-Gene PCIe node will now have two memory windows: a 32-bit non-prefetchable window and a 64-bit prefetchable window.
[bhelgaas: changelog]Signed-off-by Duc Dang <[email protected]>Signed-off-by Tanmay Inamdar <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>commit
8ef54f27f6f425fa8deedc237d99b9daf41d68d2Author: Duc Dang <[email protected]> Date: Thu Jul 9 14:20:12 2015 -0700PCI: xgene: Add support for a 64-bit prefetchable memory window
X-Gene PCIe controller has registers to support multiple memory ranges.
Add support for a 64-bit prefetchable memory window.
[bhelgaas: changelog]Signed-off-by Duc Dang <[email protected]>Signed-off-by Tanmay Inamdar <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>
Signature · 2 lines
Regards, Duc Dang.
Re: [PATCH v2 0/2] pci: xgene: Add multiple memory ranges support
In reply to Arnd BergmannQuoted 21 lines · Arnd Bergmann
Quoted 19 lines · On Monday 06 July 2015 16:28:43 Duc Dang wrote:
Quoted 12 lines · Duc Dang
This patch set adds 1 large (up to 64GB) memory window for each PCIe controller nodes in X-Gene device tree and fix PCIe controller driver to handle multiple memory ranges correctly. These changes are required to support PCIe devices that has huge BAR.
v2 changes:
1. Separate device-tree changes and driver changes into different patches
2. Explicitly define new large window as 64-bit prefetchable in dts
3. UseIORESOURCE_PREFETCHflag to determine which PCIe controller register to be used to configure the memory ranges.Quoted 3 lines
arch/arm64/boot/dts/apm/apm-storm.dtsi | 23 ++++++++++++++--------- drivers/pci/host/pci-xgene.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 11 deletions(-)Hi Arnd, Bjorn,
Quoted 8 lines
Quoted 3 lines
Do you have additional comment on this v2 patch set?
The changes look ok to me now, but I'd mention in the changelog about the fact that one of the windows is prefetchable and the other one is not, and that only prefetchable BARs are now using the 64-bit window.
Thanks, Arnd.
I posted v3 patch to clarify each PCIe node will have 2 memory windows:
1 non-prefetchable 32-bit memory window and
1 prefetchable 64-bit window
Quoted 6 lines
Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Regards, Duc Dang.
Bjorn Helgaas
maintainerHi Duc,
Quoted 5 lines · Duc Dang
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
The PCI specs don't use the "outbound BAR" terminology. I assume this is what we normally call "windows" or "apertures" for MMIO access by the CPU? (The specs rarely use those terms either, but they're commonly used in Linux, and the PCIe spec does mention them a couple times.)
By "request huge outbound memory," I assume you simply mean the device has a huge BAR, right?
Bjorn
Quoted 9 lines · Bjorn Helgaas
Hi Duc,
Quoted 5 lines · Duc Dang
X-Gene PCIe controllers support huge outbound BARs (with size upto 64GB). This patch configures additional 1 outbound BAR for X-Gene PCIe controllers with size larger than 4GB. This is required to support devices that request huge outbound memory (nVidia K40 as an example)
Quoted 5 lines
The PCI specs don't use the "outbound BAR" terminology. I assume this is what we normally call "windows" or "apertures" for MMIO access by the CPU? (The specs rarely use those terms either, but they're commonly used in Linux, and the PCIe spec does mention them a couple times.)
Yes, Bjorn. The "outbound BAR" that I mentioned is the MMIO window. I will change these terms in next patch.
Quoted 3 lines
By "request huge outbound memory," I assume you simply mean the device has a huge BAR, right?
Yes, I meant "the device has a huge BAR". I will change the description for this in next patch as well
Quoted 2 lines
Bjorn
Regards,
Duc Dang.