1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.

Jared McNeill posted 1 patch 4 years, 3 months ago
Failed in applying to current master (apply log)
Platform/RaspberryPi/RPi4/AcpiTables/Sdhc.asl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.
Posted by Jared McNeill 4 years, 3 months ago 
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)


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52611): https://edk2.groups.io/g/devel/message/52611
Mute This Topic: https://groups.io/mt/69331625/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.
Posted by Ard Biesheuvel 4 years, 2 months ago 
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)
>
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#54435): https://edk2.groups.io/g/devel/message/54435
Mute This Topic: https://groups.io/mt/69331625/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.
Posted by Pete Batard 4 years, 3 months ago 
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)
>     }
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52630): https://edk2.groups.io/g/devel/message/52630
Mute This Topic: https://groups.io/mt/69331625/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago 
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)
>>     }
>>
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52632): https://edk2.groups.io/g/devel/message/52632
Mute This Topic: https://groups.io/mt/69331625/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.
Posted by Pete Batard 4 years, 3 months ago 
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)
>>>     }
>>>
>>
>>
>> 
>>
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52633): https://edk2.groups.io/g/devel/message/52633
Mute This Topic: https://groups.io/mt/69331625/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms][PATCH] Platform/RPi4: Fix SDHC interrupt numbers.
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago 
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)
>>>>     }
>>>>
>>>
>>>
>>> 
>>>
>>
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52635): https://edk2.groups.io/g/devel/message/52635
Mute This Topic: https://groups.io/mt/69331625/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.