8590531048
Manually rebased: bcm4908/patches-5.15/071-v6.1-0001-net-broadcom-bcm4908_enet-handle-EPROBE_DEFER-when-g.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch[*] Removed upstreamed: backport-5.15/735-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch[1] backport-5.15/817-v6.5-01-leds-trigger-netdev-Recheck-NETDEV_LED_MODE_LINKUP-o.patch[2] pending-5.15/143-jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsys.patch[3] pending-5.15/160-workqueue-fix-enum-type-for-gcc-13.patch[4] bcm53xx/patches-5.15/036-v6.5-0003-ARM-dts-BCM5301X-Drop-clock-names-from-the-SPI-node.patch[5] bcm53xx/patches-5.15/036-v6.5-0015-ARM-dts-BCM5301X-fix-duplex-full-full-duplex.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=02474292a44205c1eb5a03634ead155a3c9134f4 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=86b93cbfe104e99fd3d25a49748b99fb88101573 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=79b9ab357b6f5675007f4c02ff8765cbd8dc06a2 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=d528faa9e828b9fc46dfb684a2a9fd8c2e860ed8 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=5899bc4058e89d5110a23797ff94439c53b77c25 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=95afd2c7c7d26087730dc938709e025a303e5499 Build system: x86/64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John Audia <therealgraysky@proton.me> [rebased ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
139 lines
4 KiB
Diff
139 lines
4 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 20 May 2022 20:11:39 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: introduce support for mt7986
|
|
chipset
|
|
|
|
Add support for mt7986-eth driver available on mt7986 soc.
|
|
|
|
Tested-by: Sam Shih <sam.shih@mediatek.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -87,6 +87,43 @@ static const struct mtk_reg_map mt7628_r
|
|
},
|
|
};
|
|
|
|
+static const struct mtk_reg_map mt7986_reg_map = {
|
|
+ .tx_irq_mask = 0x461c,
|
|
+ .tx_irq_status = 0x4618,
|
|
+ .pdma = {
|
|
+ .rx_ptr = 0x6100,
|
|
+ .rx_cnt_cfg = 0x6104,
|
|
+ .pcrx_ptr = 0x6108,
|
|
+ .glo_cfg = 0x6204,
|
|
+ .rst_idx = 0x6208,
|
|
+ .delay_irq = 0x620c,
|
|
+ .irq_status = 0x6220,
|
|
+ .irq_mask = 0x6228,
|
|
+ .int_grp = 0x6250,
|
|
+ },
|
|
+ .qdma = {
|
|
+ .qtx_cfg = 0x4400,
|
|
+ .rx_ptr = 0x4500,
|
|
+ .rx_cnt_cfg = 0x4504,
|
|
+ .qcrx_ptr = 0x4508,
|
|
+ .glo_cfg = 0x4604,
|
|
+ .rst_idx = 0x4608,
|
|
+ .delay_irq = 0x460c,
|
|
+ .fc_th = 0x4610,
|
|
+ .int_grp = 0x4620,
|
|
+ .hred = 0x4644,
|
|
+ .ctx_ptr = 0x4700,
|
|
+ .dtx_ptr = 0x4704,
|
|
+ .crx_ptr = 0x4710,
|
|
+ .drx_ptr = 0x4714,
|
|
+ .fq_head = 0x4720,
|
|
+ .fq_tail = 0x4724,
|
|
+ .fq_count = 0x4728,
|
|
+ .fq_blen = 0x472c,
|
|
+ },
|
|
+ .gdm1_cnt = 0x1c00,
|
|
+};
|
|
+
|
|
/* strings used by ethtool */
|
|
static const struct mtk_ethtool_stats {
|
|
char str[ETH_GSTRING_LEN];
|
|
@@ -110,7 +147,7 @@ static const char * const mtk_clks_sourc
|
|
"ethif", "sgmiitop", "esw", "gp0", "gp1", "gp2", "fe", "trgpll",
|
|
"sgmii_tx250m", "sgmii_rx250m", "sgmii_cdr_ref", "sgmii_cdr_fb",
|
|
"sgmii2_tx250m", "sgmii2_rx250m", "sgmii2_cdr_ref", "sgmii2_cdr_fb",
|
|
- "sgmii_ck", "eth2pll",
|
|
+ "sgmii_ck", "eth2pll", "wocpu0", "wocpu1", "netsys0", "netsys1"
|
|
};
|
|
|
|
void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg)
|
|
@@ -3705,6 +3742,21 @@ static const struct mtk_soc_data mt7629_
|
|
},
|
|
};
|
|
|
|
+static const struct mtk_soc_data mt7986_data = {
|
|
+ .reg_map = &mt7986_reg_map,
|
|
+ .ana_rgc3 = 0x128,
|
|
+ .caps = MT7986_CAPS,
|
|
+ .required_clks = MT7986_CLKS_BITMAP,
|
|
+ .required_pctl = false,
|
|
+ .txrx = {
|
|
+ .txd_size = sizeof(struct mtk_tx_dma_v2),
|
|
+ .rxd_size = sizeof(struct mtk_rx_dma_v2),
|
|
+ .rx_irq_done_mask = MTK_RX_DONE_INT_V2,
|
|
+ .dma_max_len = MTK_TX_DMA_BUF_LEN_V2,
|
|
+ .dma_len_offset = 8,
|
|
+ },
|
|
+};
|
|
+
|
|
static const struct mtk_soc_data rt5350_data = {
|
|
.reg_map = &mt7628_reg_map,
|
|
.caps = MT7628_CAPS,
|
|
@@ -3727,6 +3779,7 @@ const struct of_device_id of_mtk_match[]
|
|
{ .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
|
|
{ .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
|
|
{ .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},
|
|
+ { .compatible = "mediatek,mt7986-eth", .data = &mt7986_data},
|
|
{ .compatible = "ralink,rt5350-eth", .data = &rt5350_data},
|
|
{},
|
|
};
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -624,6 +624,10 @@ enum mtk_clks_map {
|
|
MTK_CLK_SGMII2_CDR_FB,
|
|
MTK_CLK_SGMII_CK,
|
|
MTK_CLK_ETH2PLL,
|
|
+ MTK_CLK_WOCPU0,
|
|
+ MTK_CLK_WOCPU1,
|
|
+ MTK_CLK_NETSYS0,
|
|
+ MTK_CLK_NETSYS1,
|
|
MTK_CLK_MAX
|
|
};
|
|
|
|
@@ -654,6 +658,16 @@ enum mtk_clks_map {
|
|
BIT(MTK_CLK_SGMII2_CDR_FB) | \
|
|
BIT(MTK_CLK_SGMII_CK) | \
|
|
BIT(MTK_CLK_ETH2PLL) | BIT(MTK_CLK_SGMIITOP))
|
|
+#define MT7986_CLKS_BITMAP (BIT(MTK_CLK_FE) | BIT(MTK_CLK_GP2) | BIT(MTK_CLK_GP1) | \
|
|
+ BIT(MTK_CLK_WOCPU1) | BIT(MTK_CLK_WOCPU0) | \
|
|
+ BIT(MTK_CLK_SGMII_TX_250M) | \
|
|
+ BIT(MTK_CLK_SGMII_RX_250M) | \
|
|
+ BIT(MTK_CLK_SGMII_CDR_REF) | \
|
|
+ BIT(MTK_CLK_SGMII_CDR_FB) | \
|
|
+ BIT(MTK_CLK_SGMII2_TX_250M) | \
|
|
+ BIT(MTK_CLK_SGMII2_RX_250M) | \
|
|
+ BIT(MTK_CLK_SGMII2_CDR_REF) | \
|
|
+ BIT(MTK_CLK_SGMII2_CDR_FB))
|
|
|
|
enum mtk_dev_state {
|
|
MTK_HW_INIT,
|
|
@@ -852,6 +866,10 @@ enum mkt_eth_capabilities {
|
|
MTK_MUX_U3_GMAC2_TO_QPHY | \
|
|
MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA)
|
|
|
|
+#define MT7986_CAPS (MTK_GMAC1_SGMII | MTK_GMAC2_SGMII | \
|
|
+ MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA | \
|
|
+ MTK_NETSYS_V2 | MTK_RSTCTRL_PPE1)
|
|
+
|
|
struct mtk_tx_dma_desc_info {
|
|
dma_addr_t addr;
|
|
u32 size;
|