Complete i.MX6UL and i.MX7 processor for bare metal application.
Subsystems (2)
v4 cover Complete i.MX6UL and i.MX7 processor for bare metal application.
This patch adds a few unimplemented TZ devices (TZASC and CSU) to i.MX6UL and i.MX7 processors to avoid bare metal application to experiment "bus error" when acccessing these devices.
It also adds some internal memory segments (OCRAM) to the i.MX7 to allow bare metal application to use them.
Last, it adds the SRC device to the i.MX7 processor to allow bare metal application to start the secondary Cortex-A7 core.
Note: When running Linux inside Qemu, the secondary core is started by calling PSCI API and Qemu is emulating PSCI without needing access to the SRC device. This is why Linux is using the 2 cores in Qemu even if the SRC is not implemented. This is not the case when running bare metal application (like u-boot itself) that do not rely on the PSCI service being available.
Changes since v3:
* Add a specific patch to remove IOMUXC GPR device from i.MX6UL
* remove unimplemented IOMUXC GPR device frome i.MX7D
* move the initialisation of PWM devices 5 to 8 to 3rd patch
* put the init of i.MX7d devices in previous order to ease review
* Remove device memory size from header file when the device is actually implemented in QEMU (the device implementation defines the memory size it manages).
Changes since v2:
* use GiB, MiB, KiB constant defined in qemu/units.h after code review
Changes since v1:
* split the i.MX6UL patch into a refactor patch and an addon patch.
* Split the i.MX7 patch into a refactor patch and an addon patch.
* Fix SRC code after few comments in code review.
Jean-Christophe Dubois (6):
Remove i.MX7 IOMUX GPR device from i.MX6UL
Refactor i.MX6UL processor code
Add i.MX6UL missing devices.
Refactor i.MX7 processor code
Add i.MX7 missing TZ devices and memory regions
Add i.MX7 SRC device implementation
hw/arm/fsl-imx6ul.c | 174 ++++++++++++------- hw/arm/fsl-imx7.c | 201 +++++++++++++++++----- hw/misc/imx7_src.c | 276 +++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + hw/misc/trace-events | 4 + include/hw/arm/fsl-imx6ul.h | 136 +++++++++++++-- include/hw/arm/fsl-imx7.h | 334 +++++++++++++++++++++++++++--------- include/hw/misc/imx7_src.h | 66 +++++++ 8 files changed, 995 insertions(+), 197 deletions(-) create mode 100644 hw/misc/imx7_src.c create mode 100644 include/hw/misc/imx7_src.h
Signature · 1 line
2.34.1
PATCH v4 1/6 Remove i.MX7 IOMUX GPR device from i.MX6UL
i.MX7 IOMUX GPR device is not equivalent to i.MX6UL IOMUXC GPR device. In particular, register 22 is not present on i.MX6UL and this is actualy The only register that is really emulated in the i.MX7 IOMUX GPR device.
Note: The i.MX6UL code is actually also implementing the IOMUX GPR device as an unimplemented device at the same bus adress and the 2 instantiations were actualy colliding. So we go back to the unimplemented device for now.
--- hw/arm/fsl-imx6ul.c | 11 ----------- include/hw/arm/fsl-imx6ul.h | 2 -- 2 files changed, 13 deletions(-)
hw/arm/fsl-imx6ul.c +0 -11
@@ -63,11 +63,6 @@ static void fsl_imx6ul_init(Object *obj)*/ object_initialize_child (obj,"snvs" , &s->snvs,TYPE_IMX7_SNVS ); -/* -* GPR -*/ -object_initialize_child (obj,"gpr" , &s->gpr,TYPE_IMX7_GPR ); -/* * GPIOs 1 to 5 */
@@ -537,12 +532,6 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_WDOGn_IRQ[i])); } -/* -* GPR -*/ -sysbus_realize (SYS_BUS_DEVICE (&s->gpr), &error_abort); -sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpr),0 ,FSL_IMX6UL_IOMUXC_GPR_ADDR ); -/* * SDMA */
include/hw/arm/fsl-imx6ul.h +0 -2
@@ -22,7 +22,6 @@#include "hw/misc/imx6ul_ccm.h" #include "hw/misc/imx6_src.h" #include "hw/misc/imx7_snvs.h" -#include "hw/misc/imx7_gpr.h" #include "hw/intc/imx_gpcv2.h" #include "hw/watchdog/wdt_imx2.h" #include "hw/gpio/imx_gpio.h"
@@ -74,7 +73,6 @@ struct FslIMX6ULState {IMX6SRCState src;IMX7SNVSState snvs;IMXGPCv2State gpcv2; -IMX7GPRState gpr;IMXSPIState spi[FSL_IMX6UL_NUM_ECSPIS ];IMXI2CState i2c[FSL_IMX6UL_NUM_I2CS ];IMXSerialState uart[FSL_IMX6UL_NUM_UARTS ];
Signature · 1 line
2.34.1
Re: [PATCH v4 1/6] Remove i.MX7 IOMUX GPR device from i.MX6UL
Quoted 11 lines · Jean-Christophe Dubois
i.MX7 IOMUX GPR device is not equivalent to i.MX6UL IOMUXC GPR device. In particular, register 22 is not present on i.MX6UL and this is actualy The only register that is really emulated in the i.MX7 IOMUX GPR device.
Note: The i.MX6UL code is actually also implementing the IOMUX GPR device as an unimplemented device at the same bus adress and the 2 instantiations were actualy colliding. So we go back to the unimplemented device for now.
Signed-off-by Jean-Christophe Dubois <[email protected]>---
thanks
-- PMM
PATCH v4 2/6 Refactor i.MX6UL processor code
In reply to Jean-Christophe Dubois* Add Addr and size definition for most i.MX6UL devices in i.MX6UL header file.
* Use those newly defined named constants whenever possible.
* Standardize the way we init a familly of unimplemented devices
- SAI
- PWM
- CAN
* Add/rework few comments
--- hw/arm/fsl-imx6ul.c | 147 ++++++++++++++++++++++++------------ include/hw/arm/fsl-imx6ul.h | 134 +++++++++++++++++++++++++++++--- 2 files changed, 221 insertions(+), 60 deletions(-)
hw/arm/fsl-imx6ul.c +98 -49
@@ -64,7 +64,7 @@ static void fsl_imx6ul_init(Object *obj)object_initialize_child (obj,"snvs" , &s->snvs,TYPE_IMX7_SNVS );/* -* GPIOs 1 to 5 +* GPIOs */ for (i =0 ; i <FSL_IMX6UL_NUM_GPIOS ; i++) {snprintf (name,NAME_SIZE ,"gpio%d" , i);
@@ -72,7 +72,7 @@ static void fsl_imx6ul_init(Object *obj) }/* -* GPT 1, 2 +* GPTs */ for (i =0 ; i <FSL_IMX6UL_NUM_GPTS ; i++) {snprintf (name,NAME_SIZE ,"gpt%d" , i);
@@ -80,7 +80,7 @@ static void fsl_imx6ul_init(Object *obj) }/* -* EPIT 1, 2 +* EPITs */ for (i =0 ; i <FSL_IMX6UL_NUM_EPITS ; i++) {snprintf (name,NAME_SIZE ,"epit%d" , i +1 );
@@ -88,7 +88,7 @@ static void fsl_imx6ul_init(Object *obj) }/* -* eCSPI +* eCSPIs */ for (i =0 ; i <FSL_IMX6UL_NUM_ECSPIS ; i++) {snprintf (name,NAME_SIZE ,"spi%d" , i +1 );
@@ -96,7 +96,7 @@ static void fsl_imx6ul_init(Object *obj) }/* -* I2C +* I2Cs */ for (i =0 ; i <FSL_IMX6UL_NUM_I2CS ; i++) {snprintf (name,NAME_SIZE ,"i2c%d" , i +1 );
@@ -104,7 +104,7 @@ static void fsl_imx6ul_init(Object *obj) }/* -* UART +* UARTs */ for (i =0 ; i <FSL_IMX6UL_NUM_UARTS ; i++) {snprintf (name,NAME_SIZE ,"uart%d" , i);
@@ -112,25 +112,31 @@ static void fsl_imx6ul_init(Object *obj) }/* -* Ethernet +* Ethernets */ for (i =0 ; i <FSL_IMX6UL_NUM_ETHS ; i++) {snprintf (name,NAME_SIZE ,"eth%d" , i);object_initialize_child (obj, name, &s->eth[i],TYPE_IMX_ENET ); } -/* USB */ +/* +* USB PHYs +*/ for (i =0 ; i <FSL_IMX6UL_NUM_USB_PHYS ; i++) {snprintf (name,NAME_SIZE ,"usbphy%d" , i);object_initialize_child (obj, name, &s->usbphy[i],TYPE_IMX_USBPHY ); } + +/* +* USBs +*/ for (i =0 ; i <FSL_IMX6UL_NUM_USBS ; i++) {snprintf (name,NAME_SIZE ,"usb%d" , i);object_initialize_child (obj, name, &s->usb[i],TYPE_CHIPIDEA ); }/* -* SDHCI +* SDHCIs */ for (i =0 ; i <FSL_IMX6UL_NUM_USDHCS ; i++) {snprintf (name,NAME_SIZE ,"usdhc%d" , i);
@@ -138,7 +144,7 @@ static void fsl_imx6ul_init(Object *obj) }/* -* Watchdog +* Watchdogs */ for (i =0 ; i <FSL_IMX6UL_NUM_WDTS ; i++) {snprintf (name,NAME_SIZE ,"wdt%d" , i);
@@ -184,10 +190,10 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)* A7MPCORE DAP */ create_unimplemented_device ("a7mpcore-dap" ,FSL_IMX6UL_A7MPCORE_DAP_ADDR , -0x100000 ); +FSL_IMX6UL_A7MPCORE_DAP_SIZE );/* -* GPT 1, 2 +* GPTs */ for (i =0 ; i <FSL_IMX6UL_NUM_GPTS ; i++) {static const hwaddr FSL_IMX6UL_GPTn_ADDR[FSL_IMX6UL_NUM_GPTS ] = {
@@ -212,7 +218,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) }/* -* EPIT 1, 2 +* EPITs */ for (i =0 ; i <FSL_IMX6UL_NUM_EPITS ; i++) {static const hwaddr FSL_IMX6UL_EPITn_ADDR[FSL_IMX6UL_NUM_EPITS ] = {
@@ -237,7 +243,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) }/* -* GPIO +* GPIOs */ for (i =0 ; i <FSL_IMX6UL_NUM_GPIOS ; i++) {static const hwaddr FSL_IMX6UL_GPIOn_ADDR[FSL_IMX6UL_NUM_GPIOS ] = {
@@ -279,17 +285,12 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) }/* -* IOMUXC and IOMUXC_GPR +* IOMUXC */ -for (i =0 ; i <1 ; i++) { -static const hwaddr FSL_IMX6UL_IOMUXCn_ADDR[FSL_IMX6UL_NUM_IOMUXCS ] = { -FSL_IMX6UL_IOMUXC_ADDR , -FSL_IMX6UL_IOMUXC_GPR_ADDR , - }; - -snprintf (name,NAME_SIZE ,"iomuxc%d" , i); -create_unimplemented_device (name, FSL_IMX6UL_IOMUXCn_ADDR[i],0x4000 ); - } +create_unimplemented_device ("iomuxc" ,FSL_IMX6UL_IOMUXC_ADDR , +FSL_IMX6UL_IOMUXC_SIZE ); +create_unimplemented_device ("iomuxc_gpr" ,FSL_IMX6UL_IOMUXC_GPR_ADDR , +FSL_IMX6UL_IOMUXC_GPR_SIZE );/* * CCM
@@ -309,7 +310,9 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)sysbus_realize (SYS_BUS_DEVICE (&s->gpcv2), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpcv2),0 ,FSL_IMX6UL_GPC_ADDR ); -/* Initialize all ECSPI */ +/* +* ECSPIs +*/ for (i =0 ; i <FSL_IMX6UL_NUM_ECSPIS ; i++) {static const hwaddr FSL_IMX6UL_SPIn_ADDR[FSL_IMX6UL_NUM_ECSPIS ] = {FSL_IMX6UL_ECSPI1_ADDR ,
@@ -337,7 +340,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) }/* -* I2C +* I2Cs */ for (i =0 ; i <FSL_IMX6UL_NUM_I2CS ; i++) {static const hwaddr FSL_IMX6UL_I2Cn_ADDR[FSL_IMX6UL_NUM_I2CS ] = {
@@ -363,7 +366,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) }/* -* UART +* UARTs */ for (i =0 ; i <FSL_IMX6UL_NUM_UARTS ; i++) {static const hwaddr FSL_IMX6UL_UARTn_ADDR[FSL_IMX6UL_NUM_UARTS ] = {
@@ -401,7 +404,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) }/* -* Ethernet +* Ethernets * * We must use two loops since phy_connected affects the other interface * and we have to set all properties before calling sysbus_realize().
@@ -454,28 +457,45 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_ENETn_TIMER_IRQ[i])); } -/* USB */ +/* +* USB PHYs +*/ for (i =0 ; i <FSL_IMX6UL_NUM_USB_PHYS ; i++) { +static const hwaddr + FSL_IMX6UL_USB_PHYn_ADDR[FSL_IMX6UL_NUM_USB_PHYS ] = { +FSL_IMX6UL_USBPHY1_ADDR , +FSL_IMX6UL_USBPHY2_ADDR , + }; +sysbus_realize (SYS_BUS_DEVICE (&s->usbphy[i]), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->usbphy[i]),0 , -FSL_IMX6UL_USBPHY1_ADDR + i *0x1000 ); + FSL_IMX6UL_USB_PHYn_ADDR[i]); } +/* +* USBs +*/ for (i =0 ; i <FSL_IMX6UL_NUM_USBS ; i++) { +static const hwaddr FSL_IMX6UL_USB02_USBn_ADDR[FSL_IMX6UL_NUM_USBS ] = { +FSL_IMX6UL_USBO2_USB1_ADDR , +FSL_IMX6UL_USBO2_USB2_ADDR , + }; +static const int FSL_IMX6UL_USBn_IRQ[] = {FSL_IMX6UL_USB1_IRQ ,FSL_IMX6UL_USB2_IRQ , }; +sysbus_realize (SYS_BUS_DEVICE (&s->usb[i]), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->usb[i]),0 , -FSL_IMX6UL_USBO2_USB_ADDR + i *0x200 ); + FSL_IMX6UL_USB02_USBn_ADDR[i]);sysbus_connect_irq (SYS_BUS_DEVICE (&s->usb[i]),0 ,qdev_get_gpio_in (DEVICE (&s->a7mpcore), FSL_IMX6UL_USBn_IRQ[i])); }/* -* USDHC +* USDHCs */ for (i =0 ; i <FSL_IMX6UL_NUM_USDHCS ; i++) {static const hwaddr FSL_IMX6UL_USDHCn_ADDR[FSL_IMX6UL_NUM_USDHCS ] = {
@@ -507,7 +527,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)sysbus_mmio_map (SYS_BUS_DEVICE (&s->snvs),0 ,FSL_IMX6UL_SNVS_HP_ADDR );/* -* Watchdog +* Watchdogs */ for (i =0 ; i <FSL_IMX6UL_NUM_WDTS ; i++) {static const hwaddr FSL_IMX6UL_WDOGn_ADDR[FSL_IMX6UL_NUM_WDTS ] = {
@@ -515,6 +535,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)FSL_IMX6UL_WDOG2_ADDR , FSL_IMX6UL_WDOG3_ADDR, }; +static const int FSL_IMX6UL_WDOGn_IRQ[FSL_IMX6UL_NUM_WDTS ] = {FSL_IMX6UL_WDOG1_IRQ , FSL_IMX6UL_WDOG2_IRQ,
@@ -535,33 +556,59 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)/* * SDMA */ -create_unimplemented_device ("sdma" ,FSL_IMX6UL_SDMA_ADDR ,0x4000 ); +create_unimplemented_device ("sdma" ,FSL_IMX6UL_SDMA_ADDR , +FSL_IMX6UL_SDMA_SIZE );/* -* SAI (Audio SSI (Synchronous Serial Interface)) +* SAIs (Audio SSI (Synchronous Serial Interface)) */ -create_unimplemented_device ("sai1" ,FSL_IMX6UL_SAI1_ADDR ,0x4000 ); -create_unimplemented_device ("sai2" ,FSL_IMX6UL_SAI2_ADDR ,0x4000 ); -create_unimplemented_device ("sai3" ,FSL_IMX6UL_SAI3_ADDR ,0x4000 ); +for (i =0 ; i <FSL_IMX6UL_NUM_SAIS ; i++) { +static const hwaddr FSL_IMX6UL_SAIn_ADDR[FSL_IMX6UL_NUM_SAIS ] = { +FSL_IMX6UL_SAI1_ADDR , +FSL_IMX6UL_SAI2_ADDR , +FSL_IMX6UL_SAI3_ADDR , + }; + +snprintf (name,NAME_SIZE ,"sai%d" , i); +create_unimplemented_device (name, FSL_IMX6UL_SAIn_ADDR[i], + FSL_IMX6UL_SAIn_SIZE); + }/* -* PWM +* PWMs */ -create_unimplemented_device ("pwm1" ,FSL_IMX6UL_PWM1_ADDR ,0x4000 ); -create_unimplemented_device ("pwm2" ,FSL_IMX6UL_PWM2_ADDR ,0x4000 ); -create_unimplemented_device ("pwm3" ,FSL_IMX6UL_PWM3_ADDR ,0x4000 ); -create_unimplemented_device ("pwm4" ,FSL_IMX6UL_PWM4_ADDR ,0x4000 ); +for (i =0 ; i <FSL_IMX6UL_NUM_PWMS ; i++) { +static const hwaddr FSL_IMX6UL_PWMn_ADDR[FSL_IMX6UL_NUM_PWMS ] = { +FSL_IMX6UL_PWM1_ADDR , +FSL_IMX6UL_PWM2_ADDR , +FSL_IMX6UL_PWM3_ADDR , +FSL_IMX6UL_PWM4_ADDR , + }; + +snprintf (name,NAME_SIZE ,"pwm%d" , i); +create_unimplemented_device (name, FSL_IMX6UL_PWMn_ADDR[i], + FSL_IMX6UL_PWMn_SIZE); + }/* * Audio ASRC (asynchronous sample rate converter) */ -create_unimplemented_device ("asrc" ,FSL_IMX6UL_ASRC_ADDR ,0x4000 ); +create_unimplemented_device ("asrc" ,FSL_IMX6UL_ASRC_ADDR , +FSL_IMX6UL_ASRC_SIZE );/* -* CAN +* CANs */ -create_unimplemented_device ("can1" ,FSL_IMX6UL_CAN1_ADDR ,0x4000 ); -create_unimplemented_device ("can2" ,FSL_IMX6UL_CAN2_ADDR ,0x4000 ); +for (i =0 ; i <FSL_IMX6UL_NUM_CANS ; i++) { +static const hwaddr FSL_IMX6UL_CANn_ADDR[FSL_IMX6UL_NUM_CANS ] = { +FSL_IMX6UL_CAN1_ADDR , +FSL_IMX6UL_CAN2_ADDR , + }; + +snprintf (name,NAME_SIZE ,"can%d" , i); +create_unimplemented_device (name, FSL_IMX6UL_CANn_ADDR[i], + FSL_IMX6UL_CANn_SIZE); + }/* * APHB_DMA
@@ -579,13 +626,15 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) };snprintf (name,NAME_SIZE ,"adc%d" , i); -create_unimplemented_device (name, FSL_IMX6UL_ADCn_ADDR[i],0x4000 ); +create_unimplemented_device (name, FSL_IMX6UL_ADCn_ADDR[i], + FSL_IMX6UL_ADCn_SIZE); }/* * LCD */ -create_unimplemented_device ("lcdif" ,FSL_IMX6UL_LCDIF_ADDR ,0x4000 ); +create_unimplemented_device ("lcdif" ,FSL_IMX6UL_LCDIF_ADDR , +FSL_IMX6UL_LCDIF_SIZE );/* * ROM memory
include/hw/arm/fsl-imx6ul.h +123 -11
254 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v4 2/6] Refactor i.MX6UL processor code
Quoted 11 lines · Jean-Christophe Dubois
* Add Addr and size definition for most i.MX6UL devices in i.MX6UL header file.
* Use those newly defined named constants whenever possible.
* Standardize the way we init a familly of unimplemented devices
- SAI
- PWM
- CAN
* Add/rework few commentsSigned-off-by Jean-Christophe Dubois <[email protected]>---
thanks
-- PMM
PATCH v4 3/6 Add i.MX6UL missing devices.
In reply to Jean-Christophe Dubois* Add TZASC as unimplemented device.
- Allow bare metal application to access this (unimplemented) device
* Add CSU as unimplemented device.
- Allow bare metal application to access this (unimplemented) device
* Add 4 missing PWM devices
--- hw/arm/fsl-imx6ul.c | 16 ++++++++++++++++ include/hw/arm/fsl-imx6ul.h | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-)
hw/arm/fsl-imx6ul.c +16 -0
@@ -583,6 +583,10 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)FSL_IMX6UL_PWM2_ADDR ,FSL_IMX6UL_PWM3_ADDR ,FSL_IMX6UL_PWM4_ADDR , +FSL_IMX6UL_PWM5_ADDR , +FSL_IMX6UL_PWM6_ADDR , +FSL_IMX6UL_PWM7_ADDR , +FSL_IMX6UL_PWM8_ADDR , };snprintf (name,NAME_SIZE ,"pwm%d" , i);
@@ -636,6 +640,18 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("lcdif" ,FSL_IMX6UL_LCDIF_ADDR ,FSL_IMX6UL_LCDIF_SIZE ); +/* +* CSU +*/ +create_unimplemented_device ("csu" ,FSL_IMX6UL_CSU_ADDR , +FSL_IMX6UL_CSU_SIZE ); + +/* +* TZASC +*/ +create_unimplemented_device ("tzasc" ,FSL_IMX6UL_TZASC_ADDR , +FSL_IMX6UL_TZASC_SIZE ); +/* * ROM memory */
include/hw/arm/fsl-imx6ul.h +1 -1
@@ -60,7 +60,7 @@ enum FslIMX6ULConfiguration {FSL_IMX6UL_NUM_USBS =2 ,FSL_IMX6UL_NUM_SAIS =3 ,FSL_IMX6UL_NUM_CANS =2 , - FSL_IMX6UL_NUM_PWMS = 4, + FSL_IMX6UL_NUM_PWMS = 8, }; struct FslIMX6ULState {
Signature · 1 line
2.34.1
PATCH v4 4/6 Refactor i.MX7 processor code
In reply to Jean-Christophe Dubois* Add Addr and size definition for all i.MX7 devices in i.MX7 header file.
* Use those newly defined named constants whenever possible.
* Standardize the way we init a familly of unimplemented devices
- SAI
- PWM
- CAN
* Add/rework few comments
--- hw/arm/fsl-imx7.c | 130 ++++++++++----- include/hw/arm/fsl-imx7.h | 326 ++++++++++++++++++++++++++++---------- 2 files changed, 333 insertions(+), 123 deletions(-)
hw/arm/fsl-imx7.c +91 -39
@@ -36,6 +36,9 @@ static void fsl_imx7_init(Object *obj)char name[NAME_SIZE ];int i; +/* +* CPUs +*/ for (i =0 ; i <MIN (ms->smp.cpus,FSL_IMX7_NUM_CPUS ); i++) {snprintf (name,NAME_SIZE ,"cpu%d" , i); object_initialize_child(obj, name, &s->cpu[i],
@@ -49,7 +52,7 @@ static void fsl_imx7_init(Object *obj) TYPE_A15MPCORE_PRIV);/* -* GPIOs 1 to 7 +* GPIOs */ for (i =0 ; i <FSL_IMX7_NUM_GPIOS ; i++) {snprintf (name,NAME_SIZE ,"gpio%d" , i);
@@ -57,7 +60,7 @@ static void fsl_imx7_init(Object *obj) }/* -* GPT1, 2, 3, 4 +* GPTs */ for (i =0 ; i <FSL_IMX7_NUM_GPTS ; i++) {snprintf (name,NAME_SIZE ,"gpt%d" , i);
@@ -79,19 +82,24 @@ static void fsl_imx7_init(Object *obj)*/ object_initialize_child (obj,"gpcv2" , &s->gpcv2,TYPE_IMX_GPCV2 ); +/* +* ECSPIs +*/ for (i =0 ; i <FSL_IMX7_NUM_ECSPIS ; i++) {snprintf (name,NAME_SIZE ,"spi%d" , i +1 );object_initialize_child (obj, name, &s->spi[i],TYPE_IMX_SPI ); } - +/* +* I2Cs +*/ for (i =0 ; i <FSL_IMX7_NUM_I2CS ; i++) {snprintf (name,NAME_SIZE ,"i2c%d" , i +1 );object_initialize_child (obj, name, &s->i2c[i],TYPE_IMX_I2C ); }/* -* UART +* UARTs */ for (i =0 ; i <FSL_IMX7_NUM_UARTS ; i++) {snprintf (name,NAME_SIZE ,"uart%d" , i);
@@ -99,7 +107,7 @@ static void fsl_imx7_init(Object *obj) }/* -* Ethernet +* Ethernets */ for (i =0 ; i <FSL_IMX7_NUM_ETHS ; i++) {snprintf (name,NAME_SIZE ,"eth%d" , i);
@@ -107,7 +115,7 @@ static void fsl_imx7_init(Object *obj) }/* -* SDHCI +* SDHCIs */ for (i =0 ; i <FSL_IMX7_NUM_USDHCS ; i++) {snprintf (name,NAME_SIZE ,"usdhc%d" , i);
@@ -120,7 +128,7 @@ static void fsl_imx7_init(Object *obj)object_initialize_child (obj,"snvs" , &s->snvs,TYPE_IMX7_SNVS );/* -* Watchdog +* Watchdogs */ for (i =0 ; i <FSL_IMX7_NUM_WDTS ; i++) {snprintf (name,NAME_SIZE ,"wdt%d" , i);
@@ -132,8 +140,14 @@ static void fsl_imx7_init(Object *obj)*/ object_initialize_child (obj,"gpr" , &s->gpr,TYPE_IMX7_GPR ); +/* +* PCIE +*/ object_initialize_child (obj,"pcie" , &s->pcie,TYPE_DESIGNWARE_PCIE_HOST ); +/* +* USBs +*/ for (i =0 ; i <FSL_IMX7_NUM_USBS ; i++) {snprintf (name,NAME_SIZE ,"usb%d" , i);object_initialize_child (obj, name, &s->usb[i],TYPE_CHIPIDEA );
@@ -156,6 +170,9 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)return ; } +/* +* CPUs +*/ for (i =0 ; i < smp_cpus; i++) { o =OBJECT (&s->cpu[i]);
@@ -206,10 +223,10 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)* A7MPCORE DAP */ create_unimplemented_device ("a7mpcore-dap" ,FSL_IMX7_A7MPCORE_DAP_ADDR , -0x100000 ); +FSL_IMX7_A7MPCORE_DAP_SIZE );/* -* GPT1, 2, 3, 4 +* GPTs */ for (i =0 ; i <FSL_IMX7_NUM_GPTS ; i++) {static const hwaddr FSL_IMX7_GPTn_ADDR[FSL_IMX7_NUM_GPTS ] = {
@@ -234,6 +251,9 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) FSL_IMX7_GPTn_IRQ[i])); } +/* +* GPIOs +*/ for (i =0 ; i <FSL_IMX7_NUM_GPIOS ; i++) {static const hwaddr FSL_IMX7_GPIOn_ADDR[FSL_IMX7_NUM_GPIOS ] = {FSL_IMX7_GPIO1_ADDR ,
@@ -281,16 +301,10 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)/* * IOMUXC and IOMUXC_LPSR */ -for (i =0 ; i <FSL_IMX7_NUM_IOMUXCS ; i++) { -static const hwaddr FSL_IMX7_IOMUXCn_ADDR[FSL_IMX7_NUM_IOMUXCS ] = { -FSL_IMX7_IOMUXC_ADDR , -FSL_IMX7_IOMUXC_LPSR_ADDR , - }; - -snprintf (name,NAME_SIZE ,"iomuxc%d" , i); -create_unimplemented_device (name, FSL_IMX7_IOMUXCn_ADDR[i], - FSL_IMX7_IOMUXCn_SIZE); - } +create_unimplemented_device ("iomuxc" ,FSL_IMX7_IOMUXC_ADDR , +FSL_IMX7_IOMUXC_SIZE ); +create_unimplemented_device ("iomuxc_lspr" ,FSL_IMX7_IOMUXC_LPSR_ADDR , +FSL_IMX7_IOMUXC_LPSR_SIZE );/* * CCM
@@ -310,7 +324,9 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)sysbus_realize (SYS_BUS_DEVICE (&s->gpcv2), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpcv2),0 ,FSL_IMX7_GPC_ADDR ); -/* Initialize all ECSPI */ +/* +* ECSPIs +*/ for (i =0 ; i <FSL_IMX7_NUM_ECSPIS ; i++) {static const hwaddr FSL_IMX7_SPIn_ADDR[FSL_IMX7_NUM_ECSPIS ] = {FSL_IMX7_ECSPI1_ADDR ,
@@ -335,6 +351,9 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) FSL_IMX7_SPIn_IRQ[i])); } +/* +* I2Cs +*/ for (i =0 ; i <FSL_IMX7_NUM_I2CS ; i++) {static const hwaddr FSL_IMX7_I2Cn_ADDR[FSL_IMX7_NUM_I2CS ] = {FSL_IMX7_I2C1_ADDR ,
@@ -359,7 +378,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) }/* -* UART +* UARTs */ for (i =0 ; i <FSL_IMX7_NUM_UARTS ; i++) {static const hwaddr FSL_IMX7_UARTn_ADDR[FSL_IMX7_NUM_UARTS ] = {
@@ -394,7 +413,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) }/* -* Ethernet +* Ethernets * * We must use two loops since phy_connected affects the other interface * and we have to set all properties before calling sysbus_realize().
@@ -434,7 +453,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) }/* -* USDHC +* USDHCs */ for (i =0 ; i <FSL_IMX7_NUM_USDHCS ; i++) {static const hwaddr FSL_IMX7_USDHCn_ADDR[FSL_IMX7_NUM_USDHCS ] = {
@@ -464,7 +483,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)* SNVS */ sysbus_realize (SYS_BUS_DEVICE (&s->snvs), &error_abort); -sysbus_mmio_map (SYS_BUS_DEVICE (&s->snvs),0 ,FSL_IMX7_SNVS_ADDR ); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->snvs),0 ,FSL_IMX7_SNVS_HP_ADDR );/* * SRC
@@ -472,7 +491,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("src" ,FSL_IMX7_SRC_ADDR ,FSL_IMX7_SRC_SIZE );/* -* Watchdog +* Watchdogs */ for (i =0 ; i <FSL_IMX7_NUM_WDTS ; i++) {static const hwaddr FSL_IMX7_WDOGn_ADDR[FSL_IMX7_NUM_WDTS ] = {
@@ -509,25 +528,49 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("caam" ,FSL_IMX7_CAAM_ADDR ,FSL_IMX7_CAAM_SIZE );/* -* PWM +* PWMs */ -create_unimplemented_device ("pwm1" ,FSL_IMX7_PWM1_ADDR , FSL_IMX7_PWMn_SIZE); -create_unimplemented_device ("pwm2" ,FSL_IMX7_PWM2_ADDR , FSL_IMX7_PWMn_SIZE); -create_unimplemented_device ("pwm3" ,FSL_IMX7_PWM3_ADDR , FSL_IMX7_PWMn_SIZE); -create_unimplemented_device ("pwm4" ,FSL_IMX7_PWM4_ADDR , FSL_IMX7_PWMn_SIZE); +for (i =0 ; i <FSL_IMX7_NUM_PWMS ; i++) { +static const hwaddr FSL_IMX7_PWMn_ADDR[FSL_IMX7_NUM_PWMS ] = { +FSL_IMX7_PWM1_ADDR , +FSL_IMX7_PWM2_ADDR , +FSL_IMX7_PWM3_ADDR , +FSL_IMX7_PWM4_ADDR , + }; + +snprintf (name,NAME_SIZE ,"pwm%d" , i); +create_unimplemented_device (name, FSL_IMX7_PWMn_ADDR[i], + FSL_IMX7_PWMn_SIZE); + }/* -* CAN +* CANs */ -create_unimplemented_device ("can1" ,FSL_IMX7_CAN1_ADDR , FSL_IMX7_CANn_SIZE); -create_unimplemented_device ("can2" ,FSL_IMX7_CAN2_ADDR , FSL_IMX7_CANn_SIZE); +for (i =0 ; i <FSL_IMX7_NUM_CANS ; i++) { +static const hwaddr FSL_IMX7_CANn_ADDR[FSL_IMX7_NUM_CANS ] = { +FSL_IMX7_CAN1_ADDR , +FSL_IMX7_CAN2_ADDR , + }; + +snprintf (name,NAME_SIZE ,"can%d" , i); +create_unimplemented_device (name, FSL_IMX7_CANn_ADDR[i], + FSL_IMX7_CANn_SIZE); + }/* -* SAI (Audio SSI (Synchronous Serial Interface)) +* SAIs (Audio SSI (Synchronous Serial Interface)) */ -create_unimplemented_device ("sai1" ,FSL_IMX7_SAI1_ADDR , FSL_IMX7_SAIn_SIZE); -create_unimplemented_device ("sai2" ,FSL_IMX7_SAI2_ADDR , FSL_IMX7_SAIn_SIZE); -create_unimplemented_device ("sai2" ,FSL_IMX7_SAI3_ADDR , FSL_IMX7_SAIn_SIZE); +for (i =0 ; i <FSL_IMX7_NUM_SAIS ; i++) { +static const hwaddr FSL_IMX7_SAIn_ADDR[FSL_IMX7_NUM_SAIS ] = { +FSL_IMX7_SAI1_ADDR , +FSL_IMX7_SAI2_ADDR , +FSL_IMX7_SAI3_ADDR , + }; + +snprintf (name,NAME_SIZE ,"sai%d" , i); +create_unimplemented_device (name, FSL_IMX7_SAIn_ADDR[i], + FSL_IMX7_SAIn_SIZE); + }/* * OCOTP
@@ -535,9 +578,15 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("ocotp" ,FSL_IMX7_OCOTP_ADDR ,FSL_IMX7_OCOTP_SIZE ); +/* +* GPR +*/ sysbus_realize (SYS_BUS_DEVICE (&s->gpr), &error_abort); -sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpr),0 ,FSL_IMX7_GPR_ADDR ); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->gpr),0 ,FSL_IMX7_IOMUXC_GPR_ADDR ); +/* +* PCIE +*/ sysbus_realize (SYS_BUS_DEVICE (&s->pcie), &error_abort);sysbus_mmio_map (SYS_BUS_DEVICE (&s->pcie),0 ,FSL_IMX7_PCIE_REG_ADDR );
@@ -550,7 +599,9 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) irq =qdev_get_gpio_in (DEVICE (&s->a7mpcore),FSL_IMX7_PCI_INTD_IRQ );sysbus_connect_irq (SYS_BUS_DEVICE (&s->pcie),3 , irq); - +/* +* USBs +*/ for (i =0 ; i <FSL_IMX7_NUM_USBS ; i++) {static const hwaddr FSL_IMX7_USBMISCn_ADDR[FSL_IMX7_NUM_USBS ] = {FSL_IMX7_USBMISC1_ADDR ,
@@ -612,6 +663,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)*/ create_unimplemented_device ("pcie-phy" ,FSL_IMX7_PCIE_PHY_ADDR ,FSL_IMX7_PCIE_PHY_SIZE ); + }static Property fsl_imx7_properties[] = {
include/hw/arm/fsl-imx7.h +242 -84
386 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v4 4/6] Refactor i.MX7 processor code
Quoted 10 lines · Jean-Christophe Dubois
* Add Addr and size definition for all i.MX7 devices in i.MX7 header file.
* Use those newly defined named constants whenever possible.
* Standardize the way we init a familly of unimplemented devices
- SAI
- PWM
- CAN
* Add/rework few commentsSigned-off-by Jean-Christophe Dubois <[email protected]>
thanks
-- PMM
PATCH v4 5/6 Add i.MX7 missing TZ devices and memory regions
In reply to Jean-Christophe Dubois* Add TZASC as unimplemented device.
- Allow bare metal application to access this (unimplemented) device
* Add CSU as unimplemented device.
- Allow bare metal application to access this (unimplemented) device
* Add various memory segments
- OCRAM
- OCRAM EPDC
- OCRAM PXP
- OCRAM S
- ROM
- CAAM
--- hw/arm/fsl-imx7.c | 63 +++++++++++++++++++++++++++++++++++++++ include/hw/arm/fsl-imx7.h | 7 +++++ 2 files changed, 70 insertions(+)
hw/arm/fsl-imx7.c +63 -0
@@ -664,6 +664,69 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)create_unimplemented_device ("pcie-phy" ,FSL_IMX7_PCIE_PHY_ADDR ,FSL_IMX7_PCIE_PHY_SIZE ); +/* +* CSU +*/ +create_unimplemented_device ("csu" ,FSL_IMX7_CSU_ADDR , +FSL_IMX7_CSU_SIZE ); + +/* +* TZASC +*/ +create_unimplemented_device ("tzasc" ,FSL_IMX7_TZASC_ADDR , +FSL_IMX7_TZASC_SIZE ); + +/* +* OCRAM memory +*/ +memory_region_init_ram (&s->ocram,NULL ,"imx7.ocram" , +FSL_IMX7_OCRAM_MEM_SIZE , + &error_abort); +memory_region_add_subregion (get_system_memory (),FSL_IMX7_OCRAM_MEM_ADDR , + &s->ocram); + +/* +* OCRAM EPDC memory +*/ +memory_region_init_ram (&s->ocram_epdc,NULL ,"imx7.ocram_epdc" , +FSL_IMX7_OCRAM_EPDC_SIZE , + &error_abort); +memory_region_add_subregion (get_system_memory (),FSL_IMX7_OCRAM_EPDC_ADDR , + &s->ocram_epdc); + +/* +* OCRAM PXP memory +*/ +memory_region_init_ram (&s->ocram_pxp,NULL ,"imx7.ocram_pxp" , +FSL_IMX7_OCRAM_PXP_SIZE , + &error_abort); +memory_region_add_subregion (get_system_memory (),FSL_IMX7_OCRAM_PXP_ADDR , + &s->ocram_pxp); + +/* +* OCRAM_S memory +*/ +memory_region_init_ram (&s->ocram_s,NULL ,"imx7.ocram_s" , +FSL_IMX7_OCRAM_S_SIZE , + &error_abort); +memory_region_add_subregion (get_system_memory (),FSL_IMX7_OCRAM_S_ADDR , + &s->ocram_s); + +/* +* ROM memory +*/ +memory_region_init_rom (&s->rom,OBJECT (dev),"imx7.rom" , +FSL_IMX7_ROM_SIZE , &error_abort); +memory_region_add_subregion (get_system_memory (),FSL_IMX7_ROM_ADDR , + &s->rom); + +/* +* CAAM memory +*/ +memory_region_init_rom (&s->caam,OBJECT (dev),"imx7.caam" , +FSL_IMX7_CAAM_MEM_SIZE , &error_abort); +memory_region_add_subregion (get_system_memory (),FSL_IMX7_CAAM_MEM_ADDR , + &s->caam); }static Property fsl_imx7_properties[] = {
include/hw/arm/fsl-imx7.h +7 -0
@@ -84,6 +84,13 @@ struct FslIMX7State {IMX7GPRState gpr;ChipideaState usb[FSL_IMX7_NUM_USBS ];DesignwarePCIEHost pcie; +MemoryRegion rom; +MemoryRegion caam; +MemoryRegion ocram; +MemoryRegion ocram_epdc; +MemoryRegion ocram_pxp; +MemoryRegion ocram_s; +uint32_t phy_num[FSL_IMX7_NUM_ETHS ];bool phy_connected[FSL_IMX7_NUM_ETHS ]; };
Signature · 1 line
2.34.1
PATCH v4 6/6 Add i.MX7 SRC device implementation
In reply to Jean-Christophe DuboisThe SRC device is normally used to start the secondary CPU.
When running Linux directly, QEMU is emulating a PSCI interface that UBOOT is installing at boot time and therefore the fact that the SRC device is unimplemented is hidden as Qemu respond directly to PSCI requets without using the SRC device.
But if you try to run a more bare metal application (maybe uboot itself), then it is not possible to start the secondary CPU as the SRC is an unimplemented device.
This patch adds the ability to start the secondary CPU through the SRC device so that you can use this feature in bare metal applications.
--- hw/arm/fsl-imx7.c | 8 +- hw/misc/imx7_src.c | 276 +++++++++++++++++++++++++++++++++++++ hw/misc/meson.build | 1 + hw/misc/trace-events | 4 + include/hw/arm/fsl-imx7.h | 3 +- include/hw/misc/imx7_src.h | 66 +++++++++ 6 files changed, 356 insertions(+), 2 deletions(-) create mode 100644 hw/misc/imx7_src.c create mode 100644 include/hw/misc/imx7_src.h
hw/arm/fsl-imx7.c +7 -1
@@ -82,6 +82,11 @@ static void fsl_imx7_init(Object *obj)*/ object_initialize_child (obj,"gpcv2" , &s->gpcv2,TYPE_IMX_GPCV2 ); +/* +* SRC +*/ +object_initialize_child (obj,"src" , &s->src,TYPE_IMX7_SRC ); +/* * ECSPIs */
@@ -488,7 +493,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)/* * SRC */ -create_unimplemented_device ("src" ,FSL_IMX7_SRC_ADDR ,FSL_IMX7_SRC_SIZE ); +sysbus_realize (SYS_BUS_DEVICE (&s->src), &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->src),0 ,FSL_IMX7_SRC_ADDR );/* * Watchdogs
hw/misc/imx7_src.c new file +276 -0
276 lines not on this page · raw message
hw/misc/meson.build +1 -0
@@ -60,6 +60,7 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx6_src.c', 'imx6ul_ccm.c', 'imx7_ccm.c', + 'imx7_src.c', 'imx7_gpr.c', 'imx7_snvs.c', 'imx_ccm.c',
hw/misc/trace-events +4 -0
@@ -199,6 +199,10 @@ ccm_clock_freq(uint32_t clock, uint32_t freq) "(Clock = %d) = %d" ccm_read_reg(const char *reg_name, uint32_t value) "reg[%s] <= 0x%" PRIx32 ccm_write_reg(const char *reg_name, uint32_t value) "reg[%s] => 0x%" PRIx32 +# imx7_src.c +imx7_src_read(const char *reg_name, uint32_t value) "reg[%s] => 0x%" PRIx32 +imx7_src_write(const char *reg_name, uint32_t value) "reg[%s] <= 0x%" PRIx32 + # iotkit-sysinfo.c iotkit_sysinfo_read(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" iotkit_sysinfo_write(uint64_t offset, uint64_t data, unsigned size) "IoTKit SysInfo write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
include/hw/arm/fsl-imx7.h +2 -1
@@ -25,6 +25,7 @@#include "hw/misc/imx7_ccm.h" #include "hw/misc/imx7_snvs.h" #include "hw/misc/imx7_gpr.h" +#include "hw/misc/imx7_src.h" #include "hw/watchdog/wdt_imx2.h" #include "hw/gpio/imx_gpio.h" #include "hw/char/imx_serial.h"
@@ -74,6 +75,7 @@ struct FslIMX7State {IMX7CCMState ccm;IMX7AnalogState analog;IMX7SNVSState snvs; +IMX7SRCState src;IMXGPCv2State gpcv2;IMXSPIState spi[FSL_IMX7_NUM_ECSPIS ];IMXI2CState i2c[FSL_IMX7_NUM_I2CS ];
@@ -292,7 +294,6 @@ enum FslIMX7MemoryMap {FSL_IMX7_GPC_ADDR =0x303A0000 ,FSL_IMX7_SRC_ADDR =0x30390000 , -FSL_IMX7_SRC_SIZE = (4 * KiB), FSL_IMX7_CCM_ADDR = 0x30380000,
include/hw/misc/imx7_src.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.34.1
Peter Maydell
AppliedQuoted 11 lines · Jean-Christophe Dubois
This patch adds a few unimplemented TZ devices (TZASC and CSU) to i.MX6UL and i.MX7 processors to avoid bare metal application to experiment "bus error" when acccessing these devices.
It also adds some internal memory segments (OCRAM) to the i.MX7 to allow bare metal application to use them.
Last, it adds the SRC device to the i.MX7 processor to allow bare metal application to start the secondary Cortex-A7 core.
Quoted 6 lines
Note: When running Linux inside Qemu, the secondary core is started by calling PSCI API and Qemu is emulating PSCI without needing access to the SRC device. This is why Linux is using the 2 cores in Qemu even if the SRC is not implemented. This is not the case when running bare metal application (like u-boot itself) that do not rely on the PSCI service being available.
Applied to target-arm.next, thanks.
-- PMM