PCI: MVEBU: Use Device ID and revision from underlying endpoint
PATCH 1/1 PCI: MVEBU: Use Device ID and revision from underlying endpoint
Marvell SoCs place the SoC number into the PCIe endpoint device ID. The SoC stepping is placed into the PCIe revision. The old plat-orion PCIe driver allowed this information to be seen in user space with a simple lspci command.
The new driver places a virtual PCI-PCI bridge on top of these endpoints. It has its own hard coded PCI device ID. Thus it is no longer possible to see what the SoC is using lspci.
When initializing the PCI-PCI bridge, set its device ID and revision from the underlying endpoint, thus restoring this functionality. Debian would like to use this in order to aid installing the correct DTB file.
--- drivers/pci/host/pci-mvebu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/pci/host/pci-mvebu.c +2 -9
@@ -60,14 +60,6 @@#define PCIE_DEBUG_CTRL 0x1a60#define PCIE_DEBUG_SOFT_RESET BIT(20) -/* -* This product ID is registered by Marvell, and used when the Marvell -* SoC is not the root complex, but an endpoint on the PCIe bus. It is -* therefore safe to re-use this PCI ID for our emulated PCI-to-PCI -* bridge. -*/ -#define MARVELL_EMULATED_PCI_PCI_BRIDGE_ID 0x7846 -/* PCI configuration space of a PCI-to-PCI bridge */ struct mvebu_sw_pci_bridge {u16 vendor;
@@ -388,7 +380,8 @@ static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) bridge->class =PCI_CLASS_BRIDGE_PCI ; bridge->vendor =PCI_VENDOR_ID_MARVELL ; - bridge->device =MARVELL_EMULATED_PCI_PCI_BRIDGE_ID ; + bridge->device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ; + bridge->revision =mvebu_readl (port,PCIE_DEV_REV_OFF ) &0xff ; bridge->header_type =PCI_HEADER_TYPE_BRIDGE ; bridge->cache_line_size =0x10 ;
Signature · 1 line
1.8.5.2
PATCH 1/1 PCI: MVEBU: Use Device ID and revision from underlying endpoint
Dear Andrew Lunn,
Quoted 14 lines · Andrew Lunn
Marvell SoCs place the SoC number into the PCIe endpoint device ID. The SoC stepping is placed into the PCIe revision. The old plat-orion PCIe driver allowed this information to be seen in user space with a simple lspci command.
The new driver places a virtual PCI-PCI bridge on top of these endpoints. It has its own hard coded PCI device ID. Thus it is no longer possible to see what the SoC is using lspci.
When initializing the PCI-PCI bridge, set its device ID and revision from the underlying endpoint, thus restoring this functionality. Debian would like to use this in order to aid installing the correct DTB file.
Quoted 4 lines
Signed-off-by Andrew Lunn <[email protected]>--- drivers/pci/host/pci-mvebu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
I have two comments below, though.
Quoted 21 lines
drivers/pci/host/pci-mvebu.c +0
-8@@ -60,14 +60,6 @@#define PCIE_DEBUG_CTRL 0x1a60#define PCIE_DEBUG_SOFT_RESET BIT(20) -/* -* This product ID is registered by Marvell, and used when the Marvell -* SoC is not the root complex, but an endpoint on the PCIe bus. It is -* therefore safe to re-use this PCI ID for our emulated PCI-to-PCI -* bridge. -*/ -#define MARVELL_EMULATED_PCI_PCI_BRIDGE_ID 0x7846 -/* PCI configuration space of a PCI-to-PCI bridge */ struct mvebu_sw_pci_bridge {u16 vendor;
drivers/pci/host/pci-mvebu.c static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) · line 382
Quoted 3 lines
drivers/pci/host/pci-mvebu.c +0
-0@@ -388,7 +380,8 @@ static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) bridge->class =PCI_CLASS_BRIDGE_PCI ; bridge->vendor =PCI_VENDOR_ID_MARVELL ;
This could also have been replaced by:
bridge->vendor = mvebu_readl(port, PCIE_DEV_ID_OFF) & 0xff;
drivers/pci/host/pci-mvebu.c static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) · line 384
Quoted 3 lines
drivers/pci/host/pci-mvebu.c +2
-1- bridge->device =MARVELL_EMULATED_PCI_PCI_BRIDGE_ID ; + bridge->device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ; + bridge->revision =mvebu_readl (port,PCIE_DEV_REV_OFF ) &0xff ;
On Armada 370 and XP, this field is apparently always 0x0, so not very useful. But if it's useful on other mvebu SoCs, that's fine, it's just an informative field anyway.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 PCI: MVEBU: Use Device ID and revision from underlying endpoint
Quoted 8 lines
drivers/pci/host/pci-mvebu.c static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) · line 382
Quoted 4 lines
drivers/pci/host/pci-mvebu.c +0
-0@@ -388,7 +380,8 @@ static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) bridge->class =PCI_CLASS_BRIDGE_PCI ; bridge->vendor =PCI_VENDOR_ID_MARVELL ;This could also have been replaced by:
bridge->vendor = mvebu_readl(port, PCIE_DEV_ID_OFF) & 0xff;
O.K, but do we ever expect it not to be PCI_VENDOR_ID_MARVELL on the underlying hardware?
Quoted 8 lines
drivers/pci/host/pci-mvebu.c static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) · line 384
Quoted 4 lines
drivers/pci/host/pci-mvebu.c +2
-1- bridge->device =MARVELL_EMULATED_PCI_PCI_BRIDGE_ID ; + bridge->device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ; + bridge->revision =mvebu_readl (port,PCIE_DEV_REV_OFF ) &0xff ;On Armada 370 and XP, this field is apparently always
0x0, so not very useful. But if it's useful on other mvebu SoCs, that's fine, it's just an informative field anyway.
Humm, that should be the stepping, unless i have made a mistake. The code Gregory wrote for mvebu-soc-id.c does:
/* SoC ID */
soc_dev_id = readl(pci_base + PCIE_DEV_ID_OFF) >> 16;
/* SoC revision */
soc_rev = readl(pci_base + PCIE_DEV_REV_OFF) & SOC_REV_MASK;However, the box i'm testing on has stepping 0, so it is hard to test. Could you test this in an OpenBlocks AX3 B0, or some other B0 device?
Thanks
Andrew
PATCH 1/1 PCI: MVEBU: Use Device ID and revision from underlying endpoint
Dear Andrew Lunn,
Quoted 11 lines · Andrew Lunn
Quoted 8 lines
drivers/pci/host/pci-mvebu.c static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) · line 382
Quoted 4 lines
drivers/pci/host/pci-mvebu.c +0
-0@@ -388,7 +380,8 @@ static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) bridge->class =PCI_CLASS_BRIDGE_PCI ; bridge->vendor =PCI_VENDOR_ID_MARVELL ;This could also have been replaced by:
bridge->vendor = mvebu_readl(port, PCIE_DEV_ID_OFF) & 0xff;O.K, but do we ever expect it not to be
PCI_VENDOR_ID_MARVELLon the underlying hardware?
No, I don't expect it to be different. Which is why I said it "could" have been replaced, because I am not sure it is worth doing it.
Quoted 11 lines
Quoted 7 lines
drivers/pci/host/pci-mvebu.c static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) · line 384
Quoted 3 lines
drivers/pci/host/pci-mvebu.c +2
-1- bridge->device =MARVELL_EMULATED_PCI_PCI_BRIDGE_ID ; + bridge->device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ; + bridge->revision =mvebu_readl (port,PCIE_DEV_REV_OFF ) &0xff ;On Armada 370 and XP, this field is apparently always
0x0, so not very useful. But if it's useful on other mvebu SoCs, that's fine, it's just an informative field anyway.Humm, that should be the stepping, unless i have made a mistake. The code Gregory wrote for
mvebu-soc-id.cdoes:
Quoted 8 lines
/* SoC ID */ soc_dev_id = readl(pci_base + PCIE_DEV_ID_OFF) >> 16; /* SoC revision */ soc_rev = readl(pci_base + PCIE_DEV_REV_OFF) & SOC_REV_MASK;However, the box i'm testing on has stepping 0, so it is hard to test. Could you test this in an OpenBlocks AX3 B0, or some other B0 device?
Tested on a B0 now, and the revision returned is indeed 0x2, so you're correct. Seems like the datasheet that indicates the value is 0x0 is wrong :)
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 PCI: MVEBU: Use Device ID and revision from underlying endpoint
In reply to Andrew LunnQuoted 14 lines · Andrew Lunn
Marvell SoCs place the SoC number into the PCIe endpoint device ID. The SoC stepping is placed into the PCIe revision. The old plat-orion PCIe driver allowed this information to be seen in user space with a simple lspci command.
The new driver places a virtual PCI-PCI bridge on top of these endpoints. It has its own hard coded PCI device ID. Thus it is no longer possible to see what the SoC is using lspci.
When initializing the PCI-PCI bridge, set its device ID and revision from the underlying endpoint, thus restoring this functionality. Debian would like to use this in order to aid installing the correct DTB file.
Quoted 4 lines
Signed-off-by Andrew Lunn <[email protected]>--- drivers/pci/host/pci-mvebu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
Also, since this fixes a userspace regression:
thx,
Jason.
Quoted 38 lines
drivers/pci/host/pci-mvebu.c +2
-9@@ -60,14 +60,6 @@#define PCIE_DEBUG_CTRL 0x1a60#define PCIE_DEBUG_SOFT_RESET BIT(20) -/* -* This product ID is registered by Marvell, and used when the Marvell -* SoC is not the root complex, but an endpoint on the PCIe bus. It is -* therefore safe to re-use this PCI ID for our emulated PCI-to-PCI -* bridge. -*/ -#define MARVELL_EMULATED_PCI_PCI_BRIDGE_ID 0x7846 -/* PCI configuration space of a PCI-to-PCI bridge */ struct mvebu_sw_pci_bridge {u16 vendor;@@ -388,7 +380,8 @@ static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) bridge->class =PCI_CLASS_BRIDGE_PCI ; bridge->vendor =PCI_VENDOR_ID_MARVELL ; - bridge->device =MARVELL_EMULATED_PCI_PCI_BRIDGE_ID ; + bridge->device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ; + bridge->revision =mvebu_readl (port,PCIE_DEV_REV_OFF ) &0xff ; bridge->header_type =PCI_HEADER_TYPE_BRIDGE ; bridge->cache_line_size =0x10 ;Signature · 7 lines
1.8.5.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 PCI: MVEBU: Use Device ID and revision from underlying endpoint
In reply to Andrew LunnQuoted 9 lines · Andrew Lunn
Marvell SoCs place the SoC number into the PCIe endpoint device ID. The SoC stepping is placed into the PCIe revision. The old plat-orion PCIe driver allowed this information to be seen in user space with a simple lspci command.
The new driver places a virtual PCI-PCI bridge on top of these endpoints. It has its own hard coded PCI device ID. Thus it is no longer possible to see what the SoC is using lspci.
Quoted 6 lines
When initializing the PCI-PCI bridge, set its device ID and revision from the underlying endpoint, thus restoring this functionality. Debian would like to use this in order to aid installing the correct DTB file.
Signed-off-by Andrew Lunn <[email protected]>
Applied to pci/host-mvebu with acks from Thomas and Jason. Since it fixes a regression, I cherry-picked it into for-linus for v3.14. Thanks!
Bjorn
Quoted 36 lines
--- drivers/pci/host/pci-mvebu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)drivers/pci/host/pci-mvebu.c +2
-9@@ -60,14 +60,6 @@#define PCIE_DEBUG_CTRL 0x1a60#define PCIE_DEBUG_SOFT_RESET BIT(20) -/* -* This product ID is registered by Marvell, and used when the Marvell -* SoC is not the root complex, but an endpoint on the PCIe bus. It is -* therefore safe to re-use this PCI ID for our emulated PCI-to-PCI -* bridge. -*/ -#define MARVELL_EMULATED_PCI_PCI_BRIDGE_ID 0x7846 -/* PCI configuration space of a PCI-to-PCI bridge */ struct mvebu_sw_pci_bridge {u16 vendor;@@ -388,7 +380,8 @@ static void mvebu_sw_pci_bridge_init(struct mvebu_pcie_port *port) bridge->class =PCI_CLASS_BRIDGE_PCI ; bridge->vendor =PCI_VENDOR_ID_MARVELL ; - bridge->device =MARVELL_EMULATED_PCI_PCI_BRIDGE_ID ; + bridge->device =mvebu_readl (port,PCIE_DEV_ID_OFF ) >>16 ; + bridge->revision =mvebu_readl (port,PCIE_DEV_REV_OFF ) &0xff ; bridge->header_type =PCI_HEADER_TYPE_BRIDGE ; bridge->cache_line_size =0x10 ;Signature · 1 line
1.8.5.2