Merge "msm: ep-pcie: Give BAR0 and BAR2 the right size"

This commit is contained in:
qctecmdr 2021-05-06 19:07:09 -07:00 • committed by Gerrit - the friendly Code Review server
commit ef335b8083
2 changed files with 5 additions and 5 deletions

View file

@ -330,7 +330,6 @@ struct ep_pcie_dev_t {
struct ep_pcie_irq_info_t irq[EP_PCIE_MAX_IRQ];
struct ep_pcie_res_info_t res[EP_PCIE_MAX_RES];
u32 mmio_res_size;
void __iomem *parf;
void __iomem *phy;
void __iomem *mmio;

View file

@ -529,16 +529,18 @@ static void ep_pcie_pipe_clk_deinit(struct ep_pcie_dev_t *dev)
static void ep_pcie_bar_init(struct ep_pcie_dev_t *dev)
{
struct resource *res = dev->res[EP_PCIE_RES_MMIO].resource;
u32 mask = res->end - res->start;
u32 properties = 0x4;
EP_PCIE_DBG(dev, "PCIe V%d: BAR mask to program is 0x%x\n",
dev->rev, dev->mmio_res_size);
dev->rev, mask);
/* Configure BAR mask via CS2 */
ep_pcie_write_mask(dev->elbi + PCIE20_ELBI_CS2_ENABLE, 0, BIT(0));
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0, dev->mmio_res_size);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0, mask);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0 + 0x4, 0);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0 + 0x8, dev->mmio_res_size);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0 + 0x8, mask);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0 + 0xc, 0);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0 + 0x10, 0);
ep_pcie_write_reg(dev->dm_core, PCIE20_BAR0 + 0x14, 0);
@ -1300,7 +1302,6 @@ static int ep_pcie_get_resources(struct ep_pcie_dev_t *dev,
goto out;
}
}
dev->mmio_res_size = res->end = res->start;
} else {
EP_PCIE_DBG(dev, "start addr for %s is %pa\n",
res_info->name, &res->start);