Skip to contentSkip to conversation

PCI: dwc: Add support for 64-bit MSI target addresses

PATCH Applied Will McVicker 6 participants 12 messages Aug 25, 2022 – Feb 9, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v6 cover PCI: dwc: Add support for 64-bit MSI target addresses

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

* Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
* Using an int for the DMA mask instead of a bool and ternary operation.

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2 without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2 (unless I don't need to do that anyway).

Thanks,
Will

Will McVicker (2):
PCI: dwc: Drop dependency on ZONE_DMA32

v6:
* Retrying DMA allocation with 64-bit mask within the error if-statement.
* Use an int for the DMA mask instead of a bool and ternary operation.

v5:
* Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
* Updated commit descriptions.
* Renamed msi_64b -> msi_64bit.
* Dropped msi_64bit ternary use.
* Dropped export of dw_pcie_msi_capabilities.

v3:
* Switched to a managed DMA allocation.
* Simplified the DMA allocation cleanup.
* Dropped msi_page from struct dw_pcie_rp.
* Allocating a u64 instead of a full page.

v2:
* Fixed build error caught by kernel test robot
* Fixed error handling reported by Isaac Manjarres
PCI: dwc: Add support for 64-bit MSI target address

 .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++----------
 drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++
 drivers/pci/controller/dwc/pcie-designware.h  |  2 +-
 3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Signature · 1 line
2.37.2.672.g94769d06f0-goog
#1 lore raw

PATCH v6 1/2 PCI: dwc: Drop dependency on ZONE_DMA32

Re-work the msi_msg DMA allocation logic to use dmam_alloc_coherent() which uses the coherent DMA mask to try to return an allocation within the DMA mask limits. With that, we now can drop the msi_page parameter in struct dw_pcie_rp. This allows kernel configurations that disable ZONE_DMA32 to continue supporting a 32-bit DMA mask. Without this patch, the PCIe host device will fail to probe when ZONE_DMA32 is disabled.

Fixes 35797e672ff0 ("PCI: dwc: Fix MSI msi_msg DMA mapping")
---
 .../pci/controller/dwc/pcie-designware-host.c | 28 +++++--------------
 drivers/pci/controller/dwc/pcie-designware.h  |  1 -
 2 files changed, 7 insertions(+), 22 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +7 -21
index 7746f94a715f..39f3b37d4033 100644
@@ -267,15 +267,6 @@ static void dw_pcie_free_msi(struct dw_pcie_rp *pp)
 
 	irq_domain_remove(pp->msi_domain);
 	irq_domain_remove(pp->irq_domain);
-
-	if (pp->msi_data) {
-		struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
-		struct device *dev = pci->dev;
-
-		dma_unmap_page(dev, pp->msi_data, PAGE_SIZE, DMA_FROM_DEVICE);
-		if (pp->msi_page)
-			__free_page(pp->msi_page);
-	}
 }
 
 static void dw_pcie_msi_init(struct dw_pcie_rp *pp)
@@ -336,6 +327,7 @@ static int dw_pcie_msi_host_init(struct dw_pcie_rp *pp)
 	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
 	struct device *dev = pci->dev;
 	struct platform_device *pdev = to_platform_device(dev);
+	u64 *msi_vaddr;
 	int ret;
 	u32 ctrl, num_ctrls;
 
@@ -375,22 +367,16 @@ static int dw_pcie_msi_host_init(struct dw_pcie_rp *pp)
 						    dw_chained_msi_isr, pp);
 	}
 
-	ret = dma_set_mask(dev, DMA_BIT_MASK(32));
+	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
 	if (ret)
 		dev_warn(dev, "Failed to set DMA mask to 32-bit. Devices with only 32-bit MSI support may not work properly\n");
 
-	pp->msi_page = alloc_page(GFP_DMA32);
-	pp->msi_data = dma_map_page(dev, pp->msi_page, 0,
-				    PAGE_SIZE, DMA_FROM_DEVICE);
-	ret = dma_mapping_error(dev, pp->msi_data);
-	if (ret) {
-		dev_err(pci->dev, "Failed to map MSI data\n");
-		__free_page(pp->msi_page);
-		pp->msi_page = NULL;
-		pp->msi_data = 0;
+	msi_vaddr = dmam_alloc_coherent(dev, sizeof(u64), &pp->msi_data,
+					GFP_KERNEL);
+	if (!msi_vaddr) {
+		dev_err(dev, "Failed to alloc and map MSI data\n");
 		dw_pcie_free_msi(pp);
-
-		return ret;
+		return -ENOMEM;
 	}
 
 	return 0;
drivers/pci/controller/dwc/pcie-designware.h +0 -1
index 09b887093a84..a871ae7eb59e 100644
@@ -243,7 +243,6 @@ struct dw_pcie_rp {
 	struct irq_domain	*irq_domain;
 	struct irq_domain	*msi_domain;
 	dma_addr_t		msi_data;
-	struct page		*msi_page;
 	struct irq_chip		*msi_irq_chip;
 	u32			num_vectors;
 	u32			irq_mask[MAX_MSI_CTRLS];
Signature · 1 line
2.37.2.672.g94769d06f0-goog
#2 lore raw

PATCH v6 2/2 PCI: dwc: Add support for 64-bit MSI target address

In reply to Will McVicker

Since not all devices require a 32-bit MSI address, add support to the PCIe host driver to allow setting the DMA mask to 64-bits if the 32-bit allocation fails. This allows kernels to disable ZONE_DMA32 and bounce buffering (swiotlb) without risking not being able to get a 32-bit address during DMA allocation.

Basically, in the slim chance that there are no 32-bit allocations available, the current PCIe host driver will fail to allocate the msi_msg page due to a DMA address overflow (seen in [1]). With this patch, the PCIe host can retry the allocation with a 64-bit DMA mask if the current PCIe device advertises 64-bit support via its MSI capabilities.

[1] https://lore.kernel.org/all/[email protected]/

---
 .../pci/controller/dwc/pcie-designware-host.c | 19 ++++++++++++++++---
 drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++++++
 drivers/pci/controller/dwc/pcie-designware.h  |  1 +
 3 files changed, 25 insertions(+), 3 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +16 -3
index 39f3b37d4033..7e0352861bcb 100644
@@ -374,9 +374,22 @@ static int dw_pcie_msi_host_init(struct dw_pcie_rp *pp)
 	msi_vaddr = dmam_alloc_coherent(dev, sizeof(u64), &pp->msi_data,
 					GFP_KERNEL);
 	if (!msi_vaddr) {
-		dev_err(dev, "Failed to alloc and map MSI data\n");
-		dw_pcie_free_msi(pp);
-		return -ENOMEM;
+		u16 msi_capabilities;
+
+		/* Retry the allocation with a 64-bit mask if supported. */
+		msi_capabilities = dw_pcie_msi_capabilities(pci);
+		if ((msi_capabilities & PCI_MSI_FLAGS_ENABLE) &&
+		    (msi_capabilities & PCI_MSI_FLAGS_64BIT)) {
+			dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
+			msi_vaddr = dmam_alloc_coherent(dev, sizeof(u64),
+							&pp->msi_data,
+							GFP_KERNEL);
+		}
+		if (!msi_vaddr) {
+			dev_err(dev, "Failed to alloc and map MSI data\n");
+			dw_pcie_free_msi(pp);
+			return -ENOMEM;
+		}
 	}
 
 	return 0;
drivers/pci/controller/dwc/pcie-designware.c +8 -0
index c6725c519a47..650a7f22f9d0 100644
@@ -82,6 +82,14 @@ u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap)
 }
 EXPORT_SYMBOL_GPL(dw_pcie_find_capability);
 
+u16 dw_pcie_msi_capabilities(struct dw_pcie *pci)
+{
+	u8 offset;
+
+	offset = dw_pcie_find_capability(pci, PCI_CAP_ID_MSI);
+	return dw_pcie_readw_dbi(pci, offset + PCI_MSI_FLAGS);
+}
+
 static u16 dw_pcie_find_next_ext_capability(struct dw_pcie *pci, u16 start,
 					    u8 cap)
 {
drivers/pci/controller/dwc/pcie-designware.h +1 -0
index a871ae7eb59e..45fcdfc8c035 100644
@@ -332,6 +332,7 @@ void dw_pcie_version_detect(struct dw_pcie *pci);
 
 u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap);
 u16 dw_pcie_find_ext_capability(struct dw_pcie *pci, u8 cap);
+u16 dw_pcie_msi_capabilities(struct dw_pcie *pci);
 
 int dw_pcie_read(void __iomem *addr, int size, u32 *val);
 int dw_pcie_write(void __iomem *addr, int size, u32 val);
Signature · 1 line
2.37.2.672.g94769d06f0-goog
maintainer Applied
#3 lore raw
In reply to Will McVicker
Quoted 6 lines · Will McVicker

I've update patch 2/2 to address Robin's suggestions. This includes:

* Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
* Using an int for the DMA mask instead of a bool and ternary operation.

Quoted 6 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2 without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2 (unless I don't need to do that anyway).

[...]

Applied to pci/dwc, thanks!

[1/2] PCI: dwc: Drop dependency on ZONE_DMA32

      https://git.kernel.org/lpieralisi/pci/c/423511ec23e2
[2/2] PCI: dwc: Add support for 64-bit MSI target address
      https://git.kernel.org/lpieralisi/pci/c/e99d8c5e803b

Thanks,
Lorenzo

#4 lore raw
In reply to Will McVicker

Hi,

Quoted 4 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

Quoted 8 lines

* Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
* Using an int for the DMA mask instead of a bool and ternary operation.

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2 without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2 (unless I don't need to do that anyway).

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0:      MEM 0x0041000000..0x004fffffff -> 0x0041000000
[    0.376171] dw-pcie 4000000.pcie0:   IB MEM 0x0400000000..0x07ffffffff -> 0x0400000000
[    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data
[    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host
[    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc: Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 32 lines

Thanks,
Will

Will McVicker (2):
PCI: dwc: Drop dependency on ZONE_DMA32

v6:
* Retrying DMA allocation with 64-bit mask within the error if-statement.
* Use an int for the DMA mask instead of a bool and ternary operation.

v5:
* Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
* Updated commit descriptions.
* Renamed msi_64b -> msi_64bit.
* Dropped msi_64bit ternary use.
* Dropped export of dw_pcie_msi_capabilities.

v3:
* Switched to a managed DMA allocation.
* Simplified the DMA allocation cleanup.
* Dropped msi_page from struct dw_pcie_rp.
* Allocating a u64 instead of a full page.

v2:
* Fixed build error caught by kernel test robot
* Fixed error handling reported by Isaac Manjarres
PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines
  .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++----------
  drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++
  drivers/pci/controller/dwc/pcie-designware.h  |  2 +-
  3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#5 lore raw
Quoted 11 lines · Evgenii Shatokhin

Hi,

Quoted 8 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

  * Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
  * Using an int for the DMA mask instead of a bool and ternary operation.

Quoted 8 lines
Quoted 4 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2 without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2 (unless I don't need to do that anyway).

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Yes, it was dropped due to the PCI_MSI_FLAGS_64BIT usage apparently being incorrect, and some other open debate (which all happened on the v5 thread):

https://lore.kernel.org/linux-pci/YzVTmy9MWh+AjshC@lpieralisi/

The DMA mask issues have now been sorted out, so you, or Will, or anyone else interested should be free to rework this on top of linux-next (although at this point, more realistically on top of 6.3-rc1 in a few weeks).

Thanks,
Robin.

Quoted 61 lines

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0:      MEM 0x0041000000..0x004fffffff -> 0x0041000000 [    0.376171] dw-pcie 4000000.pcie0:   IB MEM 0x0400000000..0x07ffffffff -> 0x0400000000 [    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data
[    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host
[    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc: Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 32 lines

Thanks,
Will

Will McVicker (2):
   PCI: dwc: Drop dependency on ZONE_DMA32

v6:
  * Retrying DMA allocation with 64-bit mask within the error if-statement.
  * Use an int for the DMA mask instead of a bool and ternary operation.

v5:
  * Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
  * Updated commit descriptions.
  * Renamed msi_64b -> msi_64bit.
  * Dropped msi_64bit ternary use.
  * Dropped export of dw_pcie_msi_capabilities.

v3:
   * Switched to a managed DMA allocation.
   * Simplified the DMA allocation cleanup.
   * Dropped msi_page from struct dw_pcie_rp.
   * Allocating a u64 instead of a full page.

v2:
   * Fixed build error caught by kernel test robot
   * Fixed error handling reported by Isaac Manjarres
  PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines

  .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++---------- drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++ drivers/pci/controller/dwc/pcie-designware.h  |  2 +-

  3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#6 lore raw
Quoted 28 lines · Robin Murphy
Quoted 18 lines · Evgenii Shatokhin

Hi,

Quoted 9 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

  * Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
  * Using an int for the DMA mask instead of a bool and ternary operation.

Quoted 5 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2 without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2
(unless I don't need to do that anyway).

Quoted 7 lines

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Quoted 5 lines

Yes, it was dropped due to the PCI_MSI_FLAGS_64BIT usage apparently being incorrect, and some other open debate (which all happened on the v5 thread):

https://lore.kernel.org/linux-pci/YzVTmy9MWh+AjshC@lpieralisi/

I see. If I understand it correctly, the problem was that PCI_MSI_FLAGS_64BIT flag did not guarantee that 64-bit mask could be used for that particular allocation. Right?

Quoted 2 lines

The DMA mask issues have now been sorted out,

I suppose, you mean https://lore.kernel.org/all/[email protected]/?

It still breaks our particular case when the SoC has no 32-bit-addressable RAM. We'd set DMA masks to DMA_BIT_MASK(36) in the platform-specific driver before calling dw_pcie_host_init(). However, dw_pcie_msi_host_init() resets it to 32-bit, tries dmam_alloc_coherent() and fails.

With 36-bit masks, the kernel seems to play well with the devices in our case.

I saw your comment in https://lore.kernel.org/linux-pci/[email protected]/ that drivers should always explicitly set their masks.

Is it a really bad idea to check the current coherent mask's bits in dw_pcie_msi_host_init() and if it is more than 32 - just issue a warning rather than reset it to 32-bit unconditionally? That would help in our case. Or, perhaps, there is a better workaround.

Looking forward to your comments.

Quoted 79 lines

so you, or Will, or anyone
else interested should be free to rework this on top of linux-next (although at this point, more realistically on top of 6.3-rc1 in a few weeks).

Thanks,
Robin.

Quoted 70 lines

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0:      MEM 0x0041000000..0x004fffffff -> 0x0041000000
[    0.376171] dw-pcie 4000000.pcie0:   IB MEM 0x0400000000..0x07ffffffff -> 0x0400000000
[    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data [    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host [    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc:
Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 33 lines

Thanks,
Will

Will McVicker (2):
   PCI: dwc: Drop dependency on ZONE_DMA32

v6:
  * Retrying DMA allocation with 64-bit mask within the error if-statement.
  * Use an int for the DMA mask instead of a bool and ternary operation.

v5:
  * Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
  * Updated commit descriptions.
  * Renamed msi_64b -> msi_64bit.
  * Dropped msi_64bit ternary use.
  * Dropped export of dw_pcie_msi_capabilities.

v3:
   * Switched to a managed DMA allocation.
   * Simplified the DMA allocation cleanup.
   * Dropped msi_page from struct dw_pcie_rp.
   * Allocating a u64 instead of a full page.

v2:
   * Fixed build error caught by kernel test robot
   * Fixed error handling reported by Isaac Manjarres
  PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines

  .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++---------- drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++ drivers/pci/controller/dwc/pcie-designware.h  |  2 +-

  3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#7 lore raw

Hi Evgenii

Quoted 34 lines · Evgenii Shatokhin
Quoted 33 lines · Robin Murphy
Quoted 19 lines · Evgenii Shatokhin

Hi,

Quoted 9 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

  * Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
  * Using an int for the DMA mask instead of a bool and ternary operation.

Quoted 6 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2
without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2
(unless I don't need to do that anyway).

Quoted 7 lines

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Yes, it was dropped due to the PCI_MSI_FLAGS_64BIT usage apparently being incorrect, and some other open debate (which all happened on the v5 thread):

Quoted 7 lines
Quoted 1 line

https://lore.kernel.org/linux-pci/YzVTmy9MWh+AjshC@lpieralisi/

I see. If I understand it correctly, the problem was that PCI_MSI_FLAGS_64BIT flag did not guarantee that 64-bit mask could be used for that particular allocation. Right?

William was trying to utilize for only software cause. Setting PCI_MSI_FLAGS_64BIT didn't actually change the hardware behavior. He could have as well provided just a driver private capability flag. (see below for a more detailed problem description)

Quoted 4 lines
Quoted 2 lines

The DMA mask issues have now been sorted out,

I suppose, you mean https://lore.kernel.org/all/[email protected]/?

Well, the way the DMA-mask issue has been solved was a bit of the hacky. I wouldn't call it a fully proper solution. The problem with pointlessly allocating physical memory for the iMSI-RX engine (it doesn't perform any DMA) and artificially restricting the coherent-DMA mask is still there. The patch in the subject was a compromise in order to at least permit unrestricted streaming DMAs but limiting the coherent DMAs for the MSI setup to work properly for all peripheral devices.

Quoted 5 lines

It still breaks our particular case when the SoC has no 32-bit-addressable RAM. We'd set DMA masks to DMA_BIT_MASK(36) in the platform-specific driver before calling dw_pcie_host_init(). However, dw_pcie_msi_host_init() resets it to 32-bit, tries dmam_alloc_coherent() and fails.

Yeah. That's another problem with the implemented approach. But are your sure the driver had worked even before this patch? AFAICS the driver allocated the MSI-targeted page from DMA32 zone before this modification. So the allocation must have failed on your platform too.

Quoted 4 lines

With 36-bit masks, the kernel seems to play well with the devices in our case.

Quoted 8 lines

I saw your comment in https://lore.kernel.org/linux-pci/[email protected]/
that drivers should always explicitly set their masks.

Is it a really bad idea to check the current coherent mask's bits in dw_pcie_msi_host_init() and if it is more than 32 - just issue a warning rather than reset it to 32-bit unconditionally? That would help in our case. Or, perhaps, there is a better workaround.

The problem isn't in the value the mask is set to. The problem is two-leveled, but is mainly connected with the PCIe device detected on the PCIe bus. There are some of them which can't send MSI TLPs to the 64-bit addresses. Since we can't predict whether such devices exist on the bus beforehand the LLDD probe is performed together with the MSI-engine initialization, the solution was to just restrict the MSIs base address to be allocated within the lowest 4GB. Moreover as I said above the iMSI-RX engine doesn't actually cause any DMA thus there is no need in any memory allocation. Instead reserving some PCIe-bus space/DWORD for MSIs would be enough. Alas the PCIe-subsystem doesn't provide a way to do so. That's why we have what you see in the driver:
DMA mask restriction and coherent DMA memory allocation.

If only we had a way to auto-detected the PCIe-bus space with no physical memory behind it and take out a DWORD from it to initialize the iMSI-RX engine we could have immediately got rid from the mask setting operation and the memory allocation. It would have solved your problem too.

-Serge(y)

Quoted 89 lines

Looking forward to your comments.

Quoted 79 lines

so you, or Will, or anyone
else interested should be free to rework this on top of linux-next (although at this point, more realistically on top of 6.3-rc1 in a few weeks).

Thanks,
Robin.

Quoted 70 lines

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0:      MEM 0x0041000000..0x004fffffff -> 0x0041000000
[    0.376171] dw-pcie 4000000.pcie0:   IB MEM 0x0400000000..0x07ffffffff -> 0x0400000000
[    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data [    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host [    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc:
Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 33 lines

Thanks,
Will

Will McVicker (2):
   PCI: dwc: Drop dependency on ZONE_DMA32

v6:
  * Retrying DMA allocation with 64-bit mask within the error if-statement.
  * Use an int for the DMA mask instead of a bool and ternary operation.

v5:
  * Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
  * Updated commit descriptions.
  * Renamed msi_64b -> msi_64bit.
  * Dropped msi_64bit ternary use.
  * Dropped export of dw_pcie_msi_capabilities.

v3:
   * Switched to a managed DMA allocation.
   * Simplified the DMA allocation cleanup.
   * Dropped msi_page from struct dw_pcie_rp.
   * Allocating a u64 instead of a full page.

v2:
   * Fixed build error caught by kernel test robot
   * Fixed error handling reported by Isaac Manjarres
  PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines

  .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++---------- drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++ drivers/pci/controller/dwc/pcie-designware.h  |  2 +-

  3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#8 lore raw

Hi Sergey,

First of all, thank you for the detailed explanation. It is clearer now what is going on and why it is that way.

Quoted 70 lines · Serge Semin

Hi Evgenii

Quoted 34 lines · Evgenii Shatokhin
Quoted 33 lines · Robin Murphy
Quoted 19 lines · Evgenii Shatokhin

Hi,

Quoted 9 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

* Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
* Using an int for the DMA mask instead of a bool and ternary
operation.

Quoted 6 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2
without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2
(unless I don't need to do that anyway).

Quoted 7 lines

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Yes, it was dropped due to the PCI_MSI_FLAGS_64BIT usage apparently being incorrect, and some other open debate (which all happened on the v5 thread):

Quoted 7 lines
Quoted 1 line

https://lore.kernel.org/linux-pci/YzVTmy9MWh+AjshC@lpieralisi/

I see. If I understand it correctly, the problem was that PCI_MSI_FLAGS_64BIT flag did not guarantee that 64-bit mask could be used for that particular allocation. Right?

William was trying to utilize for only software cause. Setting PCI_MSI_FLAGS_64BIT didn't actually change the hardware behavior. He could have as well provided just a driver private capability flag. (see below for a more detailed problem description)

Quoted 4 lines
Quoted 2 lines

The DMA mask issues have now been sorted out,

I suppose, you mean https://lore.kernel.org/all/[email protected]/?

Well, the way the DMA-mask issue has been solved was a bit of the hacky. I wouldn't call it a fully proper solution. The problem with pointlessly allocating physical memory for the iMSI-RX engine (it doesn't perform any DMA) and artificially restricting the coherent-DMA mask is still there. The patch in the subject was a compromise in order to at least permit unrestricted streaming DMAs but limiting the coherent DMAs for the MSI setup to work properly for all peripheral devices.

Quoted 5 lines

It still breaks our particular case when the SoC has no 32-bit-addressable RAM. We'd set DMA masks to DMA_BIT_MASK(36) in the platform-specific driver before calling dw_pcie_host_init(). However, dw_pcie_msi_host_init() resets it to 32-bit, tries dmam_alloc_coherent() and fails.

Quoted 4 lines

Yeah. That's another problem with the implemented approach. But are your sure the driver had worked even before this patch? AFAICS the driver allocated the MSI-targeted page from DMA32 zone before this modification. So the allocation must have failed on your platform too.

You are right. I did not notice earlier that the kernel based on 6.0-stable we used before did actually contain our SoC-specific workaround for this. Without that custom patch, initialization of PCIe host does not work. So, yes, the problem was present earlier too.

Quoted 14 lines
Quoted 5 lines

With 36-bit masks, the kernel seems to play well with the devices in our case.

Quoted 8 lines

I saw your comment in https://lore.kernel.org/linux-pci/[email protected]/
that drivers should always explicitly set their masks.

Is it a really bad idea to check the current coherent mask's bits in dw_pcie_msi_host_init() and if it is more than 32 - just issue a warning rather than reset it to 32-bit unconditionally? That would help in our case. Or, perhaps, there is a better workaround.

Quoted 12 lines

The problem isn't in the value the mask is set to. The problem is two-leveled, but is mainly connected with the PCIe device detected on the PCIe bus. There are some of them which can't send MSI TLPs to the 64-bit addresses. Since we can't predict whether such devices exist on the bus beforehand the LLDD probe is performed together with the MSI-engine initialization, the solution was to just restrict the MSIs base address to be allocated within the lowest 4GB. Moreover as I said above the iMSI-RX engine doesn't actually cause any DMA thus there is no need in any memory allocation. Instead reserving some PCIe-bus space/DWORD for MSIs would be enough. Alas the PCIe-subsystem doesn't provide a way to do so. That's why we have what you see in the driver:
DMA mask restriction and coherent DMA memory allocation.

So, if I understand you correctly, what is needed here is a small area of PCIe address space accessible to any of the connected PCIe devices. As the kernel does not know in advance, which restrictions the devices have, it tries to allocate 32-bit-addressable memory, suitable for DMA. This way, it would be OK for any attached PCIe device. Right?

Quoted 6 lines

If only we had a way to auto-detected the PCIe-bus space with no physical memory behind it and take out a DWORD from it to initialize the iMSI-RX engine we could have immediately got rid from the mask setting operation and the memory allocation. It would have solved your problem too.

Yes, it would solve our issue too. I do not know, however, if a generic solution is possible here, but I am no expert in PCIe.

For now, we are probably better off with SoC-specific patches, when we know which PCIe devices can possibly be used and what their restrictions are.

Quoted 82 lines

-Serge(y)

Quoted 79 lines

Looking forward to your comments.

Quoted 72 lines

so you, or Will, or anyone
else interested should be free to rework this on top of linux-next (although at this point, more realistically on top of 6.3-rc1 in a few weeks).

Thanks,
Robin.

Quoted 64 lines

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0: MEM
0x0041000000..0x004fffffff -> 0x0041000000
[    0.376171] dw-pcie 4000000.pcie0: IB MEM
0x0400000000..0x07ffffffff -> 0x0400000000
[    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data [    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host [    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc:
Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 33 lines

Thanks,
Will

Will McVicker (2):
PCI: dwc: Drop dependency on ZONE_DMA32

v6:
* Retrying DMA allocation with 64-bit mask within the error
if-statement.
* Use an int for the DMA mask instead of a bool and ternary operation.

v5:
* Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
* Updated commit descriptions.
* Renamed msi_64b -> msi_64bit.
* Dropped msi_64bit ternary use.
* Dropped export of dw_pcie_msi_capabilities.

v3:
* Switched to a managed DMA allocation.
* Simplified the DMA allocation cleanup.
* Dropped msi_page from struct dw_pcie_rp.
* Allocating a u64 instead of a full page.

v2:
* Fixed build error caught by kernel test robot
* Fixed error handling reported by Isaac Manjarres
PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines
   .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++----------
   drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++
   drivers/pci/controller/dwc/pcie-designware.h  |  2 +-
   3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#9 lore raw
Quoted 114 lines · Evgenii Shatokhin

Hi Sergey,

First of all, thank you for the detailed explanation. It is clearer now what is going on and why it is that way.

Quoted 70 lines · Serge Semin

Hi Evgenii

Quoted 34 lines · Evgenii Shatokhin
Quoted 33 lines · Robin Murphy
Quoted 19 lines · Evgenii Shatokhin

Hi,

Quoted 9 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

* Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
* Using an int for the DMA mask instead of a bool and ternary
operation.

Quoted 6 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2
without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2
(unless I don't need to do that anyway).

Quoted 7 lines

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Yes, it was dropped due to the PCI_MSI_FLAGS_64BIT usage apparently being incorrect, and some other open debate (which all happened on the v5 thread):

Quoted 7 lines
Quoted 1 line

https://lore.kernel.org/linux-pci/YzVTmy9MWh+AjshC@lpieralisi/

I see. If I understand it correctly, the problem was that PCI_MSI_FLAGS_64BIT flag did not guarantee that 64-bit mask could be used for that particular allocation. Right?

William was trying to utilize for only software cause. Setting PCI_MSI_FLAGS_64BIT didn't actually change the hardware behavior. He could have as well provided just a driver private capability flag. (see below for a more detailed problem description)

Quoted 4 lines
Quoted 2 lines

The DMA mask issues have now been sorted out,

I suppose, you mean https://lore.kernel.org/all/[email protected]/?

Well, the way the DMA-mask issue has been solved was a bit of the hacky. I wouldn't call it a fully proper solution. The problem with pointlessly allocating physical memory for the iMSI-RX engine (it doesn't perform any DMA) and artificially restricting the coherent-DMA mask is still there. The patch in the subject was a compromise in order to at least permit unrestricted streaming DMAs but limiting the coherent DMAs for the MSI setup to work properly for all peripheral devices.

Quoted 5 lines

It still breaks our particular case when the SoC has no 32-bit-addressable RAM. We'd set DMA masks to DMA_BIT_MASK(36) in the platform-specific driver before calling dw_pcie_host_init(). However, dw_pcie_msi_host_init() resets it to 32-bit, tries dmam_alloc_coherent() and fails.

Quoted 4 lines

Yeah. That's another problem with the implemented approach. But are your sure the driver had worked even before this patch? AFAICS the driver allocated the MSI-targeted page from DMA32 zone before this modification. So the allocation must have failed on your platform too.

You are right. I did not notice earlier that the kernel based on 6.0-stable we used before did actually contain our SoC-specific workaround for this. Without that custom patch, initialization of PCIe host does not work. So, yes, the problem was present earlier too.

Quoted 14 lines
Quoted 5 lines

With 36-bit masks, the kernel seems to play well with the devices in our case.

Quoted 8 lines

I saw your comment in https://lore.kernel.org/linux-pci/[email protected]/
that drivers should always explicitly set their masks.

Is it a really bad idea to check the current coherent mask's bits in dw_pcie_msi_host_init() and if it is more than 32 - just issue a warning rather than reset it to 32-bit unconditionally? That would help in our case. Or, perhaps, there is a better workaround.

Quoted 12 lines

The problem isn't in the value the mask is set to. The problem is two-leveled, but is mainly connected with the PCIe device detected on the PCIe bus. There are some of them which can't send MSI TLPs to the 64-bit addresses. Since we can't predict whether such devices exist on the bus beforehand the LLDD probe is performed together with the MSI-engine initialization, the solution was to just restrict the MSIs base address to be allocated within the lowest 4GB. Moreover as I said above the iMSI-RX engine doesn't actually cause any DMA thus there is no need in any memory allocation. Instead reserving some PCIe-bus space/DWORD for MSIs would be enough. Alas the PCIe-subsystem doesn't provide a way to do so. That's why we have what you see in the driver:
DMA mask restriction and coherent DMA memory allocation.

Quoted 5 lines

So, if I understand you correctly, what is needed here is a small area of PCIe address space accessible to any of the connected PCIe devices. As the kernel does not know in advance, which restrictions the devices have, it tries to allocate 32-bit-addressable memory, suitable for DMA. This way, it would be OK for any attached PCIe device. Right?

Right. The restriction is the 64-bit MSI capability. If any PCIe peripheral device has no PCI_MSI_64_BIT_ADDR_CAP flag set and the MSI target address is selected from the space above 4GB then such device MSIs won't be handled.

Note as I said above no DMA actually performed if at least one MSI vector is enabled. The driver just needs a DWORD within the PCIe bus space for the MSI MWr TLPs target address and EP+vector data. The MSI TLP data is decoded by the iMSI-RX engine in order to set the corresponding flag in the MSI IRQ status register. Such TLPs won't be passed to the master AXI-bus.

Quoted 11 lines
Quoted 7 lines

If only we had a way to auto-detected the PCIe-bus space with no physical memory behind it and take out a DWORD from it to initialize the iMSI-RX engine we could have immediately got rid from the mask setting operation and the memory allocation. It would have solved your problem too.

Yes, it would solve our issue too. I do not know, however, if a generic solution is possible here, but I am no expert in PCIe.

Currently the kernel PCIe subsystem doesn't provide a way to reserve a range within the PCIe bus memory with no physical RAM behind and left unused during the BARs resource initialization. Implementing such functionality (perhaps in the framework of the P2P module or based on it) would give the generic solution.

Quoted 3 lines

For now, we are probably better off with SoC-specific patches, when we know which PCIe devices can possibly be used and what their restrictions are.

Since you know that there is no any RAM below 4GB and you have matching CPU and PCIe address spaces, then you can just take any address below 4GB and use it to initialize the MSI-target address (dw_pcie_rp.msi_data). But make sure that the peripheral PCIe-devices don't use it for something application-specific (like accessing CPU MMIO devices mapped to that base address). That seems like the most universal solution for your case.

-Serge(y)

Quoted 88 lines
Quoted 83 lines

-Serge(y)

Quoted 79 lines

Looking forward to your comments.

Quoted 72 lines

so you, or Will, or anyone
else interested should be free to rework this on top of linux-next (although at this point, more realistically on top of 6.3-rc1 in a few weeks).

Thanks,
Robin.

Quoted 64 lines

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0: MEM
0x0041000000..0x004fffffff -> 0x0041000000
[    0.376171] dw-pcie 4000000.pcie0: IB MEM
0x0400000000..0x07ffffffff -> 0x0400000000
[    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data [    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host [    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc:
Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 33 lines

Thanks,
Will

Will McVicker (2):
PCI: dwc: Drop dependency on ZONE_DMA32

v6:
* Retrying DMA allocation with 64-bit mask within the error
if-statement.
* Use an int for the DMA mask instead of a bool and ternary operation.

v5:
* Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
* Updated commit descriptions.
* Renamed msi_64b -> msi_64bit.
* Dropped msi_64bit ternary use.
* Dropped export of dw_pcie_msi_capabilities.

v3:
* Switched to a managed DMA allocation.
* Simplified the DMA allocation cleanup.
* Dropped msi_page from struct dw_pcie_rp.
* Allocating a u64 instead of a full page.

v2:
* Fixed build error caught by kernel test robot
* Fixed error handling reported by Isaac Manjarres
PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines
   .../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++----------
   drivers/pci/controller/dwc/pcie-designware.c  |  8 ++++
   drivers/pci/controller/dwc/pcie-designware.h  |  2 +-
   3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#10 lore raw
Quoted 155 lines · Serge Semin
Quoted 114 lines · Evgenii Shatokhin

Hi Sergey,

First of all, thank you for the detailed explanation. It is clearer now what is going on and why it is that way.

Quoted 70 lines · Serge Semin

Hi Evgenii

Quoted 34 lines · Evgenii Shatokhin
Quoted 33 lines · Robin Murphy
Quoted 19 lines · Evgenii Shatokhin

Hi,

Quoted 9 lines · Will McVicker

Hi All,

I've update patch 2/2 to address Robin's suggestions. This includes:

* Dropping the while-loop for retrying with a 64-bit mask in favor of retrying within the error if-statement.
* Using an int for the DMA mask instead of a bool and ternary
operation.

Quoted 6 lines

Thanks again for the reviews and sorry for the extra revision today! Hopefully this is the last one :) If not, I'd be fine to submit patch 1/2
without 2/2 to avoid resending patch 1/2 for future revisions of patch 2/2
(unless I don't need to do that anyway).

Quoted 7 lines

The first patch of the series made it into the mainline kernel, but, it seems, the second one ("PCI: dwc: Add support for 64-bit MSI target address") did not. As of 6.2-rc6, it is still missing.

Was it intentionally dropped because of some issues or, perhaps, just by accident? If it was by accident, could you please queue it for inclusion into mainline again?

Yes, it was dropped due to the PCI_MSI_FLAGS_64BIT usage apparently being incorrect, and some other open debate (which all happened on the v5 thread):

Quoted 7 lines
Quoted 1 line

https://lore.kernel.org/linux-pci/YzVTmy9MWh+AjshC@lpieralisi/

I see. If I understand it correctly, the problem was that PCI_MSI_FLAGS_64BIT flag did not guarantee that 64-bit mask could be used for that particular allocation. Right?

William was trying to utilize for only software cause. Setting PCI_MSI_FLAGS_64BIT didn't actually change the hardware behavior. He could have as well provided just a driver private capability flag. (see below for a more detailed problem description)

Quoted 4 lines
Quoted 2 lines

The DMA mask issues have now been sorted out,

I suppose, you mean https://lore.kernel.org/all/[email protected]/?

Well, the way the DMA-mask issue has been solved was a bit of the hacky. I wouldn't call it a fully proper solution. The problem with pointlessly allocating physical memory for the iMSI-RX engine (it doesn't perform any DMA) and artificially restricting the coherent-DMA mask is still there. The patch in the subject was a compromise in order to at least permit unrestricted streaming DMAs but limiting the coherent DMAs for the MSI setup to work properly for all peripheral devices.

Quoted 5 lines

It still breaks our particular case when the SoC has no 32-bit-addressable RAM. We'd set DMA masks to DMA_BIT_MASK(36) in the platform-specific driver before calling dw_pcie_host_init(). However, dw_pcie_msi_host_init() resets it to 32-bit, tries dmam_alloc_coherent() and fails.

Quoted 4 lines

Yeah. That's another problem with the implemented approach. But are your sure the driver had worked even before this patch? AFAICS the driver allocated the MSI-targeted page from DMA32 zone before this modification. So the allocation must have failed on your platform too.

You are right. I did not notice earlier that the kernel based on 6.0-stable we used before did actually contain our SoC-specific workaround for this. Without that custom patch, initialization of PCIe host does not work. So, yes, the problem was present earlier too.

Quoted 14 lines
Quoted 5 lines

With 36-bit masks, the kernel seems to play well with the devices in our case.

Quoted 8 lines

I saw your comment in https://lore.kernel.org/linux-pci/[email protected]/
that drivers should always explicitly set their masks.

Is it a really bad idea to check the current coherent mask's bits in dw_pcie_msi_host_init() and if it is more than 32 - just issue a warning rather than reset it to 32-bit unconditionally? That would help in our case. Or, perhaps, there is a better workaround.

Quoted 12 lines

The problem isn't in the value the mask is set to. The problem is two-leveled, but is mainly connected with the PCIe device detected on the PCIe bus. There are some of them which can't send MSI TLPs to the 64-bit addresses. Since we can't predict whether such devices exist on the bus beforehand the LLDD probe is performed together with the MSI-engine initialization, the solution was to just restrict the MSIs base address to be allocated within the lowest 4GB. Moreover as I said above the iMSI-RX engine doesn't actually cause any DMA thus there is no need in any memory allocation. Instead reserving some PCIe-bus space/DWORD for MSIs would be enough. Alas the PCIe-subsystem doesn't provide a way to do so. That's why we have what you see in the driver:
DMA mask restriction and coherent DMA memory allocation.

Quoted 5 lines

So, if I understand you correctly, what is needed here is a small area of PCIe address space accessible to any of the connected PCIe devices. As the kernel does not know in advance, which restrictions the devices have, it tries to allocate 32-bit-addressable memory, suitable for DMA. This way, it would be OK for any attached PCIe device. Right?

Right. The restriction is the 64-bit MSI capability. If any PCIe peripheral device has no PCI_MSI_64_BIT_ADDR_CAP flag set and the MSI target address is selected from the space above 4GB then such device MSIs won't be handled.

Note as I said above no DMA actually performed if at least one MSI vector is enabled. The driver just needs a DWORD within the PCIe bus space for the MSI MWr TLPs target address and EP+vector data. The MSI TLP data is decoded by the iMSI-RX engine in order to set the corresponding flag in the MSI IRQ status register. Such TLPs won't be passed to the master AXI-bus.

Quoted 11 lines
Quoted 7 lines

If only we had a way to auto-detected the PCIe-bus space with no physical memory behind it and take out a DWORD from it to initialize the iMSI-RX engine we could have immediately got rid from the mask setting operation and the memory allocation. It would have solved your problem too.

Yes, it would solve our issue too. I do not know, however, if a generic solution is possible here, but I am no expert in PCIe.

Currently the kernel PCIe subsystem doesn't provide a way to reserve a range within the PCIe bus memory with no physical RAM behind and left unused during the BARs resource initialization. Implementing such functionality (perhaps in the framework of the P2P module or based on it) would give the generic solution.

Quoted 3 lines

For now, we are probably better off with SoC-specific patches, when we know which PCIe devices can possibly be used and what their restrictions are.

Quoted 7 lines

Since you know that there is no any RAM below 4GB and you have matching CPU and PCIe address spaces, then you can just take any address below 4GB and use it to initialize the MSI-target address (dw_pcie_rp.msi_data). But make sure that the peripheral PCIe-devices don't use it for something application-specific (like accessing CPU MMIO devices mapped to that base address). That seems like the most universal solution for your case.

Interesting idea!
Thank you, Sergey.

Quoted 92 lines

-Serge(y)

Quoted 88 lines
Quoted 83 lines

-Serge(y)

Quoted 79 lines

Looking forward to your comments.

Quoted 72 lines

so you, or Will, or anyone
else interested should be free to rework this on top of linux-next (although at this point, more realistically on top of 6.3-rc1 in a few weeks).

Thanks,
Robin.

Quoted 64 lines

Support for 64-bit MSI target addresses is needed for some of our SoCs. I ran into a situation when there was no available RAM in ZONE_DMA32 during initialization of PCIe host. Hence, dmam_alloc_coherent() failed in dw_pcie_msi_host_init() and initialization failed with -ENOMEM:

[    0.374834] dw-pcie 4000000.pcie0: host bridge /soc/pcie0@4000000 ranges:
[    0.375813] dw-pcie 4000000.pcie0: MEM
0x0041000000..0x004fffffff -> 0x0041000000
[    0.376171] dw-pcie 4000000.pcie0: IB MEM
0x0400000000..0x07ffffffff -> 0x0400000000
[    0.377914] dw-pcie 4000000.pcie0: Failed to alloc and map MSI data [    0.378191] dw-pcie 4000000.pcie0: Failed to initialize host [    0.378255] dw-pcie: probe of 4000000.pcie0 failed with error -12

Mainline kernel 6.2-rc6 was used in that test.

The hardware supports 64-bit target addresses, so the patch "PCI: dwc:
Add support for 64-bit MSI target address" should help with this particular failure.

Quoted 33 lines

Thanks,
Will

Will McVicker (2):
PCI: dwc: Drop dependency on ZONE_DMA32

v6:
* Retrying DMA allocation with 64-bit mask within the error
if-statement.
* Use an int for the DMA mask instead of a bool and ternary operation.

v5:
* Updated patch 2/2 to first try with a 32-bit DMA mask. On failure, retry with a 64-bit mask if supported.

v4:
* Updated commit descriptions.
* Renamed msi_64b -> msi_64bit.
* Dropped msi_64bit ternary use.
* Dropped export of dw_pcie_msi_capabilities.

v3:
* Switched to a managed DMA allocation.
* Simplified the DMA allocation cleanup.
* Dropped msi_page from struct dw_pcie_rp.
* Allocating a u64 instead of a full page.

v2:
* Fixed build error caught by kernel test robot
* Fixed error handling reported by Isaac Manjarres
PCI: dwc: Add support for 64-bit MSI target address

Quoted 7 lines

.../pci/controller/dwc/pcie-designware-host.c | 43 +++++++++---------- drivers/pci/controller/dwc/pcie-designware.c |  8 ++++ drivers/pci/controller/dwc/pcie-designware.h |  2 +-
3 files changed, 30 insertions(+), 23 deletions(-)

base-commit: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868

Thank you in advance.

Regards,
Evgenii

#11 lore raw

On 2023-02-09 08:03, Evgenii Shatokhin wrote:
[...]

Quoted 18 lines
Quoted 10 lines

Currently the kernel PCIe subsystem doesn't provide a way to reserve a range within the PCIe bus memory with no physical RAM behind and left unused during the BARs resource initialization. Implementing such functionality (perhaps in the framework of the P2P module or based on it) would give the generic solution.

Quoted 3 lines

For now, we are probably better off with SoC-specific patches, when we know which PCIe devices can possibly be used and what their restrictions are.

Quoted 7 lines

Since you know that there is no any RAM below 4GB and you have matching CPU and PCIe address spaces, then you can just take any address below 4GB and use it to initialize the MSI-target address (dw_pcie_rp.msi_data). But make sure that the peripheral PCIe-devices don't use it for something application-specific (like accessing CPU MMIO devices mapped to that base address). That seems like the most universal solution for your case.

Quoted 2 lines

Interesting idea!
Thank you, Sergey.

Yes, if the platform-specific driver knows enough to be able to pick a suitable "safe" MSI address, then I think allowing it to pre-set pp.msi_data, and only falling back to the dma-mapping workaround otherwise, sounds reasonable.

Thanks,
Robin.