[PULL 0/1] loongarch-to-apply queue

[PULL 0/1] loongarch-to-apply queue

[Song Gao]

The following changes since commit 5204b499a6cae4dfd9fe762d5e6e82224892383b:

  mailmap: Fix Stefan Weil author email (2022-12-13 15:56:57 -0500)

are available in the Git repository at:

  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221215

for you to fetch changes up to 288431a1fb9334d5d57ad7d5854d8475b23e7c42:

  hw/loongarch/virt: Add cfi01 pflash device (2022-12-15 15:46:12 +0800)

----------------------------------------------------------------
Add cfi01 pflash device

----------------------------------------------------------------
Xiaojuan Yang (1):
      hw/loongarch/virt: Add cfi01 pflash device

 hw/loongarch/Kconfig        |  1 +
 hw/loongarch/acpi-build.c   | 18 +++++++++++++
 hw/loongarch/virt.c         | 62 +++++++++++++++++++++++++++++++++++++++++++++
 include/hw/loongarch/virt.h |  5 ++++
 4 files changed, 86 insertions(+)

[PULL 1/1] hw/loongarch/virt: Add cfi01 pflash device

[Song Gao]

From: Xiaojuan Yang <yangxiaojuan@loongson.cn>

Add cfi01 pflash device for LoongArch virt machine

Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221130100647.398565-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 hw/loongarch/Kconfig        |  1 +
 hw/loongarch/acpi-build.c   | 18 +++++++++++
 hw/loongarch/virt.c         | 62 +++++++++++++++++++++++++++++++++++++
 include/hw/loongarch/virt.h |  5 +++
 4 files changed, 86 insertions(+)

diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig
index 17d15b6c90..eb112af990 100644
--- a/hw/loongarch/Kconfig
+++ b/hw/loongarch/Kconfig
@@ -20,3 +20,4 @@ config LOONGARCH_VIRT
     select ACPI_HW_REDUCED
     select FW_CFG_DMA
     select DIMM
+    select PFLASH_CFI01
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index 7d5f5a757d..c2b237736d 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -279,6 +279,23 @@ static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams)
     acpi_dsdt_add_gpex(scope, &cfg);
 }
 
+static void build_flash_aml(Aml *scope, LoongArchMachineState *lams)
+{
+    Aml *dev, *crs;
+
+    hwaddr flash_base = VIRT_FLASH_BASE;
+    hwaddr flash_size = VIRT_FLASH_SIZE;
+
+    dev = aml_device("FLS0");
+    aml_append(dev, aml_name_decl("_HID", aml_string("LNRO0015")));
+    aml_append(dev, aml_name_decl("_UID", aml_int(0)));
+
+    crs = aml_resource_template();
+    aml_append(crs, aml_memory32_fixed(flash_base, flash_size, AML_READ_WRITE));
+    aml_append(dev, aml_name_decl("_CRS", crs));
+    aml_append(scope, dev);
+}
+
 #ifdef CONFIG_TPM
 static void acpi_dsdt_add_tpm(Aml *scope, LoongArchMachineState *vms)
 {
@@ -328,6 +345,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)
     build_uart_device_aml(dsdt);
     build_pci_device_aml(dsdt, lams);
     build_la_ged_aml(dsdt, machine);
+    build_flash_aml(dsdt, lams);
 #ifdef CONFIG_TPM
     acpi_dsdt_add_tpm(dsdt, lams);
 #endif
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 958be74fa1..c8a495ea30 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -42,6 +42,63 @@
 #include "hw/display/ramfb.h"
 #include "hw/mem/pc-dimm.h"
 #include "sysemu/tpm.h"
+#include "sysemu/block-backend.h"
+#include "hw/block/flash.h"
+
+static void virt_flash_create(LoongArchMachineState *lams)
+{
+    DeviceState *dev = qdev_new(TYPE_PFLASH_CFI01);
+
+    qdev_prop_set_uint64(dev, "sector-length", VIRT_FLASH_SECTOR_SIZE);
+    qdev_prop_set_uint8(dev, "width", 4);
+    qdev_prop_set_uint8(dev, "device-width", 2);
+    qdev_prop_set_bit(dev, "big-endian", false);
+    qdev_prop_set_uint16(dev, "id0", 0x89);
+    qdev_prop_set_uint16(dev, "id1", 0x18);
+    qdev_prop_set_uint16(dev, "id2", 0x00);
+    qdev_prop_set_uint16(dev, "id3", 0x00);
+    qdev_prop_set_string(dev, "name", "virt.flash");
+    object_property_add_child(OBJECT(lams), "virt.flash", OBJECT(dev));
+    object_property_add_alias(OBJECT(lams), "pflash",
+                              OBJECT(dev), "drive");
+
+    lams->flash = PFLASH_CFI01(dev);
+}
+
+static void virt_flash_map(LoongArchMachineState *lams,
+                           MemoryRegion *sysmem)
+{
+    PFlashCFI01 *flash = lams->flash;
+    DeviceState *dev = DEVICE(flash);
+    hwaddr base = VIRT_FLASH_BASE;
+    hwaddr size = VIRT_FLASH_SIZE;
+
+    assert(QEMU_IS_ALIGNED(size, VIRT_FLASH_SECTOR_SIZE));
+    assert(size / VIRT_FLASH_SECTOR_SIZE <= UINT32_MAX);
+
+    qdev_prop_set_uint32(dev, "num-blocks", size / VIRT_FLASH_SECTOR_SIZE);
+    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+    memory_region_add_subregion(sysmem, base,
+                                sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));
+
+}
+
+static void fdt_add_flash_node(LoongArchMachineState *lams)
+{
+    MachineState *ms = MACHINE(lams);
+    char *nodename;
+
+    hwaddr flash_base = VIRT_FLASH_BASE;
+    hwaddr flash_size = VIRT_FLASH_SIZE;
+
+    nodename = g_strdup_printf("/flash@%" PRIx64, flash_base);
+    qemu_fdt_add_subnode(ms->fdt, nodename);
+    qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "cfi-flash");
+    qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
+                                 2, flash_base, 2, flash_size);
+    qemu_fdt_setprop_cell(ms->fdt, nodename, "bank-width", 4);
+    g_free(nodename);
+}
 
 static void fdt_add_rtc_node(LoongArchMachineState *lams)
 {
@@ -596,6 +653,9 @@ static void loongarch_firmware_init(LoongArchMachineState *lams)
     int bios_size;
 
     lams->bios_loaded = false;
+
+    virt_flash_map(lams, get_system_memory());
+
     if (filename) {
         bios_name = qemu_find_file(QEMU_FILE_TYPE_BIOS, filename);
         if (!bios_name) {
@@ -779,6 +839,7 @@ static void loongarch_init(MachineState *machine)
             loongarch_direct_kernel_boot(lams);
         }
     }
+    fdt_add_flash_node(lams);
     /* register reset function */
     for (i = 0; i < machine->smp.cpus; i++) {
         lacpu = LOONGARCH_CPU(qemu_get_cpu(i));
@@ -838,6 +899,7 @@ static void loongarch_machine_initfn(Object *obj)
     lams->acpi = ON_OFF_AUTO_AUTO;
     lams->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6);
     lams->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8);
+    virt_flash_create(lams);
 }
 
 static bool memhp_type_supported(DeviceState *dev)
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
index 45c383f5a7..f5f818894e 100644
--- a/include/hw/loongarch/virt.h
+++ b/include/hw/loongarch/virt.h
@@ -12,6 +12,7 @@
 #include "hw/boards.h"
 #include "qemu/queue.h"
 #include "hw/intc/loongarch_ipi.h"
+#include "hw/block/flash.h"
 
 #define LOONGARCH_MAX_VCPUS     4
 
@@ -20,6 +21,9 @@
 #define VIRT_FWCFG_BASE         0x1e020000UL
 #define VIRT_BIOS_BASE          0x1c000000UL
 #define VIRT_BIOS_SIZE          (4 * MiB)
+#define VIRT_FLASH_SECTOR_SIZE  (128 * KiB)
+#define VIRT_FLASH_BASE         0x1d000000UL
+#define VIRT_FLASH_SIZE         (16 * MiB)
 
 #define VIRT_LOWMEM_BASE        0
 #define VIRT_LOWMEM_SIZE        0x10000000
@@ -48,6 +52,7 @@ struct LoongArchMachineState {
     int          fdt_size;
     DeviceState *platform_bus_dev;
     PCIBus       *pci_bus;
+    PFlashCFI01  *flash;
 };
 
 #define TYPE_LOONGARCH_MACHINE  MACHINE_TYPE_NAME("virt")
-- 
2.31.1

Re: [PULL 0/1] loongarch-to-apply queue

[Peter Maydell]

On Thu, 15 Dec 2022 at 08:11, Song Gao <gaosong@loongson.cn> wrote:
>
> The following changes since commit 5204b499a6cae4dfd9fe762d5e6e82224892383b:
>
>   mailmap: Fix Stefan Weil author email (2022-12-13 15:56:57 -0500)
>
> are available in the Git repository at:
>
>   https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221215
>
> for you to fetch changes up to 288431a1fb9334d5d57ad7d5854d8475b23e7c42:
>
>   hw/loongarch/virt: Add cfi01 pflash device (2022-12-15 15:46:12 +0800)
>
> ----------------------------------------------------------------
> Add cfi01 pflash device
>
> ----------------------------------------------------------------
> Xiaojuan Yang (1):
>       hw/loongarch/virt: Add cfi01 pflash device


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.

-- PMM

[PULL 0/1] loongarch-to-apply queue

[Song Gao]

The following changes since commit 848a6caa88b9f082c89c9b41afa975761262981d:

  Merge tag 'migration-20230602-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-06-02 17:33:29 -0700)

are available in the Git repository at:

  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20230605

for you to fetch changes up to 8555ddc671203969b0e6eb651e538d02a9a79b3a:

  hw/intc/loongarch_ipi: Bring back all 4 IPI mailboxes (2023-06-05 11:08:55 +0800)

----------------------------------------------------------------
Fixes Coverity CID: 1512452, 1512453
Fixes: 78464f023b54 ("hw/loongarch/virt: Modify ipi as percpu device")

----------------------------------------------------------------
Jiaxun Yang (1):
      hw/intc/loongarch_ipi: Bring back all 4 IPI mailboxes

 hw/intc/loongarch_ipi.c         | 6 +++---
 include/hw/intc/loongarch_ipi.h | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

Re: [PULL 0/1] loongarch-to-apply queue

[Richard Henderson]

On 6/4/23 20:18, Song Gao wrote:
> The following changes since commit 848a6caa88b9f082c89c9b41afa975761262981d:
> 
>    Merge tag 'migration-20230602-pull-request' ofhttps://gitlab.com/juan.quintela/qemu  into staging (2023-06-02 17:33:29 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/gaosong/qemu.git  tags/pull-loongarch-20230605
> 
> for you to fetch changes up to 8555ddc671203969b0e6eb651e538d02a9a79b3a:
> 
>    hw/intc/loongarch_ipi: Bring back all 4 IPI mailboxes (2023-06-05 11:08:55 +0800)
> 
> ----------------------------------------------------------------
> Fixes Coverity CID: 1512452, 1512453
> Fixes: 78464f023b54 ("hw/loongarch/virt: Modify ipi as percpu device")

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.


r~

[PULL 0/1] loongarch-to-apply queue

[Song Gao]

The following changes since commit bd2e12310b18b51aefbf834e6d54989fd175976f:

  Merge tag 'qga-pull-2024-01-30' of https://github.com/kostyanf14/qemu into staging (2024-01-30 15:53:46 +0000)

are available in the Git repository at:

  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240201

for you to fetch changes up to 27edd5040cae63bfa92c68f69883ba81aa3b6cda:

  target/loongarch: Fix qtest test-hmp error when KVM-only build (2024-02-01 15:29:40 +0800)

----------------------------------------------------------------
pull-loongarch-20240201

----------------------------------------------------------------
Song Gao (1):
      target/loongarch: Fix qtest test-hmp error when KVM-only build

 target/loongarch/cpu.c            |   2 -
 target/loongarch/cpu_helper.c     | 231 ++++++++++++++++++++++++++++++++++++++
 target/loongarch/internals.h      |  20 +++-
 target/loongarch/meson.build      |   1 +
 target/loongarch/tcg/tlb_helper.c | 230 -------------------------------------
 5 files changed, 250 insertions(+), 234 deletions(-)
 create mode 100644 target/loongarch/cpu_helper.c

Re: [PULL 0/1] loongarch-to-apply queue

[Peter Maydell]

On Thu, 1 Feb 2024 at 07:33, Song Gao <gaosong@loongson.cn> wrote:
>
> The following changes since commit bd2e12310b18b51aefbf834e6d54989fd175976f:
>
>   Merge tag 'qga-pull-2024-01-30' of https://github.com/kostyanf14/qemu into staging (2024-01-30 15:53:46 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240201
>
> for you to fetch changes up to 27edd5040cae63bfa92c68f69883ba81aa3b6cda:
>
>   target/loongarch: Fix qtest test-hmp error when KVM-only build (2024-02-01 15:29:40 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20240201
>
> ----------------------------------------------------------------
> Song Gao (1):
>       target/loongarch: Fix qtest test-hmp error when KVM-only build
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/1] loongarch-to-apply queue

[Song Gao]

The following changes since commit 760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:

  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)

are available in the Git repository at:

  https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240221

for you to fetch changes up to be57fd1e526e70fd55f1e87b0b70fab3c6baf089:

  loongarch: Change the UEFI loading mode to loongarch (2024-02-21 17:06:23 +0800)

----------------------------------------------------------------
pull-loongarch-20240221

----------------------------------------------------------------
Xianglai Li (1):
      loongarch: Change the UEFI loading mode to loongarch

 hw/loongarch/acpi-build.c   |  29 +++++++++++--
 hw/loongarch/virt.c         | 101 ++++++++++++++++++++++++++++++++------------
 include/hw/loongarch/virt.h |  10 +++--
 3 files changed, 107 insertions(+), 33 deletions(-)

Re: [PULL 0/1] loongarch-to-apply queue

[Peter Maydell]

On Wed, 21 Feb 2024 at 09:11, Song Gao <gaosong@loongson.cn> wrote:
>
> The following changes since commit 760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:
>
>   Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240221
>
> for you to fetch changes up to be57fd1e526e70fd55f1e87b0b70fab3c6baf089:
>
>   loongarch: Change the UEFI loading mode to loongarch (2024-02-21 17:06:23 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20240221
>
> ----------------------------------------------------------------
> Xianglai Li (1):
>       loongarch: Change the UEFI loading mode to loongarch

Hi; this fails to build for mipsel:
https://gitlab.com/qemu-project/qemu/-/jobs/6232698129

../hw/loongarch/acpi-build.c: In function ‘build_flash_aml’:
../hw/loongarch/acpi-build.c:327:19: error: incompatible types when
assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
‘Int128’
327 | flash0_size = flash_mem->size;
| ^~~~~~~~~
../hw/loongarch/acpi-build.c:331:19: error: incompatible types when
assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
‘Int128’
331 | flash1_size = flash_mem->size;
| ^~~~~~~~~


../hw/loongarch/virt.c: In function ‘fdt_add_flash_node’:
../hw/loongarch/virt.c:131:19: error: incompatible types when
assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
‘Int128’
131 | flash0_size = flash_mem->size;
| ^~~~~~~~~
../hw/loongarch/virt.c:135:19: error: incompatible types when
assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
‘Int128’
135 | flash1_size = flash_mem->size;
| ^~~~~~~~~


The value you get back from pflash_cfi01_get_memory() is a
MemoryRegion -- this should be an opaque struct to you, not
something you can reach in and get the 'size' field from.
(The 'size' field is an Int128, which is not necessarily an
integer type known to the compiler -- on some platforms it is
a struct -- which is why this doesn't compile here.)

Your board code created these memory regions so typically it
should already know how big they are.  If you really
do need to get the size of a MemoryRegion, the function
to use is memory_region_size().

thanks
-- PMM

Re: [PULL 0/1] loongarch-to-apply queue

[gaosong]

在 2024/2/22 下午8:42, Peter Maydell 写道:
> On Wed, 21 Feb 2024 at 09:11, Song Gao <gaosong@loongson.cn> wrote:
>> The following changes since commit 760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:
>>
>>    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20240221
>>
>> for you to fetch changes up to be57fd1e526e70fd55f1e87b0b70fab3c6baf089:
>>
>>    loongarch: Change the UEFI loading mode to loongarch (2024-02-21 17:06:23 +0800)
>>
>> ----------------------------------------------------------------
>> pull-loongarch-20240221
>>
>> ----------------------------------------------------------------
>> Xianglai Li (1):
>>        loongarch: Change the UEFI loading mode to loongarch
> Hi; this fails to build for mipsel:
> https://gitlab.com/qemu-project/qemu/-/jobs/6232698129
>
> ../hw/loongarch/acpi-build.c: In function ‘build_flash_aml’:
> ../hw/loongarch/acpi-build.c:327:19: error: incompatible types when
> assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
> ‘Int128’
> 327 | flash0_size = flash_mem->size;
> | ^~~~~~~~~
> ../hw/loongarch/acpi-build.c:331:19: error: incompatible types when
> assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
> ‘Int128’
> 331 | flash1_size = flash_mem->size;
> | ^~~~~~~~~
>
>
> ../hw/loongarch/virt.c: In function ‘fdt_add_flash_node’:
> ../hw/loongarch/virt.c:131:19: error: incompatible types when
> assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
> ‘Int128’
> 131 | flash0_size = flash_mem->size;
> | ^~~~~~~~~
> ../hw/loongarch/virt.c:135:19: error: incompatible types when
> assigning to type ‘hwaddr’ {aka ‘long long unsigned int’} from type
> ‘Int128’
> 135 | flash1_size = flash_mem->size;
> | ^~~~~~~~~
>
>
> The value you get back from pflash_cfi01_get_memory() is a
> MemoryRegion -- this should be an opaque struct to you, not
> something you can reach in and get the 'size' field from.
> (The 'size' field is an Int128, which is not necessarily an
> integer type known to the compiler -- on some platforms it is
> a struct -- which is why this doesn't compile here.)
>
> Your board code created these memory regions so typically it
> should already know how big they are.  If you really
> do need to get the size of a MemoryRegion, the function
> to use is memory_region_size(
Got it ,  I will correct it.

Thanks.
Song Gao
> thanks
> -- PMM