On 24.10.2019 00:23, Lorenzo Bianconi wrote:
> On same device (e.g. U7612E-H1) PCIE_ASPM causes continuous mcu hangs and
> instability and so let's disable PCIE_ASPM by default. This patch has
> been successfully tested on U7612E-H1 mini-pice card
>
> Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
> Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
> ---
> drivers/net/wireless/mediatek/mt76/mmio.c | 47 +++++++++++++++++++
> drivers/net/wireless/mediatek/mt76/mt76.h | 1 +
> .../net/wireless/mediatek/mt76/mt76x2/pci.c | 2 +
> 3 files changed, 50 insertions(+)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c
> index 1c974df1fe25..f991a8f1c42a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mmio.c
> +++ b/drivers/net/wireless/mediatek/mt76/mmio.c
> @@ -3,6 +3,8 @@
> * Copyright (C) 2016 Felix Fietkau <nbd@xxxxxxxx>
> */
>
> +#include <linux/pci.h>
> +
> #include "mt76.h"
> #include "trace.h"
>
> @@ -78,6 +80,51 @@ void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr,
> }
> EXPORT_SYMBOL_GPL(mt76_set_irq_mask);
>
> +void mt76_mmio_disable_aspm(struct pci_dev *pdev)
> +{
> + struct pci_dev *parent = pdev->bus->self;
> + u16 aspm_conf, parent_aspm_conf = 0;
> +
> + pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &aspm_conf);
> + aspm_conf &= PCI_EXP_LNKCTL_ASPMC;
> + if (parent) {
> + pcie_capability_read_word(parent, PCI_EXP_LNKCTL,
> + &parent_aspm_conf);
> + parent_aspm_conf &= PCI_EXP_LNKCTL_ASPMC;
> + }
> +
> + if (!aspm_conf && (!parent || !parent_aspm_conf)) {
> + /* aspm already disabled */
> + return;
> + }
> +
> + dev_info(&pdev->dev, "disabling ASPM %s %s\n",
> + (aspm_conf & PCI_EXP_LNKCTL_ASPM_L0S) ? "L0s" : "",
> + (aspm_conf & PCI_EXP_LNKCTL_ASPM_L1) ? "L1" : "");
> +
> +#ifdef CONFIG_PCIEASPM
> + pci_disable_link_state(pdev, aspm_conf);
> +
> + /* Double-check ASPM control. If not disabled by the above, the
> + * BIOS is preventing that from happening (or CONFIG_PCIEASPM is
> + * not enabled); override by writing PCI config space directly.
> + */
> + pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &aspm_conf);
> + if (!(aspm_conf & PCI_EXP_LNKCTL_ASPMC))
> + return;
> +#endif /* CONFIG_PCIEASPM */
> +
> + /* Both device and parent should have the same ASPM setting.
> + * Disable ASPM in downstream component first and then upstream.
> + */
> + pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL, aspm_conf);
> +
> + if (parent)
> + pcie_capability_clear_word(parent, PCI_EXP_LNKCTL,
> + aspm_conf);
+ linux-pci mailing list
All this seems to be legacy code copied from e1000e.
Fiddling with the low-level PCI(e) registers should be left to the
PCI core. It shouldn't be needed here, a simple call to
pci_disable_link_state() should be sufficient. Note that this function
has a return value meanwhile that you can check instead of reading
back low-level registers.
If BIOS forbids that OS changes ASPM settings, then this should be
respected (like PCI core does). Instead the network chip may provide
the option to configure whether it activates certain ASPM (sub-)states
or not. We went through a similar exercise with the r8169 driver,
you can check how it's done there.
> +}
> +EXPORT_SYMBOL_GPL(mt76_mmio_disable_aspm);
> +
> void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
> {
> static const struct mt76_bus_ops mt76_mmio_ops = {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
> index 570c159515a0..962812b6247d 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76.h
> @@ -578,6 +578,7 @@ bool __mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
> #define mt76_poll_msec(dev, ...) __mt76_poll_msec(&((dev)->mt76), __VA_ARGS__)
>
> void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs);
> +void mt76_mmio_disable_aspm(struct pci_dev *pdev);
>
> static inline u16 mt76_chip(struct mt76_dev *dev)
> {
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
> index 73c3104f8858..264bef87e5c7 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
> @@ -81,6 +81,8 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> /* RG_SSUSB_CDR_BR_PE1D = 0x3 */
> mt76_rmw_field(dev, 0x15c58, 0x3 << 6, 0x3);
>
> + mt76_mmio_disable_aspm(pdev);
> +
> return 0;
>
> error:
>
