Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3863770pxj; Tue, 11 May 2021 13:42:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJnJhKMRbh+WVqS+ZFSq7NfTDpX/XaLuOwzKQVzPlx0+tEmeH7jwLl5D+vSN/FWiN9g6EU X-Received: by 2002:a17:906:685:: with SMTP id u5mr33931500ejb.449.1620765777596; Tue, 11 May 2021 13:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620765777; cv=none; d=google.com; s=arc-20160816; b=EPTPEZ1yDt3LQRCBw3xAV6OjcdUTvJGKXOp0+7URz7yd1/jGrQwlyvWEBS7rCm8Jd2 cdUzWRqxVoyXDGHKEcvv3/cZX23yb+KlfM8XnDMGWfM6Ljs1ciRL2N2bLF5Ghei2daad sU4zJxZ4sZqLSy5tgRlskXK5yQuI0VI5AizV8ND1Mzgfa7dLIilOm8bXBgJwo8uPAnrw IFPvQLpj7vBgWt8akG18weRI8qgM9r2S81YDMcjQCJcLAViJzfvHGadg3zSJ4eV0//uW GEu8v5e7lEIXcoH3ufuNC2trelaTWEgvtZ+mh/os4Jix8cL/yrkG4AG3cgeRsYM5i6ob 5/5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=ywsRYVsG4T6V+5fYrcP+onVKpu9LadLGw7Flt8WRKeM=; b=suhC1BSbsmCwiexpVTbXW67qTvY2Z6hdoC71O+pIfi7U75Z3rIWl9M4uWEJSB7wSkb ziaCOBXxO3+T2yf+NSwGDBo6xgdBg5Yf+3doGSYLW6l9H6qjULY/dzRA2OAAX9BBhXSY GDkDY3eHli5szDRYrIpwSqvND+2vF6tBGjGtDHQE8KzGeubAnJxRqWMCVn9TxfIjVKEx rtbQ/bB2p+QA2+CqLQ2MnFFq1+ZkaZa+YD8kz1sViDyCVKJunmwkqvWUpQ698KF/w9F7 /Wr/sp5HgPrwusndPlolTsvQdzNFyk6GBNrJnlDPDneTV76DxQ5e12QVcGVlGihay4g9 Jwjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="PNKIFd0/"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q18si22025462edi.189.2021.05.11.13.42.14; Tue, 11 May 2021 13:42:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="PNKIFd0/"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbhEKUlB (ORCPT + 99 others); Tue, 11 May 2021 16:41:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:37864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbhEKUlA (ORCPT ); Tue, 11 May 2021 16:41:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 493C661626; Tue, 11 May 2021 20:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620765593; bh=84I6qfKECiPEK7nZU97V3ZOgBKiN9TJ66JKa3zhxNoM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PNKIFd0/+NFql4l6tKr7RNtF2iRI+8GB/p+W1Z7z8Swe9s8oWv0cWadCtMxxm5yp1 peFXUKnVV8HXGLXzFgD5VZA8Fgli8uL3fNKjxt+Hkqzjk+5WqFGjLCMkRc/DF9GlEP 5DhJl9tSFQeFMexIwvmo4FONH6wz//99Xx3CF+oufcYBZdQqinNKen3apW5g45VdEU 6vah/kBZe3l4udZ+3E5pq7b0vHlO9zMZDRrjr8iv303dadKttYE10Dki3kkvTy8JZt zpw1rChcR+YlqgenYXUzflHpq3A1kL87vzi5CKpo59EBtmNO+88M6Z6LTda7pxwgMo B41+m6+xB+9Iw== Received: by pali.im (Postfix) id 64D8E9DD; Tue, 11 May 2021 22:39:50 +0200 (CEST) Date: Tue, 11 May 2021 22:39:50 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: Bjorn Helgaas , Kalle Valo , Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= , Marek =?utf-8?B?QmVow7pu?= , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= Cc: vtolkm@gmail.com, Rob Herring , Ilias Apalodimas , Thomas Petazzoni , linux-pci@vger.kernel.org, ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] PCI: Disallow retraining link for Atheros chips on non-Gen1 PCIe bridges Message-ID: <20210511203950.fplf2vgny2zotsvj@pali> References: <20210326124326.21163-1-pali@kernel.org> <20210505163357.16012-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210505163357.16012-1-pali@kernel.org> User-Agent: NeoMutt/20180716 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Hello! I would like to remind this fix. Is there something else needed to change? On Wednesday 05 May 2021 18:33:57 Pali Rohár wrote: > Atheros AR9xxx and QCA9xxx chips have behaviour issues not only after a > bus reset, but also after doing retrain link, if PCIe bridge is not in > GEN1 mode (at 2.5 GT/s speed): > > - QCA9880 and QCA9890 chips throw a Link Down event and completely > disappear from the bus and their config space is not accessible > afterwards. > > - QCA9377 chip throws a Link Down event followed by Link Up event, the > config space is accessible and PCI device ID is correct. But trying to > access chip's I/O space causes Uncorrected (Non-Fatal) AER error, > followed by Synchronous external abort 96000210 and Segmentation fault > of insmod while loading ath10k_pci.ko module. > > - AR9390 chip throws a Link Down event followed by Link Up event, config > space is accessible, but contains nonsense values. PCI device ID is > 0xABCD which indicates HW bug that chip itself was not able to read > values from internal EEPROM/OTP. > > - AR9287 chip throws also Link Down and Link Up events, also has > accessible config space containing correct values. But ath9k driver > fails to initialize card from this state as it is unable to access HW > registers. This also indicates that the chip iself is not able to read > values from internal EEPROM/OTP. > > These issues related to PCI device ID 0xABCD and to reading internal > EEPROM/OTP were previously discussed at ath9k-devel mailing list in > following thread: > > https://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg07529.html > > After experiments we've come up with a solution: it seems that Retrain > link can be called only when using GEN1 PCIe bridge or when PCIe bridge > link speed is forced to 2.5 GT/s. Applying this workaround fixes all > mentioned cards. > > This issue was reproduced with more cards: > - Compex WLE900VX (QCA9880 based / device ID 0x003c) > - QCNFA435 (QCA9377 based / device ID 0x0042) > - Compex WLE200NX (AR9287 based / device ID 0x002e) > - "noname" card (QCA9890 based / device ID 0x003c) > - Wistron NKR-DNXAH1 (AR9390 based / device ID 0x0030) > on Armada 385 with pci-mvebu.c driver and also on Armada 3720 with > pci-aardvark.c driver. > > To workaround this issue, this change introduces a new PCI quirk called > PCI_DEV_FLAGS_NO_RETRAIN_LINK_WHEN_NOT_GEN1, which is enabled for all > Atheros chips with PCI_DEV_FLAGS_NO_BUS_RESET quirk, and also for Atheros > chip AR9287. > > When this quirk is set, kernel disallows triggering PCI_EXP_LNKCTL_RL > bit in config space of PCIe Bridge in the case when PCIe Bridge is > capable of higher speed than 2.5 GT/s and this higher speed is already > allowed. When PCIe Bridge has accessible LNKCTL2 register, we try to > force target link speed to 2.5 GT/s. After this change it is possible > to trigger PCI_EXP_LNKCTL_RL bit without issues. > > Currently only PCIe ASPM kernel code triggers this PCI_EXP_LNKCTL_RL bit, > so quirk check is added only into pcie/aspm.c file. > > Signed-off-by: Pali Rohár > Reported-by: Toke Høiland-Jørgensen > Tested-by: Toke Høiland-Jørgensen > Tested-by: Marek Behún > BugLink: https://lore.kernel.org/linux-pci/87h7l8axqp.fsf@toke.dk/ > BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=84821 > BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=192441 > BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=209833 > Cc: stable@vger.kernel.org # c80851f6ce63a ("PCI: Add PCI_EXP_LNKCTL2_TLS* macros") > > --- > Changes since v1: > * Move whole quirk code into pcie_downgrade_link_to_gen1() function > * Reformat to 80 chars per line where possible > * Add quirk also for cards with AR9287 chip (PCI ID 0x002e) > * Extend commit message description and add information about 0xABCD > > Changes since v2: > * Add quirk also for Atheros QCA9377 chip > --- > drivers/pci/pcie/aspm.c | 44 +++++++++++++++++++++++++++++++++++++++++ > drivers/pci/quirks.c | 39 ++++++++++++++++++++++++++++-------- > include/linux/pci.h | 2 ++ > 3 files changed, 77 insertions(+), 8 deletions(-) > > diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c > index ac0557a305af..729b0389562b 100644 > --- a/drivers/pci/pcie/aspm.c > +++ b/drivers/pci/pcie/aspm.c > @@ -192,12 +192,56 @@ static void pcie_clkpm_cap_init(struct pcie_link_state *link, int blacklist) > link->clkpm_disable = blacklist ? 1 : 0; > } > > +static int pcie_downgrade_link_to_gen1(struct pci_dev *parent) > +{ > + u16 reg16; > + u32 reg32; > + int ret; > + > + /* Check if link is capable of higher speed than 2.5 GT/s */ > + pcie_capability_read_dword(parent, PCI_EXP_LNKCAP, ®32); > + if ((reg32 & PCI_EXP_LNKCAP_SLS) <= PCI_EXP_LNKCAP_SLS_2_5GB) > + return 0; > + > + /* Check if link speed can be downgraded to 2.5 GT/s */ > + pcie_capability_read_dword(parent, PCI_EXP_LNKCAP2, ®32); > + if (!(reg32 & PCI_EXP_LNKCAP2_SLS_2_5GB)) { > + pci_err(parent, "ASPM: Bridge does not support changing Link Speed to 2.5 GT/s\n"); > + return -EOPNOTSUPP; > + } > + > + /* Force link speed to 2.5 GT/s */ > + ret = pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL2, > + PCI_EXP_LNKCTL2_TLS, > + PCI_EXP_LNKCTL2_TLS_2_5GT); > + if (!ret) { > + /* Verify that new value was really set */ > + pcie_capability_read_word(parent, PCI_EXP_LNKCTL2, ®16); > + if ((reg16 & PCI_EXP_LNKCTL2_TLS) != PCI_EXP_LNKCTL2_TLS_2_5GT) > + ret = -EINVAL; > + } > + > + if (ret) { > + pci_err(parent, "ASPM: Changing Target Link Speed to 2.5 GT/s failed: %d\n", ret); > + return ret; > + } > + > + pci_info(parent, "ASPM: Target Link Speed changed to 2.5 GT/s due to quirk\n"); > + return 0; > +} > + > static bool pcie_retrain_link(struct pcie_link_state *link) > { > struct pci_dev *parent = link->pdev; > unsigned long end_jiffies; > u16 reg16; > > + if ((link->downstream->dev_flags & PCI_DEV_FLAGS_NO_RETRAIN_LINK_WHEN_NOT_GEN1) && > + pcie_downgrade_link_to_gen1(parent)) { > + pci_err(parent, "ASPM: Retrain Link at higher speed is disallowed by quirk\n"); > + return false; > + } > + > pcie_capability_read_word(parent, PCI_EXP_LNKCTL, ®16); > reg16 |= PCI_EXP_LNKCTL_RL; > pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 653660e3ba9e..4999ad9d08b8 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -3553,23 +3553,46 @@ static void mellanox_check_broken_intx_masking(struct pci_dev *pdev) > DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX, PCI_ANY_ID, > mellanox_check_broken_intx_masking); > > -static void quirk_no_bus_reset(struct pci_dev *dev) > +static void quirk_no_bus_reset_and_no_retrain_link(struct pci_dev *dev) > { > - dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET; > + dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET | > + PCI_DEV_FLAGS_NO_RETRAIN_LINK_WHEN_NOT_GEN1; > } > > /* > - * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset. > + * Atheros AR9xxx and QCA9xxx chips do not behave after a bus reset and also > + * after retrain link when PCIe bridge is not in GEN1 mode at 2.5 GT/s speed. > * The device will throw a Link Down error on AER-capable systems and > * regardless of AER, config space of the device is never accessible again > * and typically causes the system to hang or reset when access is attempted. > + * Or if config space is accessible again then it contains only dummy values > + * like fixed PCI device ID 0xABCD or values not initialized at all. > + * Retrain link can be called only when using GEN1 PCIe bridge or when > + * PCIe bridge has forced link speed to 2.5 GT/s via PCI_EXP_LNKCTL2 register. > + * To reset these cards it is required to do PCIe Warm Reset via PERST# pin. > * https://lore.kernel.org/r/20140923210318.498dacbd@dualc.maya.org/ > + * https://lore.kernel.org/r/87h7l8axqp.fsf@toke.dk/ > + * https://www.mail-archive.com/ath9k-devel@lists.ath9k.org/msg07529.html > */ > -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030, quirk_no_bus_reset); > -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, quirk_no_bus_reset); > -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset); > -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset); > -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x002e, > + quirk_no_bus_reset_and_no_retrain_link); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030, > + quirk_no_bus_reset_and_no_retrain_link); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, > + quirk_no_bus_reset_and_no_retrain_link); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, > + quirk_no_bus_reset_and_no_retrain_link); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, > + quirk_no_bus_reset_and_no_retrain_link); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, > + quirk_no_bus_reset_and_no_retrain_link); > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0042, > + quirk_no_bus_reset_and_no_retrain_link); > + > +static void quirk_no_bus_reset(struct pci_dev *dev) > +{ > + dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET; > +} > > /* > * Root port on some Cavium CN8xxx chips do not successfully complete a bus > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 86c799c97b77..fdbf7254e4ab 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -227,6 +227,8 @@ enum pci_dev_flags { > PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10), > /* Don't use Relaxed Ordering for TLPs directed at this device */ > PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11), > + /* Don't Retrain Link for device when bridge is not in GEN1 mode */ > + PCI_DEV_FLAGS_NO_RETRAIN_LINK_WHEN_NOT_GEN1 = (__force pci_dev_flags_t) (1 << 12), > }; > > enum pci_irq_reroute_variant { > -- > 2.20.1 >