mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bcma: support bringing up bus hosted on PCIe Gen 2

Browse source 
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Rafał Miłecki 2015-02-08 17:11:49 +01:00 committed by Kalle Valo
parent 5b6ff664c8
commit 804e27dee4
4 changed files with 32 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/bcma/bcma_private.h
View file

@ -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_up(struct bcma_drv_pci *pc);
void bcma_core_pci_down(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); extern int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc);
#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE

28
drivers/bcma/driver_pcie2.c
View file

@ -156,14 +156,23 @@ static void pciedev_reg_pm_clk_period(struct bcma_drv_pcie2 *pcie2)
void bcma_core_pcie2_init(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; u32 tmp;
tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54)); tmp = pcie2_read32(pcie2, BCMA_CORE_PCIE2_SPROM(54));
if ((tmp & 0xe) >> 1 == 2) if ((tmp & 0xe) >> 1 == 2)
bcma_core_pcie2_cfg_write(pcie2, 0x4e0, 0x17); 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 = 1024;
break;
default:
pcie2->reqsize = 128;
break;
}
if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3) if (ci->id == BCMA_CHIP_ID_BCM4360 && ci->rev > 3)
bcma_core_pcie2_war_delay_perst_enab(pcie2, true); bcma_core_pcie2_war_delay_perst_enab(pcie2, true);
@ -173,3 +182,18 @@ void bcma_core_pcie2_init(struct bcma_drv_pcie2 *pcie2)
pciedev_crwlpciegen2_180(pcie2); pciedev_crwlpciegen2_180(pcie2);
pciedev_crwlpciegen2_182(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;
int err;
err = pcie_set_readrq(dev, pcie2->reqsize);
if (err)
bcma_err(bus, "Error setting PCI_EXP_DEVCTL_READRQ: %d\n", err);
}

2
drivers/bcma/host_pci.c
View file

@ -322,7 +322,7 @@ void bcma_host_pci_up(struct bcma_bus *bus)
return; return;
if (bus->host_is_pcie2) 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 else
bcma_core_pci_up(&bus->drv_pci[0]); bcma_core_pci_up(&bus->drv_pci[0]);
} }

2
include/linux/bcma/bcma_driver_pcie2.h
View file

@ -143,6 +143,8 @@
struct bcma_drv_pcie2 { struct bcma_drv_pcie2 {
struct bcma_device *core; struct bcma_device *core;
u16 reqsize;
}; };
#define pcie2_read16(pcie2, offset) bcma_read16((pcie2)->core, offset) #define pcie2_read16(pcie2, offset) bcma_read16((pcie2)->core, offset)