domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dbc93d280c9d05733e7b45a76ec1a05b77c376a5
openwrt_NSS_ACW/target/linux/mediatek/patches-5.15/802-phy-phy-mtk-tphy-add-auto-load-valid-check-mechanism.patch
John Audia a34255b795 kernel: bump 5.15 to 5.15.75 
Removed upstreamed:
   bcm27xx/patches-5.15/950-0446-drm-vc4-Fix-timings-for-VEC-modes.patch[1]

Manually rebased:
   patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
   bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
   bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
   bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch

All other patches automatically rebased

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.75&id=2810061452f9b748b096ad023d318690ca519aa3

Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200

Signed-off-by: John Audia <therealgraysky@proton.me>
2022-10-30 17:54:59 +01:00

150 lines
4.8 KiB
Diff
Raw Blame History

From 1d5819e90f2ef6dead11809744372a9863227a92 Mon Sep 17 00:00:00 2001
From: Zhanyong Wang <zhanyong.wang@mediatek.com>
Date: Tue, 25 Jan 2022 19:03:34 +0800
Subject: [PATCH 5/5] phy: phy-mtk-tphy: add auto-load-valid check mechanism
support
add auto-load-valid check mechanism support
Signed-off-by: Zhanyong Wang <zhanyong.wang@mediatek.com>
---
drivers/phy/mediatek/phy-mtk-tphy.c | 67 +++++++++++++++++++++++++++--
1 file changed, 64 insertions(+), 3 deletions(-)
--- a/drivers/phy/mediatek/phy-mtk-tphy.c
+++ b/drivers/phy/mediatek/phy-mtk-tphy.c
@@ -376,9 +376,13 @@ struct mtk_phy_instance {
u32 type_sw_reg;
u32 type_sw_index;
u32 efuse_sw_en;
+ bool efuse_alv_en;
+ u32 efuse_autoloadvalid;
u32 efuse_intr;
u32 efuse_tx_imp;
u32 efuse_rx_imp;
+ bool efuse_alv_ln1_en;
+ u32 efuse_ln1_autoloadvalid;
u32 efuse_intr_ln1;
u32 efuse_tx_imp_ln1;
u32 efuse_rx_imp_ln1;
@@ -1126,6 +1130,7 @@ static int phy_efuse_get(struct mtk_tphy
{
struct device *dev = &instance->phy->dev;
int ret = 0;
+ bool alv = false;
/* tphy v1 doesn't support sw efuse, skip it */
if (!tphy->pdata->sw_efuse_supported) {
@@ -1140,6 +1145,20 @@ static int phy_efuse_get(struct mtk_tphy
switch (instance->type) {
case PHY_TYPE_USB2:
+ alv = of_property_read_bool(dev->of_node, "auto_load_valid");
+ if (alv) {
+ instance->efuse_alv_en = alv;
+ ret = nvmem_cell_read_variable_le_u32(dev, "auto_load_valid",
+ &instance->efuse_autoloadvalid);
+ if (ret) {
+ dev_err(dev, "fail to get u2 alv efuse, %d\n", ret);
+ break;
+ }
+ dev_info(dev,
+ "u2 auto load valid efuse: ENABLE with value: %u\n",
+ instance->efuse_autoloadvalid);
+ }
+
ret = nvmem_cell_read_variable_le_u32(dev, "intr", &instance->efuse_intr);
if (ret) {
dev_err(dev, "fail to get u2 intr efuse, %d\n", ret);
@@ -1158,6 +1177,20 @@ static int phy_efuse_get(struct mtk_tphy
case PHY_TYPE_USB3:
case PHY_TYPE_PCIE:
+ alv = of_property_read_bool(dev->of_node, "auto_load_valid");
+ if (alv) {
+ instance->efuse_alv_en = alv;
+ ret = nvmem_cell_read_variable_le_u32(dev, "auto_load_valid",
+ &instance->efuse_autoloadvalid);
+ if (ret) {
+ dev_err(dev, "fail to get u3(pcei) alv efuse, %d\n", ret);
+ break;
+ }
+ dev_info(dev,
+ "u3 auto load valid efuse: ENABLE with value: %u\n",
+ instance->efuse_autoloadvalid);
+ }
+
ret = nvmem_cell_read_variable_le_u32(dev, "intr", &instance->efuse_intr);
if (ret) {
dev_err(dev, "fail to get u3 intr efuse, %d\n", ret);
@@ -1191,6 +1224,20 @@ static int phy_efuse_get(struct mtk_tphy
if (tphy->pdata->version != MTK_PHY_V4)
break;
+ alv = of_property_read_bool(dev->of_node, "auto_load_valid_ln1");
+ if (alv) {
+ instance->efuse_alv_ln1_en = alv;
+ ret = nvmem_cell_read_variable_le_u32(dev, "auto_load_valid_ln1",
+ &instance->efuse_ln1_autoloadvalid);
+ if (ret) {
+ dev_err(dev, "fail to get pcie auto_load_valid efuse, %d\n", ret);
+ break;
+ }
+ dev_info(dev,
+ "pcie auto load valid efuse: ENABLE with value: %u\n",
+ instance->efuse_ln1_autoloadvalid);
+ }
+
ret = nvmem_cell_read_variable_le_u32(dev, "intr_ln1", &instance->efuse_intr_ln1);
if (ret) {
dev_err(dev, "fail to get u3 lane1 intr efuse, %d\n", ret);
@@ -1242,6 +1289,10 @@ static void phy_efuse_set(struct mtk_phy
switch (instance->type) {
case PHY_TYPE_USB2:
+ if (instance->efuse_alv_en &&
+ instance->efuse_autoloadvalid == 1)
+ break;
+
tmp = readl(u2_banks->misc + U3P_MISC_REG1);
tmp |= MR1_EFUSE_AUTO_LOAD_DIS;
writel(tmp, u2_banks->misc + U3P_MISC_REG1);
@@ -1252,6 +1303,10 @@ static void phy_efuse_set(struct mtk_phy
writel(tmp, u2_banks->com + U3P_USBPHYACR1);
break;
case PHY_TYPE_USB3:
+ if (instance->efuse_alv_en &&
+ instance->efuse_autoloadvalid == 1)
+ break;
+
tmp = readl(u3_banks->phyd + U3P_U3_PHYD_RSV);
tmp |= P3D_RG_EFUSE_AUTO_LOAD_DIS;
writel(tmp, u3_banks->phyd + U3P_U3_PHYD_RSV);
@@ -1278,6 +1333,10 @@ static void phy_efuse_set(struct mtk_phy
break;
case PHY_TYPE_PCIE:
+ if (instance->efuse_alv_en &&
+ instance->efuse_autoloadvalid == 1)
+ break;
+
tmp = readl(u3_banks->phyd + U3P_U3_PHYD_RSV);
tmp |= P3D_RG_EFUSE_AUTO_LOAD_DIS;
writel(tmp, u3_banks->phyd + U3P_U3_PHYD_RSV);
@@ -1298,9 +1357,12 @@ static void phy_efuse_set(struct mtk_phy
tmp &= ~P3A_RG_IEXT_INTR;
tmp |= P3A_RG_IEXT_INTR_VAL(instance->efuse_intr);
writel(tmp, u3_banks->phya + U3P_U3_PHYA_REG0);
- if (!instance->efuse_intr_ln1 &&
- !instance->efuse_rx_imp_ln1 &&
- !instance->efuse_tx_imp_ln1)
+
+ if ((!instance->efuse_intr_ln1 &&
+ !instance->efuse_rx_imp_ln1 &&
+ !instance->efuse_tx_imp_ln1) ||
+ (instance->efuse_alv_ln1_en &&
+ instance->efuse_ln1_autoloadvalid == 1))
break;
tmp = readl(u3_banks->phyd + SSUSB_LN1_OFFSET + U3P_U3_PHYD_RSV);
Reference in New Issue View Git Blame Copy Permalink