* [PATCH] Make PCIe hotplug work with Freescale PCIe controllers [not found] <3E027F8168735B46AC006B1D0C7BB0020B102CFB@039-SN2MPN1-013.039d.mgd.msft.net> @ 2013-03-12 10:12 ` Chen Yuanquan-B41889 2013-03-12 10:30 ` Rojhalat Ibrahim 0 siblings, 1 reply; 12+ messages in thread From: Chen Yuanquan-B41889 @ 2013-03-12 10:12 UTC (permalink / raw) To: linuxppc-dev, Benjamin Herrenschmidt, Kumar Gala, Zang Roy-R61911 >> -----Original Message----- >> From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- >> fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Rojhalat Ibrahim >> Sent: Tuesday, March 12, 2013 5:23 PM >> To: Kumar Gala >> Cc: linuxppc-dev@lists.ozlabs.org >> Subject: Re: [PATCH] Make PCIe hotplug work with Freescale PCIe >> controllers >> >> On Monday 11 March 2013 12:17:42 Kumar Gala wrote: >>> Rather than do it this way, we should do something like: >>> >>> fsl_indirect_read_config() { >>> link check >>> if (link) >>> indirect_read_config() >>> } >>> >>> and just add fsl_indirect_{r,w}_config into fsl_pci.c >>> >>> - k >>> >> Ok, how about this: >> Yeah, this patch can solve the problem of PCI-e bus rescan which a PCI-e EP is added to RC after RC booting up. If RC boots up without EP added, the original code will set the PCI-e bus as no link even if you add a EP to RC during RC's runtime. Regards, Yuanquan >> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> >> --- >> arch/powerpc/sysdev/fsl_pci.c | 49 >> ++++++++++++++++++++++++++++++++++++++---- >> 1 file changed, 45 insertions(+), 4 deletions(-) >> >> diff --git a/arch/powerpc/sysdev/fsl_pci.c >> b/arch/powerpc/sysdev/fsl_pci.c index 682084d..693db9f 100644 >> --- a/arch/powerpc/sysdev/fsl_pci.c >> +++ b/arch/powerpc/sysdev/fsl_pci.c >> @@ -36,6 +36,8 @@ >> >> static int fsl_pcie_bus_fixup, is_mpc83xx_pci; >> >> +static struct pci_ops *indirect_pci_ops; >> + >> static void quirk_fsl_pcie_header(struct pci_dev *dev) { >> u8 hdr_type; >> @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct >> pci_controller >> *hose) >> return 0; >> } >> >> +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int >> devfn, >> + int offset, int len, u32 *val) >> +{ >> + struct pci_controller *hose = pci_bus_to_host(bus); >> + >> + // check the link status >> + if ((bus->number == hose->first_busno) && (devfn == 0)) { >> + u32 ltssm = 0; >> + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); >> + if (ltssm < PCIE_LTSSM_L0) { >> + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; >> + } else { >> + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; >> + } >> + } >> + return indirect_pci_ops->read(bus, devfn, offset, len, val); } >> + >> +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned int >> devfn, >> + int offset, int len, u32 val) >> +{ >> + return indirect_pci_ops->write(bus, devfn, offset, len, val); } >> + >> +static struct pci_ops fsl_indirect_pci_ops = { >> + .read = fsl_indirect_read_config, >> + .write = fsl_indirect_write_config, >> +}; >> + >> +static void __init fsl_setup_indirect_pci(struct pci_controller* hose, >> + resource_size_t cfg_addr, >> + resource_size_t cfg_data, u32 flags) { >> + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); >> + indirect_pci_ops = hose->ops; >> + hose->ops = &fsl_indirect_pci_ops; >> +} >> + >> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) >> >> #define MAX_PHYS_ADDR_BITS 40 >> @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device >> *pdev, int is_primary) >> hose->first_busno = bus_range ? bus_range[0] : 0x0; >> hose->last_busno = bus_range ? bus_range[1] : 0xff; >> >> - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, >> - PPC_INDIRECT_TYPE_BIG_ENDIAN); >> + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, >> + PPC_INDIRECT_TYPE_BIG_ENDIAN); >> >> if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { >> /* For PCIE read HEADER_TYPE to identify controler mode */ @@ >> -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev) >> if (ret) >> goto err0; >> } else { >> - setup_indirect_pci(hose, rsrc_cfg.start, >> - rsrc_cfg.start + 4, 0); >> + fsl_setup_indirect_pci(hose, rsrc_cfg.start, >> + rsrc_cfg.start + 4, 0); >> } >> >> printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " >> >> >> _______________________________________________ >> Linuxppc-dev mailing list >> Linuxppc-dev@lists.ozlabs.org >> https://lists.ozlabs.org/listinfo/linuxppc-dev > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-12 10:12 ` [PATCH] Make PCIe hotplug work with Freescale PCIe controllers Chen Yuanquan-B41889 @ 2013-03-12 10:30 ` Rojhalat Ibrahim 2013-03-12 11:03 ` Chen Yuanquan-B41889 0 siblings, 1 reply; 12+ messages in thread From: Rojhalat Ibrahim @ 2013-03-12 10:30 UTC (permalink / raw) To: Chen Yuanquan-B41889; +Cc: linuxppc-dev, Zang Roy-R61911 On Tuesday 12 March 2013 18:12:20 Chen Yuanquan-B41889 wrote: > >> -----Original Message----- > >> From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > >> fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Rojhalat Ibrahim > >> Sent: Tuesday, March 12, 2013 5:23 PM > >> To: Kumar Gala > >> Cc: linuxppc-dev@lists.ozlabs.org > >> Subject: Re: [PATCH] Make PCIe hotplug work with Freescale PCIe > >> controllers > >> > >> On Monday 11 March 2013 12:17:42 Kumar Gala wrote: > >>> Rather than do it this way, we should do something like: > >>> > >>> fsl_indirect_read_config() { > >>> > >>> link check > >>> if (link) > >>> > >>> indirect_read_config() > >>> > >>> } > >>> > >>> and just add fsl_indirect_{r,w}_config into fsl_pci.c > >>> > >>> - k > >> > >> Ok, how about this: > Yeah, this patch can solve the problem of PCI-e bus rescan which a PCI-e > EP is added to RC > after RC booting up. If RC boots up without EP added, the original code > will set the PCI-e > bus as no link even if you add a EP to RC during RC's runtime. > > Regards, > Yuanquan > Right. The EP is only added if you first do "echo 1 > /sys/bus/pci/rescan". Rojhalat > >> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> > >> --- > >> > >> arch/powerpc/sysdev/fsl_pci.c | 49 > >> > >> ++++++++++++++++++++++++++++++++++++++---- > >> > >> 1 file changed, 45 insertions(+), 4 deletions(-) > >> > >> diff --git a/arch/powerpc/sysdev/fsl_pci.c > >> b/arch/powerpc/sysdev/fsl_pci.c index 682084d..693db9f 100644 > >> --- a/arch/powerpc/sysdev/fsl_pci.c > >> +++ b/arch/powerpc/sysdev/fsl_pci.c > >> @@ -36,6 +36,8 @@ > >> > >> static int fsl_pcie_bus_fixup, is_mpc83xx_pci; > >> > >> +static struct pci_ops *indirect_pci_ops; > >> + > >> > >> static void quirk_fsl_pcie_header(struct pci_dev *dev) { > >> > >> u8 hdr_type; > >> > >> @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct > >> pci_controller > >> *hose) > >> > >> return 0; > >> > >> } > >> > >> +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int > >> devfn, > >> + int offset, int len, u32 *val) > >> +{ > >> + struct pci_controller *hose = pci_bus_to_host(bus); > >> + > >> + // check the link status > >> + if ((bus->number == hose->first_busno) && (devfn == 0)) { > >> + u32 ltssm = 0; > >> + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); > >> + if (ltssm < PCIE_LTSSM_L0) { > >> + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; > >> + } else { > >> + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; > >> + } > >> + } > >> + return indirect_pci_ops->read(bus, devfn, offset, len, val); } > >> + > >> +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned int > >> devfn, > >> + int offset, int len, u32 val) > >> +{ > >> + return indirect_pci_ops->write(bus, devfn, offset, len, val); } > >> + > >> +static struct pci_ops fsl_indirect_pci_ops = { > >> + .read = fsl_indirect_read_config, > >> + .write = fsl_indirect_write_config, > >> +}; > >> + > >> +static void __init fsl_setup_indirect_pci(struct pci_controller* hose, > >> + resource_size_t cfg_addr, > >> + resource_size_t cfg_data, u32 flags) { > >> + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); > >> + indirect_pci_ops = hose->ops; > >> + hose->ops = &fsl_indirect_pci_ops; > >> +} > >> + > >> > >> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) > >> > >> #define MAX_PHYS_ADDR_BITS 40 > >> > >> @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device > >> *pdev, int is_primary) > >> > >> hose->first_busno = bus_range ? bus_range[0] : 0x0; > >> hose->last_busno = bus_range ? bus_range[1] : 0xff; > >> > >> - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, > >> - PPC_INDIRECT_TYPE_BIG_ENDIAN); > >> + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, > >> + PPC_INDIRECT_TYPE_BIG_ENDIAN); > >> > >> if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { > >> > >> /* For PCIE read HEADER_TYPE to identify controler mode */ @@ > >> > >> -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev) > >> > >> if (ret) > >> > >> goto err0; > >> > >> } else { > >> > >> - setup_indirect_pci(hose, rsrc_cfg.start, > >> - rsrc_cfg.start + 4, 0); > >> + fsl_setup_indirect_pci(hose, rsrc_cfg.start, > >> + rsrc_cfg.start + 4, 0); > >> > >> } > >> > >> printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " > >> > >> _______________________________________________ > >> Linuxppc-dev mailing list > >> Linuxppc-dev@lists.ozlabs.org > >> https://lists.ozlabs.org/listinfo/linuxppc-dev > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-12 10:30 ` Rojhalat Ibrahim @ 2013-03-12 11:03 ` Chen Yuanquan-B41889 2013-03-12 12:12 ` Rojhalat Ibrahim 0 siblings, 1 reply; 12+ messages in thread From: Chen Yuanquan-B41889 @ 2013-03-12 11:03 UTC (permalink / raw) To: Rojhalat Ibrahim; +Cc: linuxppc-dev, Zang Roy-R61911 On 03/12/2013 06:30 PM, Rojhalat Ibrahim wrote: > On Tuesday 12 March 2013 18:12:20 Chen Yuanquan-B41889 wrote: >>>> -----Original Message----- >>>> From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- >>>> fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Rojhalat Ibrahim >>>> Sent: Tuesday, March 12, 2013 5:23 PM >>>> To: Kumar Gala >>>> Cc: linuxppc-dev@lists.ozlabs.org >>>> Subject: Re: [PATCH] Make PCIe hotplug work with Freescale PCIe >>>> controllers >>>> >>>> On Monday 11 March 2013 12:17:42 Kumar Gala wrote: >>>>> Rather than do it this way, we should do something like: >>>>> >>>>> fsl_indirect_read_config() { >>>>> >>>>> link check >>>>> if (link) >>>>> >>>>> indirect_read_config() >>>>> >>>>> } >>>>> >>>>> and just add fsl_indirect_{r,w}_config into fsl_pci.c >>>>> >>>>> - k >>>> Ok, how about this: >> Yeah, this patch can solve the problem of PCI-e bus rescan which a PCI-e >> EP is added to RC >> after RC booting up. If RC boots up without EP added, the original code >> will set the PCI-e >> bus as no link even if you add a EP to RC during RC's runtime. >> >> Regards, >> Yuanquan >> > Right. The EP is only added if you first do "echo 1 > /sys/bus/pci/rescan". > > Rojhalat > The following patch can solve your issue of "only added if you first ...": diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5b3771a..c1298d0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -730,11 +730,12 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct /* Prevent assigning a bus number that already exists. * This can happen when a bridge is hot-plugged */ - if (pci_find_bus(pci_domain_nr(bus), max+1)) - goto out; - child = pci_add_new_bus(bus, dev, ++max); - if (!child) - goto out; + child = pci_find_bus(pci_domain_nr(bus), max+1); + if (!child) { + child = pci_add_new_bus(bus, dev, ++max); + if (!child) + goto out; + } buses = (buses & 0xff000000) | ((unsigned int)(child->primary) << 0) | ((unsigned int)(child->secondary) << 8) There are still some issues about powerpc PCI-e rescan. For example, add a Intel e1000e ethernet card or silicon PCI-e_sata to powerpc PCI-e slot and boot the board. The EP can work well with their driver. But if you "echo 1 > /sys/bus/pci/device/xxx/remove" which corresponds to Intel e1000e ethernet card or silicon PCI-e_sata, then "echo 1" to rescan, the device can be rescanned, but it will fail to load the corresponded driver due to hw_irq and dma_set_mask error. The following patch can solve the problem, but not a good method to solve it. diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 2476a32..f9b7f0f 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1557,6 +1557,19 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if (ppc_md.pcibios_enable_device_hook(dev)) return -EINVAL; + if (!dev->is_added) { + set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); + + set_dma_ops(&dev->dev, pci_dma_ops); + set_dma_offset(&dev->dev, PCI_DRAM_OFFSET); + + if (ppc_md.pci_dma_dev_setup) + ppc_md.pci_dma_dev_setup(dev); + + pci_read_irq_line(dev); + if (ppc_md.pci_irq_fixup) + ppc_md.pci_irq_fixup(dev); + } return pci_enable_resources(dev, mask); } Regards, Yuanquan >>>> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> >>>> --- >>>> >>>> arch/powerpc/sysdev/fsl_pci.c | 49 >>>> >>>> ++++++++++++++++++++++++++++++++++++++---- >>>> >>>> 1 file changed, 45 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/arch/powerpc/sysdev/fsl_pci.c >>>> b/arch/powerpc/sysdev/fsl_pci.c index 682084d..693db9f 100644 >>>> --- a/arch/powerpc/sysdev/fsl_pci.c >>>> +++ b/arch/powerpc/sysdev/fsl_pci.c >>>> @@ -36,6 +36,8 @@ >>>> >>>> static int fsl_pcie_bus_fixup, is_mpc83xx_pci; >>>> >>>> +static struct pci_ops *indirect_pci_ops; >>>> + >>>> >>>> static void quirk_fsl_pcie_header(struct pci_dev *dev) { >>>> >>>> u8 hdr_type; >>>> >>>> @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct >>>> pci_controller >>>> *hose) >>>> >>>> return 0; >>>> >>>> } >>>> >>>> +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int >>>> devfn, >>>> + int offset, int len, u32 *val) >>>> +{ >>>> + struct pci_controller *hose = pci_bus_to_host(bus); >>>> + >>>> + // check the link status >>>> + if ((bus->number == hose->first_busno) && (devfn == 0)) { >>>> + u32 ltssm = 0; >>>> + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); >>>> + if (ltssm < PCIE_LTSSM_L0) { >>>> + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; >>>> + } else { >>>> + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; >>>> + } >>>> + } >>>> + return indirect_pci_ops->read(bus, devfn, offset, len, val); } >>>> + >>>> +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned int >>>> devfn, >>>> + int offset, int len, u32 val) >>>> +{ >>>> + return indirect_pci_ops->write(bus, devfn, offset, len, val); } >>>> + >>>> +static struct pci_ops fsl_indirect_pci_ops = { >>>> + .read = fsl_indirect_read_config, >>>> + .write = fsl_indirect_write_config, >>>> +}; >>>> + >>>> +static void __init fsl_setup_indirect_pci(struct pci_controller* hose, >>>> + resource_size_t cfg_addr, >>>> + resource_size_t cfg_data, u32 flags) { >>>> + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); >>>> + indirect_pci_ops = hose->ops; >>>> + hose->ops = &fsl_indirect_pci_ops; >>>> +} >>>> + >>>> >>>> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) >>>> >>>> #define MAX_PHYS_ADDR_BITS 40 >>>> >>>> @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device >>>> *pdev, int is_primary) >>>> >>>> hose->first_busno = bus_range ? bus_range[0] : 0x0; >>>> hose->last_busno = bus_range ? bus_range[1] : 0xff; >>>> >>>> - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, >>>> - PPC_INDIRECT_TYPE_BIG_ENDIAN); >>>> + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, >>>> + PPC_INDIRECT_TYPE_BIG_ENDIAN); >>>> >>>> if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { >>>> >>>> /* For PCIE read HEADER_TYPE to identify controler mode */ @@ >>>> >>>> -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev) >>>> >>>> if (ret) >>>> >>>> goto err0; >>>> >>>> } else { >>>> >>>> - setup_indirect_pci(hose, rsrc_cfg.start, >>>> - rsrc_cfg.start + 4, 0); >>>> + fsl_setup_indirect_pci(hose, rsrc_cfg.start, >>>> + rsrc_cfg.start + 4, 0); >>>> >>>> } >>>> >>>> printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " >>>> >>>> _______________________________________________ >>>> Linuxppc-dev mailing list >>>> Linuxppc-dev@lists.ozlabs.org >>>> https://lists.ozlabs.org/listinfo/linuxppc-dev >> _______________________________________________ >> Linuxppc-dev mailing list >> Linuxppc-dev@lists.ozlabs.org >> https://lists.ozlabs.org/listinfo/linuxppc-dev > > ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-12 11:03 ` Chen Yuanquan-B41889 @ 2013-03-12 12:12 ` Rojhalat Ibrahim 0 siblings, 0 replies; 12+ messages in thread From: Rojhalat Ibrahim @ 2013-03-12 12:12 UTC (permalink / raw) To: Chen Yuanquan-B41889; +Cc: linuxppc-dev, Zang Roy-R61911 On Tuesday 12 March 2013 19:03:39 Chen Yuanquan-B41889 wrote: > On 03/12/2013 06:30 PM, Rojhalat Ibrahim wrote: > > On Tuesday 12 March 2013 18:12:20 Chen Yuanquan-B41889 wrote: > >>>> -----Original Message----- > >>>> From: Linuxppc-dev [mailto:linuxppc-dev-bounces+tie- > >>>> fei.zang=freescale.com@lists.ozlabs.org] On Behalf Of Rojhalat Ibrahim > >>>> Sent: Tuesday, March 12, 2013 5:23 PM > >>>> To: Kumar Gala > >>>> Cc: linuxppc-dev@lists.ozlabs.org > >>>> Subject: Re: [PATCH] Make PCIe hotplug work with Freescale PCIe > >>>> controllers > >>>> > >>>> On Monday 11 March 2013 12:17:42 Kumar Gala wrote: > >>>>> Rather than do it this way, we should do something like: > >>>>> > >>>>> fsl_indirect_read_config() { > >>>>> > >>>>> link check > >>>>> if (link) > >>>>> > >>>>> indirect_read_config() > >>>>> > >>>>> } > >>>>> > >>>>> and just add fsl_indirect_{r,w}_config into fsl_pci.c > >>>>> > >>>>> - k > >>>> > >>>> Ok, how about this: > >> Yeah, this patch can solve the problem of PCI-e bus rescan which a PCI-e > >> EP is added to RC > >> after RC booting up. If RC boots up without EP added, the original code > >> will set the PCI-e > >> bus as no link even if you add a EP to RC during RC's runtime. > >> > >> Regards, > >> Yuanquan > > > > Right. The EP is only added if you first do "echo 1 > > > /sys/bus/pci/rescan". > > > > Rojhalat > > The following patch can solve your issue of "only added if you first ...": Actually I don't have a problem with having to do a rescan before the device is added. In my case the device is a FPGA which is configured at runtime. So I can simply trigger the rescan after configuration. For my purposes the patch I proposed is sufficient for now. The additional changes suggested by you should probably go into separate patches. Rojhalat > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 5b3771a..c1298d0 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -730,11 +730,12 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, > struct > > /* Prevent assigning a bus number that already exists. > * This can happen when a bridge is hot-plugged */ > - if (pci_find_bus(pci_domain_nr(bus), max+1)) > - goto out; > - child = pci_add_new_bus(bus, dev, ++max); > - if (!child) > - goto out; > + child = pci_find_bus(pci_domain_nr(bus), max+1); > + if (!child) { > + child = pci_add_new_bus(bus, dev, ++max); > + if (!child) > + goto out; > + } > buses = (buses & 0xff000000) > > | ((unsigned int)(child->primary) << 0) > | ((unsigned int)(child->secondary) << 8) > > There are still some issues about powerpc PCI-e rescan. For example, add > a Intel e1000e > ethernet card or silicon PCI-e_sata to powerpc PCI-e slot and boot the > board. The EP can > work well with their driver. But if you "echo 1 > > /sys/bus/pci/device/xxx/remove" which > corresponds to Intel e1000e ethernet card or silicon PCI-e_sata, then > "echo 1" to rescan, > the device can be rescanned, but it will fail to load the corresponded > driver due to hw_irq > and dma_set_mask error. The following patch can solve the problem, but > not a good method > to solve it. > > diff --git a/arch/powerpc/kernel/pci-common.c > b/arch/powerpc/kernel/pci-common.c > index 2476a32..f9b7f0f 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -1557,6 +1557,19 @@ int pcibios_enable_device(struct pci_dev *dev, > int mask) > if (ppc_md.pcibios_enable_device_hook(dev)) > return -EINVAL; > > + if (!dev->is_added) { > + set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); > + > + set_dma_ops(&dev->dev, pci_dma_ops); > + set_dma_offset(&dev->dev, PCI_DRAM_OFFSET); > + > + if (ppc_md.pci_dma_dev_setup) > + ppc_md.pci_dma_dev_setup(dev); > + > + pci_read_irq_line(dev); > + if (ppc_md.pci_irq_fixup) > + ppc_md.pci_irq_fixup(dev); > + } > return pci_enable_resources(dev, mask); > } > > > Regards, > Yuanquan > > >>>> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> > >>>> --- > >>>> > >>>> arch/powerpc/sysdev/fsl_pci.c | 49 > >>>> > >>>> ++++++++++++++++++++++++++++++++++++++---- > >>>> > >>>> 1 file changed, 45 insertions(+), 4 deletions(-) > >>>> > >>>> diff --git a/arch/powerpc/sysdev/fsl_pci.c > >>>> b/arch/powerpc/sysdev/fsl_pci.c index 682084d..693db9f 100644 > >>>> --- a/arch/powerpc/sysdev/fsl_pci.c > >>>> +++ b/arch/powerpc/sysdev/fsl_pci.c > >>>> @@ -36,6 +36,8 @@ > >>>> > >>>> static int fsl_pcie_bus_fixup, is_mpc83xx_pci; > >>>> > >>>> +static struct pci_ops *indirect_pci_ops; > >>>> + > >>>> > >>>> static void quirk_fsl_pcie_header(struct pci_dev *dev) { > >>>> > >>>> u8 hdr_type; > >>>> > >>>> @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct > >>>> pci_controller > >>>> *hose) > >>>> > >>>> return 0; > >>>> > >>>> } > >>>> > >>>> +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int > >>>> devfn, > >>>> + int offset, int len, u32 *val) > >>>> +{ > >>>> + struct pci_controller *hose = pci_bus_to_host(bus); > >>>> + > >>>> + // check the link status > >>>> + if ((bus->number == hose->first_busno) && (devfn == 0)) { > >>>> + u32 ltssm = 0; > >>>> + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); > >>>> + if (ltssm < PCIE_LTSSM_L0) { > >>>> + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; > >>>> + } else { > >>>> + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; > >>>> + } > >>>> + } > >>>> + return indirect_pci_ops->read(bus, devfn, offset, len, val); } > >>>> + > >>>> +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned int > >>>> devfn, > >>>> + int offset, int len, u32 val) > >>>> +{ > >>>> + return indirect_pci_ops->write(bus, devfn, offset, len, val); } > >>>> + > >>>> +static struct pci_ops fsl_indirect_pci_ops = { > >>>> + .read = fsl_indirect_read_config, > >>>> + .write = fsl_indirect_write_config, > >>>> +}; > >>>> + > >>>> +static void __init fsl_setup_indirect_pci(struct pci_controller* hose, > >>>> + resource_size_t cfg_addr, > >>>> + resource_size_t cfg_data, u32 flags) { > >>>> + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); > >>>> + indirect_pci_ops = hose->ops; > >>>> + hose->ops = &fsl_indirect_pci_ops; > >>>> +} > >>>> + > >>>> > >>>> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) > >>>> > >>>> #define MAX_PHYS_ADDR_BITS 40 > >>>> > >>>> @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device > >>>> *pdev, int is_primary) > >>>> > >>>> hose->first_busno = bus_range ? bus_range[0] : 0x0; > >>>> hose->last_busno = bus_range ? bus_range[1] : 0xff; > >>>> > >>>> - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, > >>>> - PPC_INDIRECT_TYPE_BIG_ENDIAN); > >>>> + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, > >>>> + PPC_INDIRECT_TYPE_BIG_ENDIAN); > >>>> > >>>> if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { > >>>> > >>>> /* For PCIE read HEADER_TYPE to identify controler mode */ @@ > >>>> > >>>> -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev) > >>>> > >>>> if (ret) > >>>> > >>>> goto err0; > >>>> > >>>> } else { > >>>> > >>>> - setup_indirect_pci(hose, rsrc_cfg.start, > >>>> - rsrc_cfg.start + 4, 0); > >>>> + fsl_setup_indirect_pci(hose, rsrc_cfg.start, > >>>> + rsrc_cfg.start + 4, 0); > >>>> > >>>> } > >>>> > >>>> printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " > >>>> > >>>> _______________________________________________ > >>>> Linuxppc-dev mailing list > >>>> Linuxppc-dev@lists.ozlabs.org > >>>> https://lists.ozlabs.org/listinfo/linuxppc-dev > >> > >> _______________________________________________ > >> Linuxppc-dev mailing list > >> Linuxppc-dev@lists.ozlabs.org > >> https://lists.ozlabs.org/listinfo/linuxppc-dev ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] Make PCIe hotplug work with Freescale PCIe controllers @ 2013-03-11 14:47 Rojhalat Ibrahim 2013-03-11 15:17 ` Joakim Tjernlund 2013-03-11 17:17 ` Kumar Gala 0 siblings, 2 replies; 12+ messages in thread From: Rojhalat Ibrahim @ 2013-03-11 14:47 UTC (permalink / raw) To: galak, benh; +Cc: linuxppc-dev Hi, this issue was brought up before. See this thread: https://lists.ozlabs.org/pipermail/linuxppc-dev/2012-July/099529.html The following patch works for me. Hot-added devices appear after "echo 1 > /sys/bus/pci/rescan". I tested it with a P5020DS development system. Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> --- arch/powerpc/sysdev/indirect_pci.c | 53 ++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index 82fdad8..aa36009 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c @@ -20,22 +20,19 @@ #include <asm/pci-bridge.h> #include <asm/machdep.h> +#ifdef CONFIG_FSL_PCI +#include <sysdev/fsl_pci.h> +#endif + static int -indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, - int len, u32 *val) +read_config_no_link_check(struct pci_bus *bus, unsigned int devfn, int offset, + int len, u32 *val) { struct pci_controller *hose = pci_bus_to_host(bus); volatile void __iomem *cfg_data; u8 cfg_type = 0; u32 bus_no, reg; - if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { - if (bus->number != hose->first_busno) - return PCIBIOS_DEVICE_NOT_FOUND; - if (devfn != 0) - return PCIBIOS_DEVICE_NOT_FOUND; - } - if (ppc_md.pci_exclude_device) if (ppc_md.pci_exclude_device(hose, bus->number, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; @@ -78,6 +75,44 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, return PCIBIOS_SUCCESSFUL; } +#ifdef CONFIG_FSL_PCI +static int fsl_pcie_check_link(struct pci_bus *bus) +{ + struct pci_controller *hose = pci_bus_to_host(bus); + u32 val = 0; + + read_config_no_link_check(bus, 0, PCIE_LTSSM, 4, &val); + if (val < PCIE_LTSSM_L0) { + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; + return 1; + } else { + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; + return 0; + } +} +#endif + +static int +indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, + int len, u32 *val) +{ + struct pci_controller *hose = pci_bus_to_host(bus); + +#ifdef CONFIG_FSL_PCI + if ((bus->number == hose->first_busno) && (devfn == 0)) { + fsl_pcie_check_link(bus); + } +#endif + if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { + if (bus->number != hose->first_busno) + return PCIBIOS_DEVICE_NOT_FOUND; + if (devfn != 0) + return PCIBIOS_DEVICE_NOT_FOUND; + } + + return read_config_no_link_check(bus, devfn, offset, len, val); +} + static int indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset, int len, u32 val) ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-11 14:47 Rojhalat Ibrahim @ 2013-03-11 15:17 ` Joakim Tjernlund 2013-03-11 17:17 ` Kumar Gala 1 sibling, 0 replies; 12+ messages in thread From: Joakim Tjernlund @ 2013-03-11 15:17 UTC (permalink / raw) To: Rojhalat Ibrahim; +Cc: linuxppc-dev Rojhalat Ibrahim <imr@rtschenk.de> wrote on 2013/03/11 15:47:30: > > Hi, > > this issue was brought up before. > See this thread: https://lists.ozlabs.org/pipermail/linuxppc-dev/2012-July/099529.html > > The following patch works for me. > Hot-added devices appear after "echo 1 > /sys/bus/pci/rescan". > I tested it with a P5020DS development system. > > Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> Nice! This LOOKS ok to me(cannot test ATM as I am lagging behind) Jocke > --- > arch/powerpc/sysdev/indirect_pci.c | 53 ++++++++++++++++++++++++++++++------- > 1 file changed, 44 insertions(+), 9 deletions(-) > > diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c > index 82fdad8..aa36009 100644 > --- a/arch/powerpc/sysdev/indirect_pci.c > +++ b/arch/powerpc/sysdev/indirect_pci.c > @@ -20,22 +20,19 @@ > #include <asm/pci-bridge.h> > #include <asm/machdep.h> > > +#ifdef CONFIG_FSL_PCI > +#include <sysdev/fsl_pci.h> > +#endif > + > static int > -indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, > - int len, u32 *val) > +read_config_no_link_check(struct pci_bus *bus, unsigned int devfn, int offset, > + int len, u32 *val) > { > struct pci_controller *hose = pci_bus_to_host(bus); > volatile void __iomem *cfg_data; > u8 cfg_type = 0; > u32 bus_no, reg; > > - if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { > - if (bus->number != hose->first_busno) > - return PCIBIOS_DEVICE_NOT_FOUND; > - if (devfn != 0) > - return PCIBIOS_DEVICE_NOT_FOUND; > - } > - > if (ppc_md.pci_exclude_device) > if (ppc_md.pci_exclude_device(hose, bus->number, devfn)) > return PCIBIOS_DEVICE_NOT_FOUND; > @@ -78,6 +75,44 @@ indirect_read_config(struct pci_bus *bus, unsigned int > devfn, int offset, > return PCIBIOS_SUCCESSFUL; > } > > +#ifdef CONFIG_FSL_PCI > +static int fsl_pcie_check_link(struct pci_bus *bus) > +{ > + struct pci_controller *hose = pci_bus_to_host(bus); > + u32 val = 0; > + > + read_config_no_link_check(bus, 0, PCIE_LTSSM, 4, &val); > + if (val < PCIE_LTSSM_L0) { > + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; > + return 1; > + } else { > + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; > + return 0; > + } > +} > +#endif > + > +static int > +indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, > + int len, u32 *val) > +{ > + struct pci_controller *hose = pci_bus_to_host(bus); > + > +#ifdef CONFIG_FSL_PCI > + if ((bus->number == hose->first_busno) && (devfn == 0)) { > + fsl_pcie_check_link(bus); > + } > +#endif > + if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { > + if (bus->number != hose->first_busno) > + return PCIBIOS_DEVICE_NOT_FOUND; > + if (devfn != 0) > + return PCIBIOS_DEVICE_NOT_FOUND; > + } > + > + return read_config_no_link_check(bus, devfn, offset, len, val); > +} > + > static int > indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset, > int len, u32 val) > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-11 14:47 Rojhalat Ibrahim 2013-03-11 15:17 ` Joakim Tjernlund @ 2013-03-11 17:17 ` Kumar Gala 2013-03-12 9:23 ` Rojhalat Ibrahim 1 sibling, 1 reply; 12+ messages in thread From: Kumar Gala @ 2013-03-11 17:17 UTC (permalink / raw) To: Rojhalat Ibrahim; +Cc: linuxppc-dev On Mar 11, 2013, at 9:47 AM, Rojhalat Ibrahim wrote: > Hi, >=20 > this issue was brought up before.=20 > See this thread: = https://lists.ozlabs.org/pipermail/linuxppc-dev/2012-July/099529.html >=20 > The following patch works for me. > Hot-added devices appear after "echo 1 > /sys/bus/pci/rescan". > I tested it with a P5020DS development system. >=20 > Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> > --- > arch/powerpc/sysdev/indirect_pci.c | 53 = ++++++++++++++++++++++++++++++------- > 1 file changed, 44 insertions(+), 9 deletions(-) Rather than do it this way, we should do something like: fsl_indirect_read_config() { link check if (link) indirect_read_config() } and just add fsl_indirect_{r,w}_config into fsl_pci.c - k >=20 > diff --git a/arch/powerpc/sysdev/indirect_pci.c = b/arch/powerpc/sysdev/indirect_pci.c > index 82fdad8..aa36009 100644 > --- a/arch/powerpc/sysdev/indirect_pci.c > +++ b/arch/powerpc/sysdev/indirect_pci.c > @@ -20,22 +20,19 @@ > #include <asm/pci-bridge.h> > #include <asm/machdep.h> >=20 > +#ifdef CONFIG_FSL_PCI > +#include <sysdev/fsl_pci.h> > +#endif > + > static int > -indirect_read_config(struct pci_bus *bus, unsigned int devfn, int = offset, > - int len, u32 *val) > +read_config_no_link_check(struct pci_bus *bus, unsigned int devfn, = int offset, > + int len, u32 *val) > { > struct pci_controller *hose =3D pci_bus_to_host(bus); > volatile void __iomem *cfg_data; > u8 cfg_type =3D 0; > u32 bus_no, reg; >=20 > - if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { > - if (bus->number !=3D hose->first_busno) > - return PCIBIOS_DEVICE_NOT_FOUND; > - if (devfn !=3D 0) > - return PCIBIOS_DEVICE_NOT_FOUND; > - } > - > if (ppc_md.pci_exclude_device) > if (ppc_md.pci_exclude_device(hose, bus->number, devfn)) > return PCIBIOS_DEVICE_NOT_FOUND; > @@ -78,6 +75,44 @@ indirect_read_config(struct pci_bus *bus, unsigned = int devfn, int offset, > return PCIBIOS_SUCCESSFUL; > } >=20 > +#ifdef CONFIG_FSL_PCI > +static int fsl_pcie_check_link(struct pci_bus *bus) > +{ > + struct pci_controller *hose =3D pci_bus_to_host(bus); > + u32 val =3D 0; > + > + read_config_no_link_check(bus, 0, PCIE_LTSSM, 4, &val); > + if (val < PCIE_LTSSM_L0) { > + hose->indirect_type |=3D PPC_INDIRECT_TYPE_NO_PCIE_LINK; > + return 1; > + } else { > + hose->indirect_type &=3D = ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; > + return 0; > + } > +} > +#endif > + > +static int > +indirect_read_config(struct pci_bus *bus, unsigned int devfn, int = offset, > + int len, u32 *val) > +{ > + struct pci_controller *hose =3D pci_bus_to_host(bus); > + > +#ifdef CONFIG_FSL_PCI > + if ((bus->number =3D=3D hose->first_busno) && (devfn =3D=3D 0)) = { > + fsl_pcie_check_link(bus); > + } > +#endif > + if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) { > + if (bus->number !=3D hose->first_busno) > + return PCIBIOS_DEVICE_NOT_FOUND; > + if (devfn !=3D 0) > + return PCIBIOS_DEVICE_NOT_FOUND; > + } > + > + return read_config_no_link_check(bus, devfn, offset, len, val); > +} > + > static int > indirect_write_config(struct pci_bus *bus, unsigned int devfn, int = offset, > int len, u32 val) ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-11 17:17 ` Kumar Gala @ 2013-03-12 9:23 ` Rojhalat Ibrahim 2013-03-12 20:44 ` Kumar Gala 0 siblings, 1 reply; 12+ messages in thread From: Rojhalat Ibrahim @ 2013-03-12 9:23 UTC (permalink / raw) To: Kumar Gala; +Cc: linuxppc-dev On Monday 11 March 2013 12:17:42 Kumar Gala wrote: > > Rather than do it this way, we should do something like: > > fsl_indirect_read_config() { > link check > if (link) > indirect_read_config() > } > > and just add fsl_indirect_{r,w}_config into fsl_pci.c > > - k > Ok, how about this: Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> --- arch/powerpc/sysdev/fsl_pci.c | 49 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 682084d..693db9f 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -36,6 +36,8 @@ static int fsl_pcie_bus_fixup, is_mpc83xx_pci; +static struct pci_ops *indirect_pci_ops; + static void quirk_fsl_pcie_header(struct pci_dev *dev) { u8 hdr_type; @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct pci_controller *hose) return 0; } +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 *val) +{ + struct pci_controller *hose = pci_bus_to_host(bus); + + // check the link status + if ((bus->number == hose->first_busno) && (devfn == 0)) { + u32 ltssm = 0; + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); + if (ltssm < PCIE_LTSSM_L0) { + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; + } else { + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; + } + } + return indirect_pci_ops->read(bus, devfn, offset, len, val); +} + +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 val) +{ + return indirect_pci_ops->write(bus, devfn, offset, len, val); +} + +static struct pci_ops fsl_indirect_pci_ops = +{ + .read = fsl_indirect_read_config, + .write = fsl_indirect_write_config, +}; + +static void __init fsl_setup_indirect_pci(struct pci_controller* hose, + resource_size_t cfg_addr, + resource_size_t cfg_data, u32 flags) +{ + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); + indirect_pci_ops = hose->ops; + hose->ops = &fsl_indirect_pci_ops; +} + #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) #define MAX_PHYS_ADDR_BITS 40 @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device *pdev, int is_primary) hose->first_busno = bus_range ? bus_range[0] : 0x0; hose->last_busno = bus_range ? bus_range[1] : 0xff; - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, - PPC_INDIRECT_TYPE_BIG_ENDIAN); + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, + PPC_INDIRECT_TYPE_BIG_ENDIAN); if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { /* For PCIE read HEADER_TYPE to identify controler mode */ @@ -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev) if (ret) goto err0; } else { - setup_indirect_pci(hose, rsrc_cfg.start, - rsrc_cfg.start + 4, 0); + fsl_setup_indirect_pci(hose, rsrc_cfg.start, + rsrc_cfg.start + 4, 0); } printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-12 9:23 ` Rojhalat Ibrahim @ 2013-03-12 20:44 ` Kumar Gala 2013-03-12 20:48 ` Kumar Gala 0 siblings, 1 reply; 12+ messages in thread From: Kumar Gala @ 2013-03-12 20:44 UTC (permalink / raw) To: Rojhalat Ibrahim; +Cc: linuxppc-dev On Mar 12, 2013, at 4:23 AM, Rojhalat Ibrahim wrote: > On Monday 11 March 2013 12:17:42 Kumar Gala wrote: >>=20 >> Rather than do it this way, we should do something like: >>=20 >> fsl_indirect_read_config() { >> link check >> if (link) >> indirect_read_config() >> } >>=20 >> and just add fsl_indirect_{r,w}_config into fsl_pci.c >>=20 >> - k >>=20 >=20 > Ok, how about this: >=20 I'd rather we just export indirect_read_config() & = indirect_write_config() from indirect_pci.c and call the functions = directly. Adding a global and call them via a function pointer seems = wrong to me. - k >=20 > Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> > --- > arch/powerpc/sysdev/fsl_pci.c | 49=20 > ++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 45 insertions(+), 4 deletions(-) >=20 > diff --git a/arch/powerpc/sysdev/fsl_pci.c = b/arch/powerpc/sysdev/fsl_pci.c > index 682084d..693db9f 100644 > --- a/arch/powerpc/sysdev/fsl_pci.c > +++ b/arch/powerpc/sysdev/fsl_pci.c > @@ -36,6 +36,8 @@ >=20 > static int fsl_pcie_bus_fixup, is_mpc83xx_pci; >=20 > +static struct pci_ops *indirect_pci_ops; > + > static void quirk_fsl_pcie_header(struct pci_dev *dev) > { > u8 hdr_type; > @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct = pci_controller=20 > *hose) > return 0; > } >=20 > +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int = devfn, > + int offset, int len, u32 *val) > +{ > + struct pci_controller *hose =3D pci_bus_to_host(bus); > +=09 > + // check the link status > + if ((bus->number =3D=3D hose->first_busno) && (devfn =3D=3D 0)) = { > + u32 ltssm =3D 0; > + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); > + if (ltssm < PCIE_LTSSM_L0) { > + hose->indirect_type |=3D = PPC_INDIRECT_TYPE_NO_PCIE_LINK; > + } else { > + hose->indirect_type &=3D = ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; > + } > + } > + return indirect_pci_ops->read(bus, devfn, offset, len, val); > +} > + > +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned = int devfn, > + int offset, int len, u32 val) > +{ > + return indirect_pci_ops->write(bus, devfn, offset, len, val); > +} > + > +static struct pci_ops fsl_indirect_pci_ops =3D > +{ > + .read =3D fsl_indirect_read_config, > + .write =3D fsl_indirect_write_config, > +}; > + > +static void __init fsl_setup_indirect_pci(struct pci_controller* = hose, > + resource_size_t cfg_addr, > + resource_size_t cfg_data, u32 = flags) > +{ > + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); > + indirect_pci_ops =3D hose->ops; > + hose->ops =3D &fsl_indirect_pci_ops; > +} > + > #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) >=20 > #define MAX_PHYS_ADDR_BITS 40 > @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device = *pdev,=20 > int is_primary) > hose->first_busno =3D bus_range ? bus_range[0] : 0x0; > hose->last_busno =3D bus_range ? bus_range[1] : 0xff; >=20 > - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, > - PPC_INDIRECT_TYPE_BIG_ENDIAN); > + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, > + PPC_INDIRECT_TYPE_BIG_ENDIAN); >=20 > if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { > /* For PCIE read HEADER_TYPE to identify controler mode = */ > @@ -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node = *dev) > if (ret) > goto err0; > } else { > - setup_indirect_pci(hose, rsrc_cfg.start, > - rsrc_cfg.start + 4, 0); > + fsl_setup_indirect_pci(hose, rsrc_cfg.start, > + rsrc_cfg.start + 4, 0); > } >=20 > printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " >=20 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-12 20:44 ` Kumar Gala @ 2013-03-12 20:48 ` Kumar Gala 2013-03-13 10:06 ` Rojhalat Ibrahim 0 siblings, 1 reply; 12+ messages in thread From: Kumar Gala @ 2013-03-12 20:48 UTC (permalink / raw) To: Rojhalat Ibrahim; +Cc: linuxppc-dev On Mar 12, 2013, at 3:44 PM, Kumar Gala wrote: >=20 > On Mar 12, 2013, at 4:23 AM, Rojhalat Ibrahim wrote: >=20 >> On Monday 11 March 2013 12:17:42 Kumar Gala wrote: >>>=20 >>> Rather than do it this way, we should do something like: >>>=20 >>> fsl_indirect_read_config() { >>> link check >>> if (link) >>> indirect_read_config() >>> } >>>=20 >>> and just add fsl_indirect_{r,w}_config into fsl_pci.c >>>=20 >>> - k >>>=20 >>=20 >> Ok, how about this: >>=20 >=20 > I'd rather we just export indirect_read_config() & = indirect_write_config() from indirect_pci.c and call the functions = directly. Adding a global and call them via a function pointer seems = wrong to me. >=20 > - k Also, can you base this patch on my powerpc.git next branch as = fsl_pci.{c,h} have some changes in them. - k >=20 >>=20 >> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> >> --- >> arch/powerpc/sysdev/fsl_pci.c | 49=20 >> ++++++++++++++++++++++++++++++++++++++---- >> 1 file changed, 45 insertions(+), 4 deletions(-) >>=20 >> diff --git a/arch/powerpc/sysdev/fsl_pci.c = b/arch/powerpc/sysdev/fsl_pci.c >> index 682084d..693db9f 100644 >> --- a/arch/powerpc/sysdev/fsl_pci.c >> +++ b/arch/powerpc/sysdev/fsl_pci.c >> @@ -36,6 +36,8 @@ >>=20 >> static int fsl_pcie_bus_fixup, is_mpc83xx_pci; >>=20 >> +static struct pci_ops *indirect_pci_ops; >> + >> static void quirk_fsl_pcie_header(struct pci_dev *dev) >> { >> u8 hdr_type; >> @@ -64,6 +66,45 @@ static int __init fsl_pcie_check_link(struct = pci_controller=20 >> *hose) >> return 0; >> } >>=20 >> +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned = int devfn, >> + int offset, int len, u32 *val) >> +{ >> + struct pci_controller *hose =3D pci_bus_to_host(bus); >> +=09 >> + // check the link status >> + if ((bus->number =3D=3D hose->first_busno) && (devfn =3D=3D 0)) = { >> + u32 ltssm =3D 0; >> + indirect_pci_ops->read(bus, 0, PCIE_LTSSM, 4, <ssm); >> + if (ltssm < PCIE_LTSSM_L0) { >> + hose->indirect_type |=3D = PPC_INDIRECT_TYPE_NO_PCIE_LINK; >> + } else { >> + hose->indirect_type &=3D = ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; >> + } >> + } >> + return indirect_pci_ops->read(bus, devfn, offset, len, val); >> +} >> + >> +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned = int devfn, >> + int offset, int len, u32 val) >> +{ >> + return indirect_pci_ops->write(bus, devfn, offset, len, val); >> +} >> + >> +static struct pci_ops fsl_indirect_pci_ops =3D >> +{ >> + .read =3D fsl_indirect_read_config, >> + .write =3D fsl_indirect_write_config, >> +}; >> + >> +static void __init fsl_setup_indirect_pci(struct pci_controller* = hose, >> + resource_size_t cfg_addr, >> + resource_size_t cfg_data, u32 = flags) >> +{ >> + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); >> + indirect_pci_ops =3D hose->ops; >> + hose->ops =3D &fsl_indirect_pci_ops; >> +} >> + >> #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) >>=20 >> #define MAX_PHYS_ADDR_BITS 40 >> @@ -461,8 +502,8 @@ int __init fsl_add_bridge(struct platform_device = *pdev,=20 >> int is_primary) >> hose->first_busno =3D bus_range ? bus_range[0] : 0x0; >> hose->last_busno =3D bus_range ? bus_range[1] : 0xff; >>=20 >> - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, >> - PPC_INDIRECT_TYPE_BIG_ENDIAN); >> + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, >> + PPC_INDIRECT_TYPE_BIG_ENDIAN); >>=20 >> if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { >> /* For PCIE read HEADER_TYPE to identify controler mode = */ >> @@ -766,8 +807,8 @@ int __init mpc83xx_add_bridge(struct device_node = *dev) >> if (ret) >> goto err0; >> } else { >> - setup_indirect_pci(hose, rsrc_cfg.start, >> - rsrc_cfg.start + 4, 0); >> + fsl_setup_indirect_pci(hose, rsrc_cfg.start, >> + rsrc_cfg.start + 4, 0); >> } >>=20 >> printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " >>=20 >=20 > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-12 20:48 ` Kumar Gala @ 2013-03-13 10:06 ` Rojhalat Ibrahim 2013-03-13 19:04 ` Kumar Gala 0 siblings, 1 reply; 12+ messages in thread From: Rojhalat Ibrahim @ 2013-03-13 10:06 UTC (permalink / raw) To: Kumar Gala; +Cc: linuxppc-dev On Tuesday 12 March 2013 15:48:01 Kumar Gala wrote: > > I'd rather we just export indirect_read_config() & indirect_write_config() > > from indirect_pci.c and call the functions directly. Adding a global and > > call them via a function pointer seems wrong to me. > > > > - k > > Also, can you base this patch on my powerpc.git next branch as fsl_pci.{c,h} > have some changes in them. > > - k > Hi Kumar, here's the patch with direct calls to indirect_{r,w}_config based on your powerpc.git next branch. This does not work for PCIe IP rev 3.0 as I'm not sure how to handle "struct resource" aside from making it global or changing "struct pci_controller". Rojhalat Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> --- arch/powerpc/sysdev/fsl_pci.c | 51 ++++++++++++++++++++++++++++++++++--- arch/powerpc/sysdev/indirect_pci.c | 10 ++----- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 3271177..1d7da9d 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -36,6 +36,11 @@ static int fsl_pcie_bus_fixup, is_mpc83xx_pci; +extern int indirect_read_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 *val); +extern int indirect_write_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 val); + static void quirk_fsl_pcie_header(struct pci_dev *dev) { u8 hdr_type; @@ -86,6 +91,44 @@ static int __init fsl_pcie_check_link(struct pci_controller *hose, return 0; } +static int fsl_indirect_read_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 *val) +{ + struct pci_controller *hose = pci_bus_to_host(bus); + + // check the link status + if ((bus->number == hose->first_busno) && (devfn == 0)) { + u32 ltssm = 0; + indirect_read_config(bus, 0, PCIE_LTSSM, 4, <ssm); + if (ltssm < PCIE_LTSSM_L0) { + hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; + } else { + hose->indirect_type &= ~PPC_INDIRECT_TYPE_NO_PCIE_LINK; + } + } + return indirect_read_config(bus, devfn, offset, len, val); +} + +static int fsl_indirect_write_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 val) +{ + return indirect_write_config(bus, devfn, offset, len, val); +} + +static struct pci_ops fsl_indirect_pci_ops = +{ + .read = fsl_indirect_read_config, + .write = fsl_indirect_write_config, +}; + +static void __init fsl_setup_indirect_pci(struct pci_controller* hose, + resource_size_t cfg_addr, + resource_size_t cfg_data, u32 flags) +{ + setup_indirect_pci(hose, cfg_addr, cfg_data, flags); + hose->ops = &fsl_indirect_pci_ops; +} + #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx) #define MAX_PHYS_ADDR_BITS 40 @@ -483,8 +526,8 @@ int __init fsl_add_bridge(struct platform_device *pdev, int is_primary) hose->first_busno = bus_range ? bus_range[0] : 0x0; hose->last_busno = bus_range ? bus_range[1] : 0xff; - setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, - PPC_INDIRECT_TYPE_BIG_ENDIAN); + fsl_setup_indirect_pci(hose, rsrc.start, rsrc.start + 0x4, + PPC_INDIRECT_TYPE_BIG_ENDIAN); if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) { /* For PCIE read HEADER_TYPE to identify controler mode */ @@ -788,8 +831,8 @@ int __init mpc83xx_add_bridge(struct device_node *dev) if (ret) goto err0; } else { - setup_indirect_pci(hose, rsrc_cfg.start, - rsrc_cfg.start + 4, 0); + fsl_setup_indirect_pci(hose, rsrc_cfg.start, + rsrc_cfg.start + 4, 0); } printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. " diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index 82fdad8..c6c8b52 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c @@ -20,9 +20,8 @@ #include <asm/pci-bridge.h> #include <asm/machdep.h> -static int -indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, - int len, u32 *val) +int indirect_read_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 *val) { struct pci_controller *hose = pci_bus_to_host(bus); volatile void __iomem *cfg_data; @@ -78,9 +77,8 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, return PCIBIOS_SUCCESSFUL; } -static int -indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset, - int len, u32 val) +int indirect_write_config(struct pci_bus *bus, unsigned int devfn, + int offset, int len, u32 val) { struct pci_controller *hose = pci_bus_to_host(bus); volatile void __iomem *cfg_data; ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] Make PCIe hotplug work with Freescale PCIe controllers 2013-03-13 10:06 ` Rojhalat Ibrahim @ 2013-03-13 19:04 ` Kumar Gala 0 siblings, 0 replies; 12+ messages in thread From: Kumar Gala @ 2013-03-13 19:04 UTC (permalink / raw) To: Rojhalat Ibrahim; +Cc: linuxppc-dev On Mar 13, 2013, at 5:06 AM, Rojhalat Ibrahim wrote: > On Tuesday 12 March 2013 15:48:01 Kumar Gala wrote: >>> I'd rather we just export indirect_read_config() & = indirect_write_config() >>> from indirect_pci.c and call the functions directly. Adding a = global and >>> call them via a function pointer seems wrong to me. >>>=20 >>> - k >>=20 >> Also, can you base this patch on my powerpc.git next branch as = fsl_pci.{c,h} >> have some changes in them. >>=20 >> - k >>=20 >=20 > Hi Kumar, >=20 > here's the patch with direct calls to indirect_{r,w}_config based on = your powerpc.git next branch. >=20 > This does not work for PCIe IP rev 3.0 as I'm not sure how to handle = "struct resource" aside from making it global or changing "struct = pci_controller". >=20 > Rojhalat I'll send a reworked version that hopefully deals with that issue that = you can test and make sure things work ok. As well as some other minor = style code cleanups. - k= ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2013-03-13 19:04 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <3E027F8168735B46AC006B1D0C7BB0020B102CFB@039-SN2MPN1-013.039d.mgd.msft.net>
2013-03-12 10:12 ` [PATCH] Make PCIe hotplug work with Freescale PCIe controllers Chen Yuanquan-B41889
2013-03-12 10:30 ` Rojhalat Ibrahim
2013-03-12 11:03 ` Chen Yuanquan-B41889
2013-03-12 12:12 ` Rojhalat Ibrahim
2013-03-11 14:47 Rojhalat Ibrahim
2013-03-11 15:17 ` Joakim Tjernlund
2013-03-11 17:17 ` Kumar Gala
2013-03-12 9:23 ` Rojhalat Ibrahim
2013-03-12 20:44 ` Kumar Gala
2013-03-12 20:48 ` Kumar Gala
2013-03-13 10:06 ` Rojhalat Ibrahim
2013-03-13 19:04 ` Kumar Gala
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).