mirror of
				https://gitlab.com/qemu-project/qemu.git
				synced 2025-10-30 07:57:14 +08:00 
			
		
		
		
	hw/mips: Remove mipssim machine
The "mipssim" machine is deprecated since commit facfc943cb
("hw/mips: Mark the "mipssim" machine as deprecated"), released
in v10.0; time to remove.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20250828143800.49842-2-philmd@linaro.org>
			
			
This commit is contained in:
		| @ -1414,7 +1414,6 @@ F: tests/functional/mips*/test_tuxrun.py | ||||
| Mipssim | ||||
| R: Aleksandar Rikalo <arikalo@gmail.com> | ||||
| S: Orphan | ||||
| F: hw/mips/mipssim.c | ||||
| F: hw/net/mipsnet.c | ||||
|  | ||||
| Fuloong 2E | ||||
|  | ||||
| @ -6,4 +6,3 @@ | ||||
|  | ||||
| # Boards are selected by default, uncomment to keep out of the build. | ||||
| # CONFIG_MALTA=n | ||||
| # CONFIG_MIPSSIM=n | ||||
|  | ||||
| @ -313,18 +313,6 @@ and serves as the initial engineering sample rather than a production version. | ||||
| A newer revision, A1, is now supported, and the ``ast2700a1-evb`` should | ||||
| replace the older A0 version. | ||||
|  | ||||
| Mips ``mipssim`` machine (since 10.0) | ||||
| ''''''''''''''''''''''''''''''''''''' | ||||
|  | ||||
| Linux dropped support for this virtual machine type in kernel v3.7, and | ||||
| there does not seem to be anybody around who is still using this board | ||||
| in QEMU: Most former MIPS-related people are working on other architectures | ||||
| in their everyday job nowadays, and we are also not aware of anybody still | ||||
| using old binaries with this board (i.e. there is also no binary available | ||||
| online to check that this board did not completely bitrot yet). It is | ||||
| recommended to use another MIPS machine for future MIPS code development | ||||
| instead. | ||||
|  | ||||
| RISC-V default machine option (since 10.0) | ||||
| '''''''''''''''''''''''''''''''''''''''''' | ||||
|  | ||||
|  | ||||
| @ -1107,6 +1107,11 @@ were added for little endian CPUs. Big endian support was never tested | ||||
| and likely never worked. Starting with QEMU v10.1, the machines are now | ||||
| only available as little-endian machines. | ||||
|  | ||||
| Mips ``mipssim`` machine (removed in 10.2) | ||||
| '''''''''''''''''''''''''''''''''''''''''' | ||||
|  | ||||
| Linux dropped support for this virtual machine type in kernel v3.7, and | ||||
| there was also no binary available online to use with that board. | ||||
|  | ||||
| linux-user mode CPUs | ||||
| -------------------- | ||||
|  | ||||
| @ -12,8 +12,6 @@ machine types are emulated: | ||||
|  | ||||
| -  An ACER Pica \"pica61\". This machine needs the 64-bit emulator. | ||||
|  | ||||
| -  MIPS emulator pseudo board \"mipssim\" | ||||
|  | ||||
| -  A MIPS Magnum R4000 machine \"magnum\". This machine needs the | ||||
|    64-bit emulator. | ||||
|  | ||||
| @ -80,15 +78,6 @@ The Loongson-3 virtual platform emulation supports: | ||||
|  | ||||
| -  Both KVM and TCG supported | ||||
|  | ||||
| The mipssim pseudo board emulation provides an environment similar to | ||||
| what the proprietary MIPS emulator uses for running Linux. It supports: | ||||
|  | ||||
| -  A range of MIPS CPUs, default is the 24Kf | ||||
|  | ||||
| -  PC style serial port | ||||
|  | ||||
| -  MIPSnet network emulation | ||||
|  | ||||
| .. include:: cpu-models-mips.rst.inc | ||||
|  | ||||
| .. _nanoMIPS-System-emulator: | ||||
|  | ||||
| @ -13,13 +13,6 @@ config MALTA | ||||
|     select SERIAL_MM | ||||
|     select SMBUS_EEPROM | ||||
|  | ||||
| config MIPSSIM | ||||
|     bool | ||||
|     default y | ||||
|     depends on MIPS | ||||
|     select SERIAL_MM | ||||
|     select MIPSNET | ||||
|  | ||||
| config JAZZ | ||||
|     bool | ||||
|     default y | ||||
|  | ||||
| @ -8,7 +8,6 @@ mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) | ||||
|  | ||||
| if 'CONFIG_TCG' in config_all_accel | ||||
| mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) | ||||
| mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) | ||||
| mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) | ||||
| mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: files('boston.c')) | ||||
| endif | ||||
|  | ||||
| @ -1,249 +0,0 @@ | ||||
| /* | ||||
|  * QEMU/mipssim emulation | ||||
|  * | ||||
|  * Emulates a very simple machine model similar to the one used by the | ||||
|  * proprietary MIPS emulator. | ||||
|  * | ||||
|  * Copyright (c) 2007 Thiemo Seufer | ||||
|  * | ||||
|  * Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
|  * of this software and associated documentation files (the "Software"), to deal | ||||
|  * in the Software without restriction, including without limitation the rights | ||||
|  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
|  * copies of the Software, and to permit persons to whom the Software is | ||||
|  * furnished to do so, subject to the following conditions: | ||||
|  * | ||||
|  * The above copyright notice and this permission notice shall be included in | ||||
|  * all copies or substantial portions of the Software. | ||||
|  * | ||||
|  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
|  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
|  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||||
|  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
|  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
|  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||||
|  * THE SOFTWARE. | ||||
|  */ | ||||
|  | ||||
| #include "qemu/osdep.h" | ||||
| #include "qapi/error.h" | ||||
| #include "qemu/datadir.h" | ||||
| #include "system/address-spaces.h" | ||||
| #include "hw/clock.h" | ||||
| #include "hw/mips/mips.h" | ||||
| #include "hw/char/serial-mm.h" | ||||
| #include "net/net.h" | ||||
| #include "system/system.h" | ||||
| #include "hw/boards.h" | ||||
| #include "hw/loader.h" | ||||
| #include "elf.h" | ||||
| #include "hw/sysbus.h" | ||||
| #include "hw/qdev-properties.h" | ||||
| #include "qemu/error-report.h" | ||||
| #include "system/qtest.h" | ||||
| #include "system/reset.h" | ||||
| #include "cpu.h" | ||||
|  | ||||
| #define BIOS_SIZE (4 * MiB) | ||||
|  | ||||
| static struct _loaderparams { | ||||
|     int ram_size; | ||||
|     const char *kernel_filename; | ||||
|     const char *kernel_cmdline; | ||||
|     const char *initrd_filename; | ||||
| } loaderparams; | ||||
|  | ||||
| typedef struct ResetData { | ||||
|     MIPSCPU *cpu; | ||||
|     uint64_t vector; | ||||
| } ResetData; | ||||
|  | ||||
| static uint64_t load_kernel(void) | ||||
| { | ||||
|     uint64_t entry, kernel_high, initrd_size; | ||||
|     long kernel_size; | ||||
|     ram_addr_t initrd_offset; | ||||
|  | ||||
|     kernel_size = load_elf(loaderparams.kernel_filename, NULL, | ||||
|                            cpu_mips_kseg0_to_phys, NULL, | ||||
|                            &entry, NULL, | ||||
|                            &kernel_high, NULL, | ||||
|                            TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB, | ||||
|                            EM_MIPS, 1, 0); | ||||
|     if (kernel_size < 0) { | ||||
|         error_report("could not load kernel '%s': %s", | ||||
|                      loaderparams.kernel_filename, | ||||
|                      load_elf_strerror(kernel_size)); | ||||
|         exit(1); | ||||
|     } | ||||
|  | ||||
|     /* load initrd */ | ||||
|     initrd_size = 0; | ||||
|     initrd_offset = 0; | ||||
|     if (loaderparams.initrd_filename) { | ||||
|         initrd_size = get_image_size(loaderparams.initrd_filename); | ||||
|         if (initrd_size > 0) { | ||||
|             initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE); | ||||
|             if (initrd_offset + initrd_size > loaderparams.ram_size) { | ||||
|                 error_report("memory too small for initial ram disk '%s'", | ||||
|                              loaderparams.initrd_filename); | ||||
|                 exit(1); | ||||
|             } | ||||
|             initrd_size = load_image_targphys(loaderparams.initrd_filename, | ||||
|                 initrd_offset, loaderparams.ram_size - initrd_offset); | ||||
|         } | ||||
|         if (initrd_size == (target_ulong) -1) { | ||||
|             error_report("could not load initial ram disk '%s'", | ||||
|                          loaderparams.initrd_filename); | ||||
|             exit(1); | ||||
|         } | ||||
|     } | ||||
|     return entry; | ||||
| } | ||||
|  | ||||
| static void main_cpu_reset(void *opaque) | ||||
| { | ||||
|     ResetData *s = (ResetData *)opaque; | ||||
|     CPUMIPSState *env = &s->cpu->env; | ||||
|  | ||||
|     cpu_reset(CPU(s->cpu)); | ||||
|     env->active_tc.PC = s->vector & ~(target_ulong)1; | ||||
|     if (s->vector & 1) { | ||||
|         env->hflags |= MIPS_HFLAG_M16; | ||||
|     } | ||||
| } | ||||
|  | ||||
| static void mipsnet_init(int base, qemu_irq irq) | ||||
| { | ||||
|     DeviceState *dev; | ||||
|     SysBusDevice *s; | ||||
|  | ||||
|     dev = qemu_create_nic_device("mipsnet", true, NULL); | ||||
|     if (!dev) { | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     s = SYS_BUS_DEVICE(dev); | ||||
|     sysbus_realize_and_unref(s, &error_fatal); | ||||
|     sysbus_connect_irq(s, 0, irq); | ||||
|     memory_region_add_subregion(get_system_io(), | ||||
|                                 base, | ||||
|                                 sysbus_mmio_get_region(s, 0)); | ||||
| } | ||||
|  | ||||
| static void | ||||
| mips_mipssim_init(MachineState *machine) | ||||
| { | ||||
|     const char *kernel_filename = machine->kernel_filename; | ||||
|     const char *kernel_cmdline = machine->kernel_cmdline; | ||||
|     const char *initrd_filename = machine->initrd_filename; | ||||
|     const char *bios_name = TARGET_BIG_ENDIAN ? "mips_bios.bin" | ||||
|                                               : "mipsel_bios.bin"; | ||||
|     char *filename; | ||||
|     MemoryRegion *address_space_mem = get_system_memory(); | ||||
|     MemoryRegion *isa = g_new(MemoryRegion, 1); | ||||
|     MemoryRegion *bios = g_new(MemoryRegion, 1); | ||||
|     Clock *cpuclk; | ||||
|     MIPSCPU *cpu; | ||||
|     CPUMIPSState *env; | ||||
|     ResetData *reset_info; | ||||
|     int bios_size; | ||||
|  | ||||
|     cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); | ||||
| #ifdef TARGET_MIPS64 | ||||
|     clock_set_hz(cpuclk, 6000000); /* 6 MHz */ | ||||
| #else | ||||
|     clock_set_hz(cpuclk, 12000000); /* 12 MHz */ | ||||
| #endif | ||||
|  | ||||
|     /* Init CPUs. */ | ||||
|     cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk, | ||||
|                                      TARGET_BIG_ENDIAN); | ||||
|     env = &cpu->env; | ||||
|  | ||||
|     reset_info = g_new0(ResetData, 1); | ||||
|     reset_info->cpu = cpu; | ||||
|     reset_info->vector = env->active_tc.PC; | ||||
|     qemu_register_reset(main_cpu_reset, reset_info); | ||||
|  | ||||
|     /* Allocate RAM. */ | ||||
|     memory_region_init_rom(bios, NULL, "mips_mipssim.bios", BIOS_SIZE, | ||||
|                            &error_fatal); | ||||
|  | ||||
|     memory_region_add_subregion(address_space_mem, 0, machine->ram); | ||||
|  | ||||
|     /* Map the BIOS / boot exception handler. */ | ||||
|     memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); | ||||
|     /* Load a BIOS / boot exception handler image. */ | ||||
|     filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, | ||||
|                               machine->firmware ?: bios_name); | ||||
|     if (filename) { | ||||
|         bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE); | ||||
|         g_free(filename); | ||||
|     } else { | ||||
|         bios_size = -1; | ||||
|     } | ||||
|     if ((bios_size < 0 || bios_size > BIOS_SIZE) && | ||||
|         machine->firmware && !qtest_enabled()) { | ||||
|         /* Bail out if we have neither a kernel image nor boot vector code. */ | ||||
|         error_report("Could not load MIPS bios '%s'", machine->firmware); | ||||
|         exit(1); | ||||
|     } else { | ||||
|         /* We have a boot vector start address. */ | ||||
|         env->active_tc.PC = (target_long)(int32_t)0xbfc00000; | ||||
|     } | ||||
|  | ||||
|     if (kernel_filename) { | ||||
|         loaderparams.ram_size = machine->ram_size; | ||||
|         loaderparams.kernel_filename = kernel_filename; | ||||
|         loaderparams.kernel_cmdline = kernel_cmdline; | ||||
|         loaderparams.initrd_filename = initrd_filename; | ||||
|         reset_info->vector = load_kernel(); | ||||
|     } | ||||
|  | ||||
|     /* Init CPU internal devices. */ | ||||
|     cpu_mips_irq_init_cpu(cpu); | ||||
|     cpu_mips_clock_init(cpu); | ||||
|  | ||||
|     /* | ||||
|      * Register 64 KB of ISA IO space at 0x1fd00000.  But without interrupts | ||||
|      * (except for the hardcoded serial port interrupt) -device cannot work, | ||||
|      * so do not expose the ISA bus to the user. | ||||
|      */ | ||||
|     memory_region_init_alias(isa, NULL, "isa_mmio", | ||||
|                              get_system_io(), 0, 0x00010000); | ||||
|     memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa); | ||||
|  | ||||
|     /* | ||||
|      * A single 16450 sits at offset 0x3f8. It is attached to | ||||
|      * MIPS CPU INT2, which is interrupt 4. | ||||
|      */ | ||||
|     if (serial_hd(0)) { | ||||
|         DeviceState *dev = qdev_new(TYPE_SERIAL_MM); | ||||
|  | ||||
|         qdev_prop_set_chr(dev, "chardev", serial_hd(0)); | ||||
|         qdev_prop_set_uint8(dev, "regshift", 0); | ||||
|         qdev_prop_set_uint8(dev, "endianness", DEVICE_LITTLE_ENDIAN); | ||||
|         sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); | ||||
|         sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]); | ||||
|         memory_region_add_subregion(get_system_io(), 0x3f8, | ||||
|                       sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0)); | ||||
|     } | ||||
|  | ||||
|     /* MIPSnet uses the MIPS CPU INT0, which is interrupt 2. */ | ||||
|     mipsnet_init(0x4200, env->irq[2]); | ||||
| } | ||||
|  | ||||
| static void mips_mipssim_machine_init(MachineClass *mc) | ||||
| { | ||||
|     mc->desc = "MIPS MIPSsim platform"; | ||||
|     mc->init = mips_mipssim_init; | ||||
| #ifdef TARGET_MIPS64 | ||||
|     mc->default_cpu_type = MIPS_CPU_TYPE_NAME("5Kf"); | ||||
| #else | ||||
|     mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); | ||||
| #endif | ||||
|     mc->default_ram_id = "mips_mipssim.ram"; | ||||
| } | ||||
|  | ||||
| DEFINE_MACHINE("mipssim", mips_mipssim_machine_init) | ||||
		Reference in New Issue
	
	Block a user
	 Philippe Mathieu-Daudé
					Philippe Mathieu-Daudé