65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From ced27461c009f208f880fa6bbc34c216e103eca6 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Mon, 1 Feb 2021 21:39:36 +0000
|
|
Subject: [PATCH] Raspberry Pi 4 PCIe handover
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
drivers/pci/pcie_brcmstb.c | 19 +++++++++++++++++++
|
|
drivers/usb/host/xhci-pci.c | 2 +-
|
|
2 files changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c
|
|
index bd645d7896..398d7e1849 100644
|
|
--- a/drivers/pci/pcie_brcmstb.c
|
|
+++ b/drivers/pci/pcie_brcmstb.c
|
|
@@ -577,6 +577,24 @@ static int brcm_pcie_probe(struct udevice *dev)
|
|
return 0;
|
|
}
|
|
|
|
+static int brcm_pcie_remove(struct udevice *dev)
|
|
+{
|
|
+ struct brcm_pcie *pcie = dev_get_priv(dev);
|
|
+ void __iomem *base = pcie->base;
|
|
+
|
|
+ /* Assert fundamental reset */
|
|
+ setbits_le32(base + PCIE_RGR1_SW_INIT_1, RGR1_SW_INIT_1_PERST_MASK);
|
|
+
|
|
+ /* Turn off SerDes */
|
|
+ setbits_le32(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG,
|
|
+ PCIE_HARD_DEBUG_SERDES_IDDQ_MASK);
|
|
+
|
|
+ /* Shutdown bridge */
|
|
+ setbits_le32(base + PCIE_RGR1_SW_INIT_1, RGR1_SW_INIT_1_INIT_MASK);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int brcm_pcie_of_to_plat(struct udevice *dev)
|
|
{
|
|
struct brcm_pcie *pcie = dev_get_priv(dev);
|
|
@@ -616,6 +634,7 @@ U_BOOT_DRIVER(pcie_brcm_base) = {
|
|
.ops = &brcm_pcie_ops,
|
|
.of_match = brcm_pcie_ids,
|
|
.probe = brcm_pcie_probe,
|
|
+ .remove = brcm_pcie_remove,
|
|
.of_to_plat = brcm_pcie_of_to_plat,
|
|
.priv_auto = sizeof(struct brcm_pcie),
|
|
};
|
|
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
|
|
index 2b445f21b5..d626929953 100644
|
|
--- a/drivers/usb/host/xhci-pci.c
|
|
+++ b/drivers/usb/host/xhci-pci.c
|
|
@@ -61,7 +61,7 @@ U_BOOT_DRIVER(xhci_pci) = {
|
|
.ops = &xhci_usb_ops,
|
|
.plat_auto = sizeof(struct usb_plat),
|
|
.priv_auto = sizeof(struct xhci_ctrl),
|
|
- .flags = DM_FLAG_ALLOC_PRIV_DMA,
|
|
+ .flags = DM_FLAG_OS_PREPARE | DM_FLAG_ALLOC_PRIV_DMA,
|
|
};
|
|
|
|
static struct pci_device_id xhci_pci_supported[] = {
|
|
--
|
|
2.29.2
|
|
|