| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * ARM V2M MPS2 board emulation. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (c) 2017 Linaro Limited | 
					
						
							|  |  |  |  * Written by Peter Maydell | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  *  This program is free software; you can redistribute it and/or modify | 
					
						
							|  |  |  |  *  it under the terms of the GNU General Public License version 2 or | 
					
						
							|  |  |  |  *  (at your option) any later version. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* The MPS2 and MPS2+ dev boards are FPGA based (the 2+ has a bigger
 | 
					
						
							|  |  |  |  * FPGA but is otherwise the same as the 2). Since the CPU itself | 
					
						
							|  |  |  |  * and most of the devices are in the FPGA, the details of the board | 
					
						
							|  |  |  |  * as seen by the guest depend significantly on the FPGA image. | 
					
						
							|  |  |  |  * We model the following FPGA images: | 
					
						
							|  |  |  |  *  "mps2-an385" -- Cortex-M3 as documented in ARM Application Note AN385 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |  *  "mps2-an386" -- Cortex-M4 as documented in ARM Application Note AN386 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |  *  "mps2-an500" -- Cortex-M7 as documented in ARM Application Note AN500 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |  *  "mps2-an511" -- Cortex-M3 'DesignStart' as documented in AN511 | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Links to the TRM for the board itself and to the various Application | 
					
						
							|  |  |  |  * Notes which document the FPGA images can be found here: | 
					
						
							|  |  |  |  *   https://developer.arm.com/products/system-design/development-boards/cortex-m-prototyping-system
 | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "qemu/osdep.h"
 | 
					
						
							| 
									
										
										
										
											2019-10-22 16:50:37 +01:00
										 |  |  | #include "qemu/units.h"
 | 
					
						
							| 
									
										
										
										
											2020-02-19 11:08:57 -05:00
										 |  |  | #include "qemu/cutils.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "qapi/error.h"
 | 
					
						
							|  |  |  | #include "qemu/error-report.h"
 | 
					
						
							| 
									
										
										
										
											2019-05-23 14:47:43 +01:00
										 |  |  | #include "hw/arm/boot.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/arm/armv7m.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/or-irq.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/boards.h"
 | 
					
						
							|  |  |  | #include "exec/address-spaces.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "sysemu/sysemu.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/misc/unimp.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/char/cmsdk-apb-uart.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/timer/cmsdk-apb-timer.h"
 | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:42 +01:00
										 |  |  | #include "hw/timer/cmsdk-apb-dualtimer.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #include "hw/misc/mps2-scc.h"
 | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:35 +02:00
										 |  |  | #include "hw/misc/mps2-fpgaio.h"
 | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:36 +02:00
										 |  |  | #include "hw/ssi/pl022.h"
 | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:37 +02:00
										 |  |  | #include "hw/i2c/arm_sbcon_i2c.h"
 | 
					
						
							| 
									
										
										
										
											2019-04-12 18:54:13 +02:00
										 |  |  | #include "hw/net/lan9118.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:09 +01:00
										 |  |  | #include "net/net.h"
 | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:35 +02:00
										 |  |  | #include "hw/watchdog/cmsdk-apb-watchdog.h"
 | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:33 +00:00
										 |  |  | #include "hw/qdev-clock.h"
 | 
					
						
							| 
									
										
										
										
											2020-09-03 16:43:22 -04:00
										 |  |  | #include "qom/object.h"
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | typedef enum MPS2FPGAType { | 
					
						
							|  |  |  |     FPGA_AN385, | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |     FPGA_AN386, | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     FPGA_AN500, | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     FPGA_AN511, | 
					
						
							|  |  |  | } MPS2FPGAType; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-03 16:43:22 -04:00
										 |  |  | struct MPS2MachineClass { | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     MachineClass parent; | 
					
						
							|  |  |  |     MPS2FPGAType fpga_type; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     uint32_t scc_id; | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     bool has_block_ram; | 
					
						
							|  |  |  |     hwaddr ethernet_base; | 
					
						
							|  |  |  |     hwaddr psram_base; | 
					
						
							| 
									
										
										
										
											2020-09-03 16:43:22 -04:00
										 |  |  | }; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-03 16:43:22 -04:00
										 |  |  | struct MPS2MachineState { | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     MachineState parent; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     ARMv7MState armv7m; | 
					
						
							|  |  |  |     MemoryRegion ssram1; | 
					
						
							|  |  |  |     MemoryRegion ssram1_m; | 
					
						
							|  |  |  |     MemoryRegion ssram23; | 
					
						
							|  |  |  |     MemoryRegion ssram23_m; | 
					
						
							|  |  |  |     MemoryRegion blockram; | 
					
						
							|  |  |  |     MemoryRegion blockram_m1; | 
					
						
							|  |  |  |     MemoryRegion blockram_m2; | 
					
						
							|  |  |  |     MemoryRegion blockram_m3; | 
					
						
							|  |  |  |     MemoryRegion sram; | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:31 +02:00
										 |  |  |     /* FPGA APB subsystem */ | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     MPS2SCC scc; | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:35 +02:00
										 |  |  |     MPS2FPGAIO fpgaio; | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:31 +02:00
										 |  |  |     /* CMSDK APB subsystem */ | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:42 +01:00
										 |  |  |     CMSDKAPBDualTimer dualtimer; | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:35 +02:00
										 |  |  |     CMSDKAPBWatchdog watchdog; | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:32 +00:00
										 |  |  |     CMSDKAPBTimer timer[2]; | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:33 +00:00
										 |  |  |     Clock *sysclk; | 
					
						
							| 
									
										
										
										
											2021-08-12 10:33:39 +01:00
										 |  |  |     Clock *refclk; | 
					
						
							| 
									
										
										
										
											2020-09-03 16:43:22 -04:00
										 |  |  | }; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | #define TYPE_MPS2_MACHINE "mps2"
 | 
					
						
							|  |  |  | #define TYPE_MPS2_AN385_MACHINE MACHINE_TYPE_NAME("mps2-an385")
 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  | #define TYPE_MPS2_AN386_MACHINE MACHINE_TYPE_NAME("mps2-an386")
 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  | #define TYPE_MPS2_AN500_MACHINE MACHINE_TYPE_NAME("mps2-an500")
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | #define TYPE_MPS2_AN511_MACHINE MACHINE_TYPE_NAME("mps2-an511")
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-16 14:25:18 -04:00
										 |  |  | OBJECT_DECLARE_TYPE(MPS2MachineState, MPS2MachineClass, MPS2_MACHINE) | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | /* Main SYSCLK frequency in Hz */ | 
					
						
							|  |  |  | #define SYSCLK_FRQ 25000000
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2021-08-12 10:33:39 +01:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * The Application Notes don't say anything about how the | 
					
						
							|  |  |  |  * systick reference clock is configured. (Quite possibly | 
					
						
							|  |  |  |  * they don't have one at all.) This 1MHz clock matches the | 
					
						
							|  |  |  |  * pre-existing behaviour that used to be hardcoded in the | 
					
						
							|  |  |  |  * armv7m_systick implementation. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | #define REFCLK_FRQ (1 * 1000 * 1000)
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | /* Initialize the auxiliary RAM region @mr and map it into
 | 
					
						
							|  |  |  |  * the memory map at @base. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | static void make_ram(MemoryRegion *mr, const char *name, | 
					
						
							|  |  |  |                      hwaddr base, hwaddr size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     memory_region_init_ram(mr, NULL, name, size, &error_fatal); | 
					
						
							|  |  |  |     memory_region_add_subregion(get_system_memory(), base, mr); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Create an alias of an entire original MemoryRegion @orig
 | 
					
						
							|  |  |  |  * located at @base in the memory map. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | static void make_ram_alias(MemoryRegion *mr, const char *name, | 
					
						
							|  |  |  |                            MemoryRegion *orig, hwaddr base) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     memory_region_init_alias(mr, NULL, name, orig, 0, | 
					
						
							|  |  |  |                              memory_region_size(orig)); | 
					
						
							|  |  |  |     memory_region_add_subregion(get_system_memory(), base, mr); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void mps2_common_init(MachineState *machine) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     MPS2MachineState *mms = MPS2_MACHINE(machine); | 
					
						
							|  |  |  |     MPS2MachineClass *mmc = MPS2_MACHINE_GET_CLASS(machine); | 
					
						
							|  |  |  |     MemoryRegion *system_memory = get_system_memory(); | 
					
						
							| 
									
										
										
										
											2017-09-13 18:04:57 +02:00
										 |  |  |     MachineClass *mc = MACHINE_GET_CLASS(machine); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     DeviceState *armv7m, *sccdev; | 
					
						
							| 
									
										
											  
											
												hw/arm/mps2: Add CMSDK AHB GPIO peripherals as unimplemented devices
Register the GPIO peripherals as unimplemented to better
follow their accesses, for example booting Zephyr:
  ----------------
  IN: arm_mps2_pinmux_init
  0x00001160:  f64f 0231  movw     r2, #0xf831
  0x00001164:  4b06       ldr      r3, [pc, #0x18]
  0x00001166:  2000       movs     r0, #0
  0x00001168:  619a       str      r2, [r3, #0x18]
  0x0000116a:  f24c 426f  movw     r2, #0xc46f
  0x0000116e:  f503 5380  add.w    r3, r3, #0x1000
  0x00001172:  619a       str      r2, [r3, #0x18]
  0x00001174:  f44f 529e  mov.w    r2, #0x13c0
  0x00001178:  f503 5380  add.w    r3, r3, #0x1000
  0x0000117c:  619a       str      r2, [r3, #0x18]
  0x0000117e:  4770       bx       lr
  cmsdk-ahb-gpio: unimplemented device write (size 4, value 0xf831, offset 0x18)
  cmsdk-ahb-gpio: unimplemented device write (size 4, value 0xc46f, offset 0x18)
  cmsdk-ahb-gpio: unimplemented device write (size 4, value 0x13c0, offset 0x18)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200617072539.32686-10-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
											
										 
											2020-06-17 09:25:34 +02:00
										 |  |  |     int i; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-09-13 18:04:57 +02:00
										 |  |  |     if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) { | 
					
						
							|  |  |  |         error_report("This board can only be used with CPU %s", | 
					
						
							|  |  |  |                      mc->default_cpu_type); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         exit(1); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-02-19 11:08:57 -05:00
										 |  |  |     if (machine->ram_size != mc->default_ram_size) { | 
					
						
							|  |  |  |         char *sz = size_to_str(mc->default_ram_size); | 
					
						
							|  |  |  |         error_report("Invalid RAM size, should be %s", sz); | 
					
						
							|  |  |  |         g_free(sz); | 
					
						
							|  |  |  |         exit(EXIT_FAILURE); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:33 +00:00
										 |  |  |     /* This clock doesn't need migration because it is fixed-frequency */ | 
					
						
							|  |  |  |     mms->sysclk = clock_new(OBJECT(machine), "SYSCLK"); | 
					
						
							|  |  |  |     clock_set_hz(mms->sysclk, SYSCLK_FRQ); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2021-08-12 10:33:39 +01:00
										 |  |  |     mms->refclk = clock_new(OBJECT(machine), "REFCLK"); | 
					
						
							|  |  |  |     clock_set_hz(mms->refclk, REFCLK_FRQ); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     /* The FPGA images have an odd combination of different RAMs,
 | 
					
						
							|  |  |  |      * because in hardware they are different implementations and | 
					
						
							|  |  |  |      * connected to different buses, giving varying performance/size | 
					
						
							|  |  |  |      * tradeoffs. For QEMU they're all just RAM, though. We arbitrarily | 
					
						
							|  |  |  |      * call the 16MB our "system memory", as it's the largest lump. | 
					
						
							|  |  |  |      * | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |      * AN385/AN386/AN511: | 
					
						
							|  |  |  |      *  0x21000000 .. 0x21ffffff : PSRAM (16MB) | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |      * AN385/AN386/AN500: | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |      *  0x00000000 .. 0x003fffff : ZBT SSRAM1 | 
					
						
							|  |  |  |      *  0x00400000 .. 0x007fffff : mirror of ZBT SSRAM1 | 
					
						
							|  |  |  |      *  0x20000000 .. 0x203fffff : ZBT SSRAM 2&3 | 
					
						
							|  |  |  |      *  0x20400000 .. 0x207fffff : mirror of ZBT SSRAM 2&3 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |      * AN385/AN386 only: | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |      *  0x01000000 .. 0x01003fff : block RAM (16K) | 
					
						
							|  |  |  |      *  0x01004000 .. 0x01007fff : mirror of above | 
					
						
							|  |  |  |      *  0x01008000 .. 0x0100bfff : mirror of above | 
					
						
							|  |  |  |      *  0x0100c000 .. 0x0100ffff : mirror of above | 
					
						
							|  |  |  |      * AN511 only: | 
					
						
							|  |  |  |      *  0x00000000 .. 0x0003ffff : FPGA block RAM | 
					
						
							|  |  |  |      *  0x00400000 .. 0x007fffff : ZBT SSRAM1 | 
					
						
							|  |  |  |      *  0x20000000 .. 0x2001ffff : SRAM | 
					
						
							|  |  |  |      *  0x20400000 .. 0x207fffff : ZBT SSRAM 2&3 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |      * AN500 only: | 
					
						
							|  |  |  |      *  0x60000000 .. 0x60ffffff : PSRAM (16MB) | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |      * | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |      * The AN385/AN386 has a feature where the lowest 16K can be mapped | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |      * either to the bottom of the ZBT SSRAM1 or to the block RAM. | 
					
						
							|  |  |  |      * This is of no use for QEMU so we don't implement it (as if | 
					
						
							|  |  |  |      * zbt_boot_ctrl is always zero). | 
					
						
							|  |  |  |      */ | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     memory_region_add_subregion(system_memory, mmc->psram_base, machine->ram); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (mmc->has_block_ram) { | 
					
						
							|  |  |  |         make_ram(&mms->blockram, "mps.blockram", 0x01000000, 0x4000); | 
					
						
							|  |  |  |         make_ram_alias(&mms->blockram_m1, "mps.blockram_m1", | 
					
						
							|  |  |  |                        &mms->blockram, 0x01004000); | 
					
						
							|  |  |  |         make_ram_alias(&mms->blockram_m2, "mps.blockram_m2", | 
					
						
							|  |  |  |                        &mms->blockram, 0x01008000); | 
					
						
							|  |  |  |         make_ram_alias(&mms->blockram_m3, "mps.blockram_m3", | 
					
						
							|  |  |  |                        &mms->blockram, 0x0100c000); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     switch (mmc->fpga_type) { | 
					
						
							|  |  |  |     case FPGA_AN385: | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |     case FPGA_AN386: | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     case FPGA_AN500: | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         make_ram(&mms->ssram1, "mps.ssram1", 0x0, 0x400000); | 
					
						
							|  |  |  |         make_ram_alias(&mms->ssram1_m, "mps.ssram1_m", &mms->ssram1, 0x400000); | 
					
						
							|  |  |  |         make_ram(&mms->ssram23, "mps.ssram23", 0x20000000, 0x400000); | 
					
						
							|  |  |  |         make_ram_alias(&mms->ssram23_m, "mps.ssram23_m", | 
					
						
							|  |  |  |                        &mms->ssram23, 0x20400000); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case FPGA_AN511: | 
					
						
							|  |  |  |         make_ram(&mms->blockram, "mps.blockram", 0x0, 0x40000); | 
					
						
							|  |  |  |         make_ram(&mms->ssram1, "mps.ssram1", 0x00400000, 0x00800000); | 
					
						
							|  |  |  |         make_ram(&mms->sram, "mps.sram", 0x20000000, 0x20000); | 
					
						
							|  |  |  |         make_ram(&mms->ssram23, "mps.ssram23", 0x20400000, 0x400000); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     default: | 
					
						
							|  |  |  |         g_assert_not_reached(); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
											
										 
											2020-06-10 07:32:36 +02:00
										 |  |  |     object_initialize_child(OBJECT(mms), "armv7m", &mms->armv7m, TYPE_ARMV7M); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     armv7m = DEVICE(&mms->armv7m); | 
					
						
							|  |  |  |     switch (mmc->fpga_type) { | 
					
						
							|  |  |  |     case FPGA_AN385: | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |     case FPGA_AN386: | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     case FPGA_AN500: | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         qdev_prop_set_uint32(armv7m, "num-irq", 32); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case FPGA_AN511: | 
					
						
							|  |  |  |         qdev_prop_set_uint32(armv7m, "num-irq", 64); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     default: | 
					
						
							|  |  |  |         g_assert_not_reached(); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2021-08-12 10:33:39 +01:00
										 |  |  |     qdev_connect_clock_in(armv7m, "cpuclk", mms->sysclk); | 
					
						
							|  |  |  |     qdev_connect_clock_in(armv7m, "refclk", mms->refclk); | 
					
						
							| 
									
										
										
										
											2017-09-13 18:04:57 +02:00
										 |  |  |     qdev_prop_set_string(armv7m, "cpu-type", machine->cpu_type); | 
					
						
							| 
									
										
										
										
											2018-08-16 14:05:28 +01:00
										 |  |  |     qdev_prop_set_bit(armv7m, "enable-bitband", true); | 
					
						
							| 
									
										
											  
											
												qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)
Having to pass value before name feels grating.  Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
											
										 
											2020-07-07 18:05:54 +02:00
										 |  |  |     object_property_set_link(OBJECT(&mms->armv7m), "memory", | 
					
						
							|  |  |  |                              OBJECT(system_memory), &error_abort); | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
											
										 
											2020-06-10 07:32:36 +02:00
										 |  |  |     sysbus_realize(SYS_BUS_DEVICE(&mms->armv7m), &error_fatal); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  |     create_unimplemented_device("zbtsmram mirror", 0x00400000, 0x00400000); | 
					
						
							|  |  |  |     create_unimplemented_device("RESERVED 1", 0x00800000, 0x00800000); | 
					
						
							|  |  |  |     create_unimplemented_device("Block RAM", 0x01000000, 0x00010000); | 
					
						
							|  |  |  |     create_unimplemented_device("RESERVED 2", 0x01010000, 0x1EFF0000); | 
					
						
							|  |  |  |     create_unimplemented_device("RESERVED 3", 0x20800000, 0x00800000); | 
					
						
							|  |  |  |     create_unimplemented_device("PSRAM", 0x21000000, 0x01000000); | 
					
						
							|  |  |  |     /* These three ranges all cover multiple devices; we may implement
 | 
					
						
							|  |  |  |      * some of them below (in which case the real device takes precedence | 
					
						
							|  |  |  |      * over the unimplemented-region mapping). | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     create_unimplemented_device("CMSDK APB peripheral region @0x40000000", | 
					
						
							|  |  |  |                                 0x40000000, 0x00010000); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:32 +02:00
										 |  |  |     create_unimplemented_device("CMSDK AHB peripheral region @0x40010000", | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |                                 0x40010000, 0x00010000); | 
					
						
							|  |  |  |     create_unimplemented_device("Extra peripheral region @0x40020000", | 
					
						
							|  |  |  |                                 0x40020000, 0x00010000); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:32 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     create_unimplemented_device("RESERVED 4", 0x40030000, 0x001D0000); | 
					
						
							|  |  |  |     create_unimplemented_device("VGA", 0x41000000, 0x0200000); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     switch (mmc->fpga_type) { | 
					
						
							|  |  |  |     case FPGA_AN385: | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |     case FPGA_AN386: | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     case FPGA_AN500: | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     { | 
					
						
							|  |  |  |         /* The overflow IRQs for UARTs 0, 1 and 2 are ORed together.
 | 
					
						
							|  |  |  |          * Overflow for UARTs 4 and 5 doesn't trigger any interrupt. | 
					
						
							|  |  |  |          */ | 
					
						
							|  |  |  |         Object *orgate; | 
					
						
							|  |  |  |         DeviceState *orgate_dev; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         orgate = object_new(TYPE_OR_IRQ); | 
					
						
							| 
									
										
											  
											
												qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)
Having to pass value before name feels grating.  Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
											
										 
											2020-07-07 18:05:54 +02:00
										 |  |  |         object_property_set_int(orgate, "num-lines", 6, &error_fatal); | 
					
						
							| 
									
										
											  
											
												qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
    // only correct for bus-less @dev!
    @@
    expression errp;
    expression dev;
    @@
    -    qdev_init_nofail(dev);
    +    qdev_realize(dev, NULL, &error_fatal);
    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);
    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(dev, true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
											
										 
											2020-06-10 07:32:45 +02:00
										 |  |  |         qdev_realize(DEVICE(orgate), NULL, &error_fatal); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         orgate_dev = DEVICE(orgate); | 
					
						
							|  |  |  |         qdev_connect_gpio_out(orgate_dev, 0, qdev_get_gpio_in(armv7m, 12)); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for (i = 0; i < 5; i++) { | 
					
						
							|  |  |  |             static const hwaddr uartbase[] = {0x40004000, 0x40005000, | 
					
						
							|  |  |  |                                               0x40006000, 0x40007000, | 
					
						
							|  |  |  |                                               0x40009000}; | 
					
						
							|  |  |  |             /* RX irq number; TX irq is always one greater */ | 
					
						
							|  |  |  |             static const int uartirq[] = {0, 2, 4, 18, 20}; | 
					
						
							|  |  |  |             qemu_irq txovrint = NULL, rxovrint = NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             if (i < 3) { | 
					
						
							|  |  |  |                 txovrint = qdev_get_gpio_in(orgate_dev, i * 2); | 
					
						
							|  |  |  |                 rxovrint = qdev_get_gpio_in(orgate_dev, i * 2 + 1); | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             cmsdk_apb_uart_create(uartbase[i], | 
					
						
							|  |  |  |                                   qdev_get_gpio_in(armv7m, uartirq[i] + 1), | 
					
						
							|  |  |  |                                   qdev_get_gpio_in(armv7m, uartirq[i]), | 
					
						
							|  |  |  |                                   txovrint, rxovrint, | 
					
						
							|  |  |  |                                   NULL, | 
					
						
							| 
									
										
										
										
											2018-04-20 15:52:44 +01:00
										 |  |  |                                   serial_hd(i), SYSCLK_FRQ); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         } | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     case FPGA_AN511: | 
					
						
							|  |  |  |     { | 
					
						
							|  |  |  |         /* The overflow IRQs for all UARTs are ORed together.
 | 
					
						
							|  |  |  |          * Tx and Rx IRQs for each UART are ORed together. | 
					
						
							|  |  |  |          */ | 
					
						
							|  |  |  |         Object *orgate; | 
					
						
							|  |  |  |         DeviceState *orgate_dev; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         orgate = object_new(TYPE_OR_IRQ); | 
					
						
							| 
									
										
											  
											
												qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)
Having to pass value before name feels grating.  Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
											
										 
											2020-07-07 18:05:54 +02:00
										 |  |  |         object_property_set_int(orgate, "num-lines", 10, &error_fatal); | 
					
						
							| 
									
										
											  
											
												qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
    // only correct for bus-less @dev!
    @@
    expression errp;
    expression dev;
    @@
    -    qdev_init_nofail(dev);
    +    qdev_realize(dev, NULL, &error_fatal);
    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);
    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(dev, true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
											
										 
											2020-06-10 07:32:45 +02:00
										 |  |  |         qdev_realize(DEVICE(orgate), NULL, &error_fatal); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         orgate_dev = DEVICE(orgate); | 
					
						
							|  |  |  |         qdev_connect_gpio_out(orgate_dev, 0, qdev_get_gpio_in(armv7m, 12)); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for (i = 0; i < 5; i++) { | 
					
						
							|  |  |  |             /* system irq numbers for the combined tx/rx for each UART */ | 
					
						
							|  |  |  |             static const int uart_txrx_irqno[] = {0, 2, 45, 46, 56}; | 
					
						
							|  |  |  |             static const hwaddr uartbase[] = {0x40004000, 0x40005000, | 
					
						
							|  |  |  |                                               0x4002c000, 0x4002d000, | 
					
						
							|  |  |  |                                               0x4002e000}; | 
					
						
							|  |  |  |             Object *txrx_orgate; | 
					
						
							|  |  |  |             DeviceState *txrx_orgate_dev; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             txrx_orgate = object_new(TYPE_OR_IRQ); | 
					
						
							| 
									
										
											  
											
												qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)
Having to pass value before name feels grating.  Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
											
										 
											2020-07-07 18:05:54 +02:00
										 |  |  |             object_property_set_int(txrx_orgate, "num-lines", 2, &error_fatal); | 
					
						
							| 
									
										
											  
											
												qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
    // only correct for bus-less @dev!
    @@
    expression errp;
    expression dev;
    @@
    -    qdev_init_nofail(dev);
    +    qdev_realize(dev, NULL, &error_fatal);
    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(dev), true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);
    @ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
    expression errp;
    expression dev;
    symbol true;
    @@
    -    object_property_set_bool(dev, true, "realized", errp);
    +    qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
											
										 
											2020-06-10 07:32:45 +02:00
										 |  |  |             qdev_realize(DEVICE(txrx_orgate), NULL, &error_fatal); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |             txrx_orgate_dev = DEVICE(txrx_orgate); | 
					
						
							|  |  |  |             qdev_connect_gpio_out(txrx_orgate_dev, 0, | 
					
						
							|  |  |  |                                   qdev_get_gpio_in(armv7m, uart_txrx_irqno[i])); | 
					
						
							|  |  |  |             cmsdk_apb_uart_create(uartbase[i], | 
					
						
							|  |  |  |                                   qdev_get_gpio_in(txrx_orgate_dev, 0), | 
					
						
							|  |  |  |                                   qdev_get_gpio_in(txrx_orgate_dev, 1), | 
					
						
							| 
									
										
										
										
											2017-09-14 18:43:19 +01:00
										 |  |  |                                   qdev_get_gpio_in(orgate_dev, i * 2), | 
					
						
							|  |  |  |                                   qdev_get_gpio_in(orgate_dev, i * 2 + 1), | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |                                   NULL, | 
					
						
							| 
									
										
										
										
											2018-04-20 15:52:44 +01:00
										 |  |  |                                   serial_hd(i), SYSCLK_FRQ); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |         } | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     default: | 
					
						
							|  |  |  |         g_assert_not_reached(); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
											  
											
												hw/arm/mps2: Add CMSDK AHB GPIO peripherals as unimplemented devices
Register the GPIO peripherals as unimplemented to better
follow their accesses, for example booting Zephyr:
  ----------------
  IN: arm_mps2_pinmux_init
  0x00001160:  f64f 0231  movw     r2, #0xf831
  0x00001164:  4b06       ldr      r3, [pc, #0x18]
  0x00001166:  2000       movs     r0, #0
  0x00001168:  619a       str      r2, [r3, #0x18]
  0x0000116a:  f24c 426f  movw     r2, #0xc46f
  0x0000116e:  f503 5380  add.w    r3, r3, #0x1000
  0x00001172:  619a       str      r2, [r3, #0x18]
  0x00001174:  f44f 529e  mov.w    r2, #0x13c0
  0x00001178:  f503 5380  add.w    r3, r3, #0x1000
  0x0000117c:  619a       str      r2, [r3, #0x18]
  0x0000117e:  4770       bx       lr
  cmsdk-ahb-gpio: unimplemented device write (size 4, value 0xf831, offset 0x18)
  cmsdk-ahb-gpio: unimplemented device write (size 4, value 0xc46f, offset 0x18)
  cmsdk-ahb-gpio: unimplemented device write (size 4, value 0x13c0, offset 0x18)
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200617072539.32686-10-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
											
										 
											2020-06-17 09:25:34 +02:00
										 |  |  |     for (i = 0; i < 4; i++) { | 
					
						
							|  |  |  |         static const hwaddr gpiobase[] = {0x40010000, 0x40011000, | 
					
						
							|  |  |  |                                           0x40012000, 0x40013000}; | 
					
						
							|  |  |  |         create_unimplemented_device("cmsdk-ahb-gpio", gpiobase[i], 0x1000); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:31 +02:00
										 |  |  |     /* CMSDK APB subsystem */ | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:32 +00:00
										 |  |  |     for (i = 0; i < ARRAY_SIZE(mms->timer); i++) { | 
					
						
							|  |  |  |         g_autofree char *name = g_strdup_printf("timer%d", i); | 
					
						
							|  |  |  |         hwaddr base = 0x40000000 + i * 0x1000; | 
					
						
							|  |  |  |         int irqno = 8 + i; | 
					
						
							|  |  |  |         SysBusDevice *sbd; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         object_initialize_child(OBJECT(mms), name, &mms->timer[i], | 
					
						
							|  |  |  |                                 TYPE_CMSDK_APB_TIMER); | 
					
						
							|  |  |  |         sbd = SYS_BUS_DEVICE(&mms->timer[i]); | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:33 +00:00
										 |  |  |         qdev_connect_clock_in(DEVICE(&mms->timer[i]), "pclk", mms->sysclk); | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:32 +00:00
										 |  |  |         sysbus_realize_and_unref(sbd, &error_fatal); | 
					
						
							|  |  |  |         sysbus_mmio_map(sbd, 0, base); | 
					
						
							|  |  |  |         sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(armv7m, irqno)); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
											
										 
											2020-06-10 07:32:36 +02:00
										 |  |  |     object_initialize_child(OBJECT(mms), "dualtimer", &mms->dualtimer, | 
					
						
							|  |  |  |                             TYPE_CMSDK_APB_DUALTIMER); | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:33 +00:00
										 |  |  |     qdev_connect_clock_in(DEVICE(&mms->dualtimer), "TIMCLK", mms->sysclk); | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
											
										 
											2020-06-10 07:32:36 +02:00
										 |  |  |     sysbus_realize(SYS_BUS_DEVICE(&mms->dualtimer), &error_fatal); | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:42 +01:00
										 |  |  |     sysbus_connect_irq(SYS_BUS_DEVICE(&mms->dualtimer), 0, | 
					
						
							|  |  |  |                        qdev_get_gpio_in(armv7m, 10)); | 
					
						
							|  |  |  |     sysbus_mmio_map(SYS_BUS_DEVICE(&mms->dualtimer), 0, 0x40002000); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:33 +02:00
										 |  |  |     object_initialize_child(OBJECT(mms), "watchdog", &mms->watchdog, | 
					
						
							|  |  |  |                             TYPE_CMSDK_APB_WATCHDOG); | 
					
						
							| 
									
										
										
										
											2021-01-28 11:41:33 +00:00
										 |  |  |     qdev_connect_clock_in(DEVICE(&mms->watchdog), "WDOGCLK", mms->sysclk); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:33 +02:00
										 |  |  |     sysbus_realize(SYS_BUS_DEVICE(&mms->watchdog), &error_fatal); | 
					
						
							|  |  |  |     sysbus_connect_irq(SYS_BUS_DEVICE(&mms->watchdog), 0, | 
					
						
							|  |  |  |                        qdev_get_gpio_in_named(armv7m, "NMI", 0)); | 
					
						
							|  |  |  |     sysbus_mmio_map(SYS_BUS_DEVICE(&mms->watchdog), 0, 0x40008000); | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:42 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:31 +02:00
										 |  |  |     /* FPGA APB subsystem */ | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
											
										 
											2020-06-10 07:32:36 +02:00
										 |  |  |     object_initialize_child(OBJECT(mms), "scc", &mms->scc, TYPE_MPS2_SCC); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     sccdev = DEVICE(&mms->scc); | 
					
						
							|  |  |  |     qdev_prop_set_uint32(sccdev, "scc-cfg4", 0x2); | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:50 +01:00
										 |  |  |     qdev_prop_set_uint32(sccdev, "scc-aid", 0x00200008); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     qdev_prop_set_uint32(sccdev, "scc-id", mmc->scc_id); | 
					
						
							| 
									
										
										
										
											2021-02-15 11:51:16 +00:00
										 |  |  |     /* All these FPGA images have the same OSCCLK configuration */ | 
					
						
							|  |  |  |     qdev_prop_set_uint32(sccdev, "len-oscclk", 3); | 
					
						
							|  |  |  |     qdev_prop_set_uint32(sccdev, "oscclk[0]", 50000000); | 
					
						
							|  |  |  |     qdev_prop_set_uint32(sccdev, "oscclk[1]", 24576000); | 
					
						
							|  |  |  |     qdev_prop_set_uint32(sccdev, "oscclk[2]", 25000000); | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1
I'm converting from qdev_set_parent_bus()/realize to qdev_realize();
recent commit "qdev: Convert uses of qdev_set_parent_bus() with
Coccinelle" explains why.
sysbus_init_child_obj() is a wrapper around
object_initialize_child_with_props() and qdev_set_parent_bus().  It
passes no properties.
Convert sysbus_init_child_obj()/realize to object_initialize_child()/
qdev_realize().
Coccinelle script:
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, &child, size, type);
    +    sysbus_init_child_XXX(parent, name, &child, size, type);
         ...
    -    object_property_set_bool(OBJECT(&child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(&child), errp);
    @@
    expression parent, name, size, type, errp;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    @@
    expression parent, name, size, type;
    expression child;
    expression dev;
    expression expr;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
         ...
         dev = DEVICE(child);
         ... when != dev = expr;
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-48-armbru@redhat.com>
											
										 
											2020-06-10 07:32:36 +02:00
										 |  |  |     sysbus_realize(SYS_BUS_DEVICE(&mms->scc), &error_fatal); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     sysbus_mmio_map(SYS_BUS_DEVICE(sccdev), 0, 0x4002f000); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:35 +02:00
										 |  |  |     object_initialize_child(OBJECT(mms), "fpgaio", | 
					
						
							|  |  |  |                             &mms->fpgaio, TYPE_MPS2_FPGAIO); | 
					
						
							|  |  |  |     qdev_prop_set_uint32(DEVICE(&mms->fpgaio), "prescale-clk", 25000000); | 
					
						
							|  |  |  |     sysbus_realize(SYS_BUS_DEVICE(&mms->fpgaio), &error_fatal); | 
					
						
							|  |  |  |     sysbus_mmio_map(SYS_BUS_DEVICE(&mms->fpgaio), 0, 0x40028000); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:36 +02:00
										 |  |  |     sysbus_create_simple(TYPE_PL022, 0x40025000,        /* External ADC */ | 
					
						
							|  |  |  |                          qdev_get_gpio_in(armv7m, 22)); | 
					
						
							|  |  |  |     for (i = 0; i < 2; i++) { | 
					
						
							|  |  |  |         static const int spi_irqno[] = {11, 24}; | 
					
						
							|  |  |  |         static const hwaddr spibase[] = {0x40020000,    /* APB */ | 
					
						
							|  |  |  |                                          0x40021000,    /* LCD */ | 
					
						
							|  |  |  |                                          0x40026000,    /* Shield0 */ | 
					
						
							|  |  |  |                                          0x40027000};   /* Shield1 */ | 
					
						
							|  |  |  |         DeviceState *orgate_dev; | 
					
						
							|  |  |  |         Object *orgate; | 
					
						
							|  |  |  |         int j; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         orgate = object_new(TYPE_OR_IRQ); | 
					
						
							| 
									
										
											  
											
												qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)
Having to pass value before name feels grating.  Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
											
										 
											2020-07-07 18:05:54 +02:00
										 |  |  |         object_property_set_int(orgate, "num-lines", 2, &error_fatal); | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:36 +02:00
										 |  |  |         orgate_dev = DEVICE(orgate); | 
					
						
							|  |  |  |         qdev_realize(orgate_dev, NULL, &error_fatal); | 
					
						
							|  |  |  |         qdev_connect_gpio_out(orgate_dev, 0, | 
					
						
							|  |  |  |                               qdev_get_gpio_in(armv7m, spi_irqno[i])); | 
					
						
							|  |  |  |         for (j = 0; j < 2; j++) { | 
					
						
							|  |  |  |             sysbus_create_simple(TYPE_PL022, spibase[2 * i + j], | 
					
						
							|  |  |  |                                  qdev_get_gpio_in(orgate_dev, j)); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:37 +02:00
										 |  |  |     for (i = 0; i < 4; i++) { | 
					
						
							|  |  |  |         static const hwaddr i2cbase[] = {0x40022000,    /* Touch */ | 
					
						
							|  |  |  |                                          0x40023000,    /* Audio */ | 
					
						
							|  |  |  |                                          0x40029000,    /* Shield0 */ | 
					
						
							|  |  |  |                                          0x4002a000};   /* Shield1 */ | 
					
						
							| 
									
										
										
										
											2021-09-13 16:07:25 +01:00
										 |  |  |         DeviceState *dev; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         dev = sysbus_create_simple(TYPE_ARM_SBCON_I2C, i2cbase[i], NULL); | 
					
						
							|  |  |  |         if (i < 2) { | 
					
						
							|  |  |  |             /*
 | 
					
						
							|  |  |  |              * internal-only bus: mark it full to avoid user-created | 
					
						
							|  |  |  |              * i2c devices being plugged into it. | 
					
						
							|  |  |  |              */ | 
					
						
							|  |  |  |             BusState *qbus = qdev_get_child_bus(dev, "i2c"); | 
					
						
							|  |  |  |             qbus_mark_full(qbus); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:37 +02:00
										 |  |  |     } | 
					
						
							| 
									
										
										
										
											2020-06-17 09:25:38 +02:00
										 |  |  |     create_unimplemented_device("i2s", 0x40024000, 0x400); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:09 +01:00
										 |  |  |     /* In hardware this is a LAN9220; the LAN9118 is software compatible
 | 
					
						
							|  |  |  |      * except that it doesn't support the checksum-offload feature. | 
					
						
							|  |  |  |      */ | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     lan9118_init(&nd_table[0], mmc->ethernet_base, | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:09 +01:00
										 |  |  |                  qdev_get_gpio_in(armv7m, | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |                                   mmc->fpga_type == FPGA_AN511 ? 47 : 13)); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:09 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, | 
					
						
							| 
									
										
										
										
											2022-08-23 17:04:17 +01:00
										 |  |  |                        0, 0x400000); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void mps2_class_init(ObjectClass *oc, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     MachineClass *mc = MACHINE_CLASS(oc); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     mc->init = mps2_common_init; | 
					
						
							|  |  |  |     mc->max_cpus = 1; | 
					
						
							| 
									
										
										
										
											2020-02-19 11:08:57 -05:00
										 |  |  |     mc->default_ram_size = 16 * MiB; | 
					
						
							|  |  |  |     mc->default_ram_id = "mps.ram"; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void mps2_an385_class_init(ObjectClass *oc, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     MachineClass *mc = MACHINE_CLASS(oc); | 
					
						
							|  |  |  |     MPS2MachineClass *mmc = MPS2_MACHINE_CLASS(oc); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     mc->desc = "ARM MPS2 with AN385 FPGA image for Cortex-M3"; | 
					
						
							|  |  |  |     mmc->fpga_type = FPGA_AN385; | 
					
						
							| 
									
										
										
										
											2017-09-13 18:04:57 +02:00
										 |  |  |     mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:50 +01:00
										 |  |  |     mmc->scc_id = 0x41043850; | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     mmc->psram_base = 0x21000000; | 
					
						
							|  |  |  |     mmc->ethernet_base = 0x40200000; | 
					
						
							|  |  |  |     mmc->has_block_ram = true; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  | static void mps2_an386_class_init(ObjectClass *oc, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     MachineClass *mc = MACHINE_CLASS(oc); | 
					
						
							|  |  |  |     MPS2MachineClass *mmc = MPS2_MACHINE_CLASS(oc); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     mc->desc = "ARM MPS2 with AN386 FPGA image for Cortex-M4"; | 
					
						
							|  |  |  |     mmc->fpga_type = FPGA_AN386; | 
					
						
							|  |  |  |     mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m4"); | 
					
						
							|  |  |  |     mmc->scc_id = 0x41043860; | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     mmc->psram_base = 0x21000000; | 
					
						
							|  |  |  |     mmc->ethernet_base = 0x40200000; | 
					
						
							|  |  |  |     mmc->has_block_ram = true; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void mps2_an500_class_init(ObjectClass *oc, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     MachineClass *mc = MACHINE_CLASS(oc); | 
					
						
							|  |  |  |     MPS2MachineClass *mmc = MPS2_MACHINE_CLASS(oc); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     mc->desc = "ARM MPS2 with AN500 FPGA image for Cortex-M7"; | 
					
						
							|  |  |  |     mmc->fpga_type = FPGA_AN500; | 
					
						
							|  |  |  |     mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m7"); | 
					
						
							|  |  |  |     mmc->scc_id = 0x41045000; | 
					
						
							|  |  |  |     mmc->psram_base = 0x60000000; | 
					
						
							|  |  |  |     mmc->ethernet_base = 0xa0000000; | 
					
						
							|  |  |  |     mmc->has_block_ram = false; | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | static void mps2_an511_class_init(ObjectClass *oc, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     MachineClass *mc = MACHINE_CLASS(oc); | 
					
						
							|  |  |  |     MPS2MachineClass *mmc = MPS2_MACHINE_CLASS(oc); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     mc->desc = "ARM MPS2 with AN511 DesignStart FPGA image for Cortex-M3"; | 
					
						
							|  |  |  |     mmc->fpga_type = FPGA_AN511; | 
					
						
							| 
									
										
										
										
											2017-09-13 18:04:57 +02:00
										 |  |  |     mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3"); | 
					
						
							| 
									
										
										
										
											2018-08-24 13:17:50 +01:00
										 |  |  |     mmc->scc_id = 0x41045110; | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     mmc->psram_base = 0x21000000; | 
					
						
							|  |  |  |     mmc->ethernet_base = 0x40200000; | 
					
						
							|  |  |  |     mmc->has_block_ram = false; | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const TypeInfo mps2_info = { | 
					
						
							|  |  |  |     .name = TYPE_MPS2_MACHINE, | 
					
						
							|  |  |  |     .parent = TYPE_MACHINE, | 
					
						
							|  |  |  |     .abstract = true, | 
					
						
							|  |  |  |     .instance_size = sizeof(MPS2MachineState), | 
					
						
							|  |  |  |     .class_size = sizeof(MPS2MachineClass), | 
					
						
							|  |  |  |     .class_init = mps2_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const TypeInfo mps2_an385_info = { | 
					
						
							|  |  |  |     .name = TYPE_MPS2_AN385_MACHINE, | 
					
						
							|  |  |  |     .parent = TYPE_MPS2_MACHINE, | 
					
						
							|  |  |  |     .class_init = mps2_an385_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  | static const TypeInfo mps2_an386_info = { | 
					
						
							|  |  |  |     .name = TYPE_MPS2_AN386_MACHINE, | 
					
						
							|  |  |  |     .parent = TYPE_MPS2_MACHINE, | 
					
						
							|  |  |  |     .class_init = mps2_an386_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  | static const TypeInfo mps2_an500_info = { | 
					
						
							|  |  |  |     .name = TYPE_MPS2_AN500_MACHINE, | 
					
						
							|  |  |  |     .parent = TYPE_MPS2_MACHINE, | 
					
						
							|  |  |  |     .class_init = mps2_an500_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  | static const TypeInfo mps2_an511_info = { | 
					
						
							|  |  |  |     .name = TYPE_MPS2_AN511_MACHINE, | 
					
						
							|  |  |  |     .parent = TYPE_MPS2_MACHINE, | 
					
						
							|  |  |  |     .class_init = mps2_an511_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void mps2_machine_init(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     type_register_static(&mps2_info); | 
					
						
							|  |  |  |     type_register_static(&mps2_an385_info); | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:46 +01:00
										 |  |  |     type_register_static(&mps2_an386_info); | 
					
						
							| 
									
										
										
										
											2020-09-03 21:20:47 +01:00
										 |  |  |     type_register_static(&mps2_an500_info); | 
					
						
							| 
									
										
										
										
											2017-07-17 13:36:08 +01:00
										 |  |  |     type_register_static(&mps2_an511_info); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | type_init(mps2_machine_init); |