diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-07-02 21:04:01 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-07-02 21:04:01 +0200 |
| commit | bd23963c8f359d0a3c802f7cd96b51b4d36b01ac (patch) | |
| tree | 9122acd927e56b1b477eec87f6566b28e10e7b5e /sys/src/9/bcm64 | |
| parent | 91c277a724d5fdfbc37eb85b69250220150fe232 (diff) | |
bcm64: fix usb xhci controller on pi4 8GB variant (thanks richard miller)
On the 8GB variant of the raspberry pi 4,
the eeprom chip for the xhci controller is missing and
instead loaded from sdram (by the gpu firmware).
for this, the gpu firmware needs to be notified of
the xhci controllers pci bus address (after reset)
that was assigned by our pci enumeration code.
Diffstat (limited to 'sys/src/9/bcm64')
| -rw-r--r-- | sys/src/9/bcm64/archbcm4.c | 13 | ||||
| -rw-r--r-- | sys/src/9/bcm64/fns.h | 1 | ||||
| -rw-r--r-- | sys/src/9/bcm64/pi4 | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/sys/src/9/bcm64/archbcm4.c b/sys/src/9/bcm64/archbcm4.c index 55e90d45a..d47ba96e1 100644 --- a/sys/src/9/bcm64/archbcm4.c +++ b/sys/src/9/bcm64/archbcm4.c @@ -172,5 +172,18 @@ wakecpu(uint cpu) void archbcm4link(void) { + Pcidev *p; + + /* + * The firmware resets PCI before starting the host OS because + * without SDRAM the VL805 makes inbound requests to page-in firmware + * from SDRAM. If the OS has a different PCI mapping that would all break. + * There's no way to pause and move the mappings and it's not really desirable + * for the firmware to dictate the PCI configuration. Consequently, the mailbox + * is required so that the OS can reset the VLI after asserting PCI chip reset. + */ + if((p = pcimatch(nil, 0x1106, 0x3483)) != nil) + xhcireset(BUSBNO(p->tbdf)<<20 | BUSDNO(p->tbdf)<<15 | BUSFNO(p->tbdf)<<12); + // addclock0link(wdogfeed, HZ); } diff --git a/sys/src/9/bcm64/fns.h b/sys/src/9/bcm64/fns.h index 34cc0c812..f42c2736c 100644 --- a/sys/src/9/bcm64/fns.h +++ b/sys/src/9/bcm64/fns.h @@ -170,6 +170,7 @@ extern uint getcputemp(void); extern void vgpinit(void); extern void vgpset(uint port, int on); extern void egpset(uint port, int on); +extern int xhcireset(int devaddr); /* bootargs */ extern void bootargsinit(uintptr); diff --git a/sys/src/9/bcm64/pi4 b/sys/src/9/bcm64/pi4 index 8d30d289d..1a3b815ff 100644 --- a/sys/src/9/bcm64/pi4 +++ b/sys/src/9/bcm64/pi4 @@ -27,11 +27,11 @@ dev link gisb pci - archbcm4 + archbcm4 pci + usbxhci pci archbcm4 ethergenet ethermii ethermedium loopbackmedium - usbxhci pci ip tcp |