* [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers. @ 2019-12-30 14:07 Jared McNeill 2019-12-31 10:39 ` [edk2-devel] " Pete Batard 2020-02-14 8:58 ` Ard Biesheuvel 0 siblings, 2 replies; 6+ messages in thread From: Jared McNeill @ 2019-12-30 14:07 UTC (permalink / raw) To: devel; +Cc: Jared McNeill According to the bcm2711 devicetree, the Arasan SDHCI uses GIC SPI 126 and the Broadcom SDHost uses GIC SPI 120. Signed-off-by: Jared McNeill <jmcneill@invisible.ca> --- Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl index 57ee411a61..56d15c3927 100644 --- a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl +++ b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl @@ -33,7 +33,7 @@ Device (SDC1) Name (RBUF, ResourceTemplate () { MEMORY32FIXED (ReadWrite, 0xFE300000, 0x100,) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x5E } + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x9E } }) Return (RBUF) } @@ -76,7 +76,7 @@ Device (SDC2) Name (RBUF, ResourceTemplate () { MEMORY32FIXED (ReadWrite, 0xFE202000, 0x100,) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x58 } + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x98 } }) Return (RBUF) } -- 2.21.0 (Apple Git-122.2) ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers. 2019-12-30 14:07 [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers Jared McNeill @ 2019-12-31 10:39 ` Pete Batard 2019-12-31 13:30 ` Philippe Mathieu-Daudé 2020-02-14 8:58 ` Ard Biesheuvel 1 sibling, 1 reply; 6+ messages in thread From: Pete Batard @ 2019-12-31 10:39 UTC (permalink / raw) To: devel, jmcneill Many thanks for fixing these. Reviewed-by: Pete Batard <pete@akeo.ie> On 2019-12-30 15:07, Jared McNeill wrote: > According to the bcm2711 devicetree, the Arasan SDHCI uses GIC SPI 126 > and the Broadcom SDHost uses GIC SPI 120. > > Signed-off-by: Jared McNeill <jmcneill@invisible.ca> > --- > Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl > index 57ee411a61..56d15c3927 100644 > --- a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl > +++ b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl > @@ -33,7 +33,7 @@ Device (SDC1) > Name (RBUF, ResourceTemplate () > { > MEMORY32FIXED (ReadWrite, 0xFE300000, 0x100,) > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x5E } > + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x9E } > }) > Return (RBUF) > } > @@ -76,7 +76,7 @@ Device (SDC2) > Name (RBUF, ResourceTemplate () > { > MEMORY32FIXED (ReadWrite, 0xFE202000, 0x100,) > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x58 } > + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x98 } > }) > Return (RBUF) > } > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers. 2019-12-31 10:39 ` [edk2-devel] " Pete Batard @ 2019-12-31 13:30 ` Philippe Mathieu-Daudé 2019-12-31 14:47 ` Pete Batard 0 siblings, 1 reply; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-12-31 13:30 UTC (permalink / raw) To: devel, pete, jmcneill, Samer El-Haj-Mahmoud, Ard Biesheuvel Cc'ing Samer because he has access to the datasheet, and I wonder if Linux is right. Samer, do you mind to confirm this fix? Thanks, Phil. On 12/31/19 11:39 AM, Pete Batard wrote: > Many thanks for fixing these. > > Reviewed-by: Pete Batard <pete@akeo.ie> > > On 2019-12-30 15:07, Jared McNeill wrote: >> According to the bcm2711 devicetree, the Arasan SDHCI uses GIC SPI 126 >> and the Broadcom SDHost uses GIC SPI 120. >> >> Signed-off-by: Jared McNeill <jmcneill@invisible.ca> >> --- >> Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >> b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >> index 57ee411a61..56d15c3927 100644 >> --- a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >> +++ b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >> @@ -33,7 +33,7 @@ Device (SDC1) >> Name (RBUF, ResourceTemplate () >> { >> MEMORY32FIXED (ReadWrite, 0xFE300000, 0x100,) >> - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >> 0x5E } >> + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >> 0x9E } >> }) >> Return (RBUF) >> } >> @@ -76,7 +76,7 @@ Device (SDC2) >> Name (RBUF, ResourceTemplate () >> { >> MEMORY32FIXED (ReadWrite, 0xFE202000, 0x100,) >> - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >> 0x58 } >> + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >> 0x98 } >> }) >> Return (RBUF) >> } >> > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers. 2019-12-31 13:30 ` Philippe Mathieu-Daudé @ 2019-12-31 14:47 ` Pete Batard 2019-12-31 16:15 ` Philippe Mathieu-Daudé 0 siblings, 1 reply; 6+ messages in thread From: Pete Batard @ 2019-12-31 14:47 UTC (permalink / raw) To: Philippe Mathieu-Daudé, devel, jmcneill, Samer El-Haj-Mahmoud, Ard Biesheuvel Hi Philippe, For the record these fixes were validated by Jared by booting NetBSD as per [1]: [ 1.000007] sdhc0 at acpi0 (SDC1, BCM2847-0): mem 0xfe300000-0xfe3000ff irq 158 We'll have a few more of these coming up in [2], which we need to sort out before we send a patch, but at least for the SDHC, we're pretty confident the proposed changes are indeed correct. It's more for the FIXMEs in [2] that we may require help from someone with access to the datasheet. Of course, double checking what we already have won't hurt either. Regards, /Pete [1] https://dmesgd.nycbug.org/index.cgi?do=view&id=5273 [2] https://github.com/pftf/edk2-platforms/commit/e6df781e25fc3dc51e83393c127410a1e4fc4345 On 2019-12-31 14:30, Philippe Mathieu-Daudé wrote: > Cc'ing Samer because he has access to the datasheet, and I wonder if > Linux is right. > > Samer, do you mind to confirm this fix? > > Thanks, > > Phil. > > On 12/31/19 11:39 AM, Pete Batard wrote: >> Many thanks for fixing these. >> >> Reviewed-by: Pete Batard <pete@akeo.ie> >> >> On 2019-12-30 15:07, Jared McNeill wrote: >>> According to the bcm2711 devicetree, the Arasan SDHCI uses GIC SPI 126 >>> and the Broadcom SDHost uses GIC SPI 120. >>> >>> Signed-off-by: Jared McNeill <jmcneill@invisible.ca> >>> --- >>> Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>> b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>> index 57ee411a61..56d15c3927 100644 >>> --- a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>> +++ b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>> @@ -33,7 +33,7 @@ Device (SDC1) >>> Name (RBUF, ResourceTemplate () >>> { >>> MEMORY32FIXED (ReadWrite, 0xFE300000, 0x100,) >>> - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>> 0x5E } >>> + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>> 0x9E } >>> }) >>> Return (RBUF) >>> } >>> @@ -76,7 +76,7 @@ Device (SDC2) >>> Name (RBUF, ResourceTemplate () >>> { >>> MEMORY32FIXED (ReadWrite, 0xFE202000, 0x100,) >>> - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>> 0x58 } >>> + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>> 0x98 } >>> }) >>> Return (RBUF) >>> } >>> >> >> >> >> > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers. 2019-12-31 14:47 ` Pete Batard @ 2019-12-31 16:15 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-12-31 16:15 UTC (permalink / raw) To: Pete Batard, devel, jmcneill, Samer El-Haj-Mahmoud, Ard Biesheuvel On 12/31/19 3:47 PM, Pete Batard wrote: > Hi Philippe, > > For the record these fixes were validated by Jared by booting NetBSD as > per [1]: > > [ 1.000007] sdhc0 at acpi0 (SDC1, BCM2847-0): mem > 0xfe300000-0xfe3000ff irq 158 Nice :) > > We'll have a few more of these coming up in [2], which we need to sort > out before we send a patch, but at least for the SDHC, we're pretty > confident the proposed changes are indeed correct. > > It's more for the FIXMEs in [2] that we may require help from someone > with access to the datasheet. Of course, double checking what we already > have won't hurt either. Good idea to add "Validated on physical hw" comments there! Acked-by: Philippe Mathieu-Daude <philmd@redhat.com> > > Regards, > > /Pete > > [1] https://dmesgd.nycbug.org/index.cgi?do=view&id=5273 > [2] > https://github.com/pftf/edk2-platforms/commit/e6df781e25fc3dc51e83393c127410a1e4fc4345 > > > On 2019-12-31 14:30, Philippe Mathieu-Daudé wrote: >> Cc'ing Samer because he has access to the datasheet, and I wonder if >> Linux is right. >> >> Samer, do you mind to confirm this fix? >> >> Thanks, >> >> Phil. >> >> On 12/31/19 11:39 AM, Pete Batard wrote: >>> Many thanks for fixing these. >>> >>> Reviewed-by: Pete Batard <pete@akeo.ie> >>> >>> On 2019-12-30 15:07, Jared McNeill wrote: >>>> According to the bcm2711 devicetree, the Arasan SDHCI uses GIC SPI 126 >>>> and the Broadcom SDHost uses GIC SPI 120. >>>> >>>> Signed-off-by: Jared McNeill <jmcneill@invisible.ca> >>>> --- >>>> Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>>> b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>>> index 57ee411a61..56d15c3927 100644 >>>> --- a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>>> +++ b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl >>>> @@ -33,7 +33,7 @@ Device (SDC1) >>>> Name (RBUF, ResourceTemplate () >>>> { >>>> MEMORY32FIXED (ReadWrite, 0xFE300000, 0x100,) >>>> - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>>> 0x5E } >>>> + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>>> 0x9E } >>>> }) >>>> Return (RBUF) >>>> } >>>> @@ -76,7 +76,7 @@ Device (SDC2) >>>> Name (RBUF, ResourceTemplate () >>>> { >>>> MEMORY32FIXED (ReadWrite, 0xFE202000, 0x100,) >>>> - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>>> 0x58 } >>>> + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { >>>> 0x98 } >>>> }) >>>> Return (RBUF) >>>> } >>>> >>> >>> >>> >>> >> > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers. 2019-12-30 14:07 [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers Jared McNeill 2019-12-31 10:39 ` [edk2-devel] " Pete Batard @ 2020-02-14 8:58 ` Ard Biesheuvel 1 sibling, 0 replies; 6+ messages in thread From: Ard Biesheuvel @ 2020-02-14 8:58 UTC (permalink / raw) To: edk2-devel-groups-io, jmcneill On Mon, 30 Dec 2019 at 15:16, Jared McNeill <jmcneill@invisible.ca> wrote: > > According to the bcm2711 devicetree, the Arasan SDHCI uses GIC SPI 126 > and the Broadcom SDHost uses GIC SPI 120. > > Signed-off-by: Jared McNeill <jmcneill@invisible.ca> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Pushed as cc7a0c68618c..314c45bc620b (apologies - in my haste, I forgot to add Pete's R-b and Phil's Ack given down-thread) > --- > Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl > index 57ee411a61..56d15c3927 100644 > --- a/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl > +++ b/Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl > @@ -33,7 +33,7 @@ Device (SDC1) > Name (RBUF, ResourceTemplate () > { > MEMORY32FIXED (ReadWrite, 0xFE300000, 0x100,) > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x5E } > + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x9E } > }) > Return (RBUF) > } > @@ -76,7 +76,7 @@ Device (SDC2) > Name (RBUF, ResourceTemplate () > { > MEMORY32FIXED (ReadWrite, 0xFE202000, 0x100,) > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x58 } > + Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x98 } > }) > Return (RBUF) > } > -- > 2.21.0 (Apple Git-122.2) > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-02-14 8:58 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-12-30 14:07 [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers Jared McNeill 2019-12-31 10:39 ` [edk2-devel] " Pete Batard 2019-12-31 13:30 ` Philippe Mathieu-Daudé 2019-12-31 14:47 ` Pete Batard 2019-12-31 16:15 ` Philippe Mathieu-Daudé 2020-02-14 8:58 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox