From nobody Fri May 3 23:01:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604424697; cv=none; d=zohomail.com; s=zohoarc; b=b30cF1ff9jjcdYkmz7agzVJUvHQEl+krx/AJyskqlSZN3iD3FLKo0IBs1GNQHe9frbdaK4JcV97mJMTMiX0i4ZlfUToLPIQKLC/LoS5GT2VhB2In1uz4W9so6xhajTO1aaqaKijilZpK+H/l2KG9RxK4w8uV/QxS79DVskjSx8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604424697; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+hIf3eZWVLUuPvUK+JvEYw3IeK+GL5CZY+UJFkfdKak=; b=Tip4milQHFQt4RPTbciprMEKSFt2HTAmj83h71bcHG9fVFwKlAiIvbzBlWKpsfkYr1/d8yGpkJEgq80ou3JbrvyfFmdymuKE+p0sJ4LCQTY3wSxHeBh0thpDquHXYngaVybYOzR7CmMHcpumNPpzBrdoJ1V+RYRZy8911jUUx04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1604424697261271.5337762681869; Tue, 3 Nov 2020 09:31:37 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id 13so133883wmf.0 for ; Tue, 03 Nov 2020 09:31:36 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id b7sm25997762wrp.16.2020.11.03.09.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 09:31:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+hIf3eZWVLUuPvUK+JvEYw3IeK+GL5CZY+UJFkfdKak=; b=RDS9bHK755AAjOa913VZXj+0Y0ZgCSO0CZBQhSbRAozhcUDX2V87G4pADClN4xNOTv I+EV/1aDXWmwEvU1GGzO58N8H8m0EIHQMkkgK5U8K6WlY7Ner7UXv5URJDsbK6NZCrCL M++0mUUjdJObsQ2KPuJC7mbtn394ehNg6n3rcKjEioOkMoBeJ7SQ5b6oyzdY/nEa7+VJ SImYrk45NzebYCsLTUuilwP0ztAMz0qQeq48psLMj6RcLkwdvJf7N2wNLYZFDvYJYeyk AvEcIRscN5LYaI0ChJWGcv0Olge3UNOsI1uDAHg9VbzWkAEiZ21+QNUsGah0gYl8k+AZ yQyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+hIf3eZWVLUuPvUK+JvEYw3IeK+GL5CZY+UJFkfdKak=; b=jrbcY/75DYC/vslqF1aJzxIrKKTKNdLlqPkfsmdffl5TAtdO7rkY1rHHQ0VU1WP3jQ 2A0FXECsgo8OGGrnzNj+Ir10nndFzSxzacH3JzbwJJG/f3aojiAIMdHAsTsGwCtbt9Ep SNdOxFxag+7C1gmnoHdkFJTUsxBOQ5SNPC57mFeqGAqpiBlgIR7kVHLN1Q/LZFs+yTld 124s5T9+zm8p0zu9xpXypr/A/T8GNv5ivwBHcq5E5TnjKQ3tTYvAnYf/KtKCaR6/HoWa RyTFnT4sJAgLI/kIK12y3V0tUofY5XdcRsOg81y53RUZG8IaIFsOY87ZZjRd/wlVIIBJ oMMg== X-Gm-Message-State: AOAM532Vs8UkJZE/5lB4B12ugwJ/EpH4SJlD05BOcrRlMJsqDZBdf6rg ijwXbZshrBJEqh7iTguh78Y= X-Google-Smtp-Source: ABdhPJz0QIO2VboMehLgOmAvzOCgyqtgSqmU2Bt/s7hWh2LjZ9oyDY4GKpkZK5yzKk2/m8p/M0KGug== X-Received: by 2002:a1c:81c9:: with SMTP id c192mr221409wmd.1.1604424695048; Tue, 03 Nov 2020 09:31:35 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Jiaxun Yang , Paul Burton , libvir-list@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , John Snow , Paolo Bonzini , Laurent Vivier , Aleksandar Rikalo , qemu-block@nongnu.org, Huacai Chen , Richard Henderson , Peter Krempa Subject: [PULL 1/6] hw/mips: Remove the 'r4k' machine Date: Tue, 3 Nov 2020 18:31:22 +0100 Message-Id: <20201103173127.2704256-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103173127.2704256-1-f4bug@amsat.org> References: <20201103173127.2704256-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We deprecated the support for the 'r4k' machine for the 5.0 release (commit d32dc61421), which means that our deprecation policy allows us to drop it in release 5.2. Remove the code. To repeat the rationale from the deprecation note: - this virtual machine has no specification - the Linux kernel dropped support for it 10 years ago Users are recommended to use the Malta board instead. Acked-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth ACKed-by: Peter Krempa Message-Id: <20201102201311.2220005-1-f4bug@amsat.org> --- docs/system/deprecated.rst | 12 +- .../devices/mips-softmmu-common.mak | 1 - hw/mips/r4k.c | 318 ------------------ tests/qtest/cdrom-test.c | 2 +- tests/qtest/endianness-test.c | 2 - MAINTAINERS | 6 - hw/mips/Kconfig | 13 - hw/mips/meson.build | 1 - 8 files changed, 7 insertions(+), 348 deletions(-) delete mode 100644 hw/mips/r4k.c diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 32a0e620dbb..8c1dc7645d7 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -328,12 +328,6 @@ The 'scsi-disk' device is deprecated. Users should use= 'scsi-hd' or System emulator machines ------------------------ =20 -mips ``r4k`` platform (since 5.0) -''''''''''''''''''''''''''''''''' - -This machine type is very old and unmaintained. Users should use the ``mal= ta`` -machine type instead. - mips ``fulong2e`` machine (since 5.1) ''''''''''''''''''''''''''''''''''''' =20 @@ -576,6 +570,12 @@ The version specific Spike machines have been removed = in favour of the generic ``spike`` machine. If you need to specify an older version of the = RISC-V spec you can use the ``-cpu rv64gcsu,priv_spec=3Dv1.10.0`` command line ar= gument. =20 +mips ``r4k`` platform (removed in 5.2) +'''''''''''''''''''''''''''''''''''''' + +This machine type was very old and unmaintained. Users should use the ``ma= lta`` +machine type instead. + Related binaries ---------------- =20 diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-conf= igs/devices/mips-softmmu-common.mak index da29c6c0b24..ea78fe72759 100644 --- a/default-configs/devices/mips-softmmu-common.mak +++ b/default-configs/devices/mips-softmmu-common.mak @@ -33,7 +33,6 @@ CONFIG_MC146818RTC=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy -CONFIG_R4K=3Dy CONFIG_MALTA=3Dy CONFIG_PCNET_PCI=3Dy CONFIG_MIPSSIM=3Dy diff --git a/hw/mips/r4k.c b/hw/mips/r4k.c deleted file mode 100644 index 38308543421..00000000000 --- a/hw/mips/r4k.c +++ /dev/null @@ -1,318 +0,0 @@ -/* - * QEMU/MIPS pseudo-board - * - * emulates a simple machine with ISA-like bus. - * ISA IO space mapped to the 0x14000000 (PHYS) and - * ISA memory at the 0x10000000 (PHYS, 16Mb in size). - * All peripherial devices are attached to this "bus" with - * the standard PC ISA addresses. - */ - -#include "qemu/osdep.h" -#include "qemu/units.h" -#include "qapi/error.h" -#include "qemu-common.h" -#include "cpu.h" -#include "hw/clock.h" -#include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" -#include "hw/intc/i8259.h" -#include "hw/char/serial.h" -#include "hw/isa/isa.h" -#include "net/net.h" -#include "hw/net/ne2000-isa.h" -#include "sysemu/sysemu.h" -#include "hw/boards.h" -#include "hw/block/flash.h" -#include "qemu/log.h" -#include "hw/mips/bios.h" -#include "hw/ide.h" -#include "hw/ide/internal.h" -#include "hw/loader.h" -#include "elf.h" -#include "hw/rtc/mc146818rtc.h" -#include "hw/input/i8042.h" -#include "hw/timer/i8254.h" -#include "exec/address-spaces.h" -#include "sysemu/qtest.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "qemu/error-report.h" - -#define MAX_IDE_BUS 2 - -static const int ide_iobase[2] =3D { 0x1f0, 0x170 }; -static const int ide_iobase2[2] =3D { 0x3f6, 0x376 }; -static const int ide_irq[2] =3D { 14, 15 }; - -static ISADevice *pit; /* PIT i8254 */ - -/* i8254 PIT is attached to the IRQ0 at PIC i8259 */ - -static struct _loaderparams { - int ram_size; - const char *kernel_filename; - const char *kernel_cmdline; - const char *initrd_filename; -} loaderparams; - -static void mips_qemu_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - if ((addr & 0xffff) =3D=3D 0 && val =3D=3D 42) { - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - } else if ((addr & 0xffff) =3D=3D 4 && val =3D=3D 42) { - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - } -} - -static uint64_t mips_qemu_read(void *opaque, hwaddr addr, - unsigned size) -{ - return 0; -} - -static const MemoryRegionOps mips_qemu_ops =3D { - .read =3D mips_qemu_read, - .write =3D mips_qemu_write, - .endianness =3D DEVICE_NATIVE_ENDIAN, -}; - -typedef struct ResetData { - MIPSCPU *cpu; - uint64_t vector; -} ResetData; - -static int64_t load_kernel(void) -{ - const size_t params_size =3D 264; - int64_t entry, kernel_high, initrd_size; - long kernel_size; - ram_addr_t initrd_offset; - uint32_t *params_buf; - int big_endian; - -#ifdef TARGET_WORDS_BIGENDIAN - big_endian =3D 1; -#else - big_endian =3D 0; -#endif - kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, - cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&entry, NULL, - (uint64_t *)&kernel_high, NULL, big_endian, - 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 =3D 0; - initrd_offset =3D 0; - if (loaderparams.initrd_filename) { - initrd_size =3D get_image_size(loaderparams.initrd_filename); - if (initrd_size > 0) { - initrd_offset =3D ROUND_UP(kernel_high, INITRD_PAGE_SIZE); - if (initrd_offset + initrd_size > ram_size) { - error_report("memory too small for initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - initrd_size =3D load_image_targphys(loaderparams.initrd_filena= me, - initrd_offset, - ram_size - initrd_offset); - } - if (initrd_size =3D=3D (target_ulong) -1) { - error_report("could not load initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - } - - /* Store command line. */ - params_buf =3D g_malloc(params_size); - - params_buf[0] =3D tswap32(ram_size); - params_buf[1] =3D tswap32(0x12345678); - - if (initrd_size > 0) { - snprintf((char *)params_buf + 8, 256, - "rd_start=3D0x%" PRIx64 " rd_size=3D%" PRId64 " %s", - cpu_mips_phys_to_kseg0(NULL, initrd_offset), - initrd_size, loaderparams.kernel_cmdline); - } else { - snprintf((char *)params_buf + 8, 256, - "%s", loaderparams.kernel_cmdline); - } - - rom_add_blob_fixed("params", params_buf, params_size, - 16 * MiB - params_size); - - g_free(params_buf); - return entry; -} - -static void main_cpu_reset(void *opaque) -{ - ResetData *s =3D (ResetData *)opaque; - CPUMIPSState *env =3D &s->cpu->env; - - cpu_reset(CPU(s->cpu)); - env->active_tc.PC =3D s->vector; -} - -static const int sector_len =3D 32 * KiB; -static -void mips_r4k_init(MachineState *machine) -{ - const char *kernel_filename =3D machine->kernel_filename; - const char *kernel_cmdline =3D machine->kernel_cmdline; - const char *initrd_filename =3D machine->initrd_filename; - char *filename; - MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *bios; - MemoryRegion *iomem =3D g_new(MemoryRegion, 1); - MemoryRegion *isa_io =3D g_new(MemoryRegion, 1); - MemoryRegion *isa_mem =3D g_new(MemoryRegion, 1); - int bios_size; - Clock *cpuclk; - MIPSCPU *cpu; - CPUMIPSState *env; - ResetData *reset_info; - int i; - qemu_irq *i8259; - ISABus *isa_bus; - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - DriveInfo *dinfo; - int be; - - cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); - clock_set_hz(cpuclk, 200000000); /* 200 MHz */ - - /* init CPUs */ - cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk); - env =3D &cpu->env; - - reset_info =3D g_malloc0(sizeof(ResetData)); - reset_info->cpu =3D cpu; - reset_info->vector =3D env->active_tc.PC; - qemu_register_reset(main_cpu_reset, reset_info); - - /* allocate RAM */ - if (machine->ram_size > 256 * MiB) { - error_report("Too much memory for this machine: %" PRId64 "MB," - " maximum 256MB", ram_size / MiB); - exit(1); - } - memory_region_add_subregion(address_space_mem, 0, machine->ram); - - memory_region_init_io(iomem, NULL, &mips_qemu_ops, - NULL, "mips-qemu", 0x10000); - - memory_region_add_subregion(address_space_mem, 0x1fbf0000, iomem); - - /* - * Try to load a BIOS image. If this fails, we continue regardless, - * but initialize the hardware ourselves. When a kernel gets - * preloaded we also initialize the hardware, since the BIOS wasn't - * run. - */ - - if (bios_name =3D=3D NULL) { - bios_name =3D BIOS_FILENAME; - } - filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - if (filename) { - bios_size =3D get_image_size(filename); - } else { - bios_size =3D -1; - } -#ifdef TARGET_WORDS_BIGENDIAN - be =3D 1; -#else - be =3D 0; -#endif - dinfo =3D drive_get(IF_PFLASH, 0, 0); - if ((bios_size > 0) && (bios_size <=3D BIOS_SIZE)) { - bios =3D g_new(MemoryRegion, 1); - memory_region_init_rom(bios, NULL, "mips_r4k.bios", BIOS_SIZE, - &error_fatal); - memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios); - - load_image_targphys(filename, 0x1fc00000, BIOS_SIZE); - } else if (dinfo !=3D NULL) { - uint32_t mips_rom =3D 0x00400000; - if (!pflash_cfi01_register(0x1fc00000, "mips_r4k.bios", mips_rom, - blk_by_legacy_dinfo(dinfo), - sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - } - } else if (!qtest_enabled()) { - /* not fatal */ - warn_report("could not load MIPS bios '%s'", bios_name); - } - g_free(filename); - - if (kernel_filename) { - loaderparams.ram_size =3D machine->ram_size; - loaderparams.kernel_filename =3D kernel_filename; - loaderparams.kernel_cmdline =3D kernel_cmdline; - loaderparams.initrd_filename =3D initrd_filename; - reset_info->vector =3D load_kernel(); - } - - /* Init CPU internal devices */ - cpu_mips_irq_init_cpu(cpu); - cpu_mips_clock_init(cpu); - - /* ISA bus: IO space at 0x14000000, mem space at 0x10000000 */ - memory_region_init_alias(isa_io, NULL, "isa-io", - get_system_io(), 0, 0x00010000); - memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); - memory_region_add_subregion(get_system_memory(), 0x14000000, isa_io); - memory_region_add_subregion(get_system_memory(), 0x10000000, isa_mem); - isa_bus =3D isa_bus_new(NULL, isa_mem, get_system_io(), &error_abort); - - /* The PIC is attached to the MIPS CPU INT0 pin */ - i8259 =3D i8259_init(isa_bus, env->irq[2]); - isa_bus_irqs(isa_bus, i8259); - - mc146818_rtc_init(isa_bus, 2000, NULL); - - pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); - - serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS); - - isa_vga_init(isa_bus); - - if (nd_table[0].used) { - isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]); - } - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i =3D 0; i < MAX_IDE_BUS; i++) - isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], ide_irq[i], - hd[MAX_IDE_DEVS * i], - hd[MAX_IDE_DEVS * i + 1]); - - isa_create_simple(isa_bus, TYPE_I8042); -} - -static void mips_machine_init(MachineClass *mc) -{ - mc->deprecation_reason =3D "use malta machine type instead"; - mc->desc =3D "mips r4k platform"; - mc->init =3D mips_r4k_init; - mc->block_default_type =3D IF_IDE; -#ifdef TARGET_MIPS64 - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("R4000"); -#else - mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); -#endif - mc->default_ram_id =3D "mips_r4k.ram"; -} - -DEFINE_MACHINE("mips", mips_machine_init) diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index eef242dc80c..5af944a5fb7 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -217,7 +217,7 @@ int main(int argc, char **argv) add_cdrom_param_tests(sparc64machines); } else if (!strncmp(arch, "mips64", 6)) { const char *mips64machines[] =3D { - "magnum", "malta", "mips", "pica61", NULL + "magnum", "malta", "pica61", NULL }; add_cdrom_param_tests(mips64machines); } else if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) { diff --git a/tests/qtest/endianness-test.c b/tests/qtest/endianness-test.c index 4e79e22c28c..09ecb531f11 100644 --- a/tests/qtest/endianness-test.c +++ b/tests/qtest/endianness-test.c @@ -27,11 +27,9 @@ struct TestCase { =20 static const TestCase test_cases[] =3D { { "i386", "pc", -1 }, - { "mips", "mips", 0x14000000, .bswap =3D true }, { "mips", "malta", 0x10000000, .bswap =3D true }, { "mips64", "magnum", 0x90000000, .bswap =3D true }, { "mips64", "pica61", 0x90000000, .bswap =3D true }, - { "mips64", "mips", 0x14000000, .bswap =3D true }, { "mips64", "malta", 0x10000000, .bswap =3D true }, { "mips64el", "fuloong2e", 0x1fd00000 }, { "ppc", "g3beige", 0xfe000000, .bswap =3D true, .superio =3D "i82378"= }, diff --git a/MAINTAINERS b/MAINTAINERS index c1d16026baf..8a2c2041521 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1138,12 +1138,6 @@ S: Orphaned F: hw/mips/mipssim.c F: hw/net/mipsnet.c =20 -R4000 -R: Aurelien Jarno -R: Aleksandar Rikalo -S: Obsolete -F: hw/mips/r4k.c - Fuloong 2E M: Huacai Chen M: Philippe Mathieu-Daud=C3=A9 diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 67d39c56a4e..8be70122f4c 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,16 +1,3 @@ -config R4K - bool - select ISA_BUS - select SERIAL_ISA - select I8259 - select I8254 - select MC146818RTC - imply VGA_ISA - imply NE2000_ISA - select IDE_ISA - select PCKBD - select PFLASH_CFI01 - config MALTA bool select ISA_SUPERIO diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 46294b7382f..bcdf96be69f 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -6,6 +6,5 @@ mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) -mips_ss.add(when: 'CONFIG_R4K', if_true: files('r4k.c')) =20 hw_arch +=3D {'mips': mips_ss} --=20 2.26.2 From nobody Fri May 3 23:01:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604424702; cv=none; d=zohomail.com; s=zohoarc; b=TJ7oW/lvBu83sVsOGpFp/puAifiu02KzxOiBEPDVk+5hbPDicedl1IsNndliI2DP7nYarOApLgtU3Rb+RQsqR0oiEbXZZPKY1+tSUaF7P+CWvabFuugJjwOVLq4K0jmAbtTvo9Hvqmqa/UwEsROyC9S6fnZjZenzBtghMQroqu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604424702; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=flfR7C3ZpMvn4beKvApVO0gmRbPM0MVpe29hyYCIhJU=; b=HCzY6gSCO/8ezgojTp8Arv9PsU2RQmSYhl3ucYGNNZksspi+WNNOPjISHLpbAfS974+X5KIIbBoTnnAXUkrwut7+3UH57gjwxGbyBWuJBcQOoUG8pYEkmAf8bzVqlyYs85aC2aOX2CWwUk7h0ATr0WXmlFRwaHKbNRjOH3I2ezs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 16044247023388.201889572948517; Tue, 3 Nov 2020 09:31:42 -0800 (PST) Received: by mail-wr1-f49.google.com with SMTP id w14so19361387wrs.9 for ; Tue, 03 Nov 2020 09:31:41 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id n6sm26713461wrj.60.2020.11.03.09.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 09:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=flfR7C3ZpMvn4beKvApVO0gmRbPM0MVpe29hyYCIhJU=; b=h3ryhhunZS3camgASrkSqLiX82noUhgPpWVbaaZGIykh5WlC0RfkDvnAc+zJCoVr2H 4yImEP+dKbT3MhHxxlHzbPT5WbDkrSboo57H61BuAYKMP9uPuyjXFgsX/1YASzDrIH2s WXZ9pY9cC3JReV/L8m6qDVO4Mg5dLWLbl/+FU36ERhB8GMt4dGR4S7iiF6PDm6nzhH03 1a+xkqfaBmL/oYGUI/Y+6Wp1mkGPVY4mS6grCzml3pqcTSO6SHHtN5i7kfhHarFRQbWZ vW3fT7kk27UyAdekCSXGo8GZmWP80wPSmuGhwuPO7/+KZb21VLO99wS1gdEgq1E1Enk1 afvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=flfR7C3ZpMvn4beKvApVO0gmRbPM0MVpe29hyYCIhJU=; b=DAKviNz8GuRIfWgNHr7nCdyYSFCH6tEi32OvCqqcDnbNq7Q1QU5J7wyAPStnZgwbuN ubOFyh0i2wNMrYAbRbGF3eq3VFTPKD/tL5YASIVi0dJPyDoIvSAavww7IIjsv4UeOBXH 5Ckx2wxWS/Dg4ywovOREEiOLhmbg91rxwJd5sUNGEL6OYpFnkxBiVrYeRq732zRx0pmb 77TArIZYjSt4WyU+YtYEIFi66xY9ZL3m6Qk1Apz6CoOvPc0ncJ23MAoLX8WWA9Q83HPK ZuYnmAMgGk8uPSY6xKqCJXO9lA2QxO8Oz1cRsBd5bGFs4T6jGivv0dm6vvS98zqcJ/yQ 8RHg== X-Gm-Message-State: AOAM533h3LoJEkGvK5ruJ9aZSoij5AIlJFsdt3ubi8ImBS2nMMgQxoxV YEbDcbGH/ja11YIMr+pm7ms= X-Google-Smtp-Source: ABdhPJyZ+iAE2mxZugn6hufNKrr9JKzoMLQqYjgvZwFdgQaQojHRbVMdQ2r4lYeGTnEMSSyJUcRoJA== X-Received: by 2002:a5d:6944:: with SMTP id r4mr27496606wrw.151.1604424700260; Tue, 03 Nov 2020 09:31:40 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Jiaxun Yang , Paul Burton , libvir-list@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , John Snow , Paolo Bonzini , Laurent Vivier , Aleksandar Rikalo , qemu-block@nongnu.org, Huacai Chen , Chetan Pant Subject: [PULL 2/6] hw/mips: Fix Lesser GPL version number Date: Tue, 3 Nov 2020 18:31:23 +0100 Message-Id: <20201103173127.2704256-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103173127.2704256-1-f4bug@amsat.org> References: <20201103173127.2704256-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Chetan Pant There is no "version 2" of the "Lesser" General Public License. It is either "GPL version 2.0" or "Lesser GPL version 2.1". This patch replaces all occurrences of "Lesser GPL version 2" with "Lesser GPL version 2.1" in comment section. Signed-off-by: Chetan Pant Reviewed-by: Thomas Huth Message-Id: <20201016143509.26692-1-chetan4windows@gmail.com> [PMD: Split hw/ vs target/] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/mips/cps.h | 2 +- include/hw/misc/mips_cpc.h | 2 +- include/hw/misc/mips_itu.h | 2 +- hw/mips/cps.c | 2 +- hw/misc/mips_cpc.c | 2 +- hw/misc/mips_itu.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/mips/cps.h b/include/hw/mips/cps.h index 859a8d4a674..04d636246ab 100644 --- a/include/hw/mips/cps.h +++ b/include/hw/mips/cps.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/hw/misc/mips_cpc.h b/include/hw/misc/mips_cpc.h index e5dccea151f..fcafbd5e002 100644 --- a/include/hw/misc/mips_cpc.h +++ b/include/hw/misc/mips_cpc.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/hw/misc/mips_itu.h b/include/hw/misc/mips_itu.h index 96347dbf65d..50d961106da 100644 --- a/include/hw/misc/mips_itu.h +++ b/include/hw/misc/mips_itu.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/mips/cps.c b/hw/mips/cps.c index c624821315a..962b1b0b87c 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index 7c11fb3d447..4a94c870546 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c index 35409852588..133399598fc 100644 --- a/hw/misc/mips_itu.c +++ b/hw/misc/mips_itu.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of --=20 2.26.2 From nobody Fri May 3 23:01:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1604424740; cv=none; d=zohomail.com; s=zohoarc; b=FM1Km2o3BJ7N4vK4L3ANI6gmMuTnStQH4v5pUQy/6jf3cW8+3Akh72HriX2BpoepdYhwNMu+9/r3tiC4lT28s13fbiKY41q/53AWRTWJs3nmpAJLQMPB+aMy6klGMAW3xY2cF8x+OyGuF2XUCvsW8kBUpJgyvaUy2HvQ438TnuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604424740; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uQkw/fFXtZYbLMzJPqkh+QCHUXnq5WFrEui1LRbfpqI=; b=cVgzHWDVQV7VPwpmEDPIzzYiunWvfjlR8qrXqBuP3g35TXGiEX5e+zTWn8bQUXljqZaSeD7iMYsuqRYL3Z96FEq2QxoN1IbSyrbmsHhux2mx2r3u1yOhZ0/suyK+xhzbHWOcxbrtZKRHdpINIS/VHMNofvnwSuFwioJ3huK3N58= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604424740075540.773091652864; Tue, 3 Nov 2020 09:32:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-HhIqkWg2NnWEJlIqjbY8fw-1; Tue, 03 Nov 2020 12:32:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15E521006CB6; Tue, 3 Nov 2020 17:32:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E41BD19D6C; Tue, 3 Nov 2020 17:32:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AF0298C7D6; Tue, 3 Nov 2020 17:32:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A3HVrk6020567 for ; Tue, 3 Nov 2020 12:31:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8AE6A1002972; Tue, 3 Nov 2020 17:31:53 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8725B1002122 for ; Tue, 3 Nov 2020 17:31:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 60BAE1021F83 for ; Tue, 3 Nov 2020 17:31:53 +0000 (UTC) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-542-pujLiGgON-WmXWGtoRjWxQ-1; Tue, 03 Nov 2020 12:31:47 -0500 Received: by mail-wr1-f46.google.com with SMTP id w1so19427553wrm.4; Tue, 03 Nov 2020 09:31:46 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id h62sm28205976wrh.82.2020.11.03.09.31.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 09:31:44 -0800 (PST) X-MC-Unique: HhIqkWg2NnWEJlIqjbY8fw-1 X-MC-Unique: pujLiGgON-WmXWGtoRjWxQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uQkw/fFXtZYbLMzJPqkh+QCHUXnq5WFrEui1LRbfpqI=; b=i09ugRmaezyWp+7u6ZVpwvrpjY52xKORzWWro68cNRF3lFi5xpR21shd5GvUcvn2Wn 2WJ6g3BthTIj+gQhIVNjCWV3cSwD1DeQ8HA6swB7NWg+zOfJCDLGXUmxgeXXeSnQhbrg M/UBJ/55Sf1rfL+6gl7ttyAvO6CrBlv1CJTj6r/p3+sz3jIovBtK8yWLBz99sLDpM3iq 1o66Hftp+uu/VTQOmu3VXT1z2vKf3qjACgWxBCL7tjvepLYf157WC0JOnrJ61SKjtF0u 83ZWSzMTvPb0ll8gqOKdnBYDFDidwwnYDneGnQdvSDOgGKyulIAnoJBr+M1z/6hv+FZK RA3Q== X-Gm-Message-State: AOAM533uMXSczScNdI0YDP/h/vzQ/2tCNMy87n8/+6US9Q/U9+grdHNv 351d0Ub+Pv5djr9dUIdMy90= X-Google-Smtp-Source: ABdhPJyb3uYkPL4Kq/qc0e4nfle7YTIQ90dWfB0G70y/L5ZtN2EqhL+EgH76dc2CXh1YtNB5QspA1g== X-Received: by 2002:adf:ed49:: with SMTP id u9mr26589912wro.88.1604424705483; Tue, 03 Nov 2020 09:31:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 3/6] hw/mips/boston: Fix Lesser GPL version number Date: Tue, 3 Nov 2020 18:31:24 +0100 Message-Id: <20201103173127.2704256-4-f4bug@amsat.org> In-Reply-To: <20201103173127.2704256-1-f4bug@amsat.org> References: <20201103173127.2704256-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Paul Burton , libvir-list@redhat.com, Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Chetan Pant , Huacai Chen , Paolo Bonzini , John Snow , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Chetan Pant There is no "version 2" of the "Lesser" General Public License. It is either "GPL version 2.0" or "Lesser GPL version 2.1". This patch replaces all occurrences of "Lesser GPL version 2" with "Lesser GPL version 2.1" in comment section. Signed-off-by: Chetan Pant Reviewed-by: Thomas Huth Message-Id: <20201023122633.19466-1-chetan4windows@gmail.com> [PMD: Added hw/mips/ prefix in subject] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci-host/xilinx-pcie.h | 2 +- hw/core/loader-fit.c | 2 +- hw/mips/boston.c | 2 +- hw/pci-host/xilinx-pcie.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/pci-host/xilinx-pcie.h b/include/hw/pci-host/xilinx= -pcie.h index f079e50db44..89be88d87fd 100644 --- a/include/hw/pci-host/xilinx-pcie.h +++ b/include/hw/pci-host/xilinx-pcie.h @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index c465921b8f7..b7c7b3ba94d 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 74c18edbb34..3356d7a6814 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 3b321421b66..38d5901a454 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of --=20 2.26.2 From nobody Fri May 3 23:01:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604424735; cv=none; d=zohomail.com; s=zohoarc; b=RiuKqcoIdC79+diOV8t1K9GkcyNPfw4ordxuBAPE39bir5d/9bW4wtEC3kMgrFWooe2lwiwvSlu9FqSInvPMemHRrI4+UPaOYVLfYeXeA3+kAAXPqbsxwWeDRMaRowIttjfmckd9jWBz0gjK1Pb4JYWG18Sv6ILF8n4n9QZKiZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604424735; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=foVWc9r1HLdO6p7KIENhYlJk5TO0X5g97/2uwPfPPpU=; b=BSJ73Wggdo84mv3siPFdkok8Uvbx4ne10Y5QgqECbNOi/xkuaGqY6Ri6kqq3hlECmY13LzFdp/dzzs0o95muzLic1o2oiE6JL/F8MAlP4AUvnOAOBpKVHCWkbgn/RNgZijf/PUE5RHlvijG5eVk3tCvzKoYE8RCX2xFnyXC2KxA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604424735703260.54479722831945; Tue, 3 Nov 2020 09:32:15 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-596-Vng4ZMVSPEu05Ey1_g4Syg-1; Tue, 03 Nov 2020 12:32:09 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 69A198049DF; Tue, 3 Nov 2020 17:32:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47E3176649; Tue, 3 Nov 2020 17:32:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 13368180B65D; Tue, 3 Nov 2020 17:32:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A3HW0ob020601 for ; Tue, 3 Nov 2020 12:32:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id A1908A37AC; Tue, 3 Nov 2020 17:32:00 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BB0FA37AA for ; Tue, 3 Nov 2020 17:31:58 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71AB390E42A for ; Tue, 3 Nov 2020 17:31:58 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-pxnvRbQCMxenZ8gScGjTLw-1; Tue, 03 Nov 2020 12:31:52 -0500 Received: by mail-wr1-f41.google.com with SMTP id n18so19387558wrs.5; Tue, 03 Nov 2020 09:31:51 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id x10sm25986458wrp.62.2020.11.03.09.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 09:31:50 -0800 (PST) X-MC-Unique: Vng4ZMVSPEu05Ey1_g4Syg-1 X-MC-Unique: pxnvRbQCMxenZ8gScGjTLw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=foVWc9r1HLdO6p7KIENhYlJk5TO0X5g97/2uwPfPPpU=; b=atgvxozEXKyhXuiS1K1QSHFMQ3E8z3E6mQgf3BVYJD4fDhdF2kvSrGirWv+ul7JMJz 6NuzVbvA6QmbGeuPEL3NCvACYWUIXiAfMTaX9jRd19+WDPCpla+EeYXZDxRR0CS9kkdN JyXDecDVLfAtBTf8xREthP5TPN2VmbJWG2hmYpRV5zU0/oL8ITMT58GIrFI+/Mec/Epo HgBGib88H/csAgemWPhEcohDt1FpGDDAu5zy4T+kQg19Qa80DedTK48iy8S9ddRymne9 HzBJqc1fGYuNAMEBjG7Oo35bALhv7z3iQ0v1nr+65ywweNzZ+D0cGOgO/7+Pj/T/nvhO QDyA== X-Gm-Message-State: AOAM531bqbbOzHxv+iAYHnN/JRp2dtliSySxuXZfChvOyylh+23GuBiE EAwJQ/Ps5PkqlCHTMP1DfAM= X-Google-Smtp-Source: ABdhPJyQKtbepnTGklAK/im/LjZLVxerUBaDgLC7W9fp0ilK2rCBdCDV4yFrPYGkdsvlFRur0qpE9A== X-Received: by 2002:a5d:4b12:: with SMTP id v18mr27108339wrq.259.1604424710951; Tue, 03 Nov 2020 09:31:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 4/6] hw/intc/loongson: Fix incorrect 'core' calculation in liointc_read/write Date: Tue, 3 Nov 2020 18:31:25 +0100 Message-Id: <20201103173127.2704256-5-f4bug@amsat.org> In-Reply-To: <20201103173127.2704256-1-f4bug@amsat.org> References: <20201103173127.2704256-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Paul Burton , libvir-list@redhat.com, Aleksandar Rikalo , Euler Robot , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , AlexChen , Huacai Chen , Paolo Bonzini , John Snow , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: AlexChen According to the loongson spec (http://www.loongson.cn/uploadfile/cpu/3B1500/Loongson_3B1500_cpu_user_1.pd= f) and the macro definition(#define R_PERCORE_ISR(x) (0x40 + 0x8 * x)), we know that the ISR size per CORE is 8, so here we need to divide (addr - R_PERCORE_ISR(0)) by 8, not 4. Reported-by: Euler Robot Signed-off-by: Alex Chen Reviewed-by: Jiaxun Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <5FA12391.8090400@huawei.com> [PMD: Shortened subject] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/loongson_liointc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c index 30fb375b721..fbbfb57ee9c 100644 --- a/hw/intc/loongson_liointc.c +++ b/hw/intc/loongson_liointc.c @@ -130,7 +130,7 @@ liointc_read(void *opaque, hwaddr addr, unsigned int si= ze) =20 if (addr >=3D R_PERCORE_ISR(0) && addr < R_PERCORE_ISR(NUM_CORES)) { - int core =3D (addr - R_PERCORE_ISR(0)) / 4; + int core =3D (addr - R_PERCORE_ISR(0)) / 8; r =3D p->per_core_isr[core]; goto out; } @@ -173,7 +173,7 @@ liointc_write(void *opaque, hwaddr addr, =20 if (addr >=3D R_PERCORE_ISR(0) && addr < R_PERCORE_ISR(NUM_CORES)) { - int core =3D (addr - R_PERCORE_ISR(0)) / 4; + int core =3D (addr - R_PERCORE_ISR(0)) / 8; p->per_core_isr[core] =3D value; goto out; } --=20 2.26.2 From nobody Fri May 3 23:01:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604424740; cv=none; d=zohomail.com; s=zohoarc; b=Zg6vo+4y/HQMyAL2xJtzZCzYpbUawZUC9DU1yeQhBFMhqWJxSN5TMxqrdpnwyb3d+Ljt3hT49zByZywnCTEeKv7AGsCZR53jyAGimZd6wemNNn5dUpQx0eyD25qkt7HfuZuqhvjrAohyVvLgDJZp7kWKKvaiiVbLAPOSVkURq80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604424740; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s/6NX9jbGA7gWKbxB5Gz4aNw6mxohCMAm/BDmMgMuFc=; b=QWMH5SrbFyzY4XWA1LFiSCNCyqWURF+wIuqYztXaJ4MF+ohM+5XJY/ZHXn5dapsSva4GAkjf57AekeohlbjE+YjDuXkNwKIGCDBJ9kGkt0NewDs1gVtJJsjyO05iM3EM32GZ+JwIY/bZ/QAHTS/jgv/uuDTvNzOUqSyTgiQnrxg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604424740466251.1862473982468; Tue, 3 Nov 2020 09:32:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-qrE3s8E_NPWlJWWeKSTaIw-1; Tue, 03 Nov 2020 12:32:16 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85423186841D; Tue, 3 Nov 2020 17:32:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3383773667; Tue, 3 Nov 2020 17:32:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E844E8C7CD; Tue, 3 Nov 2020 17:32:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A3HW7td020631 for ; Tue, 3 Nov 2020 12:32:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0E233207A79B; Tue, 3 Nov 2020 17:32:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08B37207A79A for ; Tue, 3 Nov 2020 17:32:04 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A41BF858290 for ; Tue, 3 Nov 2020 17:32:04 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-pvzknGLjMuaLjgs8MAWmXA-1; Tue, 03 Nov 2020 12:31:58 -0500 Received: by mail-wm1-f46.google.com with SMTP id d142so115787wmd.4; Tue, 03 Nov 2020 09:31:57 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id h7sm26814506wrt.45.2020.11.03.09.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 09:31:55 -0800 (PST) X-MC-Unique: qrE3s8E_NPWlJWWeKSTaIw-1 X-MC-Unique: pvzknGLjMuaLjgs8MAWmXA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=s/6NX9jbGA7gWKbxB5Gz4aNw6mxohCMAm/BDmMgMuFc=; b=bj/GljevZxIyH5tNe6lqQsx4guGXmRjiBRE499Ua3vV12R3/Jm83QjRcSI9cu8z1ZN 3VHAK0kHRsfe7s8AmF8JADUEN0uj1y/DFmcjlqRkOv9DHFchtyPIgx1GgDWM220FaTvP LDGKc9TJQ5S7IYF+OzDrKN9M94TjoHU4p0emQF0EUm9T/8Wbx6DaYt34qLEcKBZJl0xj K7LvAOz7473VW6epI7Rb5plGhQ9ENGgVCTXF+D7KR6vFykZw39IP4df17tYNBMp2RRh+ ZRTjd8oT6B/t8k+0p7ZAa5pGqbIokXS3oL0+TfiPHOT+nn8gFVHMBtNZDgvgbnpkFNNx 1wjA== X-Gm-Message-State: AOAM531IuRh6MbT69hB24msGvHfPKqf8vlY77siX4KT/O1GVxKhqEFuK waQ0L6uHuBUZK3x9gH5LNyo= X-Google-Smtp-Source: ABdhPJzT7wzpZtCeZDjiMhRxZj8TRCwYEFF9RU7pepL0NWAs+cN8DhXitSSUbhjm4ecqA1/4pu8ecA== X-Received: by 2002:a1c:1b85:: with SMTP id b127mr199522wmb.163.1604424716577; Tue, 03 Nov 2020 09:31:56 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 5/6] target/mips: Fix Lesser GPL version number Date: Tue, 3 Nov 2020 18:31:26 +0100 Message-Id: <20201103173127.2704256-6-f4bug@amsat.org> In-Reply-To: <20201103173127.2704256-1-f4bug@amsat.org> References: <20201103173127.2704256-1-f4bug@amsat.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Paul Burton , libvir-list@redhat.com, Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Chetan Pant , Huacai Chen , Paolo Bonzini , John Snow , Aurelien Jarno X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Chetan Pant There is no "version 2" of the "Lesser" General Public License. It is either "GPL version 2.0" or "Lesser GPL version 2.1". This patch replaces all occurrences of "Lesser GPL version 2" with "Lesser GPL version 2.1" in comment section. Signed-off-by: Chetan Pant Reviewed-by: Thomas Huth Message-Id: <20201016143509.26692-1-chetan4windows@gmail.com> [PMD: Split hw/ vs target/] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cp0_helper.c | 2 +- target/mips/dsp_helper.c | 2 +- target/mips/fpu_helper.c | 2 +- target/mips/gdbstub.c | 2 +- target/mips/helper.c | 2 +- target/mips/lmmi_helper.c | 2 +- target/mips/mips-semi.c | 2 +- target/mips/msa_helper.c | 2 +- target/mips/op_helper.c | 2 +- target/mips/translate.c | 2 +- target/mips/translate_init.c.inc | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c index 12143ac55b9..709cc9a7e3d 100644 --- a/target/mips/cp0_helper.c +++ b/target/mips/cp0_helper.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/dsp_helper.c b/target/mips/dsp_helper.c index 8c58eeb0bf8..09b6e5fb15a 100644 --- a/target/mips/dsp_helper.c +++ b/target/mips/dsp_helper.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/fpu_helper.c b/target/mips/fpu_helper.c index 6cc956c023d..020b768e87b 100644 --- a/target/mips/fpu_helper.c +++ b/target/mips/fpu_helper.c @@ -8,7 +8,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/gdbstub.c b/target/mips/gdbstub.c index 98f56e660d2..e39f8d75cf0 100644 --- a/target/mips/gdbstub.c +++ b/target/mips/gdbstub.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/helper.c b/target/mips/helper.c index afd78b1990b..063b65c0528 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/lmmi_helper.c b/target/mips/lmmi_helper.c index 6c645cf679a..abeb7736aeb 100644 --- a/target/mips/lmmi_helper.c +++ b/target/mips/lmmi_helper.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/mips-semi.c b/target/mips/mips-semi.c index 10a710c1e80..898251aa023 100644 --- a/target/mips/mips-semi.c +++ b/target/mips/mips-semi.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/msa_helper.c b/target/mips/msa_helper.c index 6865addaf6a..249f0fdad80 100644 --- a/target/mips/msa_helper.c +++ b/target/mips/msa_helper.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c index 0050d0616b6..5184a1838be 100644 --- a/target/mips/op_helper.c +++ b/target/mips/op_helper.c @@ -6,7 +6,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/translate.c b/target/mips/translate.c index f449758606d..3197a692c45 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -10,7 +10,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/target/mips/translate_init.c.inc b/target/mips/translate_init.= c.inc index fb5a9b38e5d..ea85d5c6a79 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/translate_init.c.inc @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of --=20 2.26.2 From nobody Fri May 3 23:01:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604424723; cv=none; d=zohomail.com; s=zohoarc; b=fXaHzvIHcVKEkwGxjWdddpO9qsRMadLSQltBr7xYmA0Yo/4acQpREk6y81HksLVj5BSAm+NFtMndjGpJyE0XIHJDQSYo5yoGsqVQtIkDxhpW1j0MTOlxejSh/wLysPO7pOMbMUPhaRQ9j7xtLDC7MR+wd+zkzsNs0FuJMDVBUiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604424723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xtn9UpLprZQgb3hjVTkUMy618Qe7q31gcHcVvA1M52o=; b=a4+nImFnrNCS8QqePQvss0bQceEwzT4oPG+9cuOjw2MqC0/QVCVtIklDXDDJ6vhFZkQnYCB2QITzISGoBaBm5lYVodbAQ4cEkwLLtsvCUXiJweIN38zrY1JU8n1ycVvP/B9D/XNsNGCoOGJ+F8rBTJl5qR9ZpIFpOVYWG0OerOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1604424723642760.1498024736912; Tue, 3 Nov 2020 09:32:03 -0800 (PST) Received: by mail-wm1-f66.google.com with SMTP id v5so129651wmh.1 for ; Tue, 03 Nov 2020 09:32:03 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id d16sm22910wrw.17.2020.11.03.09.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 09:32:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xtn9UpLprZQgb3hjVTkUMy618Qe7q31gcHcVvA1M52o=; b=J490b6sPrOWXOcHMEgOlaCgBonTqhzKczJwva6bXlcBqa11a2VFlhPigpuAJds9bEU cwNaLbAZ4RcslQ/Juwbb3z3q9ozypzW20qaUMuiKw3gF4Q9NVnBMVi5BukhOP2vN4MiU v5iImSTwn9830SNGRCWbKhwMWh3r+igo7NC6j2cph9XoCh3hh4t1UgXN97wwzV3A47ci SCNA/rtnhUjb5iMFVgm1WBnxQzQ4q7IS0e1CG+6uO2YYZLKQPwiPFgiDFkdPm+vCFhtq nzlmLaMp9ihap2c1DU66R/Ck1Z6db73YXOFf4K8DRvCeuuvtA0uebsoNJwGYM8sHGv6Z glWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xtn9UpLprZQgb3hjVTkUMy618Qe7q31gcHcVvA1M52o=; b=gCR1VlDo7cTscNcAqeP8Fgu6ENQnlEypDbBoomtjql/p7UGcj30dTYO3h672MmJk/I rOPM43VgfQnWEkfZIyRrwlw/oj4MLfPgtd98UDhz+yyq//CFt01K1VmKgEVrMuFeqpXP GucGdTHDYCwG6kj5FHr0tXklvdxEWC3hoe7HMSN59jBtC34ANXOyDk5zWnJnT1kKCerB IfM7QpjVmdJ5KkdnOhinLxuPiupohhP2Tz6lD45LyomHXpseQRBmVTgLKKXLogCMD5Oz 9zCpP/Ze6eRQDfi6KgjcJyHUNHda8S3GVI44u2mxwV7BcMJwivYLerJOo3ojEO2uNjuJ hBiw== X-Gm-Message-State: AOAM532nX2JFb/R/OPKCY7rJpZ7roCBGZ5npLLuuq6JIlGU9x9TpNMt8 AT3Exw/fCVkkVWM6+iw3Uvs= X-Google-Smtp-Source: ABdhPJypUzW1ind7JILAg1GrFsSMfeUCwZif68g5FsFrEJBl+M+ugxb9nY8RG5N8HXJyjezA3Lf4uA== X-Received: by 2002:a7b:c04a:: with SMTP id u10mr226031wmc.83.1604424721805; Tue, 03 Nov 2020 09:32:01 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Jiaxun Yang , Paul Burton , libvir-list@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , John Snow , Paolo Bonzini , Laurent Vivier , Aleksandar Rikalo , qemu-block@nongnu.org, Huacai Chen , Huacai Chen , Richard Henderson Subject: [PULL 6/6] target/mips: Add unaligned access support for MIPS64R6 and Loongson-3 Date: Tue, 3 Nov 2020 18:31:27 +0100 Message-Id: <20201103173127.2704256-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103173127.2704256-1-f4bug@amsat.org> References: <20201103173127.2704256-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Huacai Chen MIPSR6 (not only MIPS32R6) processors support unaligned access in hardware, so set MO_UNALN in their default_tcg_memop_mask. Btw, new Loongson-3 (such as Loongson-3A4000) also support unaligned access, since both old and new Loongson-3 use the same binaries, we can simply set MO_UNALN for all Loongson-3 processors. Signed-off-by: Huacai Chen Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <1604053541-27822-3-git-send-email-chenhc@lemote.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index 3197a692c45..c64a1bc42e1 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -31442,8 +31442,8 @@ static void mips_tr_init_disas_context(DisasContext= Base *dcbase, CPUState *cs) #else ctx->mem_idx =3D hflags_mmu_index(ctx->hflags); #endif - ctx->default_tcg_memop_mask =3D (ctx->insn_flags & ISA_MIPS32R6) ? - MO_UNALN : MO_ALIGN; + ctx->default_tcg_memop_mask =3D (ctx->insn_flags & (ISA_MIPS32R6 | ISA= _MIPS64R6 | + INSN_LOONGSON3A)) ? MO_UNALN : MO_ALIGN; =20 LOG_DISAS("\ntb %p idx %d hflags %04x\n", ctx->base.tb, ctx->mem_idx, ctx->hflags); --=20 2.26.2