From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 470D7CA9EAF for ; Sun, 27 Oct 2019 21:40:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13E0F205C9 for ; Sun, 27 Oct 2019 21:40:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=natalenko.name header.i=@natalenko.name header.b="NxOkaGRw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727780AbfJ0Vke (ORCPT ); Sun, 27 Oct 2019 17:40:34 -0400 Received: from vulcan.natalenko.name ([104.207.131.136]:39636 "EHLO vulcan.natalenko.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727314AbfJ0Vkd (ORCPT ); Sun, 27 Oct 2019 17:40:33 -0400 Received: from mail.natalenko.name (vulcan.natalenko.name [IPv6:fe80::5400:ff:fe0c:dfa0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by vulcan.natalenko.name (Postfix) with ESMTPSA id A267860ED9E; Sun, 27 Oct 2019 22:40:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=natalenko.name; s=dkim-20170712; t=1572212430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZP0mft83BfuXGY/KXrwzMMUx2sl7QD4/f6jdUdhc4g=; b=NxOkaGRwbowyz4jbGpUv6h4T8YUZ43SIP8+ZHTgx5Q9zSKPAaigmo25wxpyAYQ1TOdlu3N EwPUzXDyeJML0MUyr/4jQLKEnI0d4tJ2mIvoFZYn31qku9+N3SLyGvtREb06wg0OHf4MWj ubcuX1jxSgryRmQA+M0uRbhK7NOEGL4= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sun, 27 Oct 2019 22:40:30 +0100 From: Oleksandr Natalenko To: Lorenzo Bianconi Cc: kvalo@codeaurora.org, linux-wireless@vger.kernel.org, nbd@nbd.name, hkallweit1@gmail.com, sgruszka@redhat.com, lorenzo.bianconi@redhat.com, netdev@vger.kernel.org Subject: Re: [PATCH v3 wireless-drivers 1/2] mt76: mt76x2e: disable pcie_aspm by default In-Reply-To: References: Message-ID: <3e11e1da564178e43ab745c780094098@natalenko.name> X-Sender: oleksandr@natalenko.name User-Agent: Roundcube Webmail/1.3.10 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi. On 27.10.2019 20:53, Lorenzo Bianconi wrote: > On same device (e.g. U7612E-H1) PCIE_ASPM causes continuous mcu hangs > and > instability. Since mt76x2 series does not manage PCIE PS states, first > we > try to disable ASPM using pci_disable_link_state. If it fails, we will > disable PCIE PS configuring PCI registers. > This patch has been successfully tested on U7612E-H1 mini-pice card > > Tested-by: Oleksandr Natalenko For this revision, not yet ;) (see below). > Signed-off-by: Felix Fietkau > Signed-off-by: Lorenzo Bianconi > --- > drivers/net/wireless/mediatek/mt76/Makefile | 2 + > drivers/net/wireless/mediatek/mt76/mt76.h | 1 + > .../net/wireless/mediatek/mt76/mt76x2/pci.c | 2 + > drivers/net/wireless/mediatek/mt76/pci.c | 46 +++++++++++++++++++ > 4 files changed, 51 insertions(+) > create mode 100644 drivers/net/wireless/mediatek/mt76/pci.c > > diff --git a/drivers/net/wireless/mediatek/mt76/Makefile > b/drivers/net/wireless/mediatek/mt76/Makefile > index 4d03596e891f..d7a1ddc9e407 100644 > --- a/drivers/net/wireless/mediatek/mt76/Makefile > +++ b/drivers/net/wireless/mediatek/mt76/Makefile > @@ -8,6 +8,8 @@ mt76-y := \ > mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \ > tx.o agg-rx.o mcu.o > > +mt76-$(CONFIG_PCI) += pci.o > + > mt76-usb-y := usb.o usb_trace.o > > CFLAGS_trace.o := -I$(src) > diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h > b/drivers/net/wireless/mediatek/mt76/mt76.h > index 570c159515a0..dc468ed9434a 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_pci_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..cf611d1b817c 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_pci_disable_aspm(pdev); > + > return 0; > > error: > diff --git a/drivers/net/wireless/mediatek/mt76/pci.c > b/drivers/net/wireless/mediatek/mt76/pci.c > new file mode 100644 > index 000000000000..04c5a692bc85 > --- /dev/null > +++ b/drivers/net/wireless/mediatek/mt76/pci.c > @@ -0,0 +1,46 @@ > +// SPDX-License-Identifier: ISC > +/* > + * Copyright (C) 2019 Lorenzo Bianconi > + */ > + > +#include FYI, I had to #include on 5.3 kernel because this is where pci_disable_link_state() is defined. It is not needed on 5.4+ since the declaration got moved to pci.h; this is just a note for those who are going to test these changes on 5.3. I'm still building the kernel, though. Will get back with the results later. > + > +void mt76_pci_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" : ""); > + > + if (IS_ENABLED(CONFIG_PCIEASPM)) { > + int err; > + > + err = pci_disable_link_state(pdev, aspm_conf); > + if (!err) > + return; > + } > + > + /* 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); > +} > +EXPORT_SYMBOL_GPL(mt76_pci_disable_aspm); -- Oleksandr Natalenko (post-factum)