From: Patrick Wildt <patrick@blueri.se>
Subject: RaspberryPi 4/5: more peripheral support
To: tech@openbsd.org
Date: Sun, 24 Mar 2024 10:39:48 +0100

Hi,

the raspberryPi 5 has a dedicated I/O chip called RP1.  They basically
"hid" it as PCIe controller, and that's how it's structured in the DT:
The PCIe controller node is to be treated as a simplebus and contains
further device nodes.

Would it be possible for someone to run a test on the previous gen, the
rPi 4?  This diff enables access to many more controllers, but I would
like to ensure I don't break the rPi 4 before committing this.

Cheers,
Patrick

diff --git a/sys/dev/fdt/bcm2711_pcie.c b/sys/dev/fdt/bcm2711_pcie.c
index 044cdf9d424..b8a9cc08679 100644
--- a/sys/dev/fdt/bcm2711_pcie.c
+++ b/sys/dev/fdt/bcm2711_pcie.c
@@ -24,6 +24,7 @@
 #include <machine/intr.h>
 #include <machine/bus.h>
 #include <machine/fdt.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
@@ -57,7 +58,7 @@ struct bcmpcie_range {
 };
 
 struct bcmpcie_softc {
-	struct device		sc_dev;
+	struct simplebus_softc	sc_sbus;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	bus_dma_tag_t		sc_dmat;
@@ -97,9 +98,11 @@ bcmpcie_match(struct device *parent, void *match, void *aux)
 {
 	struct fdt_attach_args *faa = aux;
 
-	return OF_is_compatible(faa->fa_node, "brcm,bcm2711-pcie");
+	return OF_is_compatible(faa->fa_node, "brcm,bcm2711-pcie") ||
+	    OF_is_compatible(faa->fa_node, "brcm,bcm2712-pcie");
 }
 
+int	bcmpcie_submatch(struct device *, void *, void *);
 void	bcmpcie_attach_hook(struct device *, struct device *,
 	    struct pcibus_attach_args *);
 int	bcmpcie_bus_maxdevs(void *, int);
@@ -272,8 +275,6 @@ bcmpcie_attach(struct device *parent, struct device *self, void *aux)
 		}
 	}
 
-	printf("\n");
-
 	memcpy(&sc->sc_bus_iot, sc->sc_iot, sizeof(sc->sc_bus_iot));
 	sc->sc_bus_iot.bus_private = sc;
 	sc->sc_bus_iot._space_map = bcmpcie_bs_iomap;
@@ -314,7 +315,22 @@ bcmpcie_attach(struct device *parent, struct device *self, void *aux)
 	pba.pba_domain = pci_ndomains++;
 	pba.pba_bus = 0;
 
-	config_found(self, &pba, NULL);
+	/* Attach device tree nodes enumerating PCIe bus */
+	simplebus_attach(parent, &sc->sc_sbus.sc_dev, faa);
+
+	config_found_sm(self, &pba, NULL, bcmpcie_submatch);
+}
+
+int
+bcmpcie_submatch(struct device *self, void *match, void *aux)
+{
+	struct cfdata *cf = match;
+	struct pcibus_attach_args *pba = aux;
+
+	if (strcmp(pba->pba_busname, cf->cf_driver->cd_name) != 0)
+		return 0;
+
+	return (*cf->cf_attach->ca_match)(self, match, aux);
 }
 
 void
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index e8bc5e5f2c3..bd9e32803e0 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -132,7 +132,7 @@ device	bcmmbox
 attach	bcmmbox at fdt
 file	dev/fdt/bcm2835_mbox.c		bcmmbox
 
-device	bcmpcie: pcibus
+device	bcmpcie: pcibus, fdt
 attach	bcmpcie at fdt
 file	dev/fdt/bcm2711_pcie.c		bcmpcie