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>
108 lines
3 KiB
Diff
108 lines
3 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 14 Jan 2023 18:01:29 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: introduce mtk_hw_warm_reset
|
|
support
|
|
|
|
Introduce mtk_hw_warm_reset utility routine. This is a preliminary patch
|
|
to align reset procedure to vendor sdk and avoid to power down the chip
|
|
during hw reset.
|
|
|
|
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
|
|
Tested-by: Daniel Golle <daniel@makrotopia.org>
|
|
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -3221,7 +3221,54 @@ static void mtk_hw_reset(struct mtk_eth
|
|
0x3ffffff);
|
|
}
|
|
|
|
-static int mtk_hw_init(struct mtk_eth *eth)
|
|
+static u32 mtk_hw_reset_read(struct mtk_eth *eth)
|
|
+{
|
|
+ u32 val;
|
|
+
|
|
+ regmap_read(eth->ethsys, ETHSYS_RSTCTRL, &val);
|
|
+ return val;
|
|
+}
|
|
+
|
|
+static void mtk_hw_warm_reset(struct mtk_eth *eth)
|
|
+{
|
|
+ u32 rst_mask, val;
|
|
+
|
|
+ regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, RSTCTRL_FE,
|
|
+ RSTCTRL_FE);
|
|
+ if (readx_poll_timeout_atomic(mtk_hw_reset_read, eth, val,
|
|
+ val & RSTCTRL_FE, 1, 1000)) {
|
|
+ dev_err(eth->dev, "warm reset failed\n");
|
|
+ mtk_hw_reset(eth);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
|
|
+ rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0_V2;
|
|
+ else
|
|
+ rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0;
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))
|
|
+ rst_mask |= RSTCTRL_PPE1;
|
|
+
|
|
+ regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, rst_mask);
|
|
+
|
|
+ udelay(1);
|
|
+ val = mtk_hw_reset_read(eth);
|
|
+ if (!(val & rst_mask))
|
|
+ dev_err(eth->dev, "warm reset stage0 failed %08x (%08x)\n",
|
|
+ val, rst_mask);
|
|
+
|
|
+ rst_mask |= RSTCTRL_FE;
|
|
+ regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, ~rst_mask);
|
|
+
|
|
+ udelay(1);
|
|
+ val = mtk_hw_reset_read(eth);
|
|
+ if (val & rst_mask)
|
|
+ dev_err(eth->dev, "warm reset stage1 failed %08x (%08x)\n",
|
|
+ val, rst_mask);
|
|
+}
|
|
+
|
|
+static int mtk_hw_init(struct mtk_eth *eth, bool reset)
|
|
{
|
|
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
|
|
ETHSYS_DMA_AG_MAP_PPE;
|
|
@@ -3260,7 +3307,12 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
return 0;
|
|
}
|
|
|
|
- mtk_hw_reset(eth);
|
|
+ msleep(100);
|
|
+
|
|
+ if (reset)
|
|
+ mtk_hw_warm_reset(eth);
|
|
+ else
|
|
+ mtk_hw_reset(eth);
|
|
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
/* Set FE to PDMAv2 if necessary */
|
|
@@ -3448,7 +3500,7 @@ static void mtk_pending_work(struct work
|
|
if (eth->dev->pins)
|
|
pinctrl_select_state(eth->dev->pins->p,
|
|
eth->dev->pins->default_state);
|
|
- mtk_hw_init(eth);
|
|
+ mtk_hw_init(eth, true);
|
|
|
|
/* restart DMA and enable IRQs */
|
|
for (i = 0; i < MTK_MAC_COUNT; i++) {
|
|
@@ -4050,7 +4102,7 @@ static int mtk_probe(struct platform_dev
|
|
eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE);
|
|
INIT_WORK(ð->pending_work, mtk_pending_work);
|
|
|
|
- err = mtk_hw_init(eth);
|
|
+ err = mtk_hw_init(eth, false);
|
|
if (err)
|
|
goto err_wed_exit;
|
|
|