leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'remotes/lorenzo/pci/mvebu'

Browse Source 
- Set up mvebu BAR 0 so MSI works even if bootloader doesn't do this
  (Shmuel Hazan)

* remotes/lorenzo/pci/mvebu:
  PCI: mvebu: Setup BAR0 in order to fix MSI
This commit is contained in:
Bjorn Helgaas
2020-08-05 18:24:19 -05:00
parent 64d293d8ac 216f8e95aa
commit a07a20b191
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pci/controller/pci-mvebu.c
View File

@@ -105,6 +105,7 @@ struct mvebu_pcie_port {
struct mvebu_pcie_window memwin; struct mvebu_pcie_window memwin;
struct mvebu_pcie_window iowin; struct mvebu_pcie_window iowin;
u32 saved_pcie_stat; u32 saved_pcie_stat;
struct resource regs;
}; };
static inline void mvebu_writel(struct mvebu_pcie_port *port, u32 val, u32 reg) static inline void mvebu_writel(struct mvebu_pcie_port *port, u32 val, u32 reg)
@@ -149,7 +150,9 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
/* /*
* Setup PCIE BARs and Address Decode Wins: * Setup PCIE BARs and Address Decode Wins:
* BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks * BAR[0] -> internal registers (needed for MSI)
* BAR[1] -> covers all DRAM banks
* BAR[2] -> Disabled
* WIN[0-3] -> DRAM bank[0-3] * WIN[0-3] -> DRAM bank[0-3]
*/ */
static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
@@ -203,6 +206,12 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1)); mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
mvebu_writel(port, ((size - 1) & 0xffff0000) | 1, mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
PCIE_BAR_CTRL_OFF(1)); PCIE_BAR_CTRL_OFF(1));
/*
* Point BAR[0] to the device's internal registers.
*/
mvebu_writel(port, round_down(port->regs.start, SZ_1M), PCIE_BAR_LO_OFF(0));
mvebu_writel(port, 0, PCIE_BAR_HI_OFF(0));
} }
static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
@@ -708,14 +717,13 @@ static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,
struct device_node *np, struct device_node *np,
struct mvebu_pcie_port *port) struct mvebu_pcie_port *port)
{ {
struct resource regs;
int ret = 0; int ret = 0;
ret = of_address_to_resource(np, 0, &regs); ret = of_address_to_resource(np, 0, &port->regs);
if (ret) if (ret)
return (void __iomem *)ERR_PTR(ret); return (void __iomem *)ERR_PTR(ret);
return devm_ioremap_resource(&pdev->dev, &regs); return devm_ioremap_resource(&pdev->dev, &port->regs);
} }
#define DT_FLAGS_TO_TYPE(flags) (((flags) >> 24) & 0x03) #define DT_FLAGS_TO_TYPE(flags) (((flags) >> 24) & 0x03)