Skip to contentSkip to conversation

pci: mpc85xx: Fixes for PCI config space

PATCH In review Pali Rohár 3 participants 15 messages Apr 13, 2023 – May 2, 2023 PCI

lore
Share & tools
lore
#4 lore raw

PATCH 2/3 pci: mpc85xx: Allow 8/16-bit access to PCI config space

In reply to Pali Rohár

This Freescale mpc85xx PCI controller should support 8-bit and 16-bit read and write access to PCI config space as described in more Freescale reference manuals.

This change fixes issue that 8-bit and 16-bit write to PCI config space caused to clear adjacent bits of 32-bit PCI register.

---
 drivers/pci/pci_mpc85xx.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/pci/pci_mpc85xx.c +24 -2
index 23f14db83018..d144f2b791b8 100644
@@ -25,7 +25,18 @@ static int mpc85xx_pci_dm_read_config(const struct udevice *dev, pci_dev_t bdf,
 	addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
 	out_be32(priv->cfg_addr, addr);
 	sync();
-	*value = pci_conv_32_to_size(in_le32(priv->cfg_data), offset, size);
+
+	switch (size) {
+	case PCI_SIZE_8:
+		*value = in_8(priv->cfg_data + (offset & 3));
+		break;
+	case PCI_SIZE_16:
+		*value = in_le16(priv->cfg_data + (offset & 2));
+		break;
+	case PCI_SIZE_32:
+		*value = in_le32(priv->cfg_data);
+		break;
+	}
 
 	return 0;
 }
@@ -40,7 +51,18 @@ static int mpc85xx_pci_dm_write_config(struct udevice *dev, pci_dev_t bdf,
 	addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
 	out_be32(priv->cfg_addr, addr);
 	sync();
-	out_le32(priv->cfg_data, pci_conv_size_to_32(0, value, offset, size));
+
+	switch (size) {
+	case PCI_SIZE_8:
+		out_8(priv->cfg_data + (offset & 3), value);
+		break;
+	case PCI_SIZE_16:
+		out_le16(priv->cfg_data + (offset & 2), value);
+		break;
+	case PCI_SIZE_32:
+		out_le32(priv->cfg_data, value);
+		break;
+	}
 	sync();
 
 	return 0;
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/3 pci: mpc85xx: Add missing sync() after writing to PCI config space

In reply to Pali Rohár

On PowerPC we should use barrier after store operation to HW register.

---
 drivers/pci/pci_mpc85xx.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/pci_mpc85xx.c +1 -0
index 8a81a74067e9..23f14db83018 100644
@@ -41,6 +41,7 @@ static int mpc85xx_pci_dm_write_config(struct udevice *dev, pci_dev_t bdf,
 	out_be32(priv->cfg_addr, addr);
 	sync();
 	out_le32(priv->cfg_data, pci_conv_size_to_32(0, value, offset, size));
+	sync();
 
 	return 0;
 }
Signature · 1 line
2.20.1
#7 lore raw

PATCH 3/3 pci: mpc85xx: Do not try to access extended PCIe registers

In reply to Pali Rohár

Driver pci_mpc85xx.c is PCI controller driver for old PCI Local Bus, which does not support access to extended PCIe registers (above 0xff), as opposite of the PCIe driver pcie_fsl.c for the same platform.

So do not try to access extended PCIe registers as it cannot work.

---
 drivers/pci/pci_mpc85xx.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/pci/pci_mpc85xx.c +10 -2
index d144f2b791b8..833de816c459 100644
@@ -22,7 +22,12 @@ static int mpc85xx_pci_dm_read_config(const struct udevice *dev, pci_dev_t bdf,
 	struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
 	u32 addr;
 
-	addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
+	if (offset > 0xff) {
+		*value = pci_get_ff(size);
+		return 0;
+	}
+
+	addr = PCI_CONF1_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
 	out_be32(priv->cfg_addr, addr);
 	sync();
 
@@ -48,7 +53,10 @@ static int mpc85xx_pci_dm_write_config(struct udevice *dev, pci_dev_t bdf,
 	struct mpc85xx_pci_priv *priv = dev_get_priv(dev);
 	u32 addr;
 
-	addr = PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
+	if (offset > 0xff)
+		return 0;
+
+	addr = PCI_CONF1_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), PCI_FUNC(bdf), offset);
 	out_be32(priv->cfg_addr, addr);
 	sync();
 
Signature · 1 line
2.20.1
#0 lore raw

cover pci: mpc85xx: Fixes for PCI config space

This patch series contains small fixes for mpc85xx old PCI Local Bus driver.

Heiko: Are you able to test these changes? Has your Socrates board available old PCI Local Bus support?

Pali Rohár (3):
pci: mpc85xx: Add missing sync() after writing to PCI config space
pci: mpc85xx: Allow 8/16-bit access to PCI config space
pci: mpc85xx: Do not try to access extended PCIe registers

 drivers/pci/pci_mpc85xx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)
Signature · 1 line
2.20.1
#10 lore raw

Hello Pali,

Quoted 5 lines · Pali Rohár

This patch series contains small fixes for mpc85xx old PCI Local Bus driver.

Heiko: Are you able to test these changes? Has your Socrates board available old PCI Local Bus support?

Quoted 7 lines

Pali Rohár (3):
pci: mpc85xx: Add missing sync() after writing to PCI config space
pci: mpc85xx: Allow 8/16-bit access to PCI config space
pci: mpc85xx: Do not try to access extended PCIe registers

 drivers/pci/pci_mpc85xx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

I have to look, try your patches soon, thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
#11 lore raw
In reply to Pali Rohár

Hello Pali,

Quoted 5 lines · Pali Rohár

This patch series contains small fixes for mpc85xx old PCI Local Bus driver.

Heiko: Are you able to test these changes? Has your Socrates board available old PCI Local Bus support?

Quoted 7 lines

Pali Rohár (3):
pci: mpc85xx: Add missing sync() after writing to PCI config space
pci: mpc85xx: Allow 8/16-bit access to PCI config space
pci: mpc85xx: Do not try to access extended PCIe registers

 drivers/pci/pci_mpc85xx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

I just applied your patches to my U-Boot (based on 2023.04) running on the socrates board. I see no problems.

I have there:

=> pci
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________

00.00.00   0x1957     0x0033     Processor               0x20
00.11.00   0x1131     0x1561     Serial bus controller   0x03
00.11.01   0x1131     0x1561     Serial bus controller   0x03
00.11.02   0x1131     0x1562     Serial bus controller   0x03
00.12.00   0x1131     0x1561     Serial bus controller   0x03
00.12.01   0x1131     0x1561     Serial bus controller   0x03
00.12.02   0x1131     0x1562     Serial bus controller   0x03

=>

=> usb start
starting USB...
Bus ohci_pci: USB OHCI 1.0
Bus ohci_pci: USB OHCI 1.0
Bus ohci_pci: USB OHCI 1.0
Bus ohci_pci: USB OHCI 1.0
scanning bus ohci_pci for devices... 1 USB Device(s) found scanning bus ohci_pci for devices... 1 USB Device(s) found scanning bus ohci_pci for devices... 1 USB Device(s) found scanning bus ohci_pci for devices... 2 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
=> usb storage
Device 0: Vendor: Mass Rev: 1.00 Prod: Storage Device
Type: Removable Hard Disk
Capacity: 30424.5 MB = 29.7 GB (62309376 x 512)
=>

So, I see no problems with your patches.

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
Reviewed-by Tested-by on v1 1/3
#2 lore raw

Re: [PATCH u-boot 1/3] pci: mpc85xx: Add missing sync() after writing to PCI config space

In reply to Pali Rohár

Hello Pali,

Quoted 6 lines · Pali Rohár

On PowerPC we should use barrier after store operation to HW register.

---
 drivers/pci/pci_mpc85xx.c | 1 +
 1 file changed, 1 insertion(+)

Good catch, thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
Reviewed-by Tested-by on v1 2/3
#5 lore raw

Re: [PATCH u-boot 2/3] pci: mpc85xx: Allow 8/16-bit access to PCI config space

In reply to Pali Rohár

Hello Pali,

Quoted 11 lines · Pali Rohár

This Freescale mpc85xx PCI controller should support 8-bit and 16-bit read and write access to PCI config space as described in more Freescale reference manuals.

This change fixes issue that 8-bit and 16-bit write to PCI config space caused to clear adjacent bits of 32-bit PCI register.

---
 drivers/pci/pci_mpc85xx.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

Thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
Reviewed-by Tested-by on v1 3/3
#8 lore raw

Re: [PATCH u-boot 3/3] pci: mpc85xx: Do not try to access extended PCIe registers

In reply to Pali Rohár

Hello Pali,

Quoted 10 lines · Pali Rohár

Driver pci_mpc85xx.c is PCI controller driver for old PCI Local Bus, which does not support access to extended PCIe registers (above 0xff), as opposite of the PCIe driver pcie_fsl.c for the same platform.

So do not try to access extended PCIe registers as it cannot work.

---
 drivers/pci/pci_mpc85xx.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
#12 lore raw
In reply to Heiko Schocher
Quoted 50 lines · On Monday 17 April 2023 07:12:16 Heiko Schocher wrote:

Hello Pali,

Quoted 5 lines · Pali Rohár

This patch series contains small fixes for mpc85xx old PCI Local Bus driver.

Heiko: Are you able to test these changes? Has your Socrates board available old PCI Local Bus support?

Quoted 7 lines

Pali Rohár (3):
pci: mpc85xx: Add missing sync() after writing to PCI config space
pci: mpc85xx: Allow 8/16-bit access to PCI config space
pci: mpc85xx: Do not try to access extended PCIe registers

 drivers/pci/pci_mpc85xx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

I just applied your patches to my U-Boot (based on 2023.04) running on the socrates board. I see no problems.

I have there:

=> pci
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________

00.00.00   0x1957     0x0033     Processor               0x20
00.11.00   0x1131     0x1561     Serial bus controller   0x03
00.11.01   0x1131     0x1561     Serial bus controller   0x03
00.11.02   0x1131     0x1562     Serial bus controller   0x03
00.12.00   0x1131     0x1561     Serial bus controller   0x03
00.12.01   0x1131     0x1561     Serial bus controller   0x03
00.12.02   0x1131     0x1562     Serial bus controller   0x03

=>

=> usb start
starting USB...
Bus ohci_pci: USB OHCI 1.0
Bus ohci_pci: USB OHCI 1.0
Bus ohci_pci: USB OHCI 1.0
Bus ohci_pci: USB OHCI 1.0
scanning bus ohci_pci for devices... 1 USB Device(s) found scanning bus ohci_pci for devices... 1 USB Device(s) found scanning bus ohci_pci for devices... 1 USB Device(s) found scanning bus ohci_pci for devices... 2 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
=> usb storage
Device 0: Vendor: Mass Rev: 1.00 Prod: Storage Device
Type: Removable Hard Disk
Capacity: 30424.5 MB = 29.7 GB (62309376 x 512)
=>

Quoted 1 line

So, I see no problems with your patches.

Thanks for testing!

Could you send me dump of the PCI config space from u-boot and also from Linux? So I could compare it if U-Boot is doing everything correctly.

In U-Boot for first two devices:

=> pci display.b 00.00.00 0x0 0x1000
=> pci display.b 00.11.00 0x0 0x1000

And in Linux for all devices:

  # lspci -xxxx -nn
Quoted 6 lines

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
#13 lore raw
In reply to Pali Rohár
Quoted 5 lines · On Thursday 13 April 2023 22:41:43 Pali Rohár wrote:

This patch series contains small fixes for mpc85xx old PCI Local Bus driver.

Heiko: Are you able to test these changes? Has your Socrates board available old PCI Local Bus support?

Quoted 11 lines

Pali Rohár (3):
pci: mpc85xx: Add missing sync() after writing to PCI config space
pci: mpc85xx: Allow 8/16-bit access to PCI config space
pci: mpc85xx: Do not try to access extended PCIe registers

 drivers/pci/pci_mpc85xx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)
Signature · 1 line
2.20.1

Anything more here?

Remaining issues are handled by the other patch series on the list.

#14 lore raw

Hello Pali,

Quoted 14 lines · Pali Rohár
Quoted 13 lines · On Thursday 13 April 2023 22:41:43 Pali Rohár wrote:

This patch series contains small fixes for mpc85xx old PCI Local Bus driver.

Heiko: Are you able to test these changes? Has your Socrates board available old PCI Local Bus support?

Pali Rohár (3):
pci: mpc85xx: Add missing sync() after writing to PCI config space
pci: mpc85xx: Allow 8/16-bit access to PCI config space
pci: mpc85xx: Do not try to access extended PCIe registers

 drivers/pci/pci_mpc85xx.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)
Quoted 7 lines
Quoted 3 lines
Signature · 1 line
2.20.1

Anything more here?

Remaining issues are handled by the other patch series on the list.

I see no more issues on my hardware, thanks!

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
#6 lore raw

Re: [PATCH u-boot 2/3] pci: mpc85xx: Allow 8/16-bit access to PCI config space

In reply to Pali Rohár
Quoted 10 lines · Pali Rohár

This Freescale mpc85xx PCI controller should support 8-bit and 16-bit read and write access to PCI config space as described in more Freescale reference manuals.

This change fixes issue that 8-bit and 16-bit write to PCI config space caused to clear adjacent bits of 32-bit PCI register.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom
#9 lore raw

Re: [PATCH u-boot 3/3] pci: mpc85xx: Do not try to access extended PCIe registers

In reply to Pali Rohár
Quoted 9 lines · Pali Rohár

Driver pci_mpc85xx.c is PCI controller driver for old PCI Local Bus, which does not support access to extended PCIe registers (above 0xff), as opposite of the PCIe driver pcie_fsl.c for the same platform.

So do not try to access extended PCIe registers as it cannot work.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom