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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CD621C433EF for ; Wed, 24 Nov 2021 12:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E9wDXveihVHLGyXnWD1sAeN8MQLXiXqPwHd4m5nTDKg=; b=cb/Rv2nbnBFxQr 96mzzIBdsQVitDfyURb7NDR4i4NtTnr36tIgx2IrhZoBfR8eBKFjCePF6wkgqbh0Zahp1M9tZNCpm a77SoL6svNCcxv8Ypja9e8VhqaYCMY/Ns3udAQyEd9J25jAb1OwO8mOPov8wqF1/JMYZnG7wTNDaD r6qGTeKMpIPX8GHIIdZD8+uabysVy8GfGBfRGR+fcLIEJZ6RfGo+iGHwg4IHlei5pu3vLUveIOdXW KJD7GnUO7NCPlhvdYVgtz9g1rAA+tbqercFSokD0BfhiuGCCsgJRYrPCcvbV0R++M1Eg8NtglwhWL 1p15WpytaECpdT4Gzp/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mprov-004meV-RQ; Wed, 24 Nov 2021 12:56:17 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpros-004mdb-8t for linux-arm-kernel@lists.infradead.org; Wed, 24 Nov 2021 12:56:15 +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 075C71042; Wed, 24 Nov 2021 04:56:13 -0800 (PST) Received: from [10.57.56.56] (unknown [10.57.56.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 58DFB3F73B; Wed, 24 Nov 2021 04:56:11 -0800 (PST) Message-ID: Date: Wed, 24 Nov 2021 12:56:06 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: Re: [PATCH v3 1/3] PCI: apple: Follow the PCIe specifications when resetting the port Content-Language: en-GB To: Marc Zyngier , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Cc: =?UTF-8?Q?Pali_Roh=c3=a1r?= , Alyssa Rosenzweig , Lorenzo Pieralisi , Bjorn Helgaas , Mark Kettenis , Luca Ceresoli , kernel-team@android.com References: <20211123180636.80558-1-maz@kernel.org> <20211123180636.80558-2-maz@kernel.org> From: Robin Murphy In-Reply-To: <20211123180636.80558-2-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211124_045614_388371_D3BCC609 X-CRM114-Status: GOOD ( 22.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMjAyMS0xMS0yMyAxODowNiwgTWFyYyBaeW5naWVyIHdyb3RlOgo+IFdoaWxlIHRoZSBBcHBs ZSBQQ0llIGRyaXZlciB3b3JrcyBjb3JyZWN0bHkgd2hlbiBkaXJlY3RseSBib290ZWQKPiBmcm9t IHRoZSBmaXJtd2FyZSwgaXQgZmFpbHMgdG8gaW5pdGlhbGlzZSB3aGVuIHRoZSBrZXJuZWwgaXMg Ym9vdGVkCj4gZnJvbSBhIGJvb3Rsb2FkZXIgdXNpbmcgUENJZSBzdWNoIGFzIHUtYm9vdC4KPiAK PiBUaGF0J3MgYmVhY3VzZSB3ZSdyZSBtaXNzaW5nIGEgcHJvcGVyIHJlc2V0IG9mIHRoZSBwb3J0 ICh3ZSBvbmx5Cj4gY2xlYXIgdGhlIHJlc2V0LCBidXQgbmV2ZXIgYXNzZXJ0IGl0KS4KPiAKPiBU aGUgUENJZSBzcGVjIHJlcXVpcmVtZW50cyBhcmUgdHdvLWZvbGQ6Cj4gCj4gLSAjUEVSU1QgbXVz dCBiZSBhc3NlcnRlZCBiZWZvcmUgc2V0dGluZyB1cCB0aGUgY2xvY2tzLCBhbmQKPiAgICBzdGF5 IGFzc2VydGVkIGZvciBhdCBsZWFzdCAxMDB1cyAoVHBlcnN0LWNsaykuCj4gCj4gLSBPbmNlICNQ RVJTVCBpcyBkZWFzc2VydGVkLCB0aGUgT1MgbXVzdCB3YWl0IGZvciBhdCBsZWFzdCAxMDBtcwo+ ICAgICJmcm9tIHRoZSBlbmQgb2YgYSBDb252ZW50aW9uYWwgUmVzZXQiIGJlZm9yZSB3ZSBjYW4g c3RhcnQgdGFsa2luZwo+ICAgIHRvIHRoZSBkZXZpY2VzCj4gCj4gSW1wbGVtZW50aW5nIHRoaXMg cmVzdWx0cyBpbiBhIGJvb3Rpbmcgc3lzdGVtLgo+IAo+IEZpeGVzOiAxZTMzODg4ZmJlNDQgKCJQ Q0k6IGFwcGxlOiBBZGQgaW5pdGlhbCBoYXJkd2FyZSBicmluZy11cCIpCj4gQWNrZWQtYnk6IFBh bGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+Cj4gU2lnbmVkLW9mZi1ieTogTWFyYyBaeW5naWVy IDxtYXpAa2VybmVsLm9yZz4KPiBDYzogQWx5c3NhIFJvc2VuendlaWcgPGFseXNzYUByb3Nlbnp3 ZWlnLmlvPgo+IENjOiBMb3JlbnpvIFBpZXJhbGlzaSA8bG9yZW56by5waWVyYWxpc2lAYXJtLmNv bT4KPiBDYzogQmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KPiAtLS0KPiAgIGRy aXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1hcHBsZS5jIHwgMTAgKysrKysrKysrKwo+ICAgMSBm aWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9w Y2kvY29udHJvbGxlci9wY2llLWFwcGxlLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaWUt YXBwbGUuYwo+IGluZGV4IDFiZjRkNzViNjFiZS4uOTU3OTYwYTczM2M0IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1hcHBsZS5jCj4gKysrIGIvZHJpdmVycy9wY2kv Y29udHJvbGxlci9wY2llLWFwcGxlLmMKPiBAQCAtNTM5LDEzICs1MzksMjMgQEAgc3RhdGljIGlu dCBhcHBsZV9wY2llX3NldHVwX3BvcnQoc3RydWN0IGFwcGxlX3BjaWUgKnBjaWUsCj4gICAKPiAg IAlybXdfc2V0KFBPUlRfQVBQQ0xLX0VOLCBwb3J0LT5iYXNlICsgUE9SVF9BUFBDTEspOwo+ICAg Cj4gKwkvKiBFbmdhZ2UgI1BFUlNUIGJlZm9yZSBzZXR0aW5nIHVwIHRoZSBjbG9jayAqLwo+ICsJ Z3Bpb2Rfc2V0X3ZhbHVlKHJlc2V0LCAwKTsKCkZXSVcsIGdpdmVuIHRoYXQgZ2V0dGluZyB0aGUg R1BJTyB3aXRoIEdQSU9EX09VVF9MT1cgc2hvdWxkIGhhdmUgaGFkIAp0aGlzIGVmZmVjdCBpbiB0 aGUgZmlyc3QgcGxhY2UsIGlmIHRoaXMgaXNuJ3QgYSBuby1vcCBhdCB0aGlzIHBvaW50IHRoZW4g Cml0IHdvdWxkIGhpbnQgYXQgc29tZXRoaW5nIGJlaW5nIG1vcmUgc2lnbmlmaWNhbnRseSB3cm9u ZyBkb3duIGF0IHRoZSAKR1BJTy9waW5jdHJsIGVuZCA6LwoKT25jZSB5b3UgZml4IHRoZSBwb2xh cml0eSBpbiB0aGUgbGF0ZXIgcGF0Y2gsIHRob3VnaCwgYWRkaW5nIHRoZSAKZXhwbGljaXQgcmVz ZXQgYXNzZXJ0aW9uIGhlcmUgZG9lcyBzZWVtIGEgZmFyIG5pY2VyIG9wdGlvbiB0aGFuIGZpZGRs aW5nIAp0aGUgZmxhZ3MgdG8gcHJlc2VydmUgdGhlIGltcGxpY2l0IGFzc2VydGlvbiBlYXJsaWVy LgoKQ2hlZXJzLApSb2Jpbi4KCj4gKwo+ICAgCXJldCA9IGFwcGxlX3BjaWVfc2V0dXBfcmVmY2xr KHBjaWUsIHBvcnQpOwo+ICAgCWlmIChyZXQgPCAwKQo+ICAgCQlyZXR1cm4gcmV0Owo+ICAgCj4g KwkvKiBUaGUgbWluaW1hbCBUcGVyc3QtY2xrIHZhbHVlIGlzIDEwMHVzIChQQ0llIENNUyByMi4w LCAyLjYuMikgKi8KPiArCXVzbGVlcF9yYW5nZSgxMDAsIDIwMCk7Cj4gKwo+ICsJLyogRGVhc3Nl cnQgI1BFUlNUICovCj4gICAJcm13X3NldChQT1JUX1BFUlNUX09GRiwgcG9ydC0+YmFzZSArIFBP UlRfUEVSU1QpOwo+ICAgCWdwaW9kX3NldF92YWx1ZShyZXNldCwgMSk7Cj4gICAKPiArCS8qIFdh aXQgZm9yIDEwMG1zIGFmdGVyICNQRVJTVCBkZWFzc2VydGlvbiAoUENJZSByMi4wLCA2LjYuMSkg Ki8KPiArCW1zbGVlcCgxMDApOwo+ICsKPiAgIAlyZXQgPSByZWFkbF9yZWxheGVkX3BvbGxfdGlt ZW91dChwb3J0LT5iYXNlICsgUE9SVF9TVEFUVVMsIHN0YXQsCj4gICAJCQkJCSBzdGF0ICYgUE9S VF9TVEFUVVNfUkVBRFksIDEwMCwgMjUwMDAwKTsKPiAgIAlpZiAocmV0IDwgMCkgewo+IAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtl cm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0 dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5l bAo= 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48337C433EF for ; Wed, 24 Nov 2021 12:58:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344667AbhKXNBj (ORCPT ); Wed, 24 Nov 2021 08:01:39 -0500 Received: from foss.arm.com ([217.140.110.172]:37156 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346253AbhKXM7X (ORCPT ); Wed, 24 Nov 2021 07:59:23 -0500 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 075C71042; Wed, 24 Nov 2021 04:56:13 -0800 (PST) Received: from [10.57.56.56] (unknown [10.57.56.56]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 58DFB3F73B; Wed, 24 Nov 2021 04:56:11 -0800 (PST) Message-ID: Date: Wed, 24 Nov 2021 12:56:06 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: Re: [PATCH v3 1/3] PCI: apple: Follow the PCIe specifications when resetting the port Content-Language: en-GB To: Marc Zyngier , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Cc: =?UTF-8?Q?Pali_Roh=c3=a1r?= , Alyssa Rosenzweig , Lorenzo Pieralisi , Bjorn Helgaas , Mark Kettenis , Luca Ceresoli , kernel-team@android.com References: <20211123180636.80558-1-maz@kernel.org> <20211123180636.80558-2-maz@kernel.org> From: Robin Murphy In-Reply-To: <20211123180636.80558-2-maz@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-11-23 18:06, Marc Zyngier wrote: > While the Apple PCIe driver works correctly when directly booted > from the firmware, it fails to initialise when the kernel is booted > from a bootloader using PCIe such as u-boot. > > That's beacuse we're missing a proper reset of the port (we only > clear the reset, but never assert it). > > The PCIe spec requirements are two-fold: > > - #PERST must be asserted before setting up the clocks, and > stay asserted for at least 100us (Tperst-clk). > > - Once #PERST is deasserted, the OS must wait for at least 100ms > "from the end of a Conventional Reset" before we can start talking > to the devices > > Implementing this results in a booting system. > > Fixes: 1e33888fbe44 ("PCI: apple: Add initial hardware bring-up") > Acked-by: Pali Rohár > Signed-off-by: Marc Zyngier > Cc: Alyssa Rosenzweig > Cc: Lorenzo Pieralisi > Cc: Bjorn Helgaas > --- > drivers/pci/controller/pcie-apple.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c > index 1bf4d75b61be..957960a733c4 100644 > --- a/drivers/pci/controller/pcie-apple.c > +++ b/drivers/pci/controller/pcie-apple.c > @@ -539,13 +539,23 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie, > > rmw_set(PORT_APPCLK_EN, port->base + PORT_APPCLK); > > + /* Engage #PERST before setting up the clock */ > + gpiod_set_value(reset, 0); FWIW, given that getting the GPIO with GPIOD_OUT_LOW should have had this effect in the first place, if this isn't a no-op at this point then it would hint at something being more significantly wrong down at the GPIO/pinctrl end :/ Once you fix the polarity in the later patch, though, adding the explicit reset assertion here does seem a far nicer option than fiddling the flags to preserve the implicit assertion earlier. Cheers, Robin. > + > ret = apple_pcie_setup_refclk(pcie, port); > if (ret < 0) > return ret; > > + /* The minimal Tperst-clk value is 100us (PCIe CMS r2.0, 2.6.2) */ > + usleep_range(100, 200); > + > + /* Deassert #PERST */ > rmw_set(PORT_PERST_OFF, port->base + PORT_PERST); > gpiod_set_value(reset, 1); > > + /* Wait for 100ms after #PERST deassertion (PCIe r2.0, 6.6.1) */ > + msleep(100); > + > ret = readl_relaxed_poll_timeout(port->base + PORT_STATUS, stat, > stat & PORT_STATUS_READY, 100, 250000); > if (ret < 0) { >