在 2020/7/11 9:35, Jiaxun Yang 写道:
在 2020/7/10 16:51, Zhi Li 写道:
Add gmac platform data to support LS7A bridge chip.
Co-developed-by: Hongbin Li <lihong...@loongson.cn>
Signed-off-by: Hongbin Li <lihong...@loongson.cn>
Signed-off-by: Zhi Li <lizh...@loongson.cn>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 22
++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 272cb47..dab2a40 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -138,6 +138,24 @@ static const struct stmmac_pci_info
snps_gmac5_pci_info = {
.setup = snps_gmac5_default_data,
};
+static int loongson_default_data(struct pci_dev *pdev, struct
plat_stmmacenent_data *plat)
+{
+ common_default_data(plat);
+
+ plat->bus_id = pci_dev_id(pdev);
+ plat->phy_addr = 0;
+ plat->interface = PHY_INTERFACE_MODE_GMII;
+
+ plat->dma_cfg->pbl = 32;
+ plat->dma_cfg->pblx8 = true;
+
+ return 0;
+}
+
+static struct stmmac_pci_info loongson_pci_info = {
+ .setup = loongson_default_data;
+};
+
/**
* stmmac_pci_probe
*
@@ -204,6 +222,8 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
res.addr = pcim_iomap_table(pdev)[i];
res.wol_irq = pdev->irq;
res.irq = pdev->irq;
+ if (pdev->vendor == PCI_VENDOR_ID_LOONGSON)
+ res.lpi_irq = pdev->irq + 1;
This can never work.
We're allocating IRQs by irq_domain, not ID.
Please describe IRQ in DeviceTree, and *DO NOT* sne dout untested patch.
Oops, ^ send out
FYI: Here is my solution of GMAC[1] [2], I was too busy to upstream it.
We're using totally different structure than Loongson's out of tree Kernel,
especially in IRQ management.
Please don't simply copy 'n paste code from your company's internal kernel.
Please try to understand how upstream kernel is working and test your
patches
with upstrem kernel.
[1]:
https://github.com/FlyGoat/linux/commit/9d6584c186a8007f14dc8bb2524e48a2fd7d689a
[2]:
https://github.com/FlyGoat/linux/commit/558a256acfeb022e132113e7952a9df3df375302
Thanks.
return stmmac_dvr_probe(&pdev->dev, plat, &res);
}
@@ -273,11 +293,13 @@ static SIMPLE_DEV_PM_OPS(stmmac_pm_ops,
stmmac_pci_suspend, stmmac_pci_resume);
#define PCI_DEVICE_ID_STMMAC_STMMAC 0x1108
#define PCI_DEVICE_ID_SYNOPSYS_GMAC5_ID 0x7102
+#define PCI_DEVICE_ID_LOONGSON_GMAC 0x7a03
static const struct pci_device_id stmmac_id_table[] = {
{ PCI_DEVICE_DATA(STMMAC, STMMAC, &stmmac_pci_info) },
{ PCI_DEVICE_DATA(STMICRO, MAC, &stmmac_pci_info) },
{ PCI_DEVICE_DATA(SYNOPSYS, GMAC5_ID, &snps_gmac5_pci_info) },
+ { PCI_DEVICE_DATA(LOONGSON, GMAC, &loongson_pci_info) },
{}
};
- Jiaxun
