1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [edk2-platforms][PATCH] Platform/RaspberryPi: Fix VPU memory ranges in GPU device container

GH Cao posted 1 patch 3 years, 12 months ago
Failed in applying to current master (apply log)
Platform/RaspberryPi/AcpiTables/Dsdt.asl | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
[edk2-devel] [edk2-platforms][PATCH] Platform/RaspberryPi: Fix VPU memory ranges in GPU device container
Posted by GH Cao 3 years, 12 months ago 
The PWM controller device specifies both CPU and VPU memory ranges.
CPU base addresses are provided as offsets to BCM2836_SOC_REGISTERS,
and VPU base addresses are constants.

But in Dsdt.asl, both offsets and constant addresses are seen as offsets
by QWORDMEMORYSET macro, result in incorrect VPU memory ranges.

This commits adds a new QWORDBUSMEMORYSET macro to handle VPU memory
ranges with constant base addresses.

Signed-off-by: GH Cao <driver1998@foxmail.com>
---
 Platform/RaspberryPi/AcpiTables/Dsdt.asl | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
index 95766b0..ddaf1d4 100644
--- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl
+++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
@@ -31,7 +31,11 @@
 // The ASL compiler does not support argument arithmetic in functions
 // like QWordMemory (). So we need to instantiate dummy qword regions
 // that we can then update the Min, Max and Length attributes of.
-// The two macros below help accomplish this.
+// The three macros below help accomplish this.
+//
+// QWORDMEMORYSET specifies a CPU memory range (whose base address is
+// BCM2836_SOC_REGISTERS + Offset), and QWORDBUSMEMORYSET specifies
+// a VPU memory range (whose base address is provided directly).
 //
 #define QWORDMEMORYBUF(Index)                                   \
   QWordMemory (ResourceProducer,,                               \
@@ -46,6 +50,14 @@
   Add (BCM2836_SOC_REGISTERS, Offset, MI ## Index)              \
   Add (MI ## Index, LE ## Index - 1, MA ## Index)
 
+#define QWORDBUSMEMORYSET(Index, Base, Length)                  \
+  CreateQwordField (RBUF, RB ## Index._MIN, MI ## Index)        \
+  CreateQwordField (RBUF, RB ## Index._MAX, MA ## Index)        \
+  CreateQwordField (RBUF, RB ## Index._LEN, LE ## Index)        \
+  Store (Base, MI ## Index)                                     \
+  Store (Length, LE ## Index)                                   \
+  Add (MI ## Index, LE ## Index - 1, MA ## Index)
+
 DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
 {
   Scope (\_SB_)
@@ -173,8 +185,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
         // PWM
         QWORDMEMORYSET(17, BCM2836_PWM_DMA_OFFSET, BCM2836_PWM_DMA_LENGTH)
         QWORDMEMORYSET(18, BCM2836_PWM_CTRL_OFFSET, BCM2836_PWM_CTRL_LENGTH)
-        QWORDMEMORYSET(19, BCM2836_PWM_BUS_BASE_ADDRESS, BCM2836_PWM_BUS_LENGTH)
-        QWORDMEMORYSET(20, BCM2836_PWM_CTRL_UNCACHED_BASE_ADDRESS, BCM2836_PWM_CTRL_UNCACHED_LENGTH)
+        QWORDBUSMEMORYSET(19, BCM2836_PWM_BUS_BASE_ADDRESS, BCM2836_PWM_BUS_LENGTH)
+        QWORDBUSMEMORYSET(20, BCM2836_PWM_CTRL_UNCACHED_BASE_ADDRESS, BCM2836_PWM_CTRL_UNCACHED_LENGTH)
         QWORDMEMORYSET(21, BCM2836_PWM_CLK_OFFSET, BCM2836_PWM_CLK_LENGTH)
 
         // UART
-- 
2.17.1


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

View/Reply Online (#58212): https://edk2.groups.io/g/devel/message/58212
Mute This Topic: https://groups.io/mt/73322163/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/RaspberryPi: Fix VPU memory ranges in GPU device container
Posted by Andrei Warkentin 3 years, 12 months ago 
Reviewed-by: Andrei Warkentin <andrey.warkentin@gmail.com>

Note that this not normal - ACPI resources aren't supposed to encode bus
and CPU resources in this fashion. This may mean the device will fail
admission on some OSes, and ultimately may mean the PWM device definition
will be hidden behind an "OS choice" UEFI setup option. I get that this is
how the driver is consuming it, but consider that the driver (
https://github.com/ms-iot/rpi-iotcore/tree/master/drivers/pwm) is also open
source and should be evolving as well.

A

On Tue, Apr 28, 2020 at 1:34 AM GH Cao <driver1998@foxmail.com> wrote:

> The PWM controller device specifies both CPU and VPU memory ranges.
> CPU base addresses are provided as offsets to BCM2836_SOC_REGISTERS,
> and VPU base addresses are constants.
>
> But in Dsdt.asl, both offsets and constant addresses are seen as offsets
> by QWORDMEMORYSET macro, result in incorrect VPU memory ranges.
>
> This commits adds a new QWORDBUSMEMORYSET macro to handle VPU memory
> ranges with constant base addresses.
>
> Signed-off-by: GH Cao <driver1998@foxmail.com>
> ---
>  Platform/RaspberryPi/AcpiTables/Dsdt.asl | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> index 95766b0..ddaf1d4 100644
> --- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> +++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> @@ -31,7 +31,11 @@
>  // The ASL compiler does not support argument arithmetic in functions
>  // like QWordMemory (). So we need to instantiate dummy qword regions
>  // that we can then update the Min, Max and Length attributes of.
> -// The two macros below help accomplish this.
> +// The three macros below help accomplish this.
> +//
> +// QWORDMEMORYSET specifies a CPU memory range (whose base address is
> +// BCM2836_SOC_REGISTERS + Offset), and QWORDBUSMEMORYSET specifies
> +// a VPU memory range (whose base address is provided directly).
>  //
>  #define QWORDMEMORYBUF(Index)                                   \
>    QWordMemory (ResourceProducer,,                               \
> @@ -46,6 +50,14 @@
>    Add (BCM2836_SOC_REGISTERS, Offset, MI ## Index)              \
>    Add (MI ## Index, LE ## Index - 1, MA ## Index)
>
> +#define QWORDBUSMEMORYSET(Index, Base, Length)                  \
> +  CreateQwordField (RBUF, RB ## Index._MIN, MI ## Index)        \
> +  CreateQwordField (RBUF, RB ## Index._MAX, MA ## Index)        \
> +  CreateQwordField (RBUF, RB ## Index._LEN, LE ## Index)        \
> +  Store (Base, MI ## Index)                                     \
> +  Store (Length, LE ## Index)                                   \
> +  Add (MI ## Index, LE ## Index - 1, MA ## Index)
> +
>  DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
>  {
>    Scope (\_SB_)
> @@ -173,8 +185,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN",
> "RPI", 2)
>          // PWM
>          QWORDMEMORYSET(17, BCM2836_PWM_DMA_OFFSET, BCM2836_PWM_DMA_LENGTH)
>          QWORDMEMORYSET(18, BCM2836_PWM_CTRL_OFFSET,
> BCM2836_PWM_CTRL_LENGTH)
> -        QWORDMEMORYSET(19, BCM2836_PWM_BUS_BASE_ADDRESS,
> BCM2836_PWM_BUS_LENGTH)
> -        QWORDMEMORYSET(20, BCM2836_PWM_CTRL_UNCACHED_BASE_ADDRESS,
> BCM2836_PWM_CTRL_UNCACHED_LENGTH)
> +        QWORDBUSMEMORYSET(19, BCM2836_PWM_BUS_BASE_ADDRESS,
> BCM2836_PWM_BUS_LENGTH)
> +        QWORDBUSMEMORYSET(20, BCM2836_PWM_CTRL_UNCACHED_BASE_ADDRESS,
> BCM2836_PWM_CTRL_UNCACHED_LENGTH)
>          QWORDMEMORYSET(21, BCM2836_PWM_CLK_OFFSET, BCM2836_PWM_CLK_LENGTH)
>
>          // UART
> --
> 2.17.1
>
>
> 
>
>

-- 
A

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

View/Reply Online (#58277): https://edk2.groups.io/g/devel/message/58277
Mute This Topic: https://groups.io/mt/73322163/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/RaspberryPi: Fix VPU memory ranges in GPU device container
Posted by Pete Batard 3 years, 12 months ago 
On 2020.04.28 06:09, GH Cao wrote:
> The PWM controller device specifies both CPU and VPU memory ranges.
> CPU base addresses are provided as offsets to BCM2836_SOC_REGISTERS,
> and VPU base addresses are constants.
> 
> But in Dsdt.asl, both offsets and constant addresses are seen as offsets
> by QWORDMEMORYSET macro, result in incorrect VPU memory ranges.
> 
> This commits adds a new QWORDBUSMEMORYSET macro to handle VPU memory
> ranges with constant base addresses.
> 
> Signed-off-by: GH Cao <driver1998@foxmail.com>
> ---
>   Platform/RaspberryPi/AcpiTables/Dsdt.asl | 18 +++++++++++++++---
>   1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> index 95766b0..ddaf1d4 100644
> --- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> +++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
> @@ -31,7 +31,11 @@
>   // The ASL compiler does not support argument arithmetic in functions
>   // like QWordMemory (). So we need to instantiate dummy qword regions
>   // that we can then update the Min, Max and Length attributes of.
> -// The two macros below help accomplish this.
> +// The three macros below help accomplish this.
> +//
> +// QWORDMEMORYSET specifies a CPU memory range (whose base address is
> +// BCM2836_SOC_REGISTERS + Offset), and QWORDBUSMEMORYSET specifies
> +// a VPU memory range (whose base address is provided directly).
>   //
>   #define QWORDMEMORYBUF(Index)                                   \
>     QWordMemory (ResourceProducer,,                               \
> @@ -46,6 +50,14 @@
>     Add (BCM2836_SOC_REGISTERS, Offset, MI ## Index)              \
>     Add (MI ## Index, LE ## Index - 1, MA ## Index)
>   
> +#define QWORDBUSMEMORYSET(Index, Base, Length)                  \
> +  CreateQwordField (RBUF, RB ## Index._MIN, MI ## Index)        \
> +  CreateQwordField (RBUF, RB ## Index._MAX, MA ## Index)        \
> +  CreateQwordField (RBUF, RB ## Index._LEN, LE ## Index)        \
> +  Store (Base, MI ## Index)                                     \
> +  Store (Length, LE ## Index)                                   \
> +  Add (MI ## Index, LE ## Index - 1, MA ## Index)
> +
>   DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
>   {
>     Scope (\_SB_)
> @@ -173,8 +185,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
>           // PWM
>           QWORDMEMORYSET(17, BCM2836_PWM_DMA_OFFSET, BCM2836_PWM_DMA_LENGTH)
>           QWORDMEMORYSET(18, BCM2836_PWM_CTRL_OFFSET, BCM2836_PWM_CTRL_LENGTH)
> -        QWORDMEMORYSET(19, BCM2836_PWM_BUS_BASE_ADDRESS, BCM2836_PWM_BUS_LENGTH)
> -        QWORDMEMORYSET(20, BCM2836_PWM_CTRL_UNCACHED_BASE_ADDRESS, BCM2836_PWM_CTRL_UNCACHED_LENGTH)
> +        QWORDBUSMEMORYSET(19, BCM2836_PWM_BUS_BASE_ADDRESS, BCM2836_PWM_BUS_LENGTH)
> +        QWORDBUSMEMORYSET(20, BCM2836_PWM_CTRL_UNCACHED_BASE_ADDRESS, BCM2836_PWM_CTRL_UNCACHED_LENGTH)
>           QWORDMEMORYSET(21, BCM2836_PWM_CLK_OFFSET, BCM2836_PWM_CLK_LENGTH)
>   
>           // UART
> 

Reviewed-by: Pete Batard <pete@akeo.ie>


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

View/Reply Online (#58224): https://edk2.groups.io/g/devel/message/58224
Mute This Topic: https://groups.io/mt/73322163/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.