| Message ID | 1422638566-7593-3-git-send-email-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kalle Valo |
| Headers | show |
On 01/30/2015 06:22 PM, Rafa? Mi?ecki wrote: > Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > --- > drivers/bcma/bcma_private.h | 3 +++ > drivers/bcma/driver_pcie2.c | 24 ++++++++++++++++++++++-- > drivers/bcma/host_pci.c | 2 +- > include/linux/bcma/bcma_driver_pcie2.h | 2 ++ > 4 files changed, 28 insertions(+), 3 deletions(-) > > diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h > index 351f4af..3692912 100644 > --- a/drivers/bcma/bcma_private.h > +++ b/drivers/bcma/bcma_private.h > @@ -104,6 +104,9 @@ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address); > void bcma_core_pci_up(struct bcma_drv_pci *pc); > void bcma_core_pci_down(struct bcma_drv_pci *pc); > > +/* driver_pcie2.c */ > +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2); > + > extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc); > > #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE > diff --git a/drivers/bcma/driver_pcie2.c b/drivers/bcma/driver_pcie2.c > index e4be537..c8913bc 100644 > --- a/drivers/bcma/driver_pcie2.c > +++ b/drivers/bcma/driver_pcie2.c > @@ -156,14 +156,20 @@ static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2) > > void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2) > { > - struct bcma_chipinfo *ci = &pcie2->core->bus->chipinfo; > + struct bcma_bus *bus = pcie2->core->bus; > + struct bcma_chipinfo *ci = &bus->chipinfo; > u32 tmp; > > tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54)); > if ((tmp & 0xe) >> 1 == 2) > bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17); > > - /* TODO: Do we need pcie_reqsize? */ > + switch (bus->chipinfo.id) { > + case BCMA_CHIP_ID_BCM4360: > + case BCMA_CHIP_ID_BCM4352: > + pcie2->reqsize = 0x3000; /* TODO: PCI_EXP_DEVCTL_READRQ_1024B */ > + break; > + } In the PCIe controller used in the BCM4706 there was a bug, so that it did not support a request size bigger than 128 bytes. Broadcom "fixed" that in the PCIe device driver code by decreasing the value, but we fixed that in the PCIe controller code, see: commit f4a83e578e0011ddcfdbe1c62d0916dadb4802aa Author: Hauke Mehrtens <hauke@hauke-m.de> Date: Fri Aug 23 23:22:29 2013 +0200 bcma: change max PCI read request size to 128 It could be that the PCIe controller used on ARM SoCs has similar problems but supports bigger sizes now, but not so big ones. This is just an assumption. What is the default value for pcie2->reqsize? > > if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3) > bcma_core_pcie2_war_delay_perst_enab(pcie2, true); > @@ -173,3 +179,17 @@ void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2) > pciedev_crwlpciegen2_180(pcie2); > pciedev_crwlpciegen2_182(pcie2); > } > + > +/************************************************** > + * Runtime ops. > + **************************************************/ > + > +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2) > +{ > + struct bcma_bus *bus = pcie2->core->bus; > + struct pci_dev *dev = bus->host_pci; > + > + pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, > + PCI_EXP_DEVCTL_READRQ, > + pcie2->reqsize); Use pcie_set_readrq() if it is needed. > +} > diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c > index 8dd37dc..5fb87a8 100644 > --- a/drivers/bcma/host_pci.c > +++ b/drivers/bcma/host_pci.c > @@ -322,7 +322,7 @@ void bcma_host_pci_up(struct bcma_bus *bus) > return; > > if (bus->host_is_pcie2) > - pr_warn("Bringing up bus with PCIe Gen 2 host is unsupported yet\n"); > + bcma_core_pcie2_up(&bus->drv_pcie2); > else > bcma_core_pci_up(&bus->drv_pci[0]); > } > diff --git a/include/linux/bcma/bcma_driver_pcie2.h b/include/linux/bcma/bcma_driver_pcie2.h > index 5988b05..d8c4329 100644 > --- a/include/linux/bcma/bcma_driver_pcie2.h > +++ b/include/linux/bcma/bcma_driver_pcie2.h > @@ -143,6 +143,8 @@ > > struct bcma_drv_pcie2 { > struct bcma_device *core; > + > + u16 reqsize; > }; > > #define pcie2_read16(pcie2, offset) bcma_read16((pcie2)->core, offset) > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 30 January 2015 at 20:59, Hauke Mehrtens <hauke@hauke-m.de> wrote: > On 01/30/2015 06:22 PM, Rafa? Mi?ecki wrote: >> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> >> --- >> drivers/bcma/bcma_private.h | 3 +++ >> drivers/bcma/driver_pcie2.c | 24 ++++++++++++++++++++++-- >> drivers/bcma/host_pci.c | 2 +- >> include/linux/bcma/bcma_driver_pcie2.h | 2 ++ >> 4 files changed, 28 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h >> index 351f4af..3692912 100644 >> --- a/drivers/bcma/bcma_private.h >> +++ b/drivers/bcma/bcma_private.h >> @@ -104,6 +104,9 @@ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address); >> void bcma_core_pci_up(struct bcma_drv_pci *pc); >> void bcma_core_pci_down(struct bcma_drv_pci *pc); >> >> +/* driver_pcie2.c */ >> +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2); >> + >> extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc); >> >> #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE >> diff --git a/drivers/bcma/driver_pcie2.c b/drivers/bcma/driver_pcie2.c >> index e4be537..c8913bc 100644 >> --- a/drivers/bcma/driver_pcie2.c >> +++ b/drivers/bcma/driver_pcie2.c >> @@ -156,14 +156,20 @@ static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2) >> >> void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2) >> { >> - struct bcma_chipinfo *ci = &pcie2->core->bus->chipinfo; >> + struct bcma_bus *bus = pcie2->core->bus; >> + struct bcma_chipinfo *ci = &bus->chipinfo; >> u32 tmp; >> >> tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54)); >> if ((tmp & 0xe) >> 1 == 2) >> bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17); >> >> - /* TODO: Do we need pcie_reqsize? */ >> + switch (bus->chipinfo.id) { >> + case BCMA_CHIP_ID_BCM4360: >> + case BCMA_CHIP_ID_BCM4352: >> + pcie2->reqsize = 0x3000; /* TODO: PCI_EXP_DEVCTL_READRQ_1024B */ >> + break; >> + } > > In the PCIe controller used in the BCM4706 there was a bug, so that it > did not support a request size bigger than 128 bytes. Broadcom "fixed" > that in the PCIe device driver code by decreasing the value, but we > fixed that in the PCIe controller code, see: > > commit f4a83e578e0011ddcfdbe1c62d0916dadb4802aa > Author: Hauke Mehrtens <hauke@hauke-m.de> > Date: Fri Aug 23 23:22:29 2013 +0200 > > bcma: change max PCI read request size to 128 > > It could be that the PCIe controller used on ARM SoCs has similar > problems but supports bigger sizes now, but not so big ones. Thanks for your comment! It seems indeed that Broadcom's shared code provides function called si_pcie_set_request_size My guess is that wl.ko has to contain something like if (BCM4331) si_pcie_set_request_size(sih, 128); So the question is: does wl.ko contain similar code for BCM4352/BCM4360. It appears that wl.ko (at least for x86_64) uses system calls for PCI R/W. So I've put debugging messages and there is what I got: [ 235.036193] [pci_bus_read_config_dword] pos:180 data:0x00102C10 [ 235.036195] [pci_bus_write_config_dword] pos:180 value:0x00103C10 [ 235.036199] [pci_bus_read_config_dword] pos:180 data:0x00103C10 As you can see PCI_EXP_DEVCTL_READRQ has been changed from boot-default 512B to default 1024B. It appears that wl.ko didn't call si_pcie_set_request_size for my 14e4:43b1 BCM4352. Of course it may be different for non x86_64 architectures, but I can't say it at this point. So the proposed code seems OK to me, we may need to modify it in the future for some SoCs, but we can't say that right now. > What is the default value for pcie2->reqsize? 0x0000 which is 128B. >> +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2) >> +{ >> + struct bcma_bus *bus = pcie2->core->bus; >> + struct pci_dev *dev = bus->host_pci; >> + >> + pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, >> + PCI_EXP_DEVCTL_READRQ, >> + pcie2->reqsize); > > Use pcie_set_readrq() if it is needed. What do you mean by "if needed"? Is there anything wrong?
Rafa? Mi?ecki <zajec5@gmail.com> writes: >>> +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2) >>> +{ >>> + struct bcma_bus *bus = pcie2->core->bus; >>> + struct pci_dev *dev = bus->host_pci; >>> + >>> + pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, >>> + PCI_EXP_DEVCTL_READRQ, >>> + pcie2->reqsize); >> >> Use pcie_set_readrq() if it is needed. > > What do you mean by "if needed"? Is there anything wrong? So what's the conclusion? Can I apply these?
On 02/06/2015 07:56 AM, Kalle Valo wrote: > Rafa? Mi?ecki <zajec5@gmail.com> writes: > >>>> +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2) >>>> +{ >>>> + struct bcma_bus *bus = pcie2->core->bus; >>>> + struct pci_dev *dev = bus->host_pci; >>>> + >>>> + pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, >>>> + PCI_EXP_DEVCTL_READRQ, >>>> + pcie2->reqsize); >>> >>> Use pcie_set_readrq() if it is needed. >> >> What do you mean by "if needed"? Is there anything wrong? > > So what's the conclusion? Can I apply these? > Ah sorry, The "if needed" referenced the comment above about if setting this is needed at all, or if this should be done by the driver for the (broken?) PCIe controller. pcie_set_readrq() does the setting of this register in the Linux kernel and does some additional checks, I would suggest using this function instead of setting this register by yourself. Hauke -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index 351f4af..3692912 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h @@ -104,6 +104,9 @@ u32 bcma_pcie_read(struct bcma_drv_pci *pc, u32 address); void bcma_core_pci_up(struct bcma_drv_pci *pc); void bcma_core_pci_down(struct bcma_drv_pci *pc); +/* driver_pcie2.c */ +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2); + extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc); #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE diff --git a/drivers/bcma/driver_pcie2.c b/drivers/bcma/driver_pcie2.c index e4be537..c8913bc 100644 --- a/drivers/bcma/driver_pcie2.c +++ b/drivers/bcma/driver_pcie2.c @@ -156,14 +156,20 @@ static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2) void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2) { - struct bcma_chipinfo *ci = &pcie2->core->bus->chipinfo; + struct bcma_bus *bus = pcie2->core->bus; + struct bcma_chipinfo *ci = &bus->chipinfo; u32 tmp; tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54)); if ((tmp & 0xe) >> 1 == 2) bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17); - /* TODO: Do we need pcie_reqsize? */ + switch (bus->chipinfo.id) { + case BCMA_CHIP_ID_BCM4360: + case BCMA_CHIP_ID_BCM4352: + pcie2->reqsize = 0x3000; /* TODO: PCI_EXP_DEVCTL_READRQ_1024B */ + break; + } if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3) bcma_core_pcie2_war_delay_perst_enab(pcie2, true); @@ -173,3 +179,17 @@ void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2) pciedev_crwlpciegen2_180(pcie2); pciedev_crwlpciegen2_182(pcie2); } + +/************************************************** + * Runtime ops. + **************************************************/ + +void bcma_core_pcie2_up(struct bcma_drv_pcie2 *pcie2) +{ + struct bcma_bus *bus = pcie2->core->bus; + struct pci_dev *dev = bus->host_pci; + + pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL, + PCI_EXP_DEVCTL_READRQ, + pcie2->reqsize); +} diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index 8dd37dc..5fb87a8 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c @@ -322,7 +322,7 @@ void bcma_host_pci_up(struct bcma_bus *bus) return; if (bus->host_is_pcie2) - pr_warn("Bringing up bus with PCIe Gen 2 host is unsupported yet\n"); + bcma_core_pcie2_up(&bus->drv_pcie2); else bcma_core_pci_up(&bus->drv_pci[0]); } diff --git a/include/linux/bcma/bcma_driver_pcie2.h b/include/linux/bcma/bcma_driver_pcie2.h index 5988b05..d8c4329 100644 --- a/include/linux/bcma/bcma_driver_pcie2.h +++ b/include/linux/bcma/bcma_driver_pcie2.h @@ -143,6 +143,8 @@ struct bcma_drv_pcie2 { struct bcma_device *core; + + u16 reqsize; }; #define pcie2_read16(pcie2, offset) bcma_read16((pcie2)->core, offset)
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> --- drivers/bcma/bcma_private.h | 3 +++ drivers/bcma/driver_pcie2.c | 24 ++++++++++++++++++++++-- drivers/bcma/host_pci.c | 2 +- include/linux/bcma/bcma_driver_pcie2.h | 2 ++ 4 files changed, 28 insertions(+), 3 deletions(-)