* [PATCH 0/5] Add PCIe and its clock support for mt7622
@ 2020-08-10 8:17 Chuanjia Liu
2020-08-10 8:17 ` [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC Chuanjia Liu
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Chuanjia Liu @ 2020-08-10 8:17 UTC (permalink / raw)
To: u-boot
This series patchs add PCIe/clock support for MT7622
change node:
v1:add PCIe support for MT7622
Chuanjia Liu (5):
clk: mediatek: add pciesys support for MT7622 SoC
arm: dts: mediatek: add pciesys support for MT7622 SoC
PCI: mediatek: Add PCIe support for MT7622
arm: dts: mediatek: add PCIe node for MT7622
configs: mt7622: add PCIe controller related configs
arch/arm/dts/mt7622-rfb.dts | 31 ++
arch/arm/dts/mt7622.dtsi | 79 +++++
configs/mt7622_rfb_defconfig | 4 +
drivers/clk/mediatek/clk-mt7622.c | 54 ++++
drivers/pci/pcie_mediatek.c | 462 +++++++++++++++++++++++++++++-
5 files changed, 627 insertions(+), 3 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
@ 2020-08-10 8:17 ` Chuanjia Liu
2020-08-20 12:39 ` Tom Rini
2020-08-10 8:17 ` [PATCH 2/5] arm: dts: " Chuanjia Liu
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Chuanjia Liu @ 2020-08-10 8:17 UTC (permalink / raw)
To: u-boot
This patch adds pciesys support in clock driver for
MediaTek MT7622 SoC.
Signed-off-by: Henry Yen <henry.yen@mediatek.com>
Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
---
drivers/clk/mediatek/clk-mt7622.c | 54 +++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
index dc0ba71f10..bd86b5b974 100644
--- a/drivers/clk/mediatek/clk-mt7622.c
+++ b/drivers/clk/mediatek/clk-mt7622.c
@@ -453,6 +453,41 @@ static const struct mtk_gate peri_cgs[] = {
GATE_PERI1(CLK_PERI_IRTX_PD, CLK_TOP_IRTX_SEL, 2),
};
+/* pciesys */
+static const struct mtk_gate_regs pcie_cg_regs = {
+ .set_ofs = 0x30,
+ .clr_ofs = 0x30,
+ .sta_ofs = 0x30,
+};
+
+#define GATE_PCIE(_id, _parent, _shift) { \
+ .id = _id, \
+ .parent = _parent, \
+ .regs = &pcie_cg_regs, \
+ .shift = _shift, \
+ .flags = CLK_GATE_NO_SETCLR_INV | CLK_PARENT_TOPCKGEN, \
+ }
+
+static const struct mtk_gate pcie_cgs[] = {
+ GATE_PCIE(CLK_PCIE_P1_AUX_EN, CLK_TOP_P1_1MHZ, 12),
+ GATE_PCIE(CLK_PCIE_P1_OBFF_EN, CLK_TOP_4MHZ, 13),
+ GATE_PCIE(CLK_PCIE_P1_AHB_EN, CLK_TOP_AXI_SEL, 14),
+ GATE_PCIE(CLK_PCIE_P1_AXI_EN, CLK_TOP_HIF_SEL, 15),
+ GATE_PCIE(CLK_PCIE_P1_MAC_EN, CLK_TOP_PCIE1_MAC_EN, 16),
+ GATE_PCIE(CLK_PCIE_P1_PIPE_EN, CLK_TOP_PCIE1_PIPE_EN, 17),
+ GATE_PCIE(CLK_PCIE_P0_AUX_EN, CLK_TOP_P0_1MHZ, 18),
+ GATE_PCIE(CLK_PCIE_P0_OBFF_EN, CLK_TOP_4MHZ, 19),
+ GATE_PCIE(CLK_PCIE_P0_AHB_EN, CLK_TOP_AXI_SEL, 20),
+ GATE_PCIE(CLK_PCIE_P0_AXI_EN, CLK_TOP_HIF_SEL, 21),
+ GATE_PCIE(CLK_PCIE_P0_MAC_EN, CLK_TOP_PCIE0_MAC_EN, 22),
+ GATE_PCIE(CLK_PCIE_P0_PIPE_EN, CLK_TOP_PCIE0_PIPE_EN, 23),
+ GATE_PCIE(CLK_SATA_AHB_EN, CLK_TOP_AXI_SEL, 26),
+ GATE_PCIE(CLK_SATA_AXI_EN, CLK_TOP_HIF_SEL, 27),
+ GATE_PCIE(CLK_SATA_ASIC_EN, CLK_TOP_SATA_ASIC, 28),
+ GATE_PCIE(CLK_SATA_RBC_EN, CLK_TOP_SATA_RBC, 29),
+ GATE_PCIE(CLK_SATA_PM_EN, CLK_TOP_UNIVPLL2_D4, 30),
+};
+
/* ethsys */
static const struct mtk_gate_regs eth_cg_regs = {
.sta_ofs = 0x30,
@@ -554,6 +589,11 @@ static int mt7622_pericfg_probe(struct udevice *dev)
return mtk_common_clk_gate_init(dev, &mt7622_clk_tree, peri_cgs);
}
+static int mt7622_pciesys_probe(struct udevice *dev)
+{
+ return mtk_common_clk_gate_init(dev, &mt7622_clk_tree, pcie_cgs);
+}
+
static int mt7622_ethsys_probe(struct udevice *dev)
{
return mtk_common_clk_gate_init(dev, &mt7622_clk_tree, eth_cgs);
@@ -597,6 +637,11 @@ static const struct udevice_id mt7622_pericfg_compat[] = {
{ }
};
+static const struct udevice_id mt7622_pciesys_compat[] = {
+ { .compatible = "mediatek,mt7622-pciesys", },
+ { }
+};
+
static const struct udevice_id mt7622_ethsys_compat[] = {
{ .compatible = "mediatek,mt7622-ethsys", },
{ }
@@ -660,6 +705,15 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = {
.flags = DM_FLAG_PRE_RELOC,
};
+U_BOOT_DRIVER(mtk_clk_pciesys) = {
+ .name = "mt7622-clock-pciesys",
+ .id = UCLASS_CLK,
+ .of_match = mt7622_pciesys_compat,
+ .probe = mt7622_pciesys_probe,
+ .priv_auto_alloc_size = sizeof(struct mtk_cg_priv),
+ .ops = &mtk_clk_gate_ops,
+};
+
U_BOOT_DRIVER(mtk_clk_ethsys) = {
.name = "mt7622-clock-ethsys",
.id = UCLASS_CLK,
--
2.18.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/5] arm: dts: mediatek: add pciesys support for MT7622 SoC
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
2020-08-10 8:17 ` [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC Chuanjia Liu
@ 2020-08-10 8:17 ` Chuanjia Liu
2020-08-20 12:39 ` Tom Rini
2020-08-10 8:17 ` [PATCH 3/5] PCI: mediatek: Add PCIe support for MT7622 Chuanjia Liu
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Chuanjia Liu @ 2020-08-10 8:17 UTC (permalink / raw)
To: u-boot
This patch adds pciesys support in dts for MediaTek MT7622 SoC.
Signed-off-by: Henry Yen <henry.yen@mediatek.com>
Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
---
arch/arm/dts/mt7622.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/dts/mt7622.dtsi b/arch/arm/dts/mt7622.dtsi
index f9ce0c6c3e..f6919bb706 100644
--- a/arch/arm/dts/mt7622.dtsi
+++ b/arch/arm/dts/mt7622.dtsi
@@ -186,6 +186,13 @@
status = "disabled";
};
+ pciesys: pciesys at 1a100800 {
+ compatible = "mediatek,mt7622-pciesys", "syscon";
+ reg = <0x1a100800 0x1000>;
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ };
+
ethsys: syscon at 1b000000 {
compatible = "mediatek,mt7622-ethsys", "syscon";
reg = <0x1b000000 0x1000>;
--
2.18.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/5] PCI: mediatek: Add PCIe support for MT7622
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
2020-08-10 8:17 ` [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC Chuanjia Liu
2020-08-10 8:17 ` [PATCH 2/5] arm: dts: " Chuanjia Liu
@ 2020-08-10 8:17 ` Chuanjia Liu
2020-08-20 12:40 ` Tom Rini
2020-08-10 8:17 ` [PATCH 4/5] arm: dts: mediatek: add PCIe node " Chuanjia Liu
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Chuanjia Liu @ 2020-08-10 8:17 UTC (permalink / raw)
To: u-boot
This patch adds PCIe support for the Mediatek MT7622 SOC.
Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
Signed-off-by: Henry Yen <henry.yen@mediatek.com>
---
drivers/pci/pcie_mediatek.c | 462 +++++++++++++++++++++++++++++++++++-
1 file changed, 459 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c
index 6e6375cec0..ad34f7c597 100644
--- a/drivers/pci/pcie_mediatek.c
+++ b/drivers/pci/pcie_mediatek.c
@@ -20,6 +20,7 @@
#include <linux/bitops.h>
#include <linux/iopoll.h>
#include <linux/list.h>
+#include "pci_internal.h"
/* PCIe shared registers */
#define PCIE_SYS_CFG 0x00
@@ -54,18 +55,90 @@
#define PCIE_FC_CREDIT_MASK (GENMASK(31, 31) | GENMASK(28, 16))
#define PCIE_FC_CREDIT_VAL(x) ((x) << 16)
+/* PCIe V2 share registers */
+#define PCIE_SYS_CFG_V2 0x0
+#define PCIE_CSR_LTSSM_EN(x) BIT(0 + (x) * 8)
+#define PCIE_CSR_ASPM_L1_EN(x) BIT(1 + (x) * 8)
+
+/* PCIe V2 per-port registers */
+#define PCIE_CONF_VEND_ID 0x100
+#define PCIE_CONF_DEVICE_ID 0x102
+#define PCIE_CONF_CLASS_ID 0x106
+
+#define PCIE_AHB_TRANS_BASE0_L 0x438
+#define PCIE_AHB_TRANS_BASE0_H 0x43c
+#define AHB2PCIE_SIZE(x) ((x) & GENMASK(4, 0))
+#define PCIE_AXI_WINDOW0 0x448
+#define WIN_ENABLE BIT(7)
+
+/*
+ * Define PCIe to AHB window size as 2^33 to support max 8GB address space
+ * translate, support least 4GB DRAM size access from EP DMA(physical DRAM
+ * start from 0x40000000).
+ */
+#define PCIE2AHB_SIZE 0x21
+
+/* PCIe V2 configuration transaction header */
+#define PCIE_CFG_HEADER0 0x460
+#define PCIE_CFG_HEADER1 0x464
+#define PCIE_CFG_HEADER2 0x468
+#define PCIE_CFG_WDATA 0x470
+#define PCIE_APP_TLP_REQ 0x488
+#define PCIE_CFG_RDATA 0x48c
+#define APP_CFG_REQ BIT(0)
+#define APP_CPL_STATUS GENMASK(7, 5)
+
+#define CFG_WRRD_TYPE_0 4
+#define CFG_WR_FMT 2
+#define CFG_RD_FMT 0
+
+#define CFG_DW0_LENGTH(length) ((length) & GENMASK(9, 0))
+#define CFG_DW0_TYPE(type) (((type) << 24) & GENMASK(28, 24))
+#define CFG_DW0_FMT(fmt) (((fmt) << 29) & GENMASK(31, 29))
+#define CFG_DW2_REGN(regn) ((regn) & GENMASK(11, 2))
+#define CFG_DW2_FUN(fun) (((fun) << 16) & GENMASK(18, 16))
+#define CFG_DW2_DEV(dev) (((dev) << 19) & GENMASK(23, 19))
+#define CFG_DW2_BUS(bus) (((bus) << 24) & GENMASK(31, 24))
+#define CFG_HEADER_DW0(type, fmt) \
+ (CFG_DW0_LENGTH(1) | CFG_DW0_TYPE(type) | CFG_DW0_FMT(fmt))
+#define CFG_HEADER_DW1(where, size) \
+ (GENMASK(((size) - 1), 0) << ((where) & 0x3))
+#define CFG_HEADER_DW2(regn, fun, dev, bus) \
+ (CFG_DW2_REGN(regn) | CFG_DW2_FUN(fun) | \
+ CFG_DW2_DEV(dev) | CFG_DW2_BUS(bus))
+
+#define PCIE_RST_CTRL 0x510
+#define PCIE_PHY_RSTB BIT(0)
+#define PCIE_PIPE_SRSTB BIT(1)
+#define PCIE_MAC_SRSTB BIT(2)
+#define PCIE_CRSTB BIT(3)
+#define PCIE_PERSTB BIT(8)
+#define PCIE_LINKDOWN_RST_EN GENMASK(15, 13)
+#define PCIE_LINK_STATUS_V2 0x804
+#define PCIE_PORT_LINKUP_V2 BIT(11)
+
+#define PCI_VENDOR_ID_MEDIATEK 0x14c3
+
+enum MTK_PCIE_GEN {PCIE_V1, PCIE_V2, PCIE_V3};
+
struct mtk_pcie_port {
void __iomem *base;
struct list_head list;
struct mtk_pcie *pcie;
struct reset_ctl reset;
struct clk sys_ck;
+ struct clk ahb_ck;
+ struct clk axi_ck;
+ struct clk aux_ck;
+ struct clk obff_ck;
+ struct clk pipe_ck;
struct phy phy;
u32 slot;
};
struct mtk_pcie {
void __iomem *base;
+ void *priv;
struct clk free_ck;
struct list_head ports;
};
@@ -102,6 +175,152 @@ static const struct dm_pci_ops mtk_pcie_ops = {
.write_config = mtk_pcie_write_config,
};
+static int mtk_pcie_check_cfg_cpld(struct mtk_pcie_port *port)
+{
+ u32 val;
+ int err;
+
+ err = readl_poll_timeout(port->base + PCIE_APP_TLP_REQ, val,
+ !(val & APP_CFG_REQ), 100 * 1000);
+ if (err)
+ return -1;
+
+ if (readl(port->base + PCIE_APP_TLP_REQ) & APP_CPL_STATUS)
+ return -1;
+
+ return 0;
+}
+
+static int mtk_pcie_hw_rd_cfg(struct mtk_pcie_port *port, u32 bus, pci_dev_t devfn,
+ int where, int size, ulong *val)
+{
+ u32 tmp;
+
+ writel(CFG_HEADER_DW0(CFG_WRRD_TYPE_0, CFG_RD_FMT),
+ port->base + PCIE_CFG_HEADER0);
+ writel(CFG_HEADER_DW1(where, size), port->base + PCIE_CFG_HEADER1);
+ writel(CFG_HEADER_DW2(where, PCI_FUNC(devfn), PCI_DEV(devfn), bus),
+ port->base + PCIE_CFG_HEADER2);
+
+ /* Trigger h/w to transmit Cfgrd TLP */
+ tmp = readl(port->base + PCIE_APP_TLP_REQ);
+ tmp |= APP_CFG_REQ;
+ writel(tmp, port->base + PCIE_APP_TLP_REQ);
+
+ /* Check completion status */
+ if (mtk_pcie_check_cfg_cpld(port))
+ return -1;
+
+ /* Read cpld payload of Cfgrd */
+ *val = readl(port->base + PCIE_CFG_RDATA);
+
+ if (size == 1)
+ *val = (*val >> (8 * (where & 3))) & 0xff;
+ else if (size == 2)
+ *val = (*val >> (8 * (where & 3))) & 0xffff;
+
+ return 0;
+}
+
+static int mtk_pcie_hw_wr_cfg(struct mtk_pcie_port *port, u32 bus, pci_dev_t devfn,
+ int where, int size, u32 val)
+{
+ /* Write PCIe configuration transaction header for Cfgwr */
+ writel(CFG_HEADER_DW0(CFG_WRRD_TYPE_0, CFG_WR_FMT),
+ port->base + PCIE_CFG_HEADER0);
+ writel(CFG_HEADER_DW1(where, size), port->base + PCIE_CFG_HEADER1);
+ writel(CFG_HEADER_DW2(where, PCI_FUNC(devfn), PCI_DEV(devfn), bus),
+ port->base + PCIE_CFG_HEADER2);
+
+ /* Write Cfgwr data */
+ val = val << 8 * (where & 3);
+ writel(val, port->base + PCIE_CFG_WDATA);
+
+ /* Trigger h/w to transmit Cfgwr TLP */
+ val = readl(port->base + PCIE_APP_TLP_REQ);
+ val |= APP_CFG_REQ;
+ writel(val, port->base + PCIE_APP_TLP_REQ);
+
+ /* Check completion status */
+ return mtk_pcie_check_cfg_cpld(port);
+}
+
+static struct mtk_pcie_port *mtk_pcie_find_port(const struct udevice *bus,
+ pci_dev_t bdf)
+{
+ struct mtk_pcie *pcie = dev_get_priv(bus);
+ struct mtk_pcie_port *port;
+ struct udevice *dev;
+ struct pci_child_platdata *pplat = NULL;
+ int ret = 0;
+
+ if (PCI_BUS(bdf) != 0) {
+ ret = pci_get_bus(PCI_BUS(bdf), &dev);
+ if (ret) {
+ debug("No such device,ret = %d\n", ret);
+ return NULL;
+ }
+
+ while (dev->parent->seq != 0)
+ dev = dev->parent;
+
+ pplat = dev_get_parent_platdata(dev);
+ }
+
+ list_for_each_entry(port, &pcie->ports, list) {
+ if ((PCI_BUS(bdf) == 0) && (PCI_DEV(bdf) == port->slot))
+ return port;
+
+ if (PCI_BUS(bdf) != 0 && PCI_DEV(bdf) == 0 &&
+ PCI_DEV(pplat->devfn) == port->slot)
+ return port;
+ }
+
+ return NULL;
+}
+
+static int mtk_pcie_config_read(const struct udevice *bus, pci_dev_t bdf,
+ uint offset, ulong *valuep,
+ enum pci_size_t size)
+{
+ struct mtk_pcie_port *port;
+ int ret;
+
+ port = mtk_pcie_find_port(bus, bdf);
+ if (!port) {
+ *valuep = pci_get_ff(size);
+ return 0;
+ }
+
+ ret = mtk_pcie_hw_rd_cfg(port, PCI_BUS(bdf), bdf, offset, (1 << size), valuep);
+ if (ret)
+ *valuep = pci_get_ff(size);
+
+ return ret;
+}
+
+static int mtk_pcie_config_write(struct udevice *bus, pci_dev_t bdf,
+ uint offset, ulong value,
+ enum pci_size_t size)
+{
+ struct mtk_pcie_port *port;
+
+ port = mtk_pcie_find_port(bus, bdf);
+ if (!port)
+ return 0;
+
+ /* Do not modify RC bar 0/1. */
+ if (PCI_BUS(bdf) == 0 && (offset == 0x10 || offset == 0x14))
+ return 0;
+
+ return mtk_pcie_hw_wr_cfg(port, PCI_BUS(bdf), bdf, offset, (1 << size), value);
+}
+
+static const struct dm_pci_ops mtk_pcie_ops_v2 = {
+ .read_config = mtk_pcie_config_read,
+ .write_config = mtk_pcie_config_write,
+};
+
static void mtk_pcie_port_free(struct mtk_pcie_port *port)
{
list_del(&port->list);
@@ -151,6 +370,73 @@ static int mtk_pcie_startup_port(struct mtk_pcie_port *port)
return 0;
}
+static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)
+{
+ struct mtk_pcie *pcie = port->pcie;
+ struct udevice *dev = pcie->priv;
+ struct pci_region *pci_mem;
+ u32 val;
+ int err;
+
+ /* MT7622/MT7629 platforms need to enable LTSSM and ASPM from PCIe subsys */
+ if (pcie->base) {
+ val = readl(pcie->base + PCIE_SYS_CFG_V2);
+ val |= PCIE_CSR_LTSSM_EN(port->slot) |
+ PCIE_CSR_ASPM_L1_EN(port->slot);
+ writel(val, pcie->base + PCIE_SYS_CFG_V2);
+ }
+
+ /* Assert all reset signals */
+ writel(0, port->base + PCIE_RST_CTRL);
+
+ /*
+ * Enable PCIe link down reset, if link status changed from link up to
+ * link down, this will reset MAC control registers and configuration
+ * space.
+ */
+ writel(PCIE_LINKDOWN_RST_EN, port->base + PCIE_RST_CTRL);
+ udelay(500);
+
+ /* De-assert PHY, PE, PIPE, MAC and configuration reset */
+ val = readl(port->base + PCIE_RST_CTRL);
+ val |= PCIE_PHY_RSTB | PCIE_PIPE_SRSTB | PCIE_MAC_SRSTB | PCIE_CRSTB;
+ writel(val, port->base + PCIE_RST_CTRL);
+
+ mdelay(100);
+ val |= PCIE_PERSTB;
+ writel(val, port->base + PCIE_RST_CTRL);
+
+ /* Set up vendor ID and class code */
+ val = PCI_VENDOR_ID_MEDIATEK;
+ writew(val, port->base + PCIE_CONF_VEND_ID);
+
+ val = PCI_CLASS_BRIDGE_PCI;
+ writew(val, port->base + PCIE_CONF_CLASS_ID);
+
+ /* 100ms timeout value should be enough for Gen1/2 training */
+ err = readl_poll_timeout(port->base + PCIE_LINK_STATUS_V2, val,
+ !!(val & PCIE_PORT_LINKUP_V2),
+ 100 * 1000);
+ if (err)
+ return -ETIMEDOUT;
+
+ pci_get_regions(dev, NULL, &pci_mem, NULL);
+
+ /* Set AHB to PCIe translation windows */
+ val = lower_32_bits(pci_mem->bus_start) |
+ AHB2PCIE_SIZE(fls(pci_mem->size) - 1);
+ writel(val, port->base + PCIE_AHB_TRANS_BASE0_L);
+
+ val = upper_32_bits(pci_mem->bus_start);
+ writel(val, port->base + PCIE_AHB_TRANS_BASE0_H);
+
+ /* Set PCIe to AXI translation memory space.*/
+ val = PCIE2AHB_SIZE | WIN_ENABLE;
+ writel(val, port->base + PCIE_AXI_WINDOW0);
+
+ return 0;
+}
+
static void mtk_pcie_enable_port(struct mtk_pcie_port *port)
{
int err;
@@ -183,6 +469,55 @@ exit:
mtk_pcie_port_free(port);
}
+static void mtk_pcie_enable_port_v2(struct mtk_pcie_port *port)
+{
+ int err = 0;
+
+ err = clk_enable(&port->sys_ck);
+ if (err) {
+ debug("clk_enable(sys_ck) failed: %d\n", err);
+ goto exit;
+ }
+
+ err = clk_enable(&port->ahb_ck);
+ if (err) {
+ debug("clk_enable(ahb_ck) failed: %d\n", err);
+ goto exit;
+ }
+
+ err = clk_enable(&port->aux_ck);
+ if (err) {
+ debug("clk_enable(aux_ck) failed: %d\n", err);
+ goto exit;
+ }
+
+ err = clk_enable(&port->axi_ck);
+ if (err) {
+ debug("clk_enable(axi_ck) failed: %d\n", err);
+ goto exit;
+ }
+
+ err = clk_enable(&port->obff_ck);
+ if (err) {
+ debug("clk_enable(obff_ck) failed: %d\n", err);
+ goto exit;
+ }
+
+ err = clk_enable(&port->pipe_ck);
+ if (err) {
+ debug("clk_enable(pipe_ck) failed: %d\n", err);
+ goto exit;
+ }
+
+ err = mtk_pcie_startup_port_v2(port);
+ if (!err)
+ return;
+
+ pr_err("Port%d link down\n", port->slot);
+exit:
+ mtk_pcie_port_free(port);
+}
+
static int mtk_pcie_parse_port(struct udevice *dev, u32 slot)
{
struct mtk_pcie *pcie = dev_get_priv(dev);
@@ -221,6 +556,75 @@ static int mtk_pcie_parse_port(struct udevice *dev, u32 slot)
return 0;
}
+static int mtk_pcie_parse_port_v2(struct udevice *dev, u32 slot)
+{
+ struct mtk_pcie *pcie = dev_get_priv(dev);
+ struct mtk_pcie_port *port;
+ char name[10];
+ int err;
+
+ port = devm_kzalloc(dev, sizeof(*port), GFP_KERNEL);
+ if (!port)
+ return -ENOMEM;
+
+ snprintf(name, sizeof(name), "port%d", slot);
+ port->base = dev_remap_addr_name(dev, name);
+ if (!port->base) {
+ debug("failed to map port%d base\n", slot);
+ return -ENOENT;
+ }
+
+ snprintf(name, sizeof(name), "sys_ck%d", slot);
+ err = clk_get_by_name(dev, name, &port->sys_ck);
+ if (err) {
+ debug("clk_get_by_name(sys_ck) failed: %d\n", err);
+ return err;
+ }
+
+ snprintf(name, sizeof(name), "ahb_ck%d", slot);
+ err = clk_get_by_name(dev, name, &port->ahb_ck);
+ if (err) {
+ debug("clk_get_by_name(ahb_ck) failed: %d\n", err);
+ return err;
+ }
+
+ snprintf(name, sizeof(name), "aux_ck%d", slot);
+ err = clk_get_by_name(dev, name, &port->aux_ck);
+ if (err) {
+ debug("clk_get_by_name(aux_ck) failed: %d\n", err);
+ return err;
+ }
+
+ snprintf(name, sizeof(name), "axi_ck%d", slot);
+ err = clk_get_by_name(dev, name, &port->axi_ck);
+ if (err) {
+ debug("clk_get_by_name(axi_ck) failed: %d\n", err);
+ return err;
+ }
+
+ snprintf(name, sizeof(name), "obff_ck%d", slot);
+ err = clk_get_by_name(dev, name, &port->obff_ck);
+ if (err) {
+ debug("clk_get_by_name(obff_ck) failed: %d\n", err);
+ return err;
+ }
+
+ snprintf(name, sizeof(name), "pipe_ck%d", slot);
+ err = clk_get_by_name(dev, name, &port->pipe_ck);
+ if (err) {
+ debug("clk_get_by_name(pipe_ck) failed: %d\n", err);
+ return err;
+ }
+
+ port->slot = slot;
+ port->pcie = pcie;
+
+ INIT_LIST_HEAD(&port->list);
+ list_add_tail(&port->list, &pcie->ports);
+
+ return 0;
+}
+
static int mtk_pcie_probe(struct udevice *dev)
{
struct mtk_pcie *pcie = dev_get_priv(dev);
@@ -268,16 +672,68 @@ static int mtk_pcie_probe(struct udevice *dev)
return 0;
}
+static int mtk_pcie_probe_v2(struct udevice *dev)
+{
+ struct mtk_pcie *pcie = dev_get_priv(dev);
+ struct mtk_pcie_port *port, *tmp;
+ struct fdt_pci_addr addr;
+ ofnode subnode;
+ unsigned int slot;
+ int err;
+
+ INIT_LIST_HEAD(&pcie->ports);
+
+ pcie->base = dev_remap_addr_name(dev, "subsys");
+ if (!pcie->base)
+ return -ENOENT;
+
+ pcie->priv = dev;
+
+ dev_for_each_subnode(subnode, dev) {
+ if (!ofnode_is_available(subnode))
+ continue;
+
+ err = ofnode_read_pci_addr(subnode, 0, "reg", &addr);
+ if (err)
+ return err;
+
+ slot = PCI_DEV(addr.phys_hi);
+ err = mtk_pcie_parse_port_v2(dev, slot);
+ if (err)
+ return err;
+ }
+
+ /* enable each port, and then check link status */
+ list_for_each_entry_safe(port, tmp, &pcie->ports, list)
+ mtk_pcie_enable_port_v2(port);
+
+ return 0;
+}
+
static const struct udevice_id mtk_pcie_ids[] = {
- { .compatible = "mediatek,mt7623-pcie", },
+ { .compatible = "mediatek,mt7623-pcie", PCIE_V1},
{ }
};
-U_BOOT_DRIVER(pcie_mediatek) = {
- .name = "pcie_mediatek",
+U_BOOT_DRIVER(pcie_mediatek_v1) = {
+ .name = "pcie_mediatek_v1",
.id = UCLASS_PCI,
.of_match = mtk_pcie_ids,
.ops = &mtk_pcie_ops,
.probe = mtk_pcie_probe,
.priv_auto_alloc_size = sizeof(struct mtk_pcie),
};
+
+static const struct udevice_id mtk_pcie_ids_v2[] = {
+ { .compatible = "mediatek,mt7622-pcie", PCIE_V2},
+ { }
+};
+
+U_BOOT_DRIVER(pcie_mediatek_v2) = {
+ .name = "pcie_mediatek_v2",
+ .id = UCLASS_PCI,
+ .of_match = mtk_pcie_ids_v2,
+ .ops = &mtk_pcie_ops_v2,
+ .probe = mtk_pcie_probe_v2,
+ .priv_auto_alloc_size = sizeof(struct mtk_pcie),
+};
--
2.18.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/5] arm: dts: mediatek: add PCIe node for MT7622
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
` (2 preceding siblings ...)
2020-08-10 8:17 ` [PATCH 3/5] PCI: mediatek: Add PCIe support for MT7622 Chuanjia Liu
@ 2020-08-10 8:17 ` Chuanjia Liu
2020-08-20 12:40 ` Tom Rini
2020-08-10 8:17 ` [PATCH 5/5] configs: mt7622: add PCIe controller related configs Chuanjia Liu
2020-08-10 10:27 ` Aw: [PATCH 0/5] Add PCIe and its clock support for mt7622 Frank Wunderlich
5 siblings, 1 reply; 14+ messages in thread
From: Chuanjia Liu @ 2020-08-10 8:17 UTC (permalink / raw)
To: u-boot
This patch adds PCIe node in dts for Mediatek MT7622 Soc.
Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
Signed-off-by: Henry Yen <henry.yen@mediatek.com>
---
arch/arm/dts/mt7622-rfb.dts | 31 ++++++++++++++++
arch/arm/dts/mt7622.dtsi | 72 +++++++++++++++++++++++++++++++++++++
2 files changed, 103 insertions(+)
diff --git a/arch/arm/dts/mt7622-rfb.dts b/arch/arm/dts/mt7622-rfb.dts
index f05c3fe14d..317fc78abd 100644
--- a/arch/arm/dts/mt7622-rfb.dts
+++ b/arch/arm/dts/mt7622-rfb.dts
@@ -46,8 +46,39 @@
};
};
+&pcie {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie0_pins>, <&pcie1_pins>;
+ status = "okay";
+
+ pcie at 0,0 {
+ status = "okay";
+ };
+
+ pcie at 1,0 {
+ status = "okay";
+ };
+};
&pinctrl {
+ pcie0_pins: pcie0-pins {
+ mux {
+ function = "pcie";
+ groups = "pcie0_pad_perst",
+ "pcie0_1_waken",
+ "pcie0_1_clkreq";
+ };
+ };
+
+ pcie1_pins: pcie1-pins {
+ mux {
+ function = "pcie";
+ groups = "pcie1_pad_perst",
+ "pcie1_0_waken",
+ "pcie1_0_clkreq";
+ };
+ };
+
snfi_pins: snfi-pins {
mux {
function = "flash";
diff --git a/arch/arm/dts/mt7622.dtsi b/arch/arm/dts/mt7622.dtsi
index f6919bb706..d0783bc9ff 100644
--- a/arch/arm/dts/mt7622.dtsi
+++ b/arch/arm/dts/mt7622.dtsi
@@ -193,6 +193,78 @@
#reset-cells = <1>;
};
+ pcie: pcie at 1a140000 {
+ compatible = "mediatek,mt7622-pcie";
+ device_type = "pci";
+ reg = <0x1a140000 0x1000>,
+ <0x1a143000 0x1000>,
+ <0x1a145000 0x1000>;
+ reg-names = "subsys", "port0", "port1";
+ #address-cells = <3>;
+ #size-cells = <2>;
+ interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_LOW>,
+ <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>;
+ clocks = <&pciesys CLK_PCIE_P0_MAC_EN>,
+ <&pciesys CLK_PCIE_P1_MAC_EN>,
+ <&pciesys CLK_PCIE_P0_AHB_EN>,
+ <&pciesys CLK_PCIE_P0_AHB_EN>,
+ <&pciesys CLK_PCIE_P0_AUX_EN>,
+ <&pciesys CLK_PCIE_P1_AUX_EN>,
+ <&pciesys CLK_PCIE_P0_AXI_EN>,
+ <&pciesys CLK_PCIE_P1_AXI_EN>,
+ <&pciesys CLK_PCIE_P0_OBFF_EN>,
+ <&pciesys CLK_PCIE_P1_OBFF_EN>,
+ <&pciesys CLK_PCIE_P0_PIPE_EN>,
+ <&pciesys CLK_PCIE_P1_PIPE_EN>;
+ clock-names = "sys_ck0", "sys_ck1", "ahb_ck0", "ahb_ck1",
+ "aux_ck0", "aux_ck1", "axi_ck0", "axi_ck1",
+ "obff_ck0", "obff_ck1", "pipe_ck0", "pipe_ck1";
+ power-domains = <&scpsys MT7629_POWER_DOMAIN_HIF0>;
+ bus-range = <0x00 0xff>;
+ ranges = <0x82000000 0 0x20000000 0x20000000 0 0x10000000>;
+ status = "disabled";
+
+ pcie0: pcie at 0,0 {
+ reg = <0x0000 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges;
+ status = "disabled";
+
+ interrupt-map-mask = <0 0 0 7>;
+ interrupt-map = <0 0 0 1 &pcie_intc0 0>,
+ <0 0 0 2 &pcie_intc0 1>,
+ <0 0 0 3 &pcie_intc0 2>,
+ <0 0 0 4 &pcie_intc0 3>;
+ pcie_intc0: interrupt-controller {
+ interrupt-controller;
+ #address-cells = <0>;
+ #interrupt-cells = <1>;
+ };
+ };
+
+ pcie1: pcie at 1,0 {
+ reg = <0x0800 0 0 0 0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ #interrupt-cells = <1>;
+ ranges;
+ status = "disabled";
+
+ interrupt-map-mask = <0 0 0 7>;
+ interrupt-map = <0 0 0 1 &pcie_intc1 0>,
+ <0 0 0 2 &pcie_intc1 1>,
+ <0 0 0 3 &pcie_intc1 2>,
+ <0 0 0 4 &pcie_intc1 3>;
+ pcie_intc1: interrupt-controller {
+ interrupt-controller;
+ #address-cells = <0>;
+ #interrupt-cells = <1>;
+ };
+ };
+ };
+
ethsys: syscon at 1b000000 {
compatible = "mediatek,mt7622-ethsys", "syscon";
reg = <0x1b000000 0x1000>;
--
2.18.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/5] configs: mt7622: add PCIe controller related configs
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
` (3 preceding siblings ...)
2020-08-10 8:17 ` [PATCH 4/5] arm: dts: mediatek: add PCIe node " Chuanjia Liu
@ 2020-08-10 8:17 ` Chuanjia Liu
2020-08-20 12:40 ` Tom Rini
2020-08-10 10:27 ` Aw: [PATCH 0/5] Add PCIe and its clock support for mt7622 Frank Wunderlich
5 siblings, 1 reply; 14+ messages in thread
From: Chuanjia Liu @ 2020-08-10 8:17 UTC (permalink / raw)
To: u-boot
Add PCIe command and related configs
Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
Signed-off-by: Henry Yen <henry.yen@mediatek.com>
---
configs/mt7622_rfb_defconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig
index 9ab621da15..fa2b4f9f52 100644
--- a/configs/mt7622_rfb_defconfig
+++ b/configs/mt7622_rfb_defconfig
@@ -14,6 +14,7 @@ CONFIG_SYS_PROMPT="MT7622> "
CONFIG_CMD_BOOTMENU=y
CONFIG_CMD_MMC=y
CONFIG_CMD_SF_TEST=y
+CONFIG_CMD_PCI=y
CONFIG_CMD_PING=y
CONFIG_CMD_SMC=y
CONFIG_ENV_OVERWRITE=y
@@ -53,3 +54,6 @@ CONFIG_MTK_TIMER=y
CONFIG_WDT_MTK=y
CONFIG_LZO=y
CONFIG_HEXDUMP=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_PCIE_MEDIATEK=y
--
2.18.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Aw: [PATCH 0/5] Add PCIe and its clock support for mt7622
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
` (4 preceding siblings ...)
2020-08-10 8:17 ` [PATCH 5/5] configs: mt7622: add PCIe controller related configs Chuanjia Liu
@ 2020-08-10 10:27 ` Frank Wunderlich
[not found] ` <2a41f2d5308e46f1baf80e5525c507ae@mtkmbs05n2.mediatek.inc>
5 siblings, 1 reply; 14+ messages in thread
From: Frank Wunderlich @ 2020-08-10 10:27 UTC (permalink / raw)
To: u-boot
Chuanjia Liu schrieb am 10.08.20 um 10:17:
> This series patchs add PCIe/clock support for MT7622
>
> change node:
> v1:add PCIe support for MT7622
> Chuanjia Liu (5):
> clk: mediatek: add pciesys support for MT7622 SoC
> arm: dts: mediatek: add pciesys support for MT7622 SoC
> PCI: mediatek: Add PCIe support for MT7622
> arm: dts: mediatek: add PCIe node for MT7622
> configs: mt7622: add PCIe controller related configs
Hi,
Tested on bananapi-r64 with an mt7612 in slot cn8 and compex wle900vx in cn25.
BPI-R64> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
BPI-R64> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
00.01.00 0x14c3 0x3258 Bridge device 0x04
BPI-R64> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x168c 0x003c Network controller 0x80
BPI-R64>
if i swap the cards
BPI-R64> pci enum
Port1 link down
PCI: Failed autoconfig bar 10
BPI-R64> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
BPI-R64> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x14c3 0x7612 Network controller 0x80
BPI-R64>
note that there are pcie-HW-issues on my boards revision(power limitation and missing capacitors on tx-lines) which may cause the different Pcie-Ids for mt7612 and the class of the compex-card. sorry had not seen this before on tests with Steven
maybe anyone can test the Patches with a fixed board.
regards Frank
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/5] Add PCIe and its clock support for mt7622
[not found] ` <2a41f2d5308e46f1baf80e5525c507ae@mtkmbs05n2.mediatek.inc>
@ 2020-08-13 12:53 ` Henry Yen
2020-08-13 14:26 ` Aw: " Frank Wunderlich
0 siblings, 1 reply; 14+ messages in thread
From: Henry Yen @ 2020-08-13 12:53 UTC (permalink / raw)
To: u-boot
On Mon, 2020-08-10 at 18:47 +0800, Henry Yen wrote:
>
> Chuanjia Liu schrieb am 10.08.20 um 10:17:
>
> > This series patchs add PCIe/clock support for MT7622
>
> >
>
> > change node:
>
> > v1:add PCIe support for MT7622
>
> > Chuanjia Liu (5):
>
> > clk: mediatek: add pciesys support for MT7622 SoC
>
> > arm: dts: mediatek: add pciesys support for MT7622 SoC
>
> > PCI: mediatek: Add PCIe support for MT7622
>
> > arm: dts: mediatek: add PCIe node for MT7622
>
> > configs: mt7622: add PCIe controller related configs
>
> Hi,
>
>
>
> Tested on bananapi-r64 with an mt7612 in slot cn8 and compex wle900vx
> in cn25.
>
>
>
> BPI-R64> pci enum
>
> PCI: Failed autoconfig bar 10
>
> PCI: Failed autoconfig bar 10
>
> BPI-R64> pci 0
>
> Scanning PCI devices on bus 0
>
> BusDevFun VendorId DeviceId Device Class Sub-Class
>
> _____________________________________________________________
>
> 00.00.00 0x14c3 0x3258 Bridge device 0x04
>
> 00.01.00 0x14c3 0x3258 Bridge device 0x04
>
> BPI-R64> pci 1
>
> Scanning PCI devices on bus 1
>
> BusDevFun VendorId DeviceId Device Class Sub-Class
>
> _____________________________________________________________
>
> 01.00.00 0x168c 0x003c Network controller 0x80
>
> BPI-R64>
>
>
>
> if i swap the cards
>
>
>
> BPI-R64> pci enum
>
> Port1 link down
>
> PCI: Failed autoconfig bar 10
>
> BPI-R64> pci 0
>
> Scanning PCI devices on bus 0
>
> BusDevFun VendorId DeviceId Device Class Sub-Class
>
> _____________________________________________________________
>
> 00.00.00 0x14c3 0x3258 Bridge device 0x04
>
> BPI-R64> pci 1
>
> Scanning PCI devices on bus 1
>
> BusDevFun VendorId DeviceId Device Class Sub-Class
>
> _____________________________________________________________
>
> 01.00.00 0x14c3 0x7612 Network controller 0x80
>
> BPI-R64>
>
>
>
> note that there are pcie-HW-issues on my boards revision(power
> limitation and missing capacitors on tx-lines) which may cause the
> different Pcie-Ids for mt7612 and the class of the compex-card. sorry
> had not seen this before on tests with Steven
>
>
>
> maybe anyone can test the Patches with a fixed board.
>
>
>
> regards Frank
>
Hi Frank,
We've verified the patchset on a fixed board.
The result shows that no matter how I swap the cards, it all works
fine :)
Here are the logs:
=========================================
MT7622> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
MT7622> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
00.01.00 0x14c3 0x3258 Bridge device 0x04
MT7622> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x14c3 0x7603 Network controller 0x80
MT7622> pci 2
Scanning PCI devices on bus 2
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
02.00.00 0x14c3 0x7662 Network controller 0x80
---------------------------------------
MT7622> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
MT7622> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
00.01.00 0x14c3 0x3258 Bridge device 0x04
MT7622> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x14c3 0x7662 Network controller 0x80
MT7622> pci 2
Scanning PCI devices on bus 2
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
02.00.00 0x14c3 0x7603 Network controller 0x80
=========================================
Thanks !
Sincerely,
Henry
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Aw: Re: [PATCH 0/5] Add PCIe and its clock support for mt7622
2020-08-13 12:53 ` Henry Yen
@ 2020-08-13 14:26 ` Frank Wunderlich
0 siblings, 0 replies; 14+ messages in thread
From: Frank Wunderlich @ 2020-08-13 14:26 UTC (permalink / raw)
To: u-boot
Hi Henry,
thanks for checking it...as i said i guess my behaviour is caused by known HW-issue with my R64 v1.1.
Fullsize card (gen2?) not recognized in CN8.
> Gesendet: Donnerstag, 13. August 2020 um 14:53 Uhr
> Von: "Henry Yen" <henry.yen@mediatek.com>
> We've verified the patchset on a fixed board.
>
> The result shows that no matter how I swap the cards, it all works
> fine :)
>
> Here are the logs:
>
> =========================================
> MT7622> pci enum
> PCI: Failed autoconfig bar 10
> PCI: Failed autoconfig bar 10
> MT7622> pci 0
> Scanning PCI devices on bus 0
> BusDevFun VendorId DeviceId Device Class Sub-Class
> _____________________________________________________________
> 00.00.00 0x14c3 0x3258 Bridge device 0x04
> 00.01.00 0x14c3 0x3258 Bridge device 0x04
> MT7622> pci 1
> Scanning PCI devices on bus 1
> BusDevFun VendorId DeviceId Device Class Sub-Class
> _____________________________________________________________
> 01.00.00 0x14c3 0x7603 Network controller 0x80
> MT7622> pci 2
> Scanning PCI devices on bus 2
> BusDevFun VendorId DeviceId Device Class Sub-Class
> _____________________________________________________________
> 02.00.00 0x14c3 0x7662 Network controller 0x80
>
> ---------------------------------------
>
> MT7622> pci enum
> PCI: Failed autoconfig bar 10
> PCI: Failed autoconfig bar 10
> MT7622> pci 0
> Scanning PCI devices on bus 0
> BusDevFun VendorId DeviceId Device Class Sub-Class
> _____________________________________________________________
> 00.00.00 0x14c3 0x3258 Bridge device 0x04
> 00.01.00 0x14c3 0x3258 Bridge device 0x04
> MT7622> pci 1
> Scanning PCI devices on bus 1
> BusDevFun VendorId DeviceId Device Class Sub-Class
> _____________________________________________________________
> 01.00.00 0x14c3 0x7662 Network controller 0x80
> MT7622> pci 2
> Scanning PCI devices on bus 2
> BusDevFun VendorId DeviceId Device Class Sub-Class
> _____________________________________________________________
> 02.00.00 0x14c3 0x7603 Network controller 0x80
>
> =========================================
in your logs i see you query also pci 2 (i had only tested 0+1), so i did it again
compex (fullsize) in front slot (cn25) and mt7612 (halfsize) in rear slot (cn8):
BPI-R64> pci enum
PCI: Failed autoconfig bar 10
PCI: Failed autoconfig bar 10
BPI-R64> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
00.01.00 0x14c3 0x3258 Bridge device 0x04
BPI-R64> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x168c 0x003c Network controller 0x80
BPI-R64> pci 2
Scanning PCI devices on bus 2
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
02.00.00 0x14c3 0x7612 Network controller 0x80
BPI-R64>
and swapped:
BPI-R64> pci enum
Port1 link down
PCI: Failed autoconfig bar 10
BPI-R64> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
BPI-R64> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x14c3 0x7612 Network controller 0x80
BPI-R64> pci 2
No such bus
BPI-R64>
afair compex-card was only recognized in front-slot, so same behaviour in uboot...
so first state in linux (5.8 with disabled sata):
root at bpi-r64:~# lspci
0000:00:00.0 PCI bridge: MEDIATEK Corp. Device 3258
0000:01:00.0 Network controller: Qualcomm Atheros QCA986x/988x 802.11ac Wirelesr
0001:00:01.0 PCI bridge: MEDIATEK Corp. Device 3258
0001:01:00.0 Network controller: MEDIATEK Corp. Device 7612
poweroff and swap cards
root at bpi-r64:~# lspci
00:00.0 PCI bridge: MEDIATEK Corp. Device 3258
01:00.0 Network controller: MEDIATEK Corp. Device 7612
root at bpi-r64:~#
i guess this is caused by known HW-Issues on R64 <=1.1 (power-limit / missing capacitors)
and no driver-problem in uboot...
i have a additional half-size-card (intel wifi) but no extender to mount it so i replaced compex and
pressed it down in cn8 with a remote control ;)
BPI-R64> pci 0
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x14c3 0x3258 Bridge device 0x04
00.01.00 0x14c3 0x3258 Bridge device 0x04
BPI-R64> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x14c3 0x7612 Network controller 0x80
BPI-R64> pci 2
Scanning PCI devices on bus 2
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
02.00.00 0x8086 0x4238 Network controller 0x80
BPI-R64>
and it is recognized :) in linux it looks like this:
root at bpi-r64:~# lspci
0000:00:00.0 PCI bridge: MEDIATEK Corp. Device 3258
0000:01:00.0 Network controller: MEDIATEK Corp. Device 7612
0001:00:01.0 PCI bridge: MEDIATEK Corp. Device 3258
0001:01:00.0 Network controller: Intel Corporation Centrino Ultimate-N 6300 (re)
root at bpi-r64:~#
i hope it get merged as soon as possible because it is the base for my Patches ;)
Tested-By: Frank Wunderlich <frank-w@public-files.de>
Regards Frank
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC
2020-08-10 8:17 ` [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC Chuanjia Liu
@ 2020-08-20 12:39 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2020-08-20 12:39 UTC (permalink / raw)
To: u-boot
On Mon, Aug 10, 2020 at 04:17:08PM +0800, Chuanjia Liu wrote:
> This patch adds pciesys support in clock driver for
> MediaTek MT7622 SoC.
>
> Signed-off-by: Henry Yen <henry.yen@mediatek.com>
> Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200820/890101d8/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/5] arm: dts: mediatek: add pciesys support for MT7622 SoC
2020-08-10 8:17 ` [PATCH 2/5] arm: dts: " Chuanjia Liu
@ 2020-08-20 12:39 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2020-08-20 12:39 UTC (permalink / raw)
To: u-boot
On Mon, Aug 10, 2020 at 04:17:09PM +0800, Chuanjia Liu wrote:
> This patch adds pciesys support in dts for MediaTek MT7622 SoC.
>
> Signed-off-by: Henry Yen <henry.yen@mediatek.com>
> Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200820/07e3f3b1/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/5] PCI: mediatek: Add PCIe support for MT7622
2020-08-10 8:17 ` [PATCH 3/5] PCI: mediatek: Add PCIe support for MT7622 Chuanjia Liu
@ 2020-08-20 12:40 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2020-08-20 12:40 UTC (permalink / raw)
To: u-boot
On Mon, Aug 10, 2020 at 04:17:10PM +0800, Chuanjia Liu wrote:
> This patch adds PCIe support for the Mediatek MT7622 SOC.
>
> Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
> Signed-off-by: Henry Yen <henry.yen@mediatek.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200820/d2b8f2b0/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/5] arm: dts: mediatek: add PCIe node for MT7622
2020-08-10 8:17 ` [PATCH 4/5] arm: dts: mediatek: add PCIe node " Chuanjia Liu
@ 2020-08-20 12:40 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2020-08-20 12:40 UTC (permalink / raw)
To: u-boot
On Mon, Aug 10, 2020 at 04:17:11PM +0800, Chuanjia Liu wrote:
> This patch adds PCIe node in dts for Mediatek MT7622 Soc.
>
> Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
> Signed-off-by: Henry Yen <henry.yen@mediatek.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200820/7949999f/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 5/5] configs: mt7622: add PCIe controller related configs
2020-08-10 8:17 ` [PATCH 5/5] configs: mt7622: add PCIe controller related configs Chuanjia Liu
@ 2020-08-20 12:40 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2020-08-20 12:40 UTC (permalink / raw)
To: u-boot
On Mon, Aug 10, 2020 at 04:17:12PM +0800, Chuanjia Liu wrote:
> Add PCIe command and related configs
>
> Signed-off-by: Chuanjia Liu <Chuanjia.Liu@mediatek.com>
> Signed-off-by: Henry Yen <henry.yen@mediatek.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200820/d1e5edb3/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-08-20 12:40 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-10 8:17 [PATCH 0/5] Add PCIe and its clock support for mt7622 Chuanjia Liu
2020-08-10 8:17 ` [PATCH 1/5] clk: mediatek: add pciesys support for MT7622 SoC Chuanjia Liu
2020-08-20 12:39 ` Tom Rini
2020-08-10 8:17 ` [PATCH 2/5] arm: dts: " Chuanjia Liu
2020-08-20 12:39 ` Tom Rini
2020-08-10 8:17 ` [PATCH 3/5] PCI: mediatek: Add PCIe support for MT7622 Chuanjia Liu
2020-08-20 12:40 ` Tom Rini
2020-08-10 8:17 ` [PATCH 4/5] arm: dts: mediatek: add PCIe node " Chuanjia Liu
2020-08-20 12:40 ` Tom Rini
2020-08-10 8:17 ` [PATCH 5/5] configs: mt7622: add PCIe controller related configs Chuanjia Liu
2020-08-20 12:40 ` Tom Rini
2020-08-10 10:27 ` Aw: [PATCH 0/5] Add PCIe and its clock support for mt7622 Frank Wunderlich
[not found] ` <2a41f2d5308e46f1baf80e5525c507ae@mtkmbs05n2.mediatek.inc>
2020-08-13 12:53 ` Henry Yen
2020-08-13 14:26 ` Aw: " Frank Wunderlich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.