| Message ID | 20191010145953.21327-6-tbogendoerfer@suse.de |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | Use MFD framework for SGI IOC3 drivers | expand |
On 10/10/2019 05:59 PM, Thomas Bogendoerfer wrote: > PROM only enables ethernet PHY on first Origin 200 module, so we must > do it ourselves for the second module. > > Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> > --- > arch/mips/pci/pci-ip27.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c > index 441eb9383b20..7cc784cb299b 100644 > --- a/arch/mips/pci/pci-ip27.c > +++ b/arch/mips/pci/pci-ip27.c > @@ -7,6 +7,11 @@ > * Copyright (C) 1999, 2000, 04 Ralf Baechle (ralf@linux-mips.org) > * Copyright (C) 1999, 2000 Silicon Graphics, Inc. > */ > +#include <asm/sn/addrs.h> > +#include <asm/sn/types.h> > +#include <asm/sn/klconfig.h> > +#include <asm/sn/hub.h> > +#include <asm/sn/ioc3.h> > #include <asm/pci/bridge.h> > > dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) > @@ -31,3 +36,20 @@ int pcibus_to_node(struct pci_bus *bus) > } > EXPORT_SYMBOL(pcibus_to_node); > #endif /* CONFIG_NUMA */ > + > +static void ip29_fixup_phy(struct pci_dev *dev) > +{ > + int nasid = pcibus_to_node(dev->bus); > + u32 sid; > + > + if (nasid != 1) > + return; /* only needed on second module */ > + > + /* enable ethernet PHY on IP29 systemboard */ > + pci_read_config_dword(dev, PCI_SUBSYSTEM_VENDOR_ID, &sid); > + if (sid == ((PCI_VENDOR_ID_SGI << 16) | IOC3_SUBSYS_IP29_SYSBOARD)) I thought PCI was little endian, thuis vendor ID at offset 0 and device ID at offset 2? [...] MBR, Sergei
On Thu, 10 Oct 2019 19:37:15 +0300 Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > On 10/10/2019 05:59 PM, Thomas Bogendoerfer wrote: > > + /* enable ethernet PHY on IP29 systemboard */ > > + pci_read_config_dword(dev, PCI_SUBSYSTEM_VENDOR_ID, &sid); > > + if (sid == ((PCI_VENDOR_ID_SGI << 16) | IOC3_SUBSYS_IP29_SYSBOARD)) > > I thought PCI was little endian, thuis vendor ID at offset 0 and device ID > at offset 2? you are right. I already messed it up in pci-xtalk-bridge.c. As this is just a fake sub device id, there is no harm, but I'll fix it. Thomas.
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index 441eb9383b20..7cc784cb299b 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c @@ -7,6 +7,11 @@ * Copyright (C) 1999, 2000, 04 Ralf Baechle (ralf@linux-mips.org) * Copyright (C) 1999, 2000 Silicon Graphics, Inc. */ +#include <asm/sn/addrs.h> +#include <asm/sn/types.h> +#include <asm/sn/klconfig.h> +#include <asm/sn/hub.h> +#include <asm/sn/ioc3.h> #include <asm/pci/bridge.h> dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) @@ -31,3 +36,20 @@ int pcibus_to_node(struct pci_bus *bus) } EXPORT_SYMBOL(pcibus_to_node); #endif /* CONFIG_NUMA */ + +static void ip29_fixup_phy(struct pci_dev *dev) +{ + int nasid = pcibus_to_node(dev->bus); + u32 sid; + + if (nasid != 1) + return; /* only needed on second module */ + + /* enable ethernet PHY on IP29 systemboard */ + pci_read_config_dword(dev, PCI_SUBSYSTEM_VENDOR_ID, &sid); + if (sid == ((PCI_VENDOR_ID_SGI << 16) | IOC3_SUBSYS_IP29_SYSBOARD)) + REMOTE_HUB_S(nasid, MD_LED0, 0x09); +} + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, + ip29_fixup_phy);
PROM only enables ethernet PHY on first Origin 200 module, so we must do it ourselves for the second module. Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> --- arch/mips/pci/pci-ip27.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)