From: Marc Zyngier <maz@kernel.org>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org
Cc: "Pali Rohár" <pali@kernel.org>,
"Alyssa Rosenzweig" <alyssa@rosenzweig.io>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Mark Kettenis" <mark.kettenis@xs4all.nl>,
"Luca Ceresoli" <luca@lucaceresoli.net>,
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 [thread overview]
Message-ID: <20211123180636.80558-2-maz@kernel.org> (raw)
In-Reply-To: <20211123180636.80558-1-maz@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 <pali@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
---
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
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org
Cc: "Pali Rohár" <pali@kernel.org>,
"Alyssa Rosenzweig" <alyssa@rosenzweig.io>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Mark Kettenis" <mark.kettenis@xs4all.nl>,
"Luca Ceresoli" <luca@lucaceresoli.net>,
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 [thread overview]
Message-ID: <20211123180636.80558-2-maz@kernel.org> (raw)
In-Reply-To: <20211123180636.80558-1-maz@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 <pali@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
---
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-23 18:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-23 18:06 [PATCH v3 0/3] PCI: apple: Assorted #PERST fixes Marc Zyngier
2021-11-23 18:06 ` Marc Zyngier
2021-11-23 18:06 ` Marc Zyngier [this message]
2021-11-23 18:06 ` [PATCH v3 1/3] PCI: apple: Follow the PCIe specifications when resetting the port Marc Zyngier
2021-11-24 9:22 ` Luca Ceresoli
2021-11-24 9:22 ` Luca Ceresoli
2021-11-24 12:56 ` Robin Murphy
2021-11-24 12:56 ` Robin Murphy
2021-12-07 16:22 ` Bjorn Helgaas
2021-12-07 16:22 ` Bjorn Helgaas
2021-11-23 18:06 ` [PATCH v3 2/3] arm64: dts: apple: t8103: Fix PCIe #PERST polarity Marc Zyngier
2021-11-23 18:06 ` Marc Zyngier
2021-11-23 18:16 ` Mark Kettenis
2021-11-23 18:16 ` Mark Kettenis
2021-11-24 9:17 ` Luca Ceresoli
2021-11-24 9:17 ` Luca Ceresoli
2021-12-01 14:46 ` Arnd Bergmann
2021-12-01 14:46 ` Arnd Bergmann
2021-11-23 18:06 ` [PATCH v3 3/3] PCI: apple: Fix " Marc Zyngier
2021-11-23 18:06 ` Marc Zyngier
2021-11-23 21:36 ` Luca Ceresoli
2021-11-23 21:36 ` Luca Ceresoli
2021-11-24 9:02 ` Marc Zyngier
2021-11-24 9:02 ` Marc Zyngier
2021-11-24 9:16 ` Luca Ceresoli
2021-11-24 9:16 ` Luca Ceresoli
2021-11-30 11:56 ` [PATCH v3 0/3] PCI: apple: Assorted #PERST fixes Lorenzo Pieralisi
2021-11-30 11:56 ` Lorenzo Pieralisi
2021-11-30 11:59 ` Marc Zyngier
2021-11-30 11:59 ` Marc Zyngier
2021-11-30 12:12 ` Lorenzo Pieralisi
2021-11-30 12:12 ` Lorenzo Pieralisi
2021-11-30 12:45 ` Marc Zyngier
2021-11-30 12:45 ` Marc Zyngier
2021-12-01 14:48 ` Arnd Bergmann
2021-12-01 14:48 ` Arnd Bergmann
2021-12-07 10:16 ` Lorenzo Pieralisi
2021-12-07 10:16 ` Lorenzo Pieralisi
2021-12-07 20:30 ` Bjorn Helgaas
2021-12-07 20:30 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211123180636.80558-2-maz@kernel.org \
--to=maz@kernel.org \
--cc=alyssa@rosenzweig.io \
--cc=bhelgaas@google.com \
--cc=kernel-team@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=luca@lucaceresoli.net \
--cc=mark.kettenis@xs4all.nl \
--cc=pali@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.