[PULL 0/3] MIPS patches for 2021-12-06

[PULL 0/3] MIPS patches for 2021-12-06

[Philippe Mathieu-Daudé]

2 patches fix new code, 1 fix a regression, all introduced during 6.2.

The following changes since commit 99fc08366b06282614daeda989d2fde6ab8a707f:

  Merge tag 'seabios-20211203-pull-request' of git://git.kraxel.org/qemu into staging (2021-12-03 05:26:40 -0800)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/mips-20211206

for you to fetch changes up to ac5837e330ec33e2df2d83338713a5c4272c8cc8:

  Revert "vga: don't abort when adding a duplicate isa-vga device" (2021-12-06 11:57:36 +0100)

----------------------------------------------------------------
MIPS fixes

- Do not emit SD instruction on 32-bit CPU (Jiaxun Yang)
- Correctly catch load_elf() errors on Boston board (Jiaxun Yang)
- Revert bogus CLI fix for ISA VGA devices (Alex Bennée)

----------------------------------------------------------------

Alex Bennée (1):
  Revert "vga: don't abort when adding a duplicate isa-vga device"

Jiaxun Yang (2):
  hw/mips/bootloader: Fix write_ulong()
  hw/mips/boston: Fix load_elf() error detection

 hw/display/vga-isa.c | 10 ----------
 hw/mips/bootloader.c |  6 +++++-
 hw/mips/boston.c     |  5 +++--
 3 files changed, 8 insertions(+), 13 deletions(-)

-- 
2.33.1

[PULL 1/3] hw/mips/bootloader: Fix write_ulong()

[Philippe Mathieu-Daudé]

From: Jiaxun Yang <jiaxun.yang@flygoat.com>

bl_gen_write_ulong uses sd for both 32 and 64 bit CPU,
while sd is illegal on 32 bit CPUs.

Replace sd with sw on 32bit CPUs.

Fixes: 3ebbf86128f ("hw/mips: Add a bootloader helper")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211130211729.7116-2-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/mips/bootloader.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hw/mips/bootloader.c b/hw/mips/bootloader.c
index 6ec83144909..99991f8b2b5 100644
--- a/hw/mips/bootloader.c
+++ b/hw/mips/bootloader.c
@@ -182,7 +182,11 @@ void bl_gen_write_ulong(uint32_t **p, target_ulong addr, target_ulong val)
 {
     bl_gen_load_ulong(p, BL_REG_K0, val);
     bl_gen_load_ulong(p, BL_REG_K1, addr);
-    bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0);
+    if (bootcpu_supports_isa(ISA_MIPS3)) {
+        bl_gen_sd(p, BL_REG_K0, BL_REG_K1, 0x0);
+    } else {
+        bl_gen_sw(p, BL_REG_K0, BL_REG_K1, 0x0);
+    }
 }
 
 void bl_gen_write_u32(uint32_t **p, target_ulong addr, uint32_t val)
-- 
2.33.1

[PULL 2/3] hw/mips/boston: Fix load_elf() error detection

[Philippe Mathieu-Daudé]

From: Jiaxun Yang <jiaxun.yang@flygoat.com>

load_elf() gives negative return in case of error, not zero.

Fixes: 10e3f30ff73 ("hw/mips/boston: Allow loading elf kernel and dtb")
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211130211729.7116-3-jiaxun.yang@flygoat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/mips/boston.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/mips/boston.c b/hw/mips/boston.c
index 0e3cca55118..59ca08b93a9 100644
--- a/hw/mips/boston.c
+++ b/hw/mips/boston.c
@@ -777,14 +777,15 @@ static void boston_mach_init(MachineState *machine)
             exit(1);
         }
     } else if (machine->kernel_filename) {
-        uint64_t kernel_entry, kernel_high, kernel_size;
+        uint64_t kernel_entry, kernel_high;
+        ssize_t kernel_size;
 
         kernel_size = load_elf(machine->kernel_filename, NULL,
                            cpu_mips_kseg0_to_phys, NULL,
                            &kernel_entry, NULL, &kernel_high,
                            NULL, 0, EM_MIPS, 1, 0);
 
-        if (kernel_size) {
+        if (kernel_size > 0) {
             int dt_size;
             g_autofree const void *dtb_file_data, *dtb_load_data;
             hwaddr dtb_paddr = QEMU_ALIGN_UP(kernel_high, 64 * KiB);
-- 
2.33.1

[PULL 3/3] Revert "vga: don't abort when adding a duplicate isa-vga device"

[Philippe Mathieu-Daudé]

From: Alex Bennée <alex.bennee@linaro.org>

This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2.

The check is bogus as it ends up finding itself and falling over.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211206095209.2332376-1-alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/display/vga-isa.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 8cea84f2bea..90851e730bc 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -33,7 +33,6 @@
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "qom/object.h"
-#include "qapi/error.h"
 
 #define TYPE_ISA_VGA "isa-vga"
 OBJECT_DECLARE_SIMPLE_TYPE(ISAVGAState, ISA_VGA)
@@ -62,15 +61,6 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
     MemoryRegion *vga_io_memory;
     const MemoryRegionPortio *vga_ports, *vbe_ports;
 
-    /*
-     * make sure this device is not being added twice, if so
-     * exit without crashing qemu
-     */
-    if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) {
-        error_setg(errp, "at most one %s device is permitted", TYPE_ISA_VGA);
-        return;
-    }
-
     s->global_vmstate = true;
     vga_common_init(s, OBJECT(dev));
     s->legacy_address_space = isa_address_space(isadev);
-- 
2.33.1

Re: [PULL 0/3] MIPS patches for 2021-12-06

[Richard Henderson]

On 12/6/21 3:07 AM, Philippe Mathieu-Daudé wrote:
> 2 patches fix new code, 1 fix a regression, all introduced during 6.2.
> 
> The following changes since commit 99fc08366b06282614daeda989d2fde6ab8a707f:
> 
>    Merge tag 'seabios-20211203-pull-request' of git://git.kraxel.org/qemu into staging (2021-12-03 05:26:40 -0800)
> 
> are available in the Git repository at:
> 
>    https://github.com/philmd/qemu.git tags/mips-20211206
> 
> for you to fetch changes up to ac5837e330ec33e2df2d83338713a5c4272c8cc8:
> 
>    Revert "vga: don't abort when adding a duplicate isa-vga device" (2021-12-06 11:57:36 +0100)
> 
> ----------------------------------------------------------------
> MIPS fixes
> 
> - Do not emit SD instruction on 32-bit CPU (Jiaxun Yang)
> - Correctly catch load_elf() errors on Boston board (Jiaxun Yang)
> - Revert bogus CLI fix for ISA VGA devices (Alex Bennée)
> 
> ----------------------------------------------------------------
> 
> Alex Bennée (1):
>    Revert "vga: don't abort when adding a duplicate isa-vga device"
> 
> Jiaxun Yang (2):
>    hw/mips/bootloader: Fix write_ulong()
>    hw/mips/boston: Fix load_elf() error detection
> 
>   hw/display/vga-isa.c | 10 ----------
>   hw/mips/bootloader.c |  6 +++++-
>   hw/mips/boston.c     |  5 +++--
>   3 files changed, 8 insertions(+), 13 deletions(-)

Applied, thanks.


r~