@@ -72,11 +72,12 @@ static struct stmmac_pci_info loongson_gmac_pci_info = {
static int loongson_dwmac_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
- int ret, i, bus_id, phy_mode;
+ int ret, i, bus_id, phy_mode, ch_cnt, vecs;
struct plat_stmmacenet_data *plat;
struct stmmac_pci_info *info;
struct stmmac_resources res;
struct device_node *np;
+ u32 version;
np = dev_of_node(&pdev->dev);
if (np && !of_device_is_compatible(np, "loongson, pci-gmac")) {
@@ -173,12 +174,59 @@ static int loongson_dwmac_probe(struct pci_dev *pdev,
res.wol_irq = pdev->irq;
}
+ version = readl(res.addr + GMAC_VERSION);
+ switch (version & 0xff) {
+ case DWLGMAC_CORE_1_00:
+ ch_cnt = 8;
+ plat->multi_msi_en = 1;
+ break;
+
+ case DWMAC_CORE_3_50:
+ case DWMAC_CORE_3_70:
+ default:
+ plat->multi_msi_en = 0;
+ if (version & 0x00008000) {
+ plat->host_dma_width = 64;
+ plat->dma_cfg->dma64 = true;
+ }
+ break;
+ }
+
+ if (plat->multi_msi_en) {
+ plat->rx_queues_to_use = ch_cnt;
+ plat->tx_queues_to_use = ch_cnt;
+
+ pci_disable_msi(pdev);
+
+ res.irq = pci_irq_vector(pdev, 0);
+ res.wol_irq = res.irq;
+ vecs = roundup_pow_of_two(ch_cnt * 2 + 1);
+ if (pci_alloc_irq_vectors(pdev, vecs, vecs, PCI_IRQ_MSI) < 0) {
+ dev_info(&pdev->dev,
+ "MSI enable failed, Fallback to line interrupt\n");
+ plat->multi_msi_en = 0;
+ } else {
+ /*
+ * INT NAME | MAC | CH7 rx | CH7 tx | ... | CH0 rx | CH0 tx |
+ * --------- ----- -------- -------- ... -------- --------
+ * IRQ NUM | 0 | 1 | 2 | ... | 15 | 16 |
+ */
+ for (i = 0; i < ch_cnt; i++) {
+ res.rx_irq[ch_cnt - 1 - i] = pci_irq_vector(pdev, 1 + i * 2);
+ res.tx_irq[ch_cnt - 1 - i] = pci_irq_vector(pdev, 2 + i * 2);
+ }
+ }
+ }
+
ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
if (ret)
- goto err_disable_msi;
+ goto err_free_irq_vectors;
return ret;
+err_free_irq_vectors:
+ if (plat->multi_msi_en)
+ pci_free_irq_vectors(pdev);
err_disable_msi:
pci_disable_msi(pdev);
err_disable_device:
@@ -204,6 +252,7 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)
break;
}
+ pci_free_irq_vectors(pdev);
pci_disable_msi(pdev);
pci_disable_device(pdev);
}
Set 64-Bit DMA for specific versions. Request allocation for multi- vector interrupts for DWLGMAC_CORE_1_00. If it fails, fallback to request allocation for single interrupts. Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn> --- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 53 ++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-)