[PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[Song Gao]

The following changes since commit c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:

  Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)

are available in the Git repository at:

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

for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:

  hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05 +0800)

----------------------------------------------------------------
pull for 7.2-rc4

We need this patch.

----------------------------------------------------------------
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 for 7.2-rc4 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 for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[Philippe Mathieu-Daudé]

On 2/12/22 11:25, Song Gao wrote:
> The following changes since commit c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
> 
>    Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
> 
> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
> 
>    hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05 +0800)
> 
> ----------------------------------------------------------------
> pull for 7.2-rc4
> 
> We need this patch.

FTR this is not a security/regression fix, but a mere feature.

Certainly not justified for a rc4 IMO.

> ----------------------------------------------------------------
> 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(+)
> 
> 

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[gaosong]

在 2022/12/5 15:24, Philippe Mathieu-Daudé 写道:
> On 2/12/22 11:25, Song Gao wrote:
>> The following changes since commit 
>> c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
>>
>>    Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
>>
>> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
>>
>>    hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05 
>> +0800)
>>
>> ----------------------------------------------------------------
>> pull for 7.2-rc4
>>
>> We need this patch.
>
> FTR this is not a security/regression fix, but a mere feature.
>
> Certainly not justified for a rc4 IMO.
>
We hope LoongArch 7.2 version support pflash,
otherwise the subsequent BIOS support pflash may qemu 7.2 does not support.

Thanks.
Song Gao
>> ----------------------------------------------------------------
>> 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(+)
>>
>>

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[Peter Maydell]

On Mon, 5 Dec 2022 at 09:20, gaosong@loongson.cn <gaosong@loongson.cn> wrote:
>
>
> 在 2022/12/5 15:24, Philippe Mathieu-Daudé 写道:
> > On 2/12/22 11:25, Song Gao wrote:
> >> The following changes since commit
> >> c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
> >>
> >>    Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
> >>
> >> are available in the Git repository at:
> >>
> >>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
> >>
> >> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
> >>
> >>    hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05
> >> +0800)
> >>
> >> ----------------------------------------------------------------
> >> pull for 7.2-rc4
> >>
> >> We need this patch.
> >
> > FTR this is not a security/regression fix, but a mere feature.
> >
> > Certainly not justified for a rc4 IMO.
> >
> We hope LoongArch 7.2 version support pflash,
> otherwise the subsequent BIOS support pflash may qemu 7.2 does not support.

Regardless of how much it might be nice to have a new feature
supported, new features cannot go in after softfreeze, only
fixes for bugs. At rc4, changes should really be release
critical bugs and regression fixes only. Further, any pull
request  that should be going in for rc4 should have a clear
statement of what the changes do and why they are release
critical. "We need this patch" is much too vague.

QEMU's release schedule is regular, so there will always be
another release in 4 months time. There is generally no need
to be in a huge hurry to get a feature in.

I would favour reverting this change.

thanks
-- PMM

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[gaosong]

在 2022/12/5 18:48, Peter Maydell 写道:
> On Mon, 5 Dec 2022 at 09:20, gaosong@loongson.cn <gaosong@loongson.cn> wrote:
>>
>> 在 2022/12/5 15:24, Philippe Mathieu-Daudé 写道:
>>> On 2/12/22 11:25, Song Gao wrote:
>>>> The following changes since commit
>>>> c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
>>>>
>>>>     Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>     https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
>>>>
>>>> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
>>>>
>>>>     hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05
>>>> +0800)
>>>>
>>>> ----------------------------------------------------------------
>>>> pull for 7.2-rc4
>>>>
>>>> We need this patch.
>>> FTR this is not a security/regression fix, but a mere feature.
>>>
>>> Certainly not justified for a rc4 IMO.
>>>
>> We hope LoongArch 7.2 version support pflash,
>> otherwise the subsequent BIOS support pflash may qemu 7.2 does not support.
> Regardless of how much it might be nice to have a new feature
> supported, new features cannot go in after softfreeze, only
> fixes for bugs. At rc4, changes should really be release
> critical bugs and regression fixes only. Further, any pull
> request  that should be going in for rc4 should have a clear
> statement of what the changes do and why they are release
> critical. "We need this patch" is much too vague.
>
> QEMU's release schedule is regular, so there will always be
> another release in 4 months time. There is generally no need
> to be in a huge hurry to get a feature in.
>
> I would favour reverting this change.
Got it .
I had send a patch to revert this.

Thanks.
Song Gao

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[Stefan Hajnoczi]

On Mon, 5 Dec 2022 at 06:38, gaosong@loongson.cn <gaosong@loongson.cn> wrote:
>
>
> 在 2022/12/5 18:48, Peter Maydell 写道:
> > On Mon, 5 Dec 2022 at 09:20, gaosong@loongson.cn <gaosong@loongson.cn> wrote:
> >>
> >> 在 2022/12/5 15:24, Philippe Mathieu-Daudé 写道:
> >>> On 2/12/22 11:25, Song Gao wrote:
> >>>> The following changes since commit
> >>>> c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
> >>>>
> >>>>     Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
> >>>>
> >>>> are available in the Git repository at:
> >>>>
> >>>>     https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
> >>>>
> >>>> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
> >>>>
> >>>>     hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05
> >>>> +0800)
> >>>>
> >>>> ----------------------------------------------------------------
> >>>> pull for 7.2-rc4
> >>>>
> >>>> We need this patch.
> >>> FTR this is not a security/regression fix, but a mere feature.
> >>>
> >>> Certainly not justified for a rc4 IMO.
> >>>
> >> We hope LoongArch 7.2 version support pflash,
> >> otherwise the subsequent BIOS support pflash may qemu 7.2 does not support.
> > Regardless of how much it might be nice to have a new feature
> > supported, new features cannot go in after softfreeze, only
> > fixes for bugs. At rc4, changes should really be release
> > critical bugs and regression fixes only. Further, any pull
> > request  that should be going in for rc4 should have a clear
> > statement of what the changes do and why they are release
> > critical. "We need this patch" is much too vague.
> >
> > QEMU's release schedule is regular, so there will always be
> > another release in 4 months time. There is generally no need
> > to be in a huge hurry to get a feature in.
> >
> > I would favour reverting this change.
> Got it .
> I had send a patch to revert this.

I gave it the benefit of the doubt because it's isolated and only
affects LoongArch, but Philippe and Peter are right.

Thanks for sending the revert patch.

Stefan

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[Philippe Mathieu-Daudé]

Hi,

On 2/12/22 11:25, Song Gao wrote:
> The following changes since commit c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
> 
>    Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
> 
> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
> 
>    hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05 +0800)
> 
> ----------------------------------------------------------------

Now than the 8.0 cycle started, can you respin this pull request
(preferably rebased on v7.2.0 or later)?

Regards,

Phil.

Re: [PULL for 7.2-rc4 0/1] loongarch for 7.2-rc4 patch

[gaosong]

在 2022/12/15 下午3:29, Philippe Mathieu-Daudé 写道:
> Hi,
>
> On 2/12/22 11:25, Song Gao wrote:
>> The following changes since commit 
>> c4ffd91aba1c3d878e99a3e7ba8aad4826728ece:
>>
>>    Update VERSION for v7.2.0-rc3 (2022-11-29 18:15:26 -0500)
>>
>> are available in the Git repository at:
>>
>>    https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20221202
>>
>> for you to fetch changes up to 14dccc8ea6ece7ee63273144fb55e4770a05e0fd:
>>
>>    hw/loongarch/virt: Add cfi01 pflash device (2022-12-02 18:03:05 
>> +0800)
>>
>> ----------------------------------------------------------------
>
> Now than the 8.0 cycle started, can you respin this pull request
> (preferably rebased on v7.2.0 or later)?
>
Done.

Thanks.
Song Gao