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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 3DB09ECE587 for ; Mon, 14 Oct 2019 10:01:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10E922084B for ; Mon, 14 Oct 2019 10:01:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fJBCmJnQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10E922084B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ypt0rzykGhI6ktTTn0plk6gMfnK1yUXAQVjOPlIk4RM=; b=fJBCmJnQMLB1WY b7jvyzUnMuZ7HM2b6rQov7uDp3XoZNoteRSow1QEudcRj+PWHYH9I2rb8ncEJHUGedgWsgc/5PIs8 UMgDkN6KT8xdxf2ciMzBB3Z05q+xBW6vVnERJbv72kBktAee2pqGndHPp40u3lX4XsxOs+eTBPDpW WQfsvdJ+lu10sYb1knlXG9CQWktNQcZFdHu9Zplz9bgEqSv3OkdTDc2Qfq7hpLKnGDvbIvwV3Pm7Y DTka09LM2FEkOdjS8nYzcUJwGF3JddHMB5BcaCN5iqnL+pyR5sHpDlsF8pwcd8Jlz4aIhgp5/aoQp DtidPs01O1mrnpSA0/eQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJxAo-0002Vc-HZ; Mon, 14 Oct 2019 10:01:54 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJxAb-0002I2-OI for linux-arm-kernel@lists.infradead.org; Mon, 14 Oct 2019 10:01:45 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8BEB8337; Mon, 14 Oct 2019 03:01:35 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 526CB3F718; Mon, 14 Oct 2019 03:01:34 -0700 (PDT) Date: Mon, 14 Oct 2019 11:01:29 +0100 From: Lorenzo Pieralisi To: Marc Zyngier Subject: Re: [PATCH v3] PCI: aardvark: Use LTSSM state to build link training flag Message-ID: <20191014100129.GA18832@e121166-lin.cambridge.arm.com> References: <20190522213351.21366-3-repk@triplefau.lt> <20190930154017.GF42880@e119886-lin.cambridge.arm.com> <20190930165230.GA12568@voidbox> <20191001080546.GI42880@e119886-lin.cambridge.arm.com> <20191013113415.3c653526@why> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191013113415.3c653526@why> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191014_030141_915672_9130A2C3 X-CRM114-Status: GOOD ( 36.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ellie Reeves , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Remi Pommarel , Bjorn Helgaas , Thomas Petazzoni , Andrew Murray , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sun, Oct 13, 2019 at 11:34:15AM +0100, Marc Zyngier wrote: > On Tue, 1 Oct 2019 09:05:46 +0100 > Andrew Murray wrote: > > Hi Lorenzo, > > > On Mon, Sep 30, 2019 at 06:52:30PM +0200, Remi Pommarel wrote: > > > On Mon, Sep 30, 2019 at 04:40:18PM +0100, Andrew Murray wrote: > > > > On Wed, May 22, 2019 at 11:33:51PM +0200, Remi Pommarel wrote: > > > > > Aardvark's PCI_EXP_LNKSTA_LT flag in its link status register is not > > > > > implemented and does not reflect the actual link training state (the > > > > > flag is always set to 0). In order to support link re-training feature > > > > > this flag has to be emulated. The Link Training and Status State > > > > > Machine (LTSSM) flag in Aardvark LMI config register could be used as > > > > > a link training indicator. Indeed if the LTSSM is in L0 or upper state > > > > > then link training has completed (see [1]). > > > > > > > > > > Unfortunately because after asking a link retraining it takes a while > > > > > for the LTSSM state to become less than 0x10 (due to L0s to recovery > > > > > state transition delays), LTSSM can still be in L0 while link training > > > > > has not finished yet. So this waits for link to be in recovery or lesser > > > > > state before returning after asking for a link retrain. > > > > > > > > > > [1] "PCI Express Base Specification", REV. 4.0 > > > > > PCI Express, February 19 2014, Table 4-14 > > > > > > > > > > Signed-off-by: Remi Pommarel > > > > > --- > > > > > Changes since v1: > > > > > - Rename retraining flag field > > > > > - Fix DEVCTL register writing > > > > > > > > > > Changes since v2: > > > > > - Rewrite patch logic so it is more legible > > > > > > > > > > Please note that I will unlikely be able to answer any comments from May > > > > > 24th to June 10th. > > > > > --- > > > > > drivers/pci/controller/pci-aardvark.c | 29 ++++++++++++++++++++++++++- > > > > > 1 file changed, 28 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c > > > > > index 134e0306ff00..8803083b2174 100644 > > > > > --- a/drivers/pci/controller/pci-aardvark.c > > > > > +++ b/drivers/pci/controller/pci-aardvark.c > > > > > @@ -180,6 +180,8 @@ > > > > > #define LINK_WAIT_MAX_RETRIES 10 > > > > > #define LINK_WAIT_USLEEP_MIN 90000 > > > > > #define LINK_WAIT_USLEEP_MAX 100000 > > > > > +#define RETRAIN_WAIT_MAX_RETRIES 10 > > > > > +#define RETRAIN_WAIT_USLEEP_US 2000 > > > > > > > > > > #define MSI_IRQ_NUM 32 > > > > > > > > > > @@ -239,6 +241,17 @@ static int advk_pcie_wait_for_link(struct advk_pcie *pcie) > > > > > return -ETIMEDOUT; > > > > > } > > > > > > > > > > +static void advk_pcie_wait_for_retrain(struct advk_pcie *pcie) > > > > > +{ > > > > > + size_t retries; > > > > > + > > > > > + for (retries = 0; retries < RETRAIN_WAIT_MAX_RETRIES; ++retries) { > > > > > + if (!advk_pcie_link_up(pcie)) > > > > > + break; > > > > > + udelay(RETRAIN_WAIT_USLEEP_US); > > > > > + } > > > > > +} > > > > > + > > > > > static void advk_pcie_setup_hw(struct advk_pcie *pcie) > > > > > { > > > > > u32 reg; > > > > > @@ -426,11 +439,20 @@ advk_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge, > > > > > return PCI_BRIDGE_EMUL_HANDLED; > > > > > } > > > > > > > > > > + case PCI_EXP_LNKCTL: { > > > > > + /* u32 contains both PCI_EXP_LNKCTL and PCI_EXP_LNKSTA */ > > > > > + u32 val = advk_readl(pcie, PCIE_CORE_PCIEXP_CAP + reg) & > > > > > + ~(PCI_EXP_LNKSTA_LT << 16); > > > > > > > > The commit message says "the flag is always set to 0" - therefore I guess > > > > you don't *need* to mask out the LT bit here? I assume this is just > > > > belt-and-braces but thought I'd check incase I've misunderstood or if your > > > > commit message is inaccurate. > > > > > > > > In any case masking out the bit (or adding a comment) makes this code more > > > > readable as the reader doesn't need to know what the hardware does with this > > > > bit. > > > > > > Actually vendor eventually responded that the bit was reserved, but > > > during my tests it remains to 0. > > > > > > So yes I am masking this out mainly for belt-and-braces and legibility. > > > > Thanks for the clarification. > > > > > > > > > > + if (!advk_pcie_link_up(pcie)) > > > > > + val |= (PCI_EXP_LNKSTA_LT << 16); > > > > > + *value = val; > > > > > + return PCI_BRIDGE_EMUL_HANDLED; > > > > > + } > > > > > + > > > > > case PCI_CAP_LIST_ID: > > > > > case PCI_EXP_DEVCAP: > > > > > case PCI_EXP_DEVCTL: > > > > > case PCI_EXP_LNKCAP: > > > > > - case PCI_EXP_LNKCTL: > > > > > *value = advk_readl(pcie, PCIE_CORE_PCIEXP_CAP + reg); > > > > > return PCI_BRIDGE_EMUL_HANDLED; > > > > > default: > > > > > @@ -447,8 +469,13 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, > > > > > > > > > > switch (reg) { > > > > > case PCI_EXP_DEVCTL: > > > > > + advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg); > > > > > + break; > > > > > > > > Why is this here? > > > > > > > > > > Before PCI_EXP_DEVCTL and PCI_EXP_LNKCTL were doing the same thing, but > > > as now PCI_EXP_LNKCTL does extra things (i.e. wait for link to > > > successfully retrain), they do have different behaviours. > > > > > > So this is here so PCI_EXP_DEVCTL keeps its old behaviour and do not > > > wait for link retrain in case an unrelated (PCI_EXP_LNKCTL_RL) bit is > > > set. > > > > Oh yes, of course! > > > > Thanks and: > > > > Reviewed-by: Andrew Murray > > Is there any hope for this workaround to make it into 5.4? > > My EspressoBin (which is blessed with this joke of a PCIe controller) > is pretty much a doorstop without it and dies with a SError early at > boot. > > FWIW: > > Tested-by: Marc Zyngier Hi Marc, First thing I will have to mark it as a Fixes: (if Remi can provide me with a tag that'd be great), usually we send fixes at -rc* for patches that fix code that went in the current (eg 5.4) material, I will ask Bjorn to see if we can send this in one of the upcoming -rc* even if it fixes older code. Thanks, Lorenzo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel