[PULL for 7.2-rc2 0/3] loongarch for 7.2-rc2 patches

[PULL for 7.2-rc2 0/3] loongarch for 7.2-rc2 patches

[Song Gao]

The following changes since commit 6d71357a3b651ec9db126e4862b77e13165427f5:

  rtl8139: honor large send MSS value (2022-11-21 09:28:43 -0500)

are available in the Git repository at:

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

for you to fetch changes up to 4451cc4653babf90b1808597f3f1dc71e1f63def:

  hw/loongarch: Replace the value of uart info with macro (2022-11-22 20:56:48 +0800)

----------------------------------------------------------------
pull for 7.2-rc2

----------------------------------------------------------------
Xiaojuan Yang (3):
      hw/loongarch: Add default stdout uart in fdt
      hw/loongarch: Fix setprop_sized method in fdt rtc node.
      hw/loongarch: Replace the value of uart info with macro

 hw/loongarch/acpi-build.c | 3 ++-
 hw/loongarch/virt.c       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

[PULL for 7.2-rc2 1/3] hw/loongarch: Add default stdout uart in fdt

[Song Gao]

From: Xiaojuan Yang <yangxiaojuan@loongson.cn>

Add "chosen" subnode into LoongArch fdt, and set it's
"stdout-path" prop to uart node.

Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221115114923.3372414-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 5136940b0b..b9c18ee517 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -69,6 +69,7 @@ static void fdt_add_uart_node(LoongArchMachineState *lams)
     qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "ns16550a");
     qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0x0, base, 0x0, size);
     qemu_fdt_setprop_cell(ms->fdt, nodename, "clock-frequency", 100000000);
+    qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", nodename);
     g_free(nodename);
 }
 
@@ -87,6 +88,7 @@ static void create_fdt(LoongArchMachineState *lams)
                             "linux,dummy-loongson3");
     qemu_fdt_setprop_cell(ms->fdt, "/", "#address-cells", 0x2);
     qemu_fdt_setprop_cell(ms->fdt, "/", "#size-cells", 0x2);
+    qemu_fdt_add_subnode(ms->fdt, "/chosen");
 }
 
 static void fdt_add_cpu_nodes(const LoongArchMachineState *lams)
-- 
2.31.1

[PULL for 7.2-rc2 2/3] hw/loongarch: Fix setprop_sized method in fdt rtc node.

[Song Gao]

From: Xiaojuan Yang <yangxiaojuan@loongson.cn>

Fix setprop_sized method in fdt rtc node.

Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221116040300.3459818-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 hw/loongarch/virt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index b9c18ee517..958be74fa1 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -53,7 +53,7 @@ static void fdt_add_rtc_node(LoongArchMachineState *lams)
     nodename = g_strdup_printf("/rtc@%" PRIx64, base);
     qemu_fdt_add_subnode(ms->fdt, nodename);
     qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "loongson,ls7a-rtc");
-    qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 0x0, base, size);
+    qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
     g_free(nodename);
 }
 
-- 
2.31.1

[PULL for 7.2-rc2 3/3] hw/loongarch: Replace the value of uart info with macro

[Song Gao]

From: Xiaojuan Yang <yangxiaojuan@loongson.cn>

Using macro to replace the value of uart info such as addr, size
in acpi_build method.

Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221115115008.3372489-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 hw/loongarch/acpi-build.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index 68dfb9f88a..7d5f5a757d 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -226,7 +226,8 @@ static void build_uart_device_aml(Aml *table)
     aml_append(crs,
         aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,
                          AML_NON_CACHEABLE, AML_READ_WRITE,
-                         0, 0x1FE001E0, 0x1FE001E7, 0, 0x8));
+                         0, VIRT_UART_BASE, VIRT_UART_BASE + VIRT_UART_SIZE - 1,
+                         0, VIRT_UART_SIZE));
     aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
                                   AML_SHARED, &uart_irq, 1));
     aml_append(dev, aml_name_decl("_CRS", crs));
-- 
2.31.1

Re: [PULL for 7.2-rc2 0/3] loongarch for 7.2-rc2 patches

[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-rc2 0/3] loongarch for 7.2-rc2 patches

[gaosong]

在 2022/11/23 1:09, Stefan Hajnoczi 写道:
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/7.2 for any user-visible changes.
Hi,  Where can I register an account?

Thanks.
Song Gao

Re: [PULL for 7.2-rc2 0/3] loongarch for 7.2-rc2 patches

[Daniel P. Berrangé]

On Thu, Nov 24, 2022 at 08:30:45PM +0800, gaosong@loongson.cn wrote:
> 
> 在 2022/11/23 1:09, Stefan Hajnoczi 写道:
> > Applied, thanks.
> > 
> > Please update the changelog at https://wiki.qemu.org/ChangeLog/7.2 for any user-visible changes.
> Hi,  Where can I register an account?

Due to spam attacks, it needs to be created for you.

Let me know what user name you want, and I'll create it and mail
you a password offlist.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PULL for 7.2-rc2 0/3] loongarch for 7.2-rc2 patches

[gaosong]

在 2022/11/24 20:44, Daniel P. Berrangé 写道:
> On Thu, Nov 24, 2022 at 08:30:45PM +0800, gaosong@loongson.cn wrote:
>> 在 2022/11/23 1:09, Stefan Hajnoczi 写道:
>>> Applied, thanks.
>>>
>>> Please update the changelog at https://wiki.qemu.org/ChangeLog/7.2 for any user-visible changes.
>> Hi,  Where can I register an account?
> Due to spam attacks, it needs to be created for you.
>
> Let me know what user name you want, and I'll create it and mail
> you a password offlist.

Thank you.

User-name:  gaosong

Thanks.
Song Gao