diff mbox series

[2/2] hw/misc/bcm2835_property: Add dummy Get/Set GPIO virt buf messages

Message ID 436e3f7b8f6d989a01ad0d8b9b226cbcbe0208c0.camel@kernel.crashing.org
State New
Headers show
Series [1/2] hw/misc/bcm2835_property: Fix framebuffer with recent RPi kernels | expand

Commit Message

Benjamin Herrenschmidt Oct. 17, 2021, 7:48 a.m. UTC
Without these the RaspiOS kernel tries to ioremap some bogus address
and dumps a backtrace in the console at boot. These work around it.

The virt-gpio driver still fails to initialize but much more cleanly

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 hw/misc/bcm2835_property.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Philippe Mathieu-Daudé Nov. 18, 2021, 3:24 p.m. UTC | #1
Hi Benjamin,

On 10/17/21 09:48, Benjamin Herrenschmidt wrote:
> Without these the RaspiOS kernel tries to ioremap some bogus address
> and dumps a backtrace in the console at boot. These work around it.
> 
> The virt-gpio driver still fails to initialize but much more cleanly
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
>  hw/misc/bcm2835_property.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
> index b958fa6a5c..62037c0630 100644
> --- a/hw/misc/bcm2835_property.c
> +++ b/hw/misc/bcm2835_property.c
> @@ -274,6 +274,13 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)
>              resplen = 4;
>              break;
>  
> +        case 0x00048020: /* Set GPIO virt buf */
> +            /* fall through */
> +        case 0x00040010: /* Get GPIO virt buf */
> +            stl_le_phys(&s->dma_as, value + 12, 0);

This is not correct. You tell the kernel it can access the virtbuf
at 0x0000.0000, but the raspi_smpboot code and raspi_spintables are
stored there.

You need to store the uint32_t value in BCM2835PropertyState on SET
and return it on GET.

> +            resplen = 4;
> +            break;

Regards,

Phil.
diff mbox series

Patch

diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index b958fa6a5c..62037c0630 100644
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -274,6 +274,13 @@  static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)
             resplen = 4;
             break;
 
+        case 0x00048020: /* Set GPIO virt buf */
+            /* fall through */
+        case 0x00040010: /* Get GPIO virt buf */
+            stl_le_phys(&s->dma_as, value + 12, 0);
+            resplen = 4;
+            break;
+
         case 0x00060001: /* Get DMA channels */
             /* channels 2-5 */
             stl_le_phys(&s->dma_as, value + 12, 0x003C);