GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/mediatek: PCI: Remove global variable 

Remove global variable and use 'pcidev_path_on_root()' to get the base
address of PCIe controller.

TEST=Build pass and boot up to kernel successfully via SSD on Dojo
board, here is the SSD information in boot log:
 == NVME IDENTIFY CONTROLLER DATA ==
    PCI VID   : 0x15b7
    PCI SSVID : 0x15b7
    SN        : 21517J440114
    MN        : WDC PC SN530 SDBPTPZ-256G-1006
    RAB       : 0x4
    AERL      : 0x7
    SQES      : 0x66
    CQES      : 0x44
    NN        : 0x1
Identified NVMe model WDC PC SN530 SDBPTPZ-256G-1006

BUG=b:178565024

Signed-off-by: Jianjun Wang <jianjun.wang@mediatek.com>
Change-Id: Ia41c82a7aa5d6e9d936e242550851cef83afeae9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62800
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
This commit is contained in:
Jianjun Wang 2022-03-15 13:43:14 +08:00 committed by Felix Held
parent c0808b6497
commit 5111326c5c
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/soc/mediatek/common/pcie.c
View File

@ -65,8 +65,6 @@
#define PCIE_ATR_TLP_TYPE_MEM PCIE_ATR_TLP_TYPE(0) #define PCIE_ATR_TLP_TYPE_MEM PCIE_ATR_TLP_TYPE(0)
#define PCIE_ATR_TLP_TYPE_IO PCIE_ATR_TLP_TYPE(2) #define PCIE_ATR_TLP_TYPE_IO PCIE_ATR_TLP_TYPE(2)
static const struct mtk_pcie_config *pcie_ctrl;
/* LTSSM state in PCIE_LTSSM_STATUS_REG bit[28:24] */ /* LTSSM state in PCIE_LTSSM_STATUS_REG bit[28:24] */
static const char *const ltssm_str[] = { static const char *const ltssm_str[] = {
"detect.quiet", /* 0x00 */ "detect.quiet", /* 0x00 */
@ -98,17 +96,34 @@ static const char *const ltssm_str[] = {
"hotreset", /* 0x1A */ "hotreset", /* 0x1A */
}; };
static uintptr_t mtk_pcie_get_controller_base(pci_devfn_t devfn)
{
struct device *root_dev;
const mtk_soc_config_t *config;
static uintptr_t base = 0;
if (!base) {
root_dev = pcidev_path_on_root(devfn);
config = config_of(root_dev);
base = config->pcie_config.base;
}
return base;
}
volatile union pci_bank *pci_map_bus(pci_devfn_t dev) volatile union pci_bank *pci_map_bus(pci_devfn_t dev)
{ {
u32 val, devfn, bus; u32 val, devfn, bus;
uintptr_t base;
devfn = PCI_DEV2DEVFN(dev); devfn = PCI_DEV2DEVFN(dev);
bus = PCI_DEV2SEGBUS(dev); bus = PCI_DEV2SEGBUS(dev);
val = PCIE_CFG_HEADER(bus, devfn); val = PCIE_CFG_HEADER(bus, devfn);
write32p(pcie_ctrl->base + PCIE_CFGNUM_REG, val); base = mtk_pcie_get_controller_base(dev);
write32p(base + PCIE_CFGNUM_REG, val);
return (void *)(pcie_ctrl->base + PCIE_CFG_OFFSET_ADDR); return (void *)(base + PCIE_CFG_OFFSET_ADDR);
} }
static int mtk_pcie_set_trans_window(struct device *dev, uintptr_t table, static int mtk_pcie_set_trans_window(struct device *dev, uintptr_t table,
@ -197,35 +212,34 @@ void mtk_pcie_domain_set_resources(struct device *dev)
void mtk_pcie_domain_enable(struct device *dev) void mtk_pcie_domain_enable(struct device *dev)
{ {
const mtk_soc_config_t *config = config_of(dev); const mtk_soc_config_t *config = config_of(dev);
const struct mtk_pcie_config *conf = &config->pcie_config;
const char *ltssm_state; const char *ltssm_state;
size_t tries = 0; size_t tries = 0;
uint32_t val; uint32_t val;
pcie_ctrl = &config->pcie_config;
/* Set as RC mode */ /* Set as RC mode */
val = read32p(pcie_ctrl->base + PCIE_SETTING_REG); val = read32p(conf->base + PCIE_SETTING_REG);
val |= PCIE_RC_MODE; val |= PCIE_RC_MODE;
write32p(pcie_ctrl->base + PCIE_SETTING_REG, val); write32p(conf->base + PCIE_SETTING_REG, val);
/* Set class code */ /* Set class code */
val = read32p(pcie_ctrl->base + PCIE_PCI_IDS_1); val = read32p(conf->base + PCIE_PCI_IDS_1);
val &= ~GENMASK(31, 8); val &= ~GENMASK(31, 8);
val |= PCI_CLASS(PCI_CLASS_BRIDGE_PCI << 8); val |= PCI_CLASS(PCI_CLASS_BRIDGE_PCI << 8);
write32p(pcie_ctrl->base + PCIE_PCI_IDS_1, val); write32p(conf->base + PCIE_PCI_IDS_1, val);
/* Mask all INTx interrupts */ /* Mask all INTx interrupts */
val = read32p(pcie_ctrl->base + PCIE_INT_ENABLE_REG); val = read32p(conf->base + PCIE_INT_ENABLE_REG);
val &= ~PCIE_INTX_ENABLE; val &= ~PCIE_INTX_ENABLE;
write32p(pcie_ctrl->base + PCIE_INT_ENABLE_REG, val); write32p(conf->base + PCIE_INT_ENABLE_REG, val);
/* De-assert reset signals */ /* De-assert reset signals */
mtk_pcie_reset(pcie_ctrl->base + PCIE_RST_CTRL_REG, false); mtk_pcie_reset(conf->base + PCIE_RST_CTRL_REG, false);
if (!retry(100, if (!retry(100,
(tries++, read32p(pcie_ctrl->base + PCIE_LINK_STATUS_REG) & (tries++, read32p(conf->base + PCIE_LINK_STATUS_REG) &
PCIE_CTRL_LINKUP), mdelay(1))) { PCIE_CTRL_LINKUP), mdelay(1))) {
val = read32p(pcie_ctrl->base + PCIE_LTSSM_STATUS_REG); val = read32p(conf->base + PCIE_LTSSM_STATUS_REG);
ltssm_state = PCIE_LTSSM_STATE(val) >= ARRAY_SIZE(ltssm_str) ? ltssm_state = PCIE_LTSSM_STATE(val) >= ARRAY_SIZE(ltssm_str) ?
"Unknown state" : ltssm_str[PCIE_LTSSM_STATE(val)]; "Unknown state" : ltssm_str[PCIE_LTSSM_STATE(val)];
printk(BIOS_ERR, "%s: PCIe link down, current ltssm state: %s\n", printk(BIOS_ERR, "%s: PCIe link down, current ltssm state: %s\n",