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 C7909C4332F for ; Tue, 23 Nov 2021 18:06:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239658AbhKWSJw (ORCPT ); Tue, 23 Nov 2021 13:09:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:56562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239626AbhKWSJu (ORCPT ); Tue, 23 Nov 2021 13:09:50 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5E9A260FBF; Tue, 23 Nov 2021 18:06:42 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mpaBk-007LjH-CA; Tue, 23 Nov 2021 18:06:40 +0000 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Alyssa Rosenzweig , Lorenzo Pieralisi , Bjorn Helgaas , Mark Kettenis , Luca Ceresoli , kernel-team@android.com Subject: [PATCH v3 1/3] PCI: apple: Follow the PCIe specifications when resetting the port Date: Tue, 23 Nov 2021 18:06:34 +0000 Message-Id: <20211123180636.80558-2-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211123180636.80558-1-maz@kernel.org> References: <20211123180636.80558-1-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, pali@kernel.org, alyssa@rosenzweig.io, lorenzo.pieralisi@arm.com, bhelgaas@google.com, mark.kettenis@xs4all.nl, luca@lucaceresoli.net, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); + 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) { -- 2.30.2 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 027F4C433F5 for ; Tue, 23 Nov 2021 18:08:13 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oues9yic16GrHiRXBozO5eJYoIdrjA0nCrMCiqYQpac=; b=1SwWQXZvEkYNmV vnO/PrTrCehQagcyIc+sH13ZIO6mFeAGKDDEbbhnkNcEiTzaSkaEj6z+73rFzZi4hvJH+rFndogda v9Uz1P4IQa36U99KEtZLrGAC8d07kJusTyXXGkMVcPBAo2SNQimZW2NmI8GjGGLfQXsKjDV5T8tpL om3lhH1jBnU7LmwKtuX6R3OcQV8iV+IvnOQcEo/6I1tlSd20dD8wdErlVjXJTceNgRZ+bruouY+w9 Ev0ZsUAkI8VKp0pr+QAIOaMwJTovBebjXxj76L76XKm71xaKyxBut5fhLhoWHfnOCZzlCRksrOqkz x8IeewHUBav0YIUiAw2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpaBq-0037tb-TZ; Tue, 23 Nov 2021 18:06:47 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpaBm-0037qf-K4 for linux-arm-kernel@lists.infradead.org; Tue, 23 Nov 2021 18:06:43 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5E9A260FBF; Tue, 23 Nov 2021 18:06:42 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mpaBk-007LjH-CA; Tue, 23 Nov 2021 18:06:40 +0000 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Alyssa Rosenzweig , Lorenzo Pieralisi , Bjorn Helgaas , Mark Kettenis , Luca Ceresoli , kernel-team@android.com Subject: [PATCH v3 1/3] PCI: apple: Follow the PCIe specifications when resetting the port Date: Tue, 23 Nov 2021 18:06:34 +0000 Message-Id: <20211123180636.80558-2-maz@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211123180636.80558-1-maz@kernel.org> References: <20211123180636.80558-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, pali@kernel.org, alyssa@rosenzweig.io, lorenzo.pieralisi@arm.com, bhelgaas@google.com, mark.kettenis@xs4all.nl, luca@lucaceresoli.net, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211123_100642_702519_5D6CAFF6 X-CRM114-Status: GOOD ( 17.32 ) 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org V2hpbGUgdGhlIEFwcGxlIFBDSWUgZHJpdmVyIHdvcmtzIGNvcnJlY3RseSB3aGVuIGRpcmVjdGx5 IGJvb3RlZApmcm9tIHRoZSBmaXJtd2FyZSwgaXQgZmFpbHMgdG8gaW5pdGlhbGlzZSB3aGVuIHRo ZSBrZXJuZWwgaXMgYm9vdGVkCmZyb20gYSBib290bG9hZGVyIHVzaW5nIFBDSWUgc3VjaCBhcyB1 LWJvb3QuCgpUaGF0J3MgYmVhY3VzZSB3ZSdyZSBtaXNzaW5nIGEgcHJvcGVyIHJlc2V0IG9mIHRo ZSBwb3J0ICh3ZSBvbmx5CmNsZWFyIHRoZSByZXNldCwgYnV0IG5ldmVyIGFzc2VydCBpdCkuCgpU aGUgUENJZSBzcGVjIHJlcXVpcmVtZW50cyBhcmUgdHdvLWZvbGQ6CgotICNQRVJTVCBtdXN0IGJl IGFzc2VydGVkIGJlZm9yZSBzZXR0aW5nIHVwIHRoZSBjbG9ja3MsIGFuZAogIHN0YXkgYXNzZXJ0 ZWQgZm9yIGF0IGxlYXN0IDEwMHVzIChUcGVyc3QtY2xrKS4KCi0gT25jZSAjUEVSU1QgaXMgZGVh c3NlcnRlZCwgdGhlIE9TIG11c3Qgd2FpdCBmb3IgYXQgbGVhc3QgMTAwbXMKICAiZnJvbSB0aGUg ZW5kIG9mIGEgQ29udmVudGlvbmFsIFJlc2V0IiBiZWZvcmUgd2UgY2FuIHN0YXJ0IHRhbGtpbmcK ICB0byB0aGUgZGV2aWNlcwoKSW1wbGVtZW50aW5nIHRoaXMgcmVzdWx0cyBpbiBhIGJvb3Rpbmcg c3lzdGVtLgoKRml4ZXM6IDFlMzM4ODhmYmU0NCAoIlBDSTogYXBwbGU6IEFkZCBpbml0aWFsIGhh cmR3YXJlIGJyaW5nLXVwIikKQWNrZWQtYnk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+ ClNpZ25lZC1vZmYtYnk6IE1hcmMgWnluZ2llciA8bWF6QGtlcm5lbC5vcmc+CkNjOiBBbHlzc2Eg Um9zZW56d2VpZyA8YWx5c3NhQHJvc2VuendlaWcuaW8+CkNjOiBMb3JlbnpvIFBpZXJhbGlzaSA8 bG9yZW56by5waWVyYWxpc2lAYXJtLmNvbT4KQ2M6IEJqb3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdv b2dsZS5jb20+Ci0tLQogZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2llLWFwcGxlLmMgfCAxMCAr KysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1hcHBsZS5jIGIvZHJpdmVycy9wY2kvY29udHJv bGxlci9wY2llLWFwcGxlLmMKaW5kZXggMWJmNGQ3NWI2MWJlLi45NTc5NjBhNzMzYzQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpZS1hcHBsZS5jCisrKyBiL2RyaXZlcnMv cGNpL2NvbnRyb2xsZXIvcGNpZS1hcHBsZS5jCkBAIC01MzksMTMgKzUzOSwyMyBAQCBzdGF0aWMg aW50IGFwcGxlX3BjaWVfc2V0dXBfcG9ydChzdHJ1Y3QgYXBwbGVfcGNpZSAqcGNpZSwKIAogCXJt d19zZXQoUE9SVF9BUFBDTEtfRU4sIHBvcnQtPmJhc2UgKyBQT1JUX0FQUENMSyk7CiAKKwkvKiBF bmdhZ2UgI1BFUlNUIGJlZm9yZSBzZXR0aW5nIHVwIHRoZSBjbG9jayAqLworCWdwaW9kX3NldF92 YWx1ZShyZXNldCwgMCk7CisKIAlyZXQgPSBhcHBsZV9wY2llX3NldHVwX3JlZmNsayhwY2llLCBw b3J0KTsKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJuIHJldDsKIAorCS8qIFRoZSBtaW5pbWFsIFRw ZXJzdC1jbGsgdmFsdWUgaXMgMTAwdXMgKFBDSWUgQ01TIHIyLjAsIDIuNi4yKSAqLworCXVzbGVl cF9yYW5nZSgxMDAsIDIwMCk7CisKKwkvKiBEZWFzc2VydCAjUEVSU1QgKi8KIAlybXdfc2V0KFBP UlRfUEVSU1RfT0ZGLCBwb3J0LT5iYXNlICsgUE9SVF9QRVJTVCk7CiAJZ3Bpb2Rfc2V0X3ZhbHVl KHJlc2V0LCAxKTsKIAorCS8qIFdhaXQgZm9yIDEwMG1zIGFmdGVyICNQRVJTVCBkZWFzc2VydGlv biAoUENJZSByMi4wLCA2LjYuMSkgKi8KKwltc2xlZXAoMTAwKTsKKwogCXJldCA9IHJlYWRsX3Jl bGF4ZWRfcG9sbF90aW1lb3V0KHBvcnQtPmJhc2UgKyBQT1JUX1NUQVRVUywgc3RhdCwKIAkJCQkJ IHN0YXQgJiBQT1JUX1NUQVRVU19SRUFEWSwgMTAwLCAyNTAwMDApOwogCWlmIChyZXQgPCAwKSB7 Ci0tIAoyLjMwLjIKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3Rz LmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5m by9saW51eC1hcm0ta2VybmVsCg==