hw/arm/raspi: Use named constants in BCM props
Subsystems (2)
v3 cover hw/arm/raspi: Use named constants in BCM props
v2: https://lore.kernel.org/qemu-devel/[email protected]/
This is a respin of Sergey's patch but
- split in multiple patches
- removing redundant comments
Sergey Kambalin (4):
hw/arm/raspi: Import Linux raspi definitions as
'raspberrypi-fw-defs.h'
hw/misc/bcm2835_property: Use 'raspberrypi-fw-defs.h' definitions hw/misc/bcm2835_property: Replace magic frequency values by
definitions
hw/misc/bcm2835_property: Handle CORE_CLK_ID firmware property
include/hw/arm/raspi_platform.h | 6 + include/hw/misc/raspberrypi-fw-defs.h | 163 ++++++++++++++++++++++++++ hw/misc/bcm2835_property.c | 112 +++++++++--------- 3 files changed, 228 insertions(+), 53 deletions(-) create mode 100644 include/hw/misc/raspberrypi-fw-defs.h
Signature · 1 line
2.38.1
PATCH v3 1/4 hw/arm/raspi: Import Linux raspi definitions as 'raspberrypi-fw-defs.h'
From: Sergey Kambalin <[email protected]>
Message-Id: <[email protected]>
--- include/hw/misc/raspberrypi-fw-defs.h | 163 ++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 include/hw/misc/raspberrypi-fw-defs.h
include/hw/misc/raspberrypi-fw-defs.h new file +163 -0
@@ -0,0 +1,163 @@ +/* +* Raspberry Pi firmware definitions +* +* Copyright (C) 2022 Auriga LLC, based on Linux kernel +* `include/soc/bcm2835/raspberrypi-firmware.h` (Copyright © 2015 Broadcom) +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ +#define INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ + +#include "qemu/osdep.h" + +enum rpi_firmware_property_tag { +RPI_FWREQ_PROPERTY_END =0 , +RPI_FWREQ_GET_FIRMWARE_REVISION =0x00000001 , +RPI_FWREQ_GET_FIRMWARE_VARIANT =0x00000002 , +RPI_FWREQ_GET_FIRMWARE_HASH =0x00000003 , + +RPI_FWREQ_SET_CURSOR_INFO =0x00008010 , +RPI_FWREQ_SET_CURSOR_STATE =0x00008011 , + +RPI_FWREQ_GET_BOARD_MODEL =0x00010001 , +RPI_FWREQ_GET_BOARD_REVISION =0x00010002 , +RPI_FWREQ_GET_BOARD_MAC_ADDRESS =0x00010003 , +RPI_FWREQ_GET_BOARD_SERIAL =0x00010004 , +RPI_FWREQ_GET_ARM_MEMORY =0x00010005 , +RPI_FWREQ_GET_VC_MEMORY =0x00010006 , +RPI_FWREQ_GET_CLOCKS =0x00010007 , +RPI_FWREQ_GET_POWER_STATE =0x00020001 , +RPI_FWREQ_GET_TIMING =0x00020002 , +RPI_FWREQ_SET_POWER_STATE =0x00028001 , +RPI_FWREQ_GET_CLOCK_STATE =0x00030001 , +RPI_FWREQ_GET_CLOCK_RATE =0x00030002 , +RPI_FWREQ_GET_VOLTAGE =0x00030003 , +RPI_FWREQ_GET_MAX_CLOCK_RATE =0x00030004 , +RPI_FWREQ_GET_MAX_VOLTAGE =0x00030005 , +RPI_FWREQ_GET_TEMPERATURE =0x00030006 , +RPI_FWREQ_GET_MIN_CLOCK_RATE =0x00030007 , +RPI_FWREQ_GET_MIN_VOLTAGE =0x00030008 , +RPI_FWREQ_GET_TURBO =0x00030009 , +RPI_FWREQ_GET_MAX_TEMPERATURE =0x0003000a , +RPI_FWREQ_GET_STC =0x0003000b , +RPI_FWREQ_ALLOCATE_MEMORY =0x0003000c , +RPI_FWREQ_LOCK_MEMORY =0x0003000d , +RPI_FWREQ_UNLOCK_MEMORY =0x0003000e , +RPI_FWREQ_RELEASE_MEMORY =0x0003000f , +RPI_FWREQ_EXECUTE_CODE =0x00030010 , +RPI_FWREQ_EXECUTE_QPU =0x00030011 , +RPI_FWREQ_SET_ENABLE_QPU =0x00030012 , +RPI_FWREQ_GET_DISPMANX_RESOURCE_MEM_HANDLE =0x00030014 , +RPI_FWREQ_GET_EDID_BLOCK =0x00030020 , +RPI_FWREQ_GET_CUSTOMER_OTP =0x00030021 , +RPI_FWREQ_GET_EDID_BLOCK_DISPLAY =0x00030023 , +RPI_FWREQ_GET_DOMAIN_STATE =0x00030030 , +RPI_FWREQ_GET_THROTTLED =0x00030046 , +RPI_FWREQ_GET_CLOCK_MEASURED =0x00030047 , +RPI_FWREQ_NOTIFY_REBOOT =0x00030048 , +RPI_FWREQ_SET_CLOCK_STATE =0x00038001 , +RPI_FWREQ_SET_CLOCK_RATE =0x00038002 , +RPI_FWREQ_SET_VOLTAGE =0x00038003 , +RPI_FWREQ_SET_MAX_CLOCK_RATE =0x00038004 , +RPI_FWREQ_SET_MIN_CLOCK_RATE =0x00038007 , +RPI_FWREQ_SET_TURBO =0x00038009 , +RPI_FWREQ_SET_CUSTOMER_OTP =0x00038021 , +RPI_FWREQ_SET_DOMAIN_STATE =0x00038030 , +RPI_FWREQ_GET_GPIO_STATE =0x00030041 , +RPI_FWREQ_SET_GPIO_STATE =0x00038041 , +RPI_FWREQ_SET_SDHOST_CLOCK =0x00038042 , +RPI_FWREQ_GET_GPIO_CONFIG =0x00030043 , +RPI_FWREQ_SET_GPIO_CONFIG =0x00038043 , +RPI_FWREQ_GET_PERIPH_REG =0x00030045 , +RPI_FWREQ_SET_PERIPH_REG =0x00038045 , +RPI_FWREQ_GET_POE_HAT_VAL =0x00030049 , +RPI_FWREQ_SET_POE_HAT_VAL =0x00038049 , +RPI_FWREQ_SET_POE_HAT_VAL_OLD =0x00030050 , +RPI_FWREQ_NOTIFY_XHCI_RESET =0x00030058 , +RPI_FWREQ_GET_REBOOT_FLAGS =0x00030064 , +RPI_FWREQ_SET_REBOOT_FLAGS =0x00038064 , +RPI_FWREQ_NOTIFY_DISPLAY_DONE =0x00030066 , + +/* Dispmanx TAGS */ +RPI_FWREQ_FRAMEBUFFER_ALLOCATE =0x00040001 , +RPI_FWREQ_FRAMEBUFFER_BLANK =0x00040002 , +RPI_FWREQ_FRAMEBUFFER_GET_PHYSICAL_WIDTH_HEIGHT =0x00040003 , +RPI_FWREQ_FRAMEBUFFER_GET_VIRTUAL_WIDTH_HEIGHT =0x00040004 , +RPI_FWREQ_FRAMEBUFFER_GET_DEPTH =0x00040005 , +RPI_FWREQ_FRAMEBUFFER_GET_PIXEL_ORDER =0x00040006 , +RPI_FWREQ_FRAMEBUFFER_GET_ALPHA_MODE =0x00040007 , +RPI_FWREQ_FRAMEBUFFER_GET_PITCH =0x00040008 , +RPI_FWREQ_FRAMEBUFFER_GET_VIRTUAL_OFFSET =0x00040009 , +RPI_FWREQ_FRAMEBUFFER_GET_OVERSCAN =0x0004000a , +RPI_FWREQ_FRAMEBUFFER_GET_PALETTE =0x0004000b , +RPI_FWREQ_FRAMEBUFFER_GET_LAYER =0x0004000c , +RPI_FWREQ_FRAMEBUFFER_GET_TRANSFORM =0x0004000d , +RPI_FWREQ_FRAMEBUFFER_GET_VSYNC =0x0004000e , +RPI_FWREQ_FRAMEBUFFER_GET_TOUCHBUF =0x0004000f , +RPI_FWREQ_FRAMEBUFFER_GET_GPIOVIRTBUF =0x00040010 , +RPI_FWREQ_FRAMEBUFFER_RELEASE =0x00048001 , +RPI_FWREQ_FRAMEBUFFER_GET_DISPLAY_ID =0x00040016 , +RPI_FWREQ_FRAMEBUFFER_SET_DISPLAY_NUM =0x00048013 , +RPI_FWREQ_FRAMEBUFFER_GET_NUM_DISPLAYS =0x00040013 , +RPI_FWREQ_FRAMEBUFFER_GET_DISPLAY_SETTINGS =0x00040014 , +RPI_FWREQ_FRAMEBUFFER_TEST_PHYSICAL_WIDTH_HEIGHT =0x00044003 , +RPI_FWREQ_FRAMEBUFFER_TEST_VIRTUAL_WIDTH_HEIGHT =0x00044004 , +RPI_FWREQ_FRAMEBUFFER_TEST_DEPTH =0x00044005 , +RPI_FWREQ_FRAMEBUFFER_TEST_PIXEL_ORDER =0x00044006 , +RPI_FWREQ_FRAMEBUFFER_TEST_ALPHA_MODE =0x00044007 , +RPI_FWREQ_FRAMEBUFFER_TEST_VIRTUAL_OFFSET =0x00044009 , +RPI_FWREQ_FRAMEBUFFER_TEST_OVERSCAN =0x0004400a , +RPI_FWREQ_FRAMEBUFFER_TEST_PALETTE =0x0004400b , +RPI_FWREQ_FRAMEBUFFER_TEST_LAYER =0x0004400c , +RPI_FWREQ_FRAMEBUFFER_TEST_TRANSFORM =0x0004400d , +RPI_FWREQ_FRAMEBUFFER_TEST_VSYNC =0x0004400e , +RPI_FWREQ_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT =0x00048003 , +RPI_FWREQ_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT =0x00048004 , +RPI_FWREQ_FRAMEBUFFER_SET_DEPTH =0x00048005 , +RPI_FWREQ_FRAMEBUFFER_SET_PIXEL_ORDER =0x00048006 , +RPI_FWREQ_FRAMEBUFFER_SET_ALPHA_MODE =0x00048007 , +RPI_FWREQ_FRAMEBUFFER_SET_PITCH =0x00048008 , +RPI_FWREQ_FRAMEBUFFER_SET_VIRTUAL_OFFSET =0x00048009 , +RPI_FWREQ_FRAMEBUFFER_SET_OVERSCAN =0x0004800a , +RPI_FWREQ_FRAMEBUFFER_SET_PALETTE =0x0004800b , + +RPI_FWREQ_FRAMEBUFFER_SET_TOUCHBUF =0x0004801f , +RPI_FWREQ_FRAMEBUFFER_SET_GPIOVIRTBUF =0x00048020 , +RPI_FWREQ_FRAMEBUFFER_SET_VSYNC =0x0004800e , +RPI_FWREQ_FRAMEBUFFER_SET_LAYER =0x0004800c , +RPI_FWREQ_FRAMEBUFFER_SET_TRANSFORM =0x0004800d , +RPI_FWREQ_FRAMEBUFFER_SET_BACKLIGHT =0x0004800f , + +RPI_FWREQ_VCHIQ_INIT =0x00048010 , + +RPI_FWREQ_SET_PLANE =0x00048015 , +RPI_FWREQ_GET_DISPLAY_TIMING =0x00040017 , +RPI_FWREQ_SET_TIMING =0x00048017 , +RPI_FWREQ_GET_DISPLAY_CFG =0x00040018 , +RPI_FWREQ_SET_DISPLAY_POWER =0x00048019 , +RPI_FWREQ_GET_COMMAND_LINE =0x00050001 , +RPI_FWREQ_GET_DMA_CHANNELS =0x00060001 , +}; + +enum rpi_firmware_clk_id { +RPI_FIRMWARE_EMMC_CLK_ID =1 , +RPI_FIRMWARE_UART_CLK_ID , +RPI_FIRMWARE_ARM_CLK_ID , +RPI_FIRMWARE_CORE_CLK_ID , +RPI_FIRMWARE_V3D_CLK_ID , +RPI_FIRMWARE_H264_CLK_ID , +RPI_FIRMWARE_ISP_CLK_ID , +RPI_FIRMWARE_SDRAM_CLK_ID , +RPI_FIRMWARE_PIXEL_CLK_ID , +RPI_FIRMWARE_PWM_CLK_ID , +RPI_FIRMWARE_HEVC_CLK_ID , +RPI_FIRMWARE_EMMC2_CLK_ID , +RPI_FIRMWARE_M2MC_CLK_ID , +RPI_FIRMWARE_PIXEL_BVB_CLK_ID , +RPI_FIRMWARE_VEC_CLK_ID , +RPI_FIRMWARE_NUM_CLK_ID , +}; + +#endif /* INCLUDE_HW_MISC_RASPBERRYPI_FW_DEFS_H_ */
Signature · 1 line
2.38.1
Re: [PATCH v3 1/4] hw/arm/raspi: Import Linux raspi definitions as 'raspberrypi-fw-defs.h'
Quoted 10 lines · Philippe Mathieu-Daudé
From: Sergey Kambalin<[email protected]>
Signed-off-by Sergey Kambalin<[email protected]>Message-Id:<[email protected]>
[PMD: Split from bigger patch: 1/4]Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- include/hw/misc/raspberrypi-fw-defs.h | 163 ++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)create mode 100644
include/hw/misc/raspberrypi-fw-defs.h
r~
PATCH v3 2/4 hw/misc/bcm2835_property: Use 'raspberrypi-fw-defs.h' definitions
In reply to Philippe Mathieu-DaudéFrom: Sergey Kambalin <[email protected]>
Replace magic property values by a proper definition, removing redundant comments.
Message-Id: <[email protected]>
--- hw/misc/bcm2835_property.c | 101 +++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 50 deletions(-)
hw/misc/bcm2835_property.c +51 -50
@@ -12,6 +12,7 @@#include "migration/vmstate.h" #include "hw/irq.h" #include "hw/misc/bcm2835_mbox_defs.h" +#include "hw/misc/raspberrypi-fw-defs.h" #include "sysemu/dma.h" #include "qemu/log.h" #include "qemu/module.h"
@@ -51,48 +52,48 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)/* @(value + 8) : Request/response indicator */ resplen =0 ;switch (tag) { -case 0x00000000 :/* End tag */ +case RPI_FWREQ_PROPERTY_END :break ; -case 0x00000001 :/* Get firmware revision */ +case RPI_FWREQ_GET_FIRMWARE_REVISION :stl_le_phys (&s->dma_as, value +12 ,346337 ); resplen =4 ;break ; -case 0x00010001 :/* Get board model */ +case RPI_FWREQ_GET_BOARD_MODEL :qemu_log_mask (LOG_UNIMP ,"bcm2835_property: 0x%08x get board model NYI\n" , tag); resplen =4 ;break ; -case 0x00010002 :/* Get board revision */ +case RPI_FWREQ_GET_BOARD_REVISION :stl_le_phys (&s->dma_as, value +12 , s->board_rev); resplen =4 ;break ; -case 0x00010003 :/* Get board MAC address */ +case RPI_FWREQ_GET_BOARD_MAC_ADDRESS : resplen =sizeof (s->macaddr.a);dma_memory_write (&s->dma_as, value +12 , s->macaddr.a, resplen,MEMTXATTRS_UNSPECIFIED );break ; -case 0x00010004 :/* Get board serial */ +case RPI_FWREQ_GET_BOARD_SERIAL :qemu_log_mask (LOG_UNIMP ,"bcm2835_property: 0x%08x get board serial NYI\n" , tag); resplen =8 ;break ; -case 0x00010005 :/* Get ARM memory */ +case RPI_FWREQ_GET_ARM_MEMORY :/* base */ stl_le_phys (&s->dma_as, value +12 ,0 );/* size */ stl_le_phys (&s->dma_as, value +16 , s->fbdev->vcram_base); resplen =8 ;break ; -case 0x00010006 :/* Get VC memory */ +case RPI_FWREQ_GET_VC_MEMORY :/* base */ stl_le_phys (&s->dma_as, value +12 , s->fbdev->vcram_base);/* size */ stl_le_phys (&s->dma_as, value +16 , s->fbdev->vcram_size); resplen =8 ;break ; -case 0x00028001 :/* Set power state */ +case RPI_FWREQ_SET_POWER_STATE :/* Assume that whatever device they asked for exists, * and we'll just claim we set it to the desired state */
@@ -103,26 +104,26 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)/* Clocks */ -case 0x00030001 :/* Get clock state */ +case RPI_FWREQ_GET_CLOCK_STATE :stl_le_phys (&s->dma_as, value +16 ,0x1 ); resplen =8 ;break ; -case 0x00038001 :/* Set clock state */ +case RPI_FWREQ_SET_CLOCK_STATE :qemu_log_mask (LOG_UNIMP ,"bcm2835_property: 0x%08x set clock state NYI\n" , tag); resplen =8 ;break ; -case 0x00030002 :/* Get clock rate */ -case 0x00030004 :/* Get max clock rate */ -case 0x00030007 :/* Get min clock rate */ +case RPI_FWREQ_GET_CLOCK_RATE : +case RPI_FWREQ_GET_MAX_CLOCK_RATE : +case RPI_FWREQ_GET_MIN_CLOCK_RATE :switch (ldl_le_phys (&s->dma_as, value +12 )) { -case 1 :/* EMMC */ +case RPI_FIRMWARE_EMMC_CLK_ID :stl_le_phys (&s->dma_as, value +16 ,50000000 );break ; -case 2 :/* UART */ +case RPI_FIRMWARE_UART_CLK_ID :stl_le_phys (&s->dma_as, value +16 ,3000000 );break ;default :
@@ -132,9 +133,9 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value) resplen =8 ;break ; -case 0x00038002 :/* Set clock rate */ -case 0x00038004 :/* Set max clock rate */ -case 0x00038007 :/* Set min clock rate */ +case RPI_FWREQ_SET_CLOCK_RATE : +case RPI_FWREQ_SET_MAX_CLOCK_RATE : +case RPI_FWREQ_SET_MIN_CLOCK_RATE :qemu_log_mask (LOG_UNIMP ,"bcm2835_property: 0x%08x set clock rate NYI\n" , tag);
@@ -143,121 +144,121 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)/* Temperature */ -case 0x00030006 :/* Get temperature */ +case RPI_FWREQ_GET_TEMPERATURE :stl_le_phys (&s->dma_as, value +16 ,25000 ); resplen =8 ;break ; -case 0x0003000A :/* Get max temperature */ +case RPI_FWREQ_GET_MAX_TEMPERATURE :stl_le_phys (&s->dma_as, value +16 ,99000 ); resplen =8 ;break ;/* Frame buffer */ -case 0x00040001 :/* Allocate buffer */ +case RPI_FWREQ_FRAMEBUFFER_ALLOCATE :stl_le_phys (&s->dma_as, value +12 , fbconfig.base);stl_le_phys (&s->dma_as, value +16 ,bcm2835_fb_get_size (&fbconfig)); resplen =8 ;break ; -case 0x00048001 :/* Release buffer */ +case RPI_FWREQ_FRAMEBUFFER_RELEASE : resplen =0 ;break ; -case 0x00040002 :/* Blank screen */ +case RPI_FWREQ_FRAMEBUFFER_BLANK : resplen =4 ;break ; -case 0x00044003 :/* Test physical display width/height */ -case 0x00044004 :/* Test virtual display width/height */ +case RPI_FWREQ_FRAMEBUFFER_TEST_PHYSICAL_WIDTH_HEIGHT : +case RPI_FWREQ_FRAMEBUFFER_TEST_VIRTUAL_WIDTH_HEIGHT : resplen =8 ;break ; -case 0x00048003 :/* Set physical display width/height */ +case RPI_FWREQ_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT : fbconfig.xres =ldl_le_phys (&s->dma_as, value +12 ); fbconfig.yres =ldl_le_phys (&s->dma_as, value +16 );bcm2835_fb_validate_config (&fbconfig); fbconfig_updated = true;/* fall through */ -case 0x00040003 :/* Get physical display width/height */ +case RPI_FWREQ_FRAMEBUFFER_GET_PHYSICAL_WIDTH_HEIGHT :stl_le_phys (&s->dma_as, value +12 , fbconfig.xres);stl_le_phys (&s->dma_as, value +16 , fbconfig.yres); resplen =8 ;break ; -case 0x00048004 :/* Set virtual display width/height */ +case RPI_FWREQ_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT : fbconfig.xres_virtual =ldl_le_phys (&s->dma_as, value +12 ); fbconfig.yres_virtual =ldl_le_phys (&s->dma_as, value +16 );bcm2835_fb_validate_config (&fbconfig); fbconfig_updated = true;/* fall through */ -case 0x00040004 :/* Get virtual display width/height */ +case RPI_FWREQ_FRAMEBUFFER_GET_VIRTUAL_WIDTH_HEIGHT :stl_le_phys (&s->dma_as, value +12 , fbconfig.xres_virtual);stl_le_phys (&s->dma_as, value +16 , fbconfig.yres_virtual); resplen =8 ;break ; -case 0x00044005 :/* Test depth */ +case RPI_FWREQ_FRAMEBUFFER_TEST_DEPTH : resplen =4 ;break ; -case 0x00048005 :/* Set depth */ +case RPI_FWREQ_FRAMEBUFFER_SET_DEPTH : fbconfig.bpp =ldl_le_phys (&s->dma_as, value +12 );bcm2835_fb_validate_config (&fbconfig); fbconfig_updated = true;/* fall through */ -case 0x00040005 :/* Get depth */ +case RPI_FWREQ_FRAMEBUFFER_GET_DEPTH :stl_le_phys (&s->dma_as, value +12 , fbconfig.bpp); resplen =4 ;break ; -case 0x00044006 :/* Test pixel order */ +case RPI_FWREQ_FRAMEBUFFER_TEST_PIXEL_ORDER : resplen =4 ;break ; -case 0x00048006 :/* Set pixel order */ +case RPI_FWREQ_FRAMEBUFFER_SET_PIXEL_ORDER : fbconfig.pixo =ldl_le_phys (&s->dma_as, value +12 );bcm2835_fb_validate_config (&fbconfig); fbconfig_updated = true;/* fall through */ -case 0x00040006 :/* Get pixel order */ +case RPI_FWREQ_FRAMEBUFFER_GET_PIXEL_ORDER :stl_le_phys (&s->dma_as, value +12 , fbconfig.pixo); resplen =4 ;break ; -case 0x00044007 :/* Test pixel alpha */ +case RPI_FWREQ_FRAMEBUFFER_TEST_ALPHA_MODE : resplen =4 ;break ; -case 0x00048007 :/* Set alpha */ +case RPI_FWREQ_FRAMEBUFFER_SET_ALPHA_MODE : fbconfig.alpha =ldl_le_phys (&s->dma_as, value +12 );bcm2835_fb_validate_config (&fbconfig); fbconfig_updated = true;/* fall through */ -case 0x00040007 :/* Get alpha */ +case RPI_FWREQ_FRAMEBUFFER_GET_ALPHA_MODE :stl_le_phys (&s->dma_as, value +12 , fbconfig.alpha); resplen =4 ;break ; -case 0x00040008 :/* Get pitch */ +case RPI_FWREQ_FRAMEBUFFER_GET_PITCH :stl_le_phys (&s->dma_as, value +12 ,bcm2835_fb_get_pitch (&fbconfig)); resplen =4 ;break ; -case 0x00044009 :/* Test virtual offset */ +case RPI_FWREQ_FRAMEBUFFER_TEST_VIRTUAL_OFFSET : resplen =8 ;break ; -case 0x00048009 :/* Set virtual offset */ +case RPI_FWREQ_FRAMEBUFFER_SET_VIRTUAL_OFFSET : fbconfig.xoffset =ldl_le_phys (&s->dma_as, value +12 ); fbconfig.yoffset =ldl_le_phys (&s->dma_as, value +16 );bcm2835_fb_validate_config (&fbconfig); fbconfig_updated = true;/* fall through */ -case 0x00040009 :/* Get virtual offset */ +case RPI_FWREQ_FRAMEBUFFER_GET_VIRTUAL_OFFSET :stl_le_phys (&s->dma_as, value +12 , fbconfig.xoffset);stl_le_phys (&s->dma_as, value +16 , fbconfig.yoffset); resplen =8 ;break ; -case 0x0004000a :/* Get/Test/Set overscan */ -case 0x0004400a : -case 0x0004800a : +case RPI_FWREQ_FRAMEBUFFER_GET_OVERSCAN : +case RPI_FWREQ_FRAMEBUFFER_TEST_OVERSCAN : +case RPI_FWREQ_FRAMEBUFFER_SET_OVERSCAN :stl_le_phys (&s->dma_as, value +12 ,0 );stl_le_phys (&s->dma_as, value +16 ,0 );stl_le_phys (&s->dma_as, value +20 ,0 );stl_le_phys (&s->dma_as, value +24 ,0 ); resplen =16 ;break ; -case 0x0004800b :/* Set palette */ +case RPI_FWREQ_FRAMEBUFFER_SET_PALETTE : offset =ldl_le_phys (&s->dma_as, value +12 ); length =ldl_le_phys (&s->dma_as, value +16 ); n =0 ;
@@ -270,18 +271,18 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)stl_le_phys (&s->dma_as, value +12 ,0 ); resplen =4 ;break ; -case 0x00040013 :/* Get number of displays */ +case RPI_FWREQ_FRAMEBUFFER_GET_NUM_DISPLAYS :stl_le_phys (&s->dma_as, value +12 ,1 ); resplen =4 ;break ; -case 0x00060001 :/* Get DMA channels */ +case RPI_FWREQ_GET_DMA_CHANNELS :/* channels 2-5 */ stl_le_phys (&s->dma_as, value +12 ,0x003C ); resplen =4 ;break ; -case 0x00050001 :/* Get command line */ +case RPI_FWREQ_GET_COMMAND_LINE :/* * We follow the firmware behaviour: no NUL terminator is * written to the buffer, and if the buffer is too short
Signature · 1 line
2.38.1
Re: [PATCH v3 2/4] hw/misc/bcm2835_property: Use 'raspberrypi-fw-defs.h' definitions
Quoted 5 lines · Philippe Mathieu-Daudé
From: Sergey Kambalin<[email protected]>
Replace magic property values by a proper definition, removing redundant comments.
Quoted 7 lines
Signed-off-by Sergey Kambalin<[email protected]>Message-Id:<[email protected]>
[PMD: Split from bigger patch: 2/4]Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- hw/misc/bcm2835_property.c | 101 +++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 50 deletions(-)
r~
RFC PATCH v3 3/4 hw/misc/bcm2835_property: Replace magic frequency values by definitions
In reply to Philippe Mathieu-DaudéFrom: Sergey Kambalin <[email protected]>
Message-Id: <[email protected]>
---
FIXME: RPI_FIRMWARE_DEFAULT_CLK_RATE is raspi1-specific... Good enough for now?
--- include/hw/arm/raspi_platform.h | 5 +++++ hw/misc/bcm2835_property.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)
include/hw/arm/raspi_platform.h +5 -0
@@ -170,4 +170,9 @@#define INTERRUPT_ILLEGAL_TYPE0 6#define INTERRUPT_ILLEGAL_TYPE1 7 +/* Clock rates */ +#define RPI_FIRMWARE_EMMC_CLK_RATE 50000000 +#define RPI_FIRMWARE_UART_CLK_RATE 3000000 +#define RPI_FIRMWARE_DEFAULT_CLK_RATE 700000000 +#endif
hw/misc/bcm2835_property.c +5 -3
@@ -17,6 +17,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "trace.h" +#include "hw/arm/raspi_platform.h" /* https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface */
@@ -121,13 +122,14 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)case RPI_FWREQ_GET_MIN_CLOCK_RATE :switch (ldl_le_phys (&s->dma_as, value +12 )) {case RPI_FIRMWARE_EMMC_CLK_ID : -stl_le_phys (&s->dma_as, value +16 ,50000000 ); +stl_le_phys (&s->dma_as, value +16 ,RPI_FIRMWARE_EMMC_CLK_RATE );break ;case RPI_FIRMWARE_UART_CLK_ID : -stl_le_phys (&s->dma_as, value +16 ,3000000 ); +stl_le_phys (&s->dma_as, value +16 ,RPI_FIRMWARE_UART_CLK_RATE );break ;default : -stl_le_phys (&s->dma_as, value +16 ,700000000 ); +stl_le_phys (&s->dma_as, value +16 , +RPI_FIRMWARE_DEFAULT_CLK_RATE );break ; } resplen =8 ;
Signature · 1 line
2.38.1
Re: [RFC PATCH v3 3/4] hw/misc/bcm2835_property: Replace magic frequency values by definitions
Quoted 4 lines · Philippe Mathieu-Daudé
From: Sergey Kambalin<[email protected]>
Signed-off-by Sergey Kambalin<[email protected]>Message-Id:<[email protected]>
Quoted 8 lines
[PMD: Split from bigger patch: 4/4]Signed-off-by Philippe Mathieu-Daudé<[email protected]>---
FIXME:RPI_FIRMWARE_DEFAULT_CLK_RATEis raspi1-specific... Good enough for now?--- include/hw/arm/raspi_platform.h | 5 +++++ hw/misc/bcm2835_property.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-)
r~
RFC PATCH v3 4/4 hw/misc/bcm2835_property: Handle CORE_CLK_ID firmware property
In reply to Philippe Mathieu-DaudéFrom: Sergey Kambalin <[email protected]>
Message-Id: <[email protected]>
---
TOCHECK: seems raspi3-specific freq. Use a per-soc freq? Good enough for now?
--- include/hw/arm/raspi_platform.h | 1 + hw/misc/bcm2835_property.c | 3 +++ 2 files changed, 4 insertions(+)
include/hw/arm/raspi_platform.h +1 -0
@@ -173,6 +173,7 @@/* Clock rates */ #define RPI_FIRMWARE_EMMC_CLK_RATE 50000000#define RPI_FIRMWARE_UART_CLK_RATE 3000000 +#define RPI_FIRMWARE_CORE_CLK_RATE 350000000#define RPI_FIRMWARE_DEFAULT_CLK_RATE 700000000#endif
hw/misc/bcm2835_property.c +3 -0
@@ -127,6 +127,9 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value)case RPI_FIRMWARE_UART_CLK_ID :stl_le_phys (&s->dma_as, value +16 ,RPI_FIRMWARE_UART_CLK_RATE );break ; +case RPI_FIRMWARE_CORE_CLK_ID : +stl_le_phys (&s->dma_as, value +16 ,RPI_FIRMWARE_CORE_CLK_RATE ); +break ;default :stl_le_phys (&s->dma_as, value +16 ,RPI_FIRMWARE_DEFAULT_CLK_RATE );
Signature · 1 line
2.38.1
Re: [RFC PATCH v3 4/4] hw/misc/bcm2835_property: Handle CORE_CLK_ID firmware property
Quoted 9 lines · Philippe Mathieu-Daudé
From: Sergey Kambalin <[email protected]>
Signed-off-by Sergey Kambalin <[email protected]>Message-Id: <[email protected]>
[PMD: Split from bigger patch: 3/4]Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
TOCHECK: seems raspi3-specific freq. Use a per-soc freq? Good enough for now?
Seems like 'good enough for now' to me. We can add a comment:
+/*
+ * TODO: this is really SoC-specific; we might want to
+ * set it per-SoC if it turns out any guests care.
+ */
-- PMM
Peter Maydell
AppliedQuoted 6 lines · Philippe Mathieu-Daudé
v2: https://lore.kernel.org/qemu-devel/[email protected]/
This is a respin of Sergey's patch but
- split in multiple patches
- removing redundant comments
Applied to target-arm.next (with the comment I mentioned added to patch 4), thanks.
-- PMM