[PATCH v1] [PATCH 04/05] wifi: mt76: add PCIe speed tuning for mt7922/mt7928
Anthony Liu <[email protected]>
| Newsgroups | org.infradead.lists.linux-mediatek,org.kernel.vger.linux-wireless |
|---|---|
| Message-ID | <[email protected]> |
Some hardware platforms use ACPI MTFG table denoting the existence of noise that impacts Wi-Fi performance. This patch reads the ACPI SAR info and notifies F/W to detect current status and to adjust PCIe bus to mitigate the noise. Change-Id: Ieb0e09c11970461b74472c5007b1b897c2a6e749 CR-Id: WCNCR00542202 Signed-off-by: Anthony Liu <[email protected]> Reviewed-on: https://gerrit.mediatek.inc/c/neptune/oss/nbd168_wireless/+/12378113 Commit-Check: srv_check_service <[email protected]> Code-Review-Course-Train: srv_check_service <[email protected]> AutoUT-Review-Label: srv_neptune_adm <[email protected]> GAI-Code-Review: srv_ai_review001 <[email protected]> Reviewed-by: jb.tsai <[email protected]> --- .../net/wireless/mediatek/mt76/mt7921/init.c | 5 ++++ .../wireless/mediatek/mt76/mt7921/pci_mac.c | 6 ++++ .../net/wireless/mediatek/mt76/mt7925/init.c | 2 ++ .../wireless/mediatek/mt76/mt7925/pci_mac.c | 6 ++++ drivers/net/wireless/mediatek/mt76/mt792x.h | 4 +++ .../net/wireless/mediatek/mt76/mt792x_core.c | 28 +++++++++++++++++++ 6 files changed, 51 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c index 49be2fa4e3fa..fbd77ec48a52 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c @@ -102,6 +102,11 @@ static int __mt7921_init_hardware(struct mt792x_dev *dev) goto out; ret = mt7921_mac_init(dev); + if (ret) + goto out; + + if (is_mt7922(&dev->mt76)) + ret = mt792x_mcu_set_dyn_pcie_gen(dev); out: return ret; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c index 98b3469ac597..2449ac8ed6a4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c @@ -116,6 +116,12 @@ int mt7921e_mac_reset(struct mt792x_dev *dev) if (err) goto out; + if (is_mt7922(&dev->mt76)) { + err = mt792x_mcu_set_dyn_pcie_gen(dev); + if (err) + goto out; + } + err = __mt7921_start(&dev->phy); out: diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/init.c b/drivers/net/wireless/mediatek/mt76/mt7925/init.c index cd22fcc021b1..e499b64971b4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/init.c @@ -126,6 +126,8 @@ static int __mt7925_init_hardware(struct mt792x_dev *dev) } } + if (is_mt7928(&dev->mt76)) + ret = mt792x_mcu_set_dyn_pcie_gen(dev); out: return ret; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c index 8477d21abc66..9e4e78910560 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c @@ -149,6 +149,12 @@ int mt7925e_mac_reset(struct mt792x_dev *dev) goto out; } + if (is_mt7928(&dev->mt76)) { + err = mt792x_mcu_set_dyn_pcie_gen(dev); + if (err) + goto out; + } + err = __mt7925_start(&dev->phy); out: clear_bit(MT76_RESET, &dev->mphy.state); diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h index e7f3d36d5338..c1fa3dbba5ca 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x.h +++ b/drivers/net/wireless/mediatek/mt76/mt792x.h @@ -532,6 +532,7 @@ void mt792x_mac_link_bss_remove(struct mt792x_dev *dev, struct mt792x_link_sta *mlink); void mt792x_config_mac_addr_list(struct mt792x_dev *dev); int mt792x_mcu_chip_config(struct mt792x_dev *dev, const char *cmd); +int mt792x_mcu_set_dyn_pcie_gen(struct mt792x_dev *dev); static inline char *mt792x_ram_name(struct mt792x_dev *dev) { @@ -630,6 +631,9 @@ int __mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev); int mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev); int mt792xe_mcu_fw_pmctrl(struct mt792x_dev *dev); +#define MT792X_ACPI_FLAG_VALID BIT(0) /* ACPI SAR is valid */ +#define MT792X_ACPI_FLAG_PCIe BIT(3) /* Valid only when valid is set */ + #ifdef CONFIG_ACPI int mt792x_init_acpi_sar(struct mt792x_dev *dev); int mt792x_init_acpi_sar_power(struct mt792x_phy *phy, bool set_default); diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c index d676517df902..e77224e2ca50 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c +++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c @@ -1180,6 +1180,34 @@ int mt792x_mcu_chip_config(struct mt792x_dev *dev, const char *cmd) } EXPORT_SYMBOL_GPL(mt792x_mcu_chip_config); +int mt792x_mcu_set_dyn_pcie_gen(struct mt792x_dev *dev) +{ + u8 acpi_conf = mt792x_acpi_get_flags(&dev->phy); + char cmd[64]; + int ret = 0; + + if (!(acpi_conf & MT792X_ACPI_FLAG_VALID) || + !(acpi_conf & MT792X_ACPI_FLAG_PCIe)) + return 0; + + strscpy(cmd, "PcieGenSwitch 1 1200 0 -60"); + ret = mt792x_mcu_chip_config(dev, cmd); + if (ret) + return ret; + + strscpy(cmd, "PcieGenSwitchAGGen2 0"); + ret = mt792x_mcu_chip_config(dev, cmd); + if (ret) + return ret; + + if (!dev->mphy.cap.has_6ghz) + return 0; + + strscpy(cmd, "PcieGenSwitch6G 1"); + return mt792x_mcu_chip_config(dev, cmd); +} +EXPORT_SYMBOL_GPL(mt792x_mcu_set_dyn_pcie_gen); + MODULE_DESCRIPTION("MediaTek MT792x core driver"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Lorenzo Bianconi <[email protected]>"); -- 2.45.2