* [PULL 00/18] loongarch-to-apply queue
@ 2024-12-13 9:40 Bibo Mao
2024-12-14 13:39 ` Stefan Hajnoczi
0 siblings, 1 reply; 26+ messages in thread
From: Bibo Mao @ 2024-12-13 9:40 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Richard Henderson, Song Gao
The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307:
Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000)
are available in the Git repository at:
https://gitlab.com/bibo-mao/qemu.git pull-loongarch-20241213
for you to fetch changes up to 78aa256571aa06f32001bd80635a1858187c609b:
hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic (2024-12-13 14:39:39 +0800)
----------------------------------------------------------------
pull-loongarch-20241213
----------------------------------------------------------------
Bibo Mao (8):
include: Add loongarch_pic_common header file
include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
hw/intc/loongarch_pch: Merge instance_init() into realize()
hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
hw/intc/loongarch_pch: Inherit from loongarch_pic_common
hw/intc/loongarch_pch: Add pre_save and post_load interfaces
hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
hw/intc/loongarch_pch_pic.c | 106 +++++++++++----------------------
hw/intc/loongarch_pic_common.c | 97 ++++++++++++++++++++++++++++++
hw/intc/meson.build | 2 +-
hw/loongarch/virt.c | 2 +-
include/hw/intc/loongarch_pch_pic.h | 70 +++++-----------------
include/hw/intc/loongarch_pic_common.h | 82 +++++++++++++++++++++++++
6 files changed, 230 insertions(+), 129 deletions(-)
create mode 100644 hw/intc/loongarch_pic_common.c
create mode 100644 include/hw/intc/loongarch_pic_common.h
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PULL 00/18] loongarch-to-apply queue
2024-12-13 9:40 Bibo Mao
@ 2024-12-14 13:39 ` Stefan Hajnoczi
2024-12-16 0:57 ` bibo mao
0 siblings, 1 reply; 26+ messages in thread
From: Stefan Hajnoczi @ 2024-12-14 13:39 UTC (permalink / raw)
To: Bibo Mao; +Cc: qemu-devel, Peter Maydell, Richard Henderson, Song Gao
On Fri, 13 Dec 2024 at 04:42, Bibo Mao <maobibo@loongson.cn> wrote:
>
> The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307:
>
> Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/bibo-mao/qemu.git pull-loongarch-20241213
This tag is not in the repository. Did you forget to push it?
Thanks,
Stefan
>
> for you to fetch changes up to 78aa256571aa06f32001bd80635a1858187c609b:
>
> hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic (2024-12-13 14:39:39 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20241213
>
> ----------------------------------------------------------------
> Bibo Mao (8):
> include: Add loongarch_pic_common header file
> include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
> hw/intc/loongarch_pch: Merge instance_init() into realize()
> hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
> hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
> hw/intc/loongarch_pch: Inherit from loongarch_pic_common
> hw/intc/loongarch_pch: Add pre_save and post_load interfaces
> hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
>
> hw/intc/loongarch_pch_pic.c | 106 +++++++++++----------------------
> hw/intc/loongarch_pic_common.c | 97 ++++++++++++++++++++++++++++++
> hw/intc/meson.build | 2 +-
> hw/loongarch/virt.c | 2 +-
> include/hw/intc/loongarch_pch_pic.h | 70 +++++-----------------
> include/hw/intc/loongarch_pic_common.h | 82 +++++++++++++++++++++++++
> 6 files changed, 230 insertions(+), 129 deletions(-)
> create mode 100644 hw/intc/loongarch_pic_common.c
> create mode 100644 include/hw/intc/loongarch_pic_common.h
>
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PULL 00/18] loongarch-to-apply queue
2024-12-14 13:39 ` Stefan Hajnoczi
@ 2024-12-16 0:57 ` bibo mao
0 siblings, 0 replies; 26+ messages in thread
From: bibo mao @ 2024-12-16 0:57 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Peter Maydell, Richard Henderson, Song Gao
On 2024/12/14 下午9:39, Stefan Hajnoczi wrote:
> On Fri, 13 Dec 2024 at 04:42, Bibo Mao <maobibo@loongson.cn> wrote:
>>
>> The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307:
>>
>> Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/bibo-mao/qemu.git pull-loongarch-20241213
>
> This tag is not in the repository. Did you forget to push it?
Sorry for that.
Yes, I forget to push it :(, will submit the second version.
Regards
Bibo Mao
>
> Thanks,
> Stefan
>
>>
>> for you to fetch changes up to 78aa256571aa06f32001bd80635a1858187c609b:
>>
>> hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic (2024-12-13 14:39:39 +0800)
>>
>> ----------------------------------------------------------------
>> pull-loongarch-20241213
>>
>> ----------------------------------------------------------------
>> Bibo Mao (8):
>> include: Add loongarch_pic_common header file
>> include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
>> hw/intc/loongarch_pch: Merge instance_init() into realize()
>> hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
>> hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
>> hw/intc/loongarch_pch: Inherit from loongarch_pic_common
>> hw/intc/loongarch_pch: Add pre_save and post_load interfaces
>> hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
>>
>> hw/intc/loongarch_pch_pic.c | 106 +++++++++++----------------------
>> hw/intc/loongarch_pic_common.c | 97 ++++++++++++++++++++++++++++++
>> hw/intc/meson.build | 2 +-
>> hw/loongarch/virt.c | 2 +-
>> include/hw/intc/loongarch_pch_pic.h | 70 +++++-----------------
>> include/hw/intc/loongarch_pic_common.h | 82 +++++++++++++++++++++++++
>> 6 files changed, 230 insertions(+), 129 deletions(-)
>> create mode 100644 hw/intc/loongarch_pic_common.c
>> create mode 100644 include/hw/intc/loongarch_pic_common.h
>>
>>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PULL 00/18] loongarch-to-apply queue
@ 2024-12-16 1:55 Bibo Mao
2024-12-16 19:19 ` Stefan Hajnoczi
0 siblings, 1 reply; 26+ messages in thread
From: Bibo Mao @ 2024-12-16 1:55 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
The following changes since commit ca80a5d026a280762e0772615f1988db542b3ade:
Merge tag 'hw-misc-20241214' of https://github.com/philmd/qemu into staging (2024-12-14 08:42:53 -0500)
are available in the Git repository at:
https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241216
for you to fetch changes up to efada537c6c49e414ae87ce66803d6d8543ad140:
hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi (2024-12-16 09:05:14 +0800)
----------------------------------------------------------------
pull-loongarch-20241216
v1 .. v2: Push patch again since forgot to push to upstream
----------------------------------------------------------------
Bibo Mao (18):
include: Add loongarch_pic_common header file
include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
hw/intc/loongarch_pch: Merge instance_init() into realize()
hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
hw/intc/loongarch_pch: Inherit from loongarch_pic_common
hw/intc/loongarch_pch: Add pre_save and post_load interfaces
hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
include: Add loongarch_extioi_common header file
include: Move struct LoongArchExtIOI to header file loongarch_extioi_common
include: Rename LoongArchExtIOI with LoongArchExtIOICommonState
hw/intc/loongarch_extioi: Rename LoongArchExtIOI with LoongArchExtIOICommonState
hw/intc/loongarch_extioi: Add common realize interface
hw/intc/loongarch_extioi: Add unrealize interface
hw/intc/loongarch_extioi: Add common file loongarch_extioi_common
hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common
hw/intc/loongarch_extioi: Add pre_save interface
hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi
hw/intc/loongarch_extioi.c | 110 +++++++++--------------------
hw/intc/loongarch_extioi_common.c | 113 ++++++++++++++++++++++++++++++
hw/intc/loongarch_pch_pic.c | 106 +++++++++-------------------
hw/intc/loongarch_pic_common.c | 97 +++++++++++++++++++++++++
hw/intc/meson.build | 4 +-
hw/loongarch/virt.c | 2 +-
include/hw/intc/loongarch_extioi.h | 84 +++-------------------
include/hw/intc/loongarch_extioi_common.h | 98 ++++++++++++++++++++++++++
include/hw/intc/loongarch_pch_pic.h | 70 ++++--------------
include/hw/intc/loongarch_pic_common.h | 82 ++++++++++++++++++++++
10 files changed, 488 insertions(+), 278 deletions(-)
create mode 100644 hw/intc/loongarch_extioi_common.c
create mode 100644 hw/intc/loongarch_pic_common.c
create mode 100644 include/hw/intc/loongarch_extioi_common.h
create mode 100644 include/hw/intc/loongarch_pic_common.h
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PULL 00/18] loongarch-to-apply queue
2024-12-16 1:55 Bibo Mao
@ 2024-12-16 19:19 ` Stefan Hajnoczi
2024-12-18 8:55 ` bibo mao
0 siblings, 1 reply; 26+ messages in thread
From: Stefan Hajnoczi @ 2024-12-16 19:19 UTC (permalink / raw)
To: Bibo Mao; +Cc: qemu-devel, Song Gao
On Sun, 15 Dec 2024 at 20:56, Bibo Mao <maobibo@loongson.cn> wrote:
>
> The following changes since commit ca80a5d026a280762e0772615f1988db542b3ade:
>
> Merge tag 'hw-misc-20241214' of https://github.com/philmd/qemu into staging (2024-12-14 08:42:53 -0500)
>
> are available in the Git repository at:
>
> https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241216
>
> for you to fetch changes up to efada537c6c49e414ae87ce66803d6d8543ad140:
>
> hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi (2024-12-16 09:05:14 +0800)
>
> ----------------------------------------------------------------
> pull-loongarch-20241216
> v1 .. v2: Push patch again since forgot to push to upstream
Please take a look at following qtest failure from the
x64-freebsd-14-build CI job:
8/730 qemu:qtest+qtest-loongarch64 / qtest-loongarch64/qom-test ERROR
0.84s killed by signal 6 SIGABRT
――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
stderr:
Broken pipe
../tests/qtest/libqtest.c:205: kill_qemu() detected QEMU death from
signal 11 (Segmentation fault) (core dumped)
(test program exited with status code -6)
TAP parsing error: Too few tests run (expected 2, got 0)
https://gitlab.com/qemu-project/qemu/-/jobs/8656122662/viewer
You can reproduce the FreeBSD 14 environment using `make
vm-build-freebsd`. See `make vm-help` for more options.
Here is the merge tag where this happened. It probably also happens on
your pull request tag:
https://gitlab.com/qemu-project/qemu/-/commit/466535ecb37d28ef79aecc4550b7cd1160c6beac
If you find that there was an issue with the commits in your pull
request, please send a new pull request revision. If you find that the
issue was not caused by a commit in your pull request, please reply
here so we can discuss how to solve it.
Thanks,
Stefan
>
> ----------------------------------------------------------------
> Bibo Mao (18):
> include: Add loongarch_pic_common header file
> include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
> hw/intc/loongarch_pch: Merge instance_init() into realize()
> hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
> hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
> hw/intc/loongarch_pch: Inherit from loongarch_pic_common
> hw/intc/loongarch_pch: Add pre_save and post_load interfaces
> hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
> include: Add loongarch_extioi_common header file
> include: Move struct LoongArchExtIOI to header file loongarch_extioi_common
> include: Rename LoongArchExtIOI with LoongArchExtIOICommonState
> hw/intc/loongarch_extioi: Rename LoongArchExtIOI with LoongArchExtIOICommonState
> hw/intc/loongarch_extioi: Add common realize interface
> hw/intc/loongarch_extioi: Add unrealize interface
> hw/intc/loongarch_extioi: Add common file loongarch_extioi_common
> hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common
> hw/intc/loongarch_extioi: Add pre_save interface
> hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi
>
> hw/intc/loongarch_extioi.c | 110 +++++++++--------------------
> hw/intc/loongarch_extioi_common.c | 113 ++++++++++++++++++++++++++++++
> hw/intc/loongarch_pch_pic.c | 106 +++++++++-------------------
> hw/intc/loongarch_pic_common.c | 97 +++++++++++++++++++++++++
> hw/intc/meson.build | 4 +-
> hw/loongarch/virt.c | 2 +-
> include/hw/intc/loongarch_extioi.h | 84 +++-------------------
> include/hw/intc/loongarch_extioi_common.h | 98 ++++++++++++++++++++++++++
> include/hw/intc/loongarch_pch_pic.h | 70 ++++--------------
> include/hw/intc/loongarch_pic_common.h | 82 ++++++++++++++++++++++
> 10 files changed, 488 insertions(+), 278 deletions(-)
> create mode 100644 hw/intc/loongarch_extioi_common.c
> create mode 100644 hw/intc/loongarch_pic_common.c
> create mode 100644 include/hw/intc/loongarch_extioi_common.h
> create mode 100644 include/hw/intc/loongarch_pic_common.h
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PULL 00/18] loongarch-to-apply queue
2024-12-16 19:19 ` Stefan Hajnoczi
@ 2024-12-18 8:55 ` bibo mao
0 siblings, 0 replies; 26+ messages in thread
From: bibo mao @ 2024-12-18 8:55 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
On 2024/12/17 上午3:19, Stefan Hajnoczi wrote:
> On Sun, 15 Dec 2024 at 20:56, Bibo Mao <maobibo@loongson.cn> wrote:
>>
>> The following changes since commit ca80a5d026a280762e0772615f1988db542b3ade:
>>
>> Merge tag 'hw-misc-20241214' of https://github.com/philmd/qemu into staging (2024-12-14 08:42:53 -0500)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241216
>>
>> for you to fetch changes up to efada537c6c49e414ae87ce66803d6d8543ad140:
>>
>> hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi (2024-12-16 09:05:14 +0800)
>>
>> ----------------------------------------------------------------
>> pull-loongarch-20241216
>> v1 .. v2: Push patch again since forgot to push to upstream
>
> Please take a look at following qtest failure from the
> x64-freebsd-14-build CI job:
>
> 8/730 qemu:qtest+qtest-loongarch64 / qtest-loongarch64/qom-test ERROR
> 0.84s killed by signal 6 SIGABRT
> ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
> stderr:
> Broken pipe
> ../tests/qtest/libqtest.c:205: kill_qemu() detected QEMU death from
> signal 11 (Segmentation fault) (core dumped)
> (test program exited with status code -6)
> TAP parsing error: Too few tests run (expected 2, got 0)
>
> https://gitlab.com/qemu-project/qemu/-/jobs/8656122662/viewer
>
> You can reproduce the FreeBSD 14 environment using `make
> vm-build-freebsd`. See `make vm-help` for more options.
>
> Here is the merge tag where this happened. It probably also happens on
> your pull request tag:
> https://gitlab.com/qemu-project/qemu/-/commit/466535ecb37d28ef79aecc4550b7cd1160c6beac
>
> If you find that there was an issue with the commits in your pull
> request, please send a new pull request revision. If you find that the
> issue was not caused by a commit in your pull request, please reply
> here so we can discuss how to solve it.
Sorry, there is problem on FreeBSD and it can be reproduced on my
FreeBSD VM. Will fresh the patch.
Regards
Bibo Mao
>
> Thanks,
> Stefan
>
>>
>> ----------------------------------------------------------------
>> Bibo Mao (18):
>> include: Add loongarch_pic_common header file
>> include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
>> hw/intc/loongarch_pch: Merge instance_init() into realize()
>> hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
>> hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
>> hw/intc/loongarch_pch: Inherit from loongarch_pic_common
>> hw/intc/loongarch_pch: Add pre_save and post_load interfaces
>> hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
>> include: Add loongarch_extioi_common header file
>> include: Move struct LoongArchExtIOI to header file loongarch_extioi_common
>> include: Rename LoongArchExtIOI with LoongArchExtIOICommonState
>> hw/intc/loongarch_extioi: Rename LoongArchExtIOI with LoongArchExtIOICommonState
>> hw/intc/loongarch_extioi: Add common realize interface
>> hw/intc/loongarch_extioi: Add unrealize interface
>> hw/intc/loongarch_extioi: Add common file loongarch_extioi_common
>> hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common
>> hw/intc/loongarch_extioi: Add pre_save interface
>> hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi
>>
>> hw/intc/loongarch_extioi.c | 110 +++++++++--------------------
>> hw/intc/loongarch_extioi_common.c | 113 ++++++++++++++++++++++++++++++
>> hw/intc/loongarch_pch_pic.c | 106 +++++++++-------------------
>> hw/intc/loongarch_pic_common.c | 97 +++++++++++++++++++++++++
>> hw/intc/meson.build | 4 +-
>> hw/loongarch/virt.c | 2 +-
>> include/hw/intc/loongarch_extioi.h | 84 +++-------------------
>> include/hw/intc/loongarch_extioi_common.h | 98 ++++++++++++++++++++++++++
>> include/hw/intc/loongarch_pch_pic.h | 70 ++++--------------
>> include/hw/intc/loongarch_pic_common.h | 82 ++++++++++++++++++++++
>> 10 files changed, 488 insertions(+), 278 deletions(-)
>> create mode 100644 hw/intc/loongarch_extioi_common.c
>> create mode 100644 hw/intc/loongarch_pic_common.c
>> create mode 100644 include/hw/intc/loongarch_extioi_common.h
>> create mode 100644 include/hw/intc/loongarch_pic_common.h
>>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PULL 00/18] loongarch-to-apply queue
@ 2024-12-19 7:54 Bibo Mao
2024-12-19 7:54 ` [PULL 01/18] include: Add loongarch_pic_common header file Bibo Mao
` (15 more replies)
0 siblings, 16 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
The following changes since commit 8032c78e556cd0baec111740a6c636863f9bd7c8:
Merge tag 'firmware-20241216-pull-request' of https://gitlab.com/kraxel/qemu into staging (2024-12-16 14:20:33 -0500)
are available in the Git repository at:
https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241219
for you to fetch changes up to 6f6006ad07243543595c7607ffbeee7f45b94b80:
hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi (2024-12-19 15:23:30 +0800)
----------------------------------------------------------------
pull-loongarch-20241219
v2 .. v3:
1. Fix make check issue on freeBSD 14
v1 .. v2:
1. Push patch again since forgot to push to upstream
----------------------------------------------------------------
Bibo Mao (18):
include: Add loongarch_pic_common header file
include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
hw/intc/loongarch_pch: Merge instance_init() into realize()
hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
hw/intc/loongarch_pch: Inherit from loongarch_pic_common
hw/intc/loongarch_pch: Add pre_save and post_load interfaces
hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
include: Add loongarch_extioi_common header file
include: Move struct LoongArchExtIOI to header file loongarch_extioi_common
include: Rename LoongArchExtIOI with LoongArchExtIOICommonState
hw/intc/loongarch_extioi: Rename LoongArchExtIOI with LoongArchExtIOICommonState
hw/intc/loongarch_extioi: Add common realize interface
hw/intc/loongarch_extioi: Add unrealize interface
hw/intc/loongarch_extioi: Add common file loongarch_extioi_common
hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common
hw/intc/loongarch_extioi: Add pre_save interface
hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi
hw/intc/loongarch_extioi.c | 112 ++++++++++-------------------
hw/intc/loongarch_extioi_common.c | 113 ++++++++++++++++++++++++++++++
hw/intc/loongarch_pch_pic.c | 106 +++++++++-------------------
hw/intc/loongarch_pic_common.c | 97 +++++++++++++++++++++++++
hw/intc/meson.build | 4 +-
hw/loongarch/virt.c | 2 +-
include/hw/intc/loongarch_extioi.h | 84 +++-------------------
include/hw/intc/loongarch_extioi_common.h | 98 ++++++++++++++++++++++++++
include/hw/intc/loongarch_pch_pic.h | 70 ++++--------------
include/hw/intc/loongarch_pic_common.h | 82 ++++++++++++++++++++++
10 files changed, 490 insertions(+), 278 deletions(-)
create mode 100644 hw/intc/loongarch_extioi_common.c
create mode 100644 hw/intc/loongarch_pic_common.c
create mode 100644 include/hw/intc/loongarch_extioi_common.h
create mode 100644 include/hw/intc/loongarch_pic_common.h
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PULL 01/18] include: Add loongarch_pic_common header file
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 02/18] include: Move struct LoongArchPCHPIC to " Bibo Mao
` (14 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Add common header file hw/intc/loongarch_pic_common.h, and move
some macro definition from hw/intc/loongarch_pch_pic.h to the common
header file.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
include/hw/intc/loongarch_pch_pic.h | 36 +++-------------------
include/hw/intc/loongarch_pic_common.h | 42 ++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 31 deletions(-)
create mode 100644 include/hw/intc/loongarch_pic_common.h
diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h
index d5437e88f2..861b32313b 100644
--- a/include/hw/intc/loongarch_pch_pic.h
+++ b/include/hw/intc/loongarch_pch_pic.h
@@ -5,42 +5,15 @@
* Copyright (c) 2021 Loongson Technology Corporation Limited
*/
-#include "hw/sysbus.h"
+#ifndef HW_LOONGARCH_PCH_PIC_H
+#define HW_LOONGARCH_PCH_PIC_H
+
+#include "hw/intc/loongarch_pic_common.h"
#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic"
#define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC)
-#define PCH_PIC_INT_ID_VAL 0x7000000UL
-#define PCH_PIC_INT_ID_VER 0x1UL
-
-#define PCH_PIC_INT_ID_LO 0x00
-#define PCH_PIC_INT_ID_HI 0x04
-#define PCH_PIC_INT_MASK_LO 0x20
-#define PCH_PIC_INT_MASK_HI 0x24
-#define PCH_PIC_HTMSI_EN_LO 0x40
-#define PCH_PIC_HTMSI_EN_HI 0x44
-#define PCH_PIC_INT_EDGE_LO 0x60
-#define PCH_PIC_INT_EDGE_HI 0x64
-#define PCH_PIC_INT_CLEAR_LO 0x80
-#define PCH_PIC_INT_CLEAR_HI 0x84
-#define PCH_PIC_AUTO_CTRL0_LO 0xc0
-#define PCH_PIC_AUTO_CTRL0_HI 0xc4
-#define PCH_PIC_AUTO_CTRL1_LO 0xe0
-#define PCH_PIC_AUTO_CTRL1_HI 0xe4
-#define PCH_PIC_ROUTE_ENTRY_OFFSET 0x100
-#define PCH_PIC_ROUTE_ENTRY_END 0x13f
-#define PCH_PIC_HTMSI_VEC_OFFSET 0x200
-#define PCH_PIC_HTMSI_VEC_END 0x23f
-#define PCH_PIC_INT_STATUS_LO 0x3a0
-#define PCH_PIC_INT_STATUS_HI 0x3a4
-#define PCH_PIC_INT_POL_LO 0x3e0
-#define PCH_PIC_INT_POL_HI 0x3e4
-
-#define STATUS_LO_START 0
-#define STATUS_HI_START 0x4
-#define POL_LO_START 0x40
-#define POL_HI_START 0x44
struct LoongArchPCHPIC {
SysBusDevice parent_obj;
qemu_irq parent_irq[64];
@@ -67,3 +40,4 @@ struct LoongArchPCHPIC {
MemoryRegion iomem8;
unsigned int irq_num;
};
+#endif /* HW_LOONGARCH_PCH_PIC_H */
diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h
new file mode 100644
index 0000000000..6d0e33e1ac
--- /dev/null
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * LoongArch 7A1000 I/O interrupt controller definitions
+ * Copyright (c) 2024 Loongson Technology Corporation Limited
+ */
+
+#ifndef HW_LOONGARCH_PIC_COMMON_H
+#define HW_LOONGARCH_PIC_COMMON_H
+
+#include "hw/pci-host/ls7a.h"
+#include "hw/sysbus.h"
+
+#define PCH_PIC_INT_ID_VAL 0x7000000UL
+#define PCH_PIC_INT_ID_VER 0x1UL
+#define PCH_PIC_INT_ID_LO 0x00
+#define PCH_PIC_INT_ID_HI 0x04
+#define PCH_PIC_INT_MASK_LO 0x20
+#define PCH_PIC_INT_MASK_HI 0x24
+#define PCH_PIC_HTMSI_EN_LO 0x40
+#define PCH_PIC_HTMSI_EN_HI 0x44
+#define PCH_PIC_INT_EDGE_LO 0x60
+#define PCH_PIC_INT_EDGE_HI 0x64
+#define PCH_PIC_INT_CLEAR_LO 0x80
+#define PCH_PIC_INT_CLEAR_HI 0x84
+#define PCH_PIC_AUTO_CTRL0_LO 0xc0
+#define PCH_PIC_AUTO_CTRL0_HI 0xc4
+#define PCH_PIC_AUTO_CTRL1_LO 0xe0
+#define PCH_PIC_AUTO_CTRL1_HI 0xe4
+#define PCH_PIC_ROUTE_ENTRY_OFFSET 0x100
+#define PCH_PIC_ROUTE_ENTRY_END 0x13f
+#define PCH_PIC_HTMSI_VEC_OFFSET 0x200
+#define PCH_PIC_HTMSI_VEC_END 0x23f
+#define PCH_PIC_INT_STATUS_LO 0x3a0
+#define PCH_PIC_INT_STATUS_HI 0x3a4
+#define PCH_PIC_INT_POL_LO 0x3e0
+#define PCH_PIC_INT_POL_HI 0x3e4
+
+#define STATUS_LO_START 0
+#define STATUS_HI_START 0x4
+#define POL_LO_START 0x40
+#define POL_HI_START 0x44
+#endif /* HW_LOONGARCH_PIC_COMMON_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 02/18] include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
2024-12-19 7:54 ` [PULL 01/18] include: Add loongarch_pic_common header file Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 03/18] hw/intc/loongarch_pch: Merge instance_init() into realize() Bibo Mao
` (13 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Move structure LoongArchPCHPIC from header file loongarch_pch_pic.h
to file loongarch_pic_common.h, and rename structure name with
LoongArchPICCommonState.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
include/hw/intc/loongarch_pch_pic.h | 27 +------------------------
include/hw/intc/loongarch_pic_common.h | 28 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h
index 861b32313b..381accbf2b 100644
--- a/include/hw/intc/loongarch_pch_pic.h
+++ b/include/hw/intc/loongarch_pch_pic.h
@@ -10,34 +10,9 @@
#include "hw/intc/loongarch_pic_common.h"
+#define LoongArchPCHPIC LoongArchPICCommonState
#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic"
#define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC)
-struct LoongArchPCHPIC {
- SysBusDevice parent_obj;
- qemu_irq parent_irq[64];
- uint64_t int_mask; /*0x020 interrupt mask register*/
- uint64_t htmsi_en; /*0x040 1=msi*/
- uint64_t intedge; /*0x060 edge=1 level =0*/
- uint64_t intclr; /*0x080 for clean edge int,set 1 clean,set 0 is noused*/
- uint64_t auto_crtl0; /*0x0c0*/
- uint64_t auto_crtl1; /*0x0e0*/
- uint64_t last_intirr; /* edge detection */
- uint64_t intirr; /* 0x380 interrupt request register */
- uint64_t intisr; /* 0x3a0 interrupt service register */
- /*
- * 0x3e0 interrupt level polarity selection
- * register 0 for high level trigger
- */
- uint64_t int_polarity;
-
- uint8_t route_entry[64]; /*0x100 - 0x138*/
- uint8_t htmsi_vector[64]; /*0x200 - 0x238*/
-
- MemoryRegion iomem32_low;
- MemoryRegion iomem32_high;
- MemoryRegion iomem8;
- unsigned int irq_num;
-};
#endif /* HW_LOONGARCH_PCH_PIC_H */
diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h
index 6d0e33e1ac..124bb7d226 100644
--- a/include/hw/intc/loongarch_pic_common.h
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -39,4 +39,32 @@
#define STATUS_HI_START 0x4
#define POL_LO_START 0x40
#define POL_HI_START 0x44
+
+struct LoongArchPICCommonState {
+ SysBusDevice parent_obj;
+
+ qemu_irq parent_irq[64];
+ uint64_t int_mask; /* 0x020 interrupt mask register */
+ uint64_t htmsi_en; /* 0x040 1=msi */
+ uint64_t intedge; /* 0x060 edge=1 level=0 */
+ uint64_t intclr; /* 0x080 clean edge int, set 1 clean, 0 noused */
+ uint64_t auto_crtl0; /* 0x0c0 */
+ uint64_t auto_crtl1; /* 0x0e0 */
+ uint64_t last_intirr; /* edge detection */
+ uint64_t intirr; /* 0x380 interrupt request register */
+ uint64_t intisr; /* 0x3a0 interrupt service register */
+ /*
+ * 0x3e0 interrupt level polarity selection
+ * register 0 for high level trigger
+ */
+ uint64_t int_polarity;
+
+ uint8_t route_entry[64]; /* 0x100 - 0x138 */
+ uint8_t htmsi_vector[64]; /* 0x200 - 0x238 */
+
+ MemoryRegion iomem32_low;
+ MemoryRegion iomem32_high;
+ MemoryRegion iomem8;
+ unsigned int irq_num;
+};
#endif /* HW_LOONGARCH_PIC_COMMON_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 03/18] hw/intc/loongarch_pch: Merge instance_init() into realize()
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
2024-12-19 7:54 ` [PULL 01/18] include: Add loongarch_pic_common header file Bibo Mao
2024-12-19 7:54 ` [PULL 02/18] include: Move struct LoongArchPCHPIC to " Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 04/18] hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState Bibo Mao
` (12 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Memory region is created in instance_init(), merge it into function
realize(). There is no special class_init() for loongarch_pch object.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_pch_pic.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 6a87b1aab7..ea87851994 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -382,6 +382,7 @@ static void loongarch_pch_pic_reset(DeviceState *d)
static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
{
LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
error_setg(errp, "Invalid 'pic_irq_num'");
@@ -390,19 +391,12 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
qdev_init_gpio_out(dev, s->parent_irq, s->irq_num);
qdev_init_gpio_in(dev, pch_pic_irq_handler, s->irq_num);
-}
-
-static void loongarch_pch_pic_init(Object *obj)
-{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(obj);
- SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
-
- memory_region_init_io(&s->iomem32_low, obj,
+ memory_region_init_io(&s->iomem32_low, OBJECT(dev),
&loongarch_pch_pic_reg32_low_ops,
s, PCH_PIC_NAME(.reg32_part1), 0x100);
- memory_region_init_io(&s->iomem8, obj, &loongarch_pch_pic_reg8_ops,
+ memory_region_init_io(&s->iomem8, OBJECT(dev), &loongarch_pch_pic_reg8_ops,
s, PCH_PIC_NAME(.reg8), 0x2a0);
- memory_region_init_io(&s->iomem32_high, obj,
+ memory_region_init_io(&s->iomem32_high, OBJECT(dev),
&loongarch_pch_pic_reg32_high_ops,
s, PCH_PIC_NAME(.reg32_part2), 0xc60);
sysbus_init_mmio(sbd, &s->iomem32_low);
@@ -451,7 +445,6 @@ static const TypeInfo loongarch_pch_pic_info = {
.name = TYPE_LOONGARCH_PCH_PIC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LoongArchPCHPIC),
- .instance_init = loongarch_pch_pic_init,
.class_init = loongarch_pch_pic_class_init,
};
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 04/18] hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (2 preceding siblings ...)
2024-12-19 7:54 ` [PULL 03/18] hw/intc/loongarch_pch: Merge instance_init() into realize() Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 05/18] hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common Bibo Mao
` (11 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
With pic vmstate, rename structure name vmstate_loongarch_pch_pic with
vmstate_loongarch_pic_common, and with pic property rename
loongarch_pch_pic_properties with loongarch_pic_common_properties.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_pch_pic.c | 52 +++++++++++++++++++++++--------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index ea87851994..60a1e82253 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -379,13 +379,25 @@ static void loongarch_pch_pic_reset(DeviceState *d)
s->int_polarity = 0x0;
}
+static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
+{
+ LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev);
+
+ if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
+ error_setg(errp, "Invalid 'pic_irq_num'");
+ return;
+ }
+}
+
static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
{
LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ Error *local_err = NULL;
- if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
- error_setg(errp, "Invalid 'pic_irq_num'");
+ loongarch_pic_common_realize(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
@@ -405,28 +417,28 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
}
-static const Property loongarch_pch_pic_properties[] = {
- DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPCHPIC, irq_num, 0),
+static const Property loongarch_pic_common_properties[] = {
+ DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0),
DEFINE_PROP_END_OF_LIST(),
};
-static const VMStateDescription vmstate_loongarch_pch_pic = {
- .name = TYPE_LOONGARCH_PCH_PIC,
+static const VMStateDescription vmstate_loongarch_pic_common = {
+ .name = "loongarch_pch_pic",
.version_id = 1,
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
- VMSTATE_UINT64(int_mask, LoongArchPCHPIC),
- VMSTATE_UINT64(htmsi_en, LoongArchPCHPIC),
- VMSTATE_UINT64(intedge, LoongArchPCHPIC),
- VMSTATE_UINT64(intclr, LoongArchPCHPIC),
- VMSTATE_UINT64(auto_crtl0, LoongArchPCHPIC),
- VMSTATE_UINT64(auto_crtl1, LoongArchPCHPIC),
- VMSTATE_UINT8_ARRAY(route_entry, LoongArchPCHPIC, 64),
- VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPCHPIC, 64),
- VMSTATE_UINT64(last_intirr, LoongArchPCHPIC),
- VMSTATE_UINT64(intirr, LoongArchPCHPIC),
- VMSTATE_UINT64(intisr, LoongArchPCHPIC),
- VMSTATE_UINT64(int_polarity, LoongArchPCHPIC),
+ VMSTATE_UINT64(int_mask, LoongArchPICCommonState),
+ VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState),
+ VMSTATE_UINT64(intedge, LoongArchPICCommonState),
+ VMSTATE_UINT64(intclr, LoongArchPICCommonState),
+ VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState),
+ VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState),
+ VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64),
+ VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64),
+ VMSTATE_UINT64(last_intirr, LoongArchPICCommonState),
+ VMSTATE_UINT64(intirr, LoongArchPICCommonState),
+ VMSTATE_UINT64(intisr, LoongArchPICCommonState),
+ VMSTATE_UINT64(int_polarity, LoongArchPICCommonState),
VMSTATE_END_OF_LIST()
}
};
@@ -437,8 +449,8 @@ static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data)
dc->realize = loongarch_pch_pic_realize;
device_class_set_legacy_reset(dc, loongarch_pch_pic_reset);
- dc->vmsd = &vmstate_loongarch_pch_pic;
- device_class_set_props(dc, loongarch_pch_pic_properties);
+ dc->vmsd = &vmstate_loongarch_pic_common;
+ device_class_set_props(dc, loongarch_pic_common_properties);
}
static const TypeInfo loongarch_pch_pic_info = {
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 05/18] hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (3 preceding siblings ...)
2024-12-19 7:54 ` [PULL 04/18] hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 06/18] hw/intc/loongarch_pch: Inherit from loongarch_pic_common Bibo Mao
` (10 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Move some common functions to file loongarch_pic_common.c, the common
functions include loongarch_pic_common_realize(), property structure
loongarch_pic_common_properties and vmstate structure
vmstate_loongarch_pic_common.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_pch_pic.c | 37 +-----------------------------
hw/intc/loongarch_pic_common.c | 41 ++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 36 deletions(-)
create mode 100644 hw/intc/loongarch_pic_common.c
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 60a1e82253..25c612b366 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -379,16 +379,7 @@ static void loongarch_pch_pic_reset(DeviceState *d)
s->int_polarity = 0x0;
}
-static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
-{
- LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev);
-
- if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
- error_setg(errp, "Invalid 'pic_irq_num'");
- return;
- }
-}
-
+#include "loongarch_pic_common.c"
static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
{
LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev);
@@ -417,32 +408,6 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
}
-static const Property loongarch_pic_common_properties[] = {
- DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0),
- DEFINE_PROP_END_OF_LIST(),
-};
-
-static const VMStateDescription vmstate_loongarch_pic_common = {
- .name = "loongarch_pch_pic",
- .version_id = 1,
- .minimum_version_id = 1,
- .fields = (const VMStateField[]) {
- VMSTATE_UINT64(int_mask, LoongArchPICCommonState),
- VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState),
- VMSTATE_UINT64(intedge, LoongArchPICCommonState),
- VMSTATE_UINT64(intclr, LoongArchPICCommonState),
- VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState),
- VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState),
- VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64),
- VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64),
- VMSTATE_UINT64(last_intirr, LoongArchPICCommonState),
- VMSTATE_UINT64(intirr, LoongArchPICCommonState),
- VMSTATE_UINT64(intisr, LoongArchPICCommonState),
- VMSTATE_UINT64(int_polarity, LoongArchPICCommonState),
- VMSTATE_END_OF_LIST()
- }
-};
-
static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c
new file mode 100644
index 0000000000..ff8ebff93f
--- /dev/null
+++ b/hw/intc/loongarch_pic_common.c
@@ -0,0 +1,41 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * QEMU Loongson 7A1000 I/O interrupt controller.
+ * Copyright (C) 2024 Loongson Technology Corporation Limited
+ */
+
+static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
+{
+ LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev);
+
+ if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
+ error_setg(errp, "Invalid 'pic_irq_num'");
+ return;
+ }
+}
+
+static const Property loongarch_pic_common_properties[] = {
+ DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static const VMStateDescription vmstate_loongarch_pic_common = {
+ .name = "loongarch_pch_pic",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (const VMStateField[]) {
+ VMSTATE_UINT64(int_mask, LoongArchPICCommonState),
+ VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState),
+ VMSTATE_UINT64(intedge, LoongArchPICCommonState),
+ VMSTATE_UINT64(intclr, LoongArchPICCommonState),
+ VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState),
+ VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState),
+ VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64),
+ VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64),
+ VMSTATE_UINT64(last_intirr, LoongArchPICCommonState),
+ VMSTATE_UINT64(intirr, LoongArchPICCommonState),
+ VMSTATE_UINT64(intisr, LoongArchPICCommonState),
+ VMSTATE_UINT64(int_polarity, LoongArchPICCommonState),
+ VMSTATE_END_OF_LIST()
+ }
+};
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 06/18] hw/intc/loongarch_pch: Inherit from loongarch_pic_common
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (4 preceding siblings ...)
2024-12-19 7:54 ` [PULL 05/18] hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 07/18] hw/intc/loongarch_pch: Add pre_save and post_load interfaces Bibo Mao
` (9 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Set TYPE_LOONGARCH_PIC inherit from TYPE_LOONGARCH_PIC_COMMON object,
it shares vmsate and property of TYPE_LOONGARCH_PIC_COMMON, and has
its own realize() function.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_pch_pic.c | 38 ++++++++++++--------------
hw/intc/loongarch_pic_common.c | 32 +++++++++++++++++++++-
hw/intc/meson.build | 2 +-
include/hw/intc/loongarch_pch_pic.h | 21 +++++++++++---
include/hw/intc/loongarch_pic_common.h | 10 +++++++
5 files changed, 77 insertions(+), 26 deletions(-)
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 25c612b366..11effd4cc9 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -379,14 +379,14 @@ static void loongarch_pch_pic_reset(DeviceState *d)
s->int_polarity = 0x0;
}
-#include "loongarch_pic_common.c"
-static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
+static void loongarch_pic_realize(DeviceState *dev, Error **errp)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev);
- SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(dev);
+ LoongarchPICClass *lpc = LOONGARCH_PIC_GET_CLASS(dev);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
Error *local_err = NULL;
- loongarch_pic_common_realize(dev, &local_err);
+ lpc->parent_realize(dev, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -408,26 +408,24 @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp)
}
-static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data)
+static void loongarch_pic_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ LoongarchPICClass *lpc = LOONGARCH_PIC_CLASS(klass);
- dc->realize = loongarch_pch_pic_realize;
device_class_set_legacy_reset(dc, loongarch_pch_pic_reset);
- dc->vmsd = &vmstate_loongarch_pic_common;
- device_class_set_props(dc, loongarch_pic_common_properties);
+ device_class_set_parent_realize(dc, loongarch_pic_realize,
+ &lpc->parent_realize);
}
-static const TypeInfo loongarch_pch_pic_info = {
- .name = TYPE_LOONGARCH_PCH_PIC,
- .parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(LoongArchPCHPIC),
- .class_init = loongarch_pch_pic_class_init,
+static const TypeInfo loongarch_pic_types[] = {
+ {
+ .name = TYPE_LOONGARCH_PIC,
+ .parent = TYPE_LOONGARCH_PIC_COMMON,
+ .instance_size = sizeof(LoongarchPICState),
+ .class_size = sizeof(LoongarchPICClass),
+ .class_init = loongarch_pic_class_init,
+ }
};
-static void loongarch_pch_pic_register_types(void)
-{
- type_register_static(&loongarch_pch_pic_info);
-}
-
-type_init(loongarch_pch_pic_register_types)
+DEFINE_TYPES(loongarch_pic_types)
diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c
index ff8ebff93f..f97e38368d 100644
--- a/hw/intc/loongarch_pic_common.c
+++ b/hw/intc/loongarch_pic_common.c
@@ -4,9 +4,15 @@
* Copyright (C) 2024 Loongson Technology Corporation Limited
*/
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/intc/loongarch_pic_common.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
+
static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
{
- LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(dev);
if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) {
error_setg(errp, "Invalid 'pic_irq_num'");
@@ -39,3 +45,27 @@ static const VMStateDescription vmstate_loongarch_pic_common = {
VMSTATE_END_OF_LIST()
}
};
+
+static void loongarch_pic_common_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_CLASS(klass);
+
+ device_class_set_parent_realize(dc, loongarch_pic_common_realize,
+ &lpcc->parent_realize);
+ device_class_set_props(dc, loongarch_pic_common_properties);
+ dc->vmsd = &vmstate_loongarch_pic_common;
+}
+
+static const TypeInfo loongarch_pic_common_types[] = {
+ {
+ .name = TYPE_LOONGARCH_PIC_COMMON,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(LoongArchPICCommonState),
+ .class_size = sizeof(LoongArchPICCommonClass),
+ .class_init = loongarch_pic_common_class_init,
+ .abstract = true,
+ }
+};
+
+DEFINE_TYPES(loongarch_pic_common_types)
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index 6bfdc4eb33..848cb6685e 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -71,6 +71,6 @@ specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c'))
specific_ss.add(when: 'CONFIG_LOONGSON_IPI_COMMON', if_true: files('loongson_ipi_common.c'))
specific_ss.add(when: 'CONFIG_LOONGSON_IPI', if_true: files('loongson_ipi.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_IPI', if_true: files('loongarch_ipi.c'))
-specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c'))
+specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c', 'loongarch_pic_common.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_MSI', if_true: files('loongarch_pch_msi.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_EXTIOI', if_true: files('loongarch_extioi.c'))
diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h
index 381accbf2b..f84be0ac62 100644
--- a/include/hw/intc/loongarch_pch_pic.h
+++ b/include/hw/intc/loongarch_pch_pic.h
@@ -10,9 +10,22 @@
#include "hw/intc/loongarch_pic_common.h"
-#define LoongArchPCHPIC LoongArchPICCommonState
-#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic"
-#define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name
-OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC)
+#define TYPE_LOONGARCH_PIC "loongarch_pic"
+#define PCH_PIC_NAME(name) TYPE_LOONGARCH_PIC#name
+OBJECT_DECLARE_TYPE(LoongarchPICState, LoongarchPICClass, LOONGARCH_PIC)
+
+struct LoongarchPICState {
+ LoongArchPICCommonState parent_obj;
+};
+
+struct LoongarchPICClass {
+ LoongArchPICCommonClass parent_class;
+
+ DeviceRealize parent_realize;
+};
+
+#define TYPE_LOONGARCH_PCH_PIC TYPE_LOONGARCH_PIC
+typedef struct LoongArchPICCommonState LoongArchPCHPIC;
+#define LOONGARCH_PCH_PIC(obj) ((struct LoongArchPICCommonState *)(obj))
#endif /* HW_LOONGARCH_PCH_PIC_H */
diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h
index 124bb7d226..0a1a28063c 100644
--- a/include/hw/intc/loongarch_pic_common.h
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -40,6 +40,10 @@
#define POL_LO_START 0x40
#define POL_HI_START 0x44
+#define TYPE_LOONGARCH_PIC_COMMON "loongarch_pic_common"
+OBJECT_DECLARE_TYPE(LoongArchPICCommonState,
+ LoongArchPICCommonClass, LOONGARCH_PIC_COMMON)
+
struct LoongArchPICCommonState {
SysBusDevice parent_obj;
@@ -67,4 +71,10 @@ struct LoongArchPICCommonState {
MemoryRegion iomem8;
unsigned int irq_num;
};
+
+struct LoongArchPICCommonClass {
+ SysBusDeviceClass parent_class;
+
+ DeviceRealize parent_realize;
+};
#endif /* HW_LOONGARCH_PIC_COMMON_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 07/18] hw/intc/loongarch_pch: Add pre_save and post_load interfaces
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (5 preceding siblings ...)
2024-12-19 7:54 ` [PULL 06/18] hw/intc/loongarch_pch: Inherit from loongarch_pic_common Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 08/18] hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic Bibo Mao
` (8 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Add vmstate pre_save and post_load interfaces, which can be used
by pic kvm driver in future.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_pic_common.c | 26 ++++++++++++++++++++++++++
include/hw/intc/loongarch_pic_common.h | 2 ++
2 files changed, 28 insertions(+)
diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c
index f97e38368d..bcb6b7b3fc 100644
--- a/hw/intc/loongarch_pic_common.c
+++ b/hw/intc/loongarch_pic_common.c
@@ -10,6 +10,30 @@
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
+static int loongarch_pic_pre_save(void *opaque)
+{
+ LoongArchPICCommonState *s = (LoongArchPICCommonState *)opaque;
+ LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_GET_CLASS(s);
+
+ if (lpcc->pre_save) {
+ return lpcc->pre_save(s);
+ }
+
+ return 0;
+}
+
+static int loongarch_pic_post_load(void *opaque, int version_id)
+{
+ LoongArchPICCommonState *s = (LoongArchPICCommonState *)opaque;
+ LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_GET_CLASS(s);
+
+ if (lpcc->post_load) {
+ return lpcc->post_load(s, version_id);
+ }
+
+ return 0;
+}
+
static void loongarch_pic_common_realize(DeviceState *dev, Error **errp)
{
LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(dev);
@@ -29,6 +53,8 @@ static const VMStateDescription vmstate_loongarch_pic_common = {
.name = "loongarch_pch_pic",
.version_id = 1,
.minimum_version_id = 1,
+ .pre_save = loongarch_pic_pre_save,
+ .post_load = loongarch_pic_post_load,
.fields = (const VMStateField[]) {
VMSTATE_UINT64(int_mask, LoongArchPICCommonState),
VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState),
diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h
index 0a1a28063c..43cce48978 100644
--- a/include/hw/intc/loongarch_pic_common.h
+++ b/include/hw/intc/loongarch_pic_common.h
@@ -76,5 +76,7 @@ struct LoongArchPICCommonClass {
SysBusDeviceClass parent_class;
DeviceRealize parent_realize;
+ int (*pre_save)(LoongArchPICCommonState *s);
+ int (*post_load)(LoongArchPICCommonState *s, int version_id);
};
#endif /* HW_LOONGARCH_PIC_COMMON_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 08/18] hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (6 preceding siblings ...)
2024-12-19 7:54 ` [PULL 07/18] hw/intc/loongarch_pch: Add pre_save and post_load interfaces Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 09/18] include: Add loongarch_extioi_common header file Bibo Mao
` (7 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Remove definition about LoongArchPCHPIC and LOONGARCH_PCH_PIC, and
replace them with LoongArchPICCommonState and LOONGARCH_PIC_COMMON
separately. Also remove unnecessary header files.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_pch_pic.c | 24 ++++++++++--------------
hw/loongarch/virt.c | 2 +-
include/hw/intc/loongarch_pch_pic.h | 4 ----
3 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c
index 11effd4cc9..acd75ccb0c 100644
--- a/hw/intc/loongarch_pch_pic.c
+++ b/hw/intc/loongarch_pch_pic.c
@@ -7,17 +7,13 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
-#include "hw/sysbus.h"
-#include "hw/loongarch/virt.h"
-#include "hw/pci-host/ls7a.h"
#include "hw/irq.h"
#include "hw/intc/loongarch_pch_pic.h"
-#include "hw/qdev-properties.h"
-#include "migration/vmstate.h"
#include "trace.h"
#include "qapi/error.h"
-static void pch_pic_update_irq(LoongArchPCHPIC *s, uint64_t mask, int level)
+static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask,
+ int level)
{
uint64_t val;
int irq;
@@ -45,7 +41,7 @@ static void pch_pic_update_irq(LoongArchPCHPIC *s, uint64_t mask, int level)
static void pch_pic_irq_handler(void *opaque, int irq, int level)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint64_t mask = 1ULL << irq;
assert(irq < s->irq_num);
@@ -78,7 +74,7 @@ static void pch_pic_irq_handler(void *opaque, int irq, int level)
static uint64_t loongarch_pch_pic_low_readw(void *opaque, hwaddr addr,
unsigned size)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint64_t val = 0;
uint32_t offset = addr & 0xfff;
@@ -136,7 +132,7 @@ static uint64_t get_writew_val(uint64_t value, uint32_t target, bool hi)
static void loongarch_pch_pic_low_writew(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint32_t offset, old_valid, data = (uint32_t)value;
uint64_t old, int_mask;
offset = addr & 0xfff;
@@ -208,7 +204,7 @@ static void loongarch_pch_pic_low_writew(void *opaque, hwaddr addr,
static uint64_t loongarch_pch_pic_high_readw(void *opaque, hwaddr addr,
unsigned size)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint64_t val = 0;
uint32_t offset = addr & 0xfff;
@@ -236,7 +232,7 @@ static uint64_t loongarch_pch_pic_high_readw(void *opaque, hwaddr addr,
static void loongarch_pch_pic_high_writew(void *opaque, hwaddr addr,
uint64_t value, unsigned size)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint32_t offset, data = (uint32_t)value;
offset = addr & 0xfff;
@@ -263,7 +259,7 @@ static void loongarch_pch_pic_high_writew(void *opaque, hwaddr addr,
static uint64_t loongarch_pch_pic_readb(void *opaque, hwaddr addr,
unsigned size)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint64_t val = 0;
uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET;
int64_t offset_tmp;
@@ -292,7 +288,7 @@ static uint64_t loongarch_pch_pic_readb(void *opaque, hwaddr addr,
static void loongarch_pch_pic_writeb(void *opaque, hwaddr addr,
uint64_t data, unsigned size)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
int32_t offset_tmp;
uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET;
@@ -360,7 +356,7 @@ static const MemoryRegionOps loongarch_pch_pic_reg8_ops = {
static void loongarch_pch_pic_reset(DeviceState *d)
{
- LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(d);
+ LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(d);
int i;
s->int_mask = -1;
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 9a635d1d3d..43a3e0d4d4 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -894,7 +894,7 @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)
/* Add Extend I/O Interrupt Controller node */
fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle);
- pch_pic = qdev_new(TYPE_LOONGARCH_PCH_PIC);
+ pch_pic = qdev_new(TYPE_LOONGARCH_PIC);
num = VIRT_PCH_PIC_IRQ_NUM;
qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num);
d = SYS_BUS_DEVICE(pch_pic);
diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h
index f84be0ac62..481cc58aed 100644
--- a/include/hw/intc/loongarch_pch_pic.h
+++ b/include/hw/intc/loongarch_pch_pic.h
@@ -24,8 +24,4 @@ struct LoongarchPICClass {
DeviceRealize parent_realize;
};
-#define TYPE_LOONGARCH_PCH_PIC TYPE_LOONGARCH_PIC
-typedef struct LoongArchPICCommonState LoongArchPCHPIC;
-#define LOONGARCH_PCH_PIC(obj) ((struct LoongArchPICCommonState *)(obj))
-
#endif /* HW_LOONGARCH_PCH_PIC_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 09/18] include: Add loongarch_extioi_common header file
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (7 preceding siblings ...)
2024-12-19 7:54 ` [PULL 08/18] hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 10/18] include: Move struct LoongArchExtIOI to header file loongarch_extioi_common Bibo Mao
` (6 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Add common header file include/hw/intc/loongarch_extioi_common.h, and
move some macro definition from include/hw/intc/loongarch_extioi.h to
the common header file.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
include/hw/intc/loongarch_extioi.h | 50 +------------------
include/hw/intc/loongarch_extioi_common.h | 58 +++++++++++++++++++++++
2 files changed, 59 insertions(+), 49 deletions(-)
create mode 100644 include/hw/intc/loongarch_extioi_common.h
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index 626a37dfa1..b1f87cd246 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -5,58 +5,10 @@
* Copyright (C) 2021 Loongson Technology Corporation Limited
*/
-#include "hw/sysbus.h"
-#include "hw/loongarch/virt.h"
-
#ifndef LOONGARCH_EXTIOI_H
#define LOONGARCH_EXTIOI_H
-#define LS3A_INTC_IP 8
-#define EXTIOI_IRQS (256)
-#define EXTIOI_IRQS_BITMAP_SIZE (256 / 8)
-/* irq from EXTIOI is routed to no more than 4 cpus */
-#define EXTIOI_CPUS (4)
-/* map to ipnum per 32 irqs */
-#define EXTIOI_IRQS_IPMAP_SIZE (256 / 32)
-#define EXTIOI_IRQS_COREMAP_SIZE 256
-#define EXTIOI_IRQS_NODETYPE_COUNT 16
-#define EXTIOI_IRQS_GROUP_COUNT 8
-
-#define APIC_OFFSET 0x400
-#define APIC_BASE (0x1000ULL + APIC_OFFSET)
-
-#define EXTIOI_NODETYPE_START (0x4a0 - APIC_OFFSET)
-#define EXTIOI_NODETYPE_END (0x4c0 - APIC_OFFSET)
-#define EXTIOI_IPMAP_START (0x4c0 - APIC_OFFSET)
-#define EXTIOI_IPMAP_END (0x4c8 - APIC_OFFSET)
-#define EXTIOI_ENABLE_START (0x600 - APIC_OFFSET)
-#define EXTIOI_ENABLE_END (0x620 - APIC_OFFSET)
-#define EXTIOI_BOUNCE_START (0x680 - APIC_OFFSET)
-#define EXTIOI_BOUNCE_END (0x6a0 - APIC_OFFSET)
-#define EXTIOI_ISR_START (0x700 - APIC_OFFSET)
-#define EXTIOI_ISR_END (0x720 - APIC_OFFSET)
-#define EXTIOI_COREISR_START (0x800 - APIC_OFFSET)
-#define EXTIOI_COREISR_END (0xB20 - APIC_OFFSET)
-#define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET)
-#define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET)
-#define EXTIOI_SIZE 0x800
-
-#define EXTIOI_VIRT_BASE (0x40000000)
-#define EXTIOI_VIRT_SIZE (0x1000)
-#define EXTIOI_VIRT_FEATURES (0x0)
-#define EXTIOI_HAS_VIRT_EXTENSION (0)
-#define EXTIOI_HAS_ENABLE_OPTION (1)
-#define EXTIOI_HAS_INT_ENCODE (2)
-#define EXTIOI_HAS_CPU_ENCODE (3)
-#define EXTIOI_VIRT_HAS_FEATURES (BIT(EXTIOI_HAS_VIRT_EXTENSION) \
- | BIT(EXTIOI_HAS_ENABLE_OPTION) \
- | BIT(EXTIOI_HAS_CPU_ENCODE))
-#define EXTIOI_VIRT_CONFIG (0x4)
-#define EXTIOI_ENABLE (1)
-#define EXTIOI_ENABLE_INT_ENCODE (2)
-#define EXTIOI_ENABLE_CPU_ENCODE (3)
-#define EXTIOI_VIRT_COREMAP_START (0x40)
-#define EXTIOI_VIRT_COREMAP_END (0x240)
+#include "hw/intc/loongarch_extioi_common.h"
typedef struct ExtIOICore {
uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h
new file mode 100644
index 0000000000..09e2b760f3
--- /dev/null
+++ b/include/hw/intc/loongarch_extioi_common.h
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * LoongArch 3A5000 ext interrupt controller definitions
+ * Copyright (C) 2024 Loongson Technology Corporation Limited
+ */
+
+#ifndef LOONGARCH_EXTIOI_COMMON_H
+#define LOONGARCH_EXTIOI_COMMON_H
+
+#include "hw/sysbus.h"
+#include "hw/loongarch/virt.h"
+
+#define LS3A_INTC_IP 8
+#define EXTIOI_IRQS (256)
+#define EXTIOI_IRQS_BITMAP_SIZE (256 / 8)
+/* irq from EXTIOI is routed to no more than 4 cpus */
+#define EXTIOI_CPUS (4)
+/* map to ipnum per 32 irqs */
+#define EXTIOI_IRQS_IPMAP_SIZE (256 / 32)
+#define EXTIOI_IRQS_COREMAP_SIZE 256
+#define EXTIOI_IRQS_NODETYPE_COUNT 16
+#define EXTIOI_IRQS_GROUP_COUNT 8
+
+#define APIC_OFFSET 0x400
+#define APIC_BASE (0x1000ULL + APIC_OFFSET)
+#define EXTIOI_NODETYPE_START (0x4a0 - APIC_OFFSET)
+#define EXTIOI_NODETYPE_END (0x4c0 - APIC_OFFSET)
+#define EXTIOI_IPMAP_START (0x4c0 - APIC_OFFSET)
+#define EXTIOI_IPMAP_END (0x4c8 - APIC_OFFSET)
+#define EXTIOI_ENABLE_START (0x600 - APIC_OFFSET)
+#define EXTIOI_ENABLE_END (0x620 - APIC_OFFSET)
+#define EXTIOI_BOUNCE_START (0x680 - APIC_OFFSET)
+#define EXTIOI_BOUNCE_END (0x6a0 - APIC_OFFSET)
+#define EXTIOI_ISR_START (0x700 - APIC_OFFSET)
+#define EXTIOI_ISR_END (0x720 - APIC_OFFSET)
+#define EXTIOI_COREISR_START (0x800 - APIC_OFFSET)
+#define EXTIOI_COREISR_END (0xB20 - APIC_OFFSET)
+#define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET)
+#define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET)
+#define EXTIOI_SIZE 0x800
+
+#define EXTIOI_VIRT_BASE (0x40000000)
+#define EXTIOI_VIRT_SIZE (0x1000)
+#define EXTIOI_VIRT_FEATURES (0x0)
+#define EXTIOI_HAS_VIRT_EXTENSION (0)
+#define EXTIOI_HAS_ENABLE_OPTION (1)
+#define EXTIOI_HAS_INT_ENCODE (2)
+#define EXTIOI_HAS_CPU_ENCODE (3)
+#define EXTIOI_VIRT_HAS_FEATURES (BIT(EXTIOI_HAS_VIRT_EXTENSION) \
+ | BIT(EXTIOI_HAS_ENABLE_OPTION) \
+ | BIT(EXTIOI_HAS_CPU_ENCODE))
+#define EXTIOI_VIRT_CONFIG (0x4)
+#define EXTIOI_ENABLE (1)
+#define EXTIOI_ENABLE_INT_ENCODE (2)
+#define EXTIOI_ENABLE_CPU_ENCODE (3)
+#define EXTIOI_VIRT_COREMAP_START (0x40)
+#define EXTIOI_VIRT_COREMAP_END (0x240)
+#endif /* LOONGARCH_EXTIOI_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 10/18] include: Move struct LoongArchExtIOI to header file loongarch_extioi_common
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (8 preceding siblings ...)
2024-12-19 7:54 ` [PULL 09/18] include: Add loongarch_extioi_common header file Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 11/18] include: Rename LoongArchExtIOI with LoongArchExtIOICommonState Bibo Mao
` (5 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Move definiton of structure LoongArchExtIOI from header file loongarch_extioi.h
to file loongarch_extioi_common.h.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
include/hw/intc/loongarch_extioi.h | 26 ----------------------
include/hw/intc/loongarch_extioi_common.h | 27 +++++++++++++++++++++++
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index b1f87cd246..64924f5a0a 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -10,32 +10,6 @@
#include "hw/intc/loongarch_extioi_common.h"
-typedef struct ExtIOICore {
- uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
- DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS);
- qemu_irq parent_irq[LS3A_INTC_IP];
-} ExtIOICore;
-
#define TYPE_LOONGARCH_EXTIOI "loongarch.extioi"
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchExtIOI, LOONGARCH_EXTIOI)
-struct LoongArchExtIOI {
- SysBusDevice parent_obj;
- uint32_t num_cpu;
- uint32_t features;
- uint32_t status;
- /* hardware state */
- uint32_t nodetype[EXTIOI_IRQS_NODETYPE_COUNT / 2];
- uint32_t bounce[EXTIOI_IRQS_GROUP_COUNT];
- uint32_t isr[EXTIOI_IRQS / 32];
- uint32_t enable[EXTIOI_IRQS / 32];
- uint32_t ipmap[EXTIOI_IRQS_IPMAP_SIZE / 4];
- uint32_t coremap[EXTIOI_IRQS / 4];
- uint32_t sw_pending[EXTIOI_IRQS / 32];
- uint8_t sw_ipmap[EXTIOI_IRQS_IPMAP_SIZE];
- uint8_t sw_coremap[EXTIOI_IRQS];
- qemu_irq irq[EXTIOI_IRQS];
- ExtIOICore *cpu;
- MemoryRegion extioi_system_mem;
- MemoryRegion virt_extend;
-};
#endif /* LOONGARCH_EXTIOI_H */
diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h
index 09e2b760f3..1eb8780549 100644
--- a/include/hw/intc/loongarch_extioi_common.h
+++ b/include/hw/intc/loongarch_extioi_common.h
@@ -55,4 +55,31 @@
#define EXTIOI_ENABLE_CPU_ENCODE (3)
#define EXTIOI_VIRT_COREMAP_START (0x40)
#define EXTIOI_VIRT_COREMAP_END (0x240)
+
+typedef struct ExtIOICore {
+ uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
+ DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS);
+ qemu_irq parent_irq[LS3A_INTC_IP];
+} ExtIOICore;
+
+struct LoongArchExtIOI {
+ SysBusDevice parent_obj;
+ uint32_t num_cpu;
+ uint32_t features;
+ uint32_t status;
+ /* hardware state */
+ uint32_t nodetype[EXTIOI_IRQS_NODETYPE_COUNT / 2];
+ uint32_t bounce[EXTIOI_IRQS_GROUP_COUNT];
+ uint32_t isr[EXTIOI_IRQS / 32];
+ uint32_t enable[EXTIOI_IRQS / 32];
+ uint32_t ipmap[EXTIOI_IRQS_IPMAP_SIZE / 4];
+ uint32_t coremap[EXTIOI_IRQS / 4];
+ uint32_t sw_pending[EXTIOI_IRQS / 32];
+ uint8_t sw_ipmap[EXTIOI_IRQS_IPMAP_SIZE];
+ uint8_t sw_coremap[EXTIOI_IRQS];
+ qemu_irq irq[EXTIOI_IRQS];
+ ExtIOICore *cpu;
+ MemoryRegion extioi_system_mem;
+ MemoryRegion virt_extend;
+};
#endif /* LOONGARCH_EXTIOI_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 11/18] include: Rename LoongArchExtIOI with LoongArchExtIOICommonState
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (9 preceding siblings ...)
2024-12-19 7:54 ` [PULL 10/18] include: Move struct LoongArchExtIOI to header file loongarch_extioi_common Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 12/18] hw/intc/loongarch_extioi: " Bibo Mao
` (4 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Rename structure LoongArchExtIOI with LoongArchExtIOICommonState,
since it is defined in file loongarch_extioi_common.h
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
include/hw/intc/loongarch_extioi.h | 1 +
include/hw/intc/loongarch_extioi_common.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index 64924f5a0a..d6747046b4 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -10,6 +10,7 @@
#include "hw/intc/loongarch_extioi_common.h"
+#define LoongArchExtIOI LoongArchExtIOICommonState
#define TYPE_LOONGARCH_EXTIOI "loongarch.extioi"
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchExtIOI, LOONGARCH_EXTIOI)
#endif /* LOONGARCH_EXTIOI_H */
diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h
index 1eb8780549..51243b8092 100644
--- a/include/hw/intc/loongarch_extioi_common.h
+++ b/include/hw/intc/loongarch_extioi_common.h
@@ -62,7 +62,7 @@ typedef struct ExtIOICore {
qemu_irq parent_irq[LS3A_INTC_IP];
} ExtIOICore;
-struct LoongArchExtIOI {
+struct LoongArchExtIOICommonState {
SysBusDevice parent_obj;
uint32_t num_cpu;
uint32_t features;
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 12/18] hw/intc/loongarch_extioi: Rename LoongArchExtIOI with LoongArchExtIOICommonState
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (10 preceding siblings ...)
2024-12-19 7:54 ` [PULL 11/18] include: Rename LoongArchExtIOI with LoongArchExtIOICommonState Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 13/18] hw/intc/loongarch_extioi: Add common realize interface Bibo Mao
` (3 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
With some structure such as vmstate and property, rename LoongArchExtIOI
with LoongArchExtIOICommonState, these common structure will be moved
to common file.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi.c | 41 +++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index dd91f89361..039fc4dd1e 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -391,6 +391,11 @@ static int vmstate_extioi_post_load(void *opaque, int version_id)
return 0;
}
+static int loongarch_extioi_common_post_load(void *opaque, int version_id)
+{
+ return vmstate_extioi_post_load(opaque, version_id);
+}
+
static const VMStateDescription vmstate_extioi_core = {
.name = "extioi-core",
.version_id = 1,
@@ -402,31 +407,35 @@ static const VMStateDescription vmstate_extioi_core = {
};
static const VMStateDescription vmstate_loongarch_extioi = {
- .name = TYPE_LOONGARCH_EXTIOI,
+ .name = "loongarch.extioi",
.version_id = 3,
.minimum_version_id = 3,
- .post_load = vmstate_extioi_post_load,
+ .post_load = loongarch_extioi_common_post_load,
.fields = (const VMStateField[]) {
- VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOI, EXTIOI_IRQS_GROUP_COUNT),
- VMSTATE_UINT32_ARRAY(nodetype, LoongArchExtIOI,
+ VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOICommonState,
+ EXTIOI_IRQS_GROUP_COUNT),
+ VMSTATE_UINT32_ARRAY(nodetype, LoongArchExtIOICommonState,
EXTIOI_IRQS_NODETYPE_COUNT / 2),
- VMSTATE_UINT32_ARRAY(enable, LoongArchExtIOI, EXTIOI_IRQS / 32),
- VMSTATE_UINT32_ARRAY(isr, LoongArchExtIOI, EXTIOI_IRQS / 32),
- VMSTATE_UINT32_ARRAY(ipmap, LoongArchExtIOI, EXTIOI_IRQS_IPMAP_SIZE / 4),
- VMSTATE_UINT32_ARRAY(coremap, LoongArchExtIOI, EXTIOI_IRQS / 4),
-
- VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongArchExtIOI, num_cpu,
- vmstate_extioi_core, ExtIOICore),
- VMSTATE_UINT32(features, LoongArchExtIOI),
- VMSTATE_UINT32(status, LoongArchExtIOI),
+ VMSTATE_UINT32_ARRAY(enable, LoongArchExtIOICommonState,
+ EXTIOI_IRQS / 32),
+ VMSTATE_UINT32_ARRAY(isr, LoongArchExtIOICommonState,
+ EXTIOI_IRQS / 32),
+ VMSTATE_UINT32_ARRAY(ipmap, LoongArchExtIOICommonState,
+ EXTIOI_IRQS_IPMAP_SIZE / 4),
+ VMSTATE_UINT32_ARRAY(coremap, LoongArchExtIOICommonState,
+ EXTIOI_IRQS / 4),
+ VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongArchExtIOICommonState,
+ num_cpu, vmstate_extioi_core, ExtIOICore),
+ VMSTATE_UINT32(features, LoongArchExtIOICommonState),
+ VMSTATE_UINT32(status, LoongArchExtIOICommonState),
VMSTATE_END_OF_LIST()
}
};
static const Property extioi_properties[] = {
- DEFINE_PROP_UINT32("num-cpu", LoongArchExtIOI, num_cpu, 1),
- DEFINE_PROP_BIT("has-virtualization-extension", LoongArchExtIOI, features,
- EXTIOI_HAS_VIRT_EXTENSION, 0),
+ DEFINE_PROP_UINT32("num-cpu", LoongArchExtIOICommonState, num_cpu, 1),
+ DEFINE_PROP_BIT("has-virtualization-extension", LoongArchExtIOICommonState,
+ features, EXTIOI_HAS_VIRT_EXTENSION, 0),
DEFINE_PROP_END_OF_LIST(),
};
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 13/18] hw/intc/loongarch_extioi: Add common realize interface
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (11 preceding siblings ...)
2024-12-19 7:54 ` [PULL 12/18] hw/intc/loongarch_extioi: " Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 7:54 ` [PULL 14/18] hw/intc/loongarch_extioi: Add unrealize interface Bibo Mao
` (2 subsequent siblings)
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Add common realize function, it is only to check validity of property.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index 039fc4dd1e..dcc278a214 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -318,14 +318,26 @@ static const MemoryRegionOps extioi_virt_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
+static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
+{
+ LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)dev;
+
+ if (s->num_cpu == 0) {
+ error_setg(errp, "num-cpu must be at least 1");
+ return;
+ }
+}
+
static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
{
LoongArchExtIOI *s = LOONGARCH_EXTIOI(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ Error *local_err = NULL;
int i, pin;
- if (s->num_cpu == 0) {
- error_setg(errp, "num-cpu must be at least 1");
+ loongarch_extioi_common_realize(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 14/18] hw/intc/loongarch_extioi: Add unrealize interface
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (12 preceding siblings ...)
2024-12-19 7:54 ` [PULL 13/18] hw/intc/loongarch_extioi: Add common realize interface Bibo Mao
@ 2024-12-19 7:54 ` Bibo Mao
2024-12-19 8:07 ` [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common Bibo Mao
2024-12-20 16:20 ` [PULL 00/18] loongarch-to-apply queue Stefan Hajnoczi
15 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 7:54 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
For loongarch extioi emulation driver, add unrealize interface and
remove instance_finalize interface and move the code to unrealize
interface.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index dcc278a214..d759b7f57d 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -372,9 +372,9 @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
}
}
-static void loongarch_extioi_finalize(Object *obj)
+static void loongarch_extioi_unrealize(DeviceState *dev)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(obj);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI(dev);
g_free(s->cpu);
}
@@ -456,6 +456,7 @@ static void loongarch_extioi_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = loongarch_extioi_realize;
+ dc->unrealize = loongarch_extioi_unrealize;
device_class_set_legacy_reset(dc, loongarch_extioi_reset);
device_class_set_props(dc, extioi_properties);
dc->vmsd = &vmstate_loongarch_extioi;
@@ -466,7 +467,6 @@ static const TypeInfo loongarch_extioi_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct LoongArchExtIOI),
.class_init = loongarch_extioi_class_init,
- .instance_finalize = loongarch_extioi_finalize,
};
static void loongarch_extioi_register_types(void)
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (13 preceding siblings ...)
2024-12-19 7:54 ` [PULL 14/18] hw/intc/loongarch_extioi: Add unrealize interface Bibo Mao
@ 2024-12-19 8:07 ` Bibo Mao
2024-12-19 8:07 ` [PULL 16/18] hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common Bibo Mao
` (2 more replies)
2024-12-20 16:20 ` [PULL 00/18] loongarch-to-apply queue Stefan Hajnoczi
15 siblings, 3 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 8:07 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Add new common file loongarch_extioi_common.c, and move vmstate
and property structure to common file.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi.c | 59 +----------------------------
hw/intc/loongarch_extioi_common.c | 63 +++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 57 deletions(-)
create mode 100644 hw/intc/loongarch_extioi_common.c
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index d759b7f57d..d7471ff165 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -318,15 +318,8 @@ static const MemoryRegionOps extioi_virt_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
-{
- LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)dev;
-
- if (s->num_cpu == 0) {
- error_setg(errp, "num-cpu must be at least 1");
- return;
- }
-}
+static int vmstate_extioi_post_load(void *opaque, int version_id);
+#include "loongarch_extioi_common.c"
static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
{
@@ -403,54 +396,6 @@ static int vmstate_extioi_post_load(void *opaque, int version_id)
return 0;
}
-static int loongarch_extioi_common_post_load(void *opaque, int version_id)
-{
- return vmstate_extioi_post_load(opaque, version_id);
-}
-
-static const VMStateDescription vmstate_extioi_core = {
- .name = "extioi-core",
- .version_id = 1,
- .minimum_version_id = 1,
- .fields = (const VMStateField[]) {
- VMSTATE_UINT32_ARRAY(coreisr, ExtIOICore, EXTIOI_IRQS_GROUP_COUNT),
- VMSTATE_END_OF_LIST()
- }
-};
-
-static const VMStateDescription vmstate_loongarch_extioi = {
- .name = "loongarch.extioi",
- .version_id = 3,
- .minimum_version_id = 3,
- .post_load = loongarch_extioi_common_post_load,
- .fields = (const VMStateField[]) {
- VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOICommonState,
- EXTIOI_IRQS_GROUP_COUNT),
- VMSTATE_UINT32_ARRAY(nodetype, LoongArchExtIOICommonState,
- EXTIOI_IRQS_NODETYPE_COUNT / 2),
- VMSTATE_UINT32_ARRAY(enable, LoongArchExtIOICommonState,
- EXTIOI_IRQS / 32),
- VMSTATE_UINT32_ARRAY(isr, LoongArchExtIOICommonState,
- EXTIOI_IRQS / 32),
- VMSTATE_UINT32_ARRAY(ipmap, LoongArchExtIOICommonState,
- EXTIOI_IRQS_IPMAP_SIZE / 4),
- VMSTATE_UINT32_ARRAY(coremap, LoongArchExtIOICommonState,
- EXTIOI_IRQS / 4),
- VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongArchExtIOICommonState,
- num_cpu, vmstate_extioi_core, ExtIOICore),
- VMSTATE_UINT32(features, LoongArchExtIOICommonState),
- VMSTATE_UINT32(status, LoongArchExtIOICommonState),
- VMSTATE_END_OF_LIST()
- }
-};
-
-static const Property extioi_properties[] = {
- DEFINE_PROP_UINT32("num-cpu", LoongArchExtIOICommonState, num_cpu, 1),
- DEFINE_PROP_BIT("has-virtualization-extension", LoongArchExtIOICommonState,
- features, EXTIOI_HAS_VIRT_EXTENSION, 0),
- DEFINE_PROP_END_OF_LIST(),
-};
-
static void loongarch_extioi_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
new file mode 100644
index 0000000000..6c8366a5e5
--- /dev/null
+++ b/hw/intc/loongarch_extioi_common.c
@@ -0,0 +1,63 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Loongson extioi interrupt controller emulation
+ * Copyright (C) 2024 Loongson Technology Corporation Limited
+ */
+
+static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
+{
+ LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)dev;
+
+ if (s->num_cpu == 0) {
+ error_setg(errp, "num-cpu must be at least 1");
+ return;
+ }
+}
+
+static int loongarch_extioi_common_post_load(void *opaque, int version_id)
+{
+ return vmstate_extioi_post_load(opaque, version_id);
+}
+
+static const VMStateDescription vmstate_extioi_core = {
+ .name = "extioi-core",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (const VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(coreisr, ExtIOICore, EXTIOI_IRQS_GROUP_COUNT),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static const VMStateDescription vmstate_loongarch_extioi = {
+ .name = "loongarch.extioi",
+ .version_id = 3,
+ .minimum_version_id = 3,
+ .post_load = loongarch_extioi_common_post_load,
+ .fields = (const VMStateField[]) {
+ VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOICommonState,
+ EXTIOI_IRQS_GROUP_COUNT),
+ VMSTATE_UINT32_ARRAY(nodetype, LoongArchExtIOICommonState,
+ EXTIOI_IRQS_NODETYPE_COUNT / 2),
+ VMSTATE_UINT32_ARRAY(enable, LoongArchExtIOICommonState,
+ EXTIOI_IRQS / 32),
+ VMSTATE_UINT32_ARRAY(isr, LoongArchExtIOICommonState,
+ EXTIOI_IRQS / 32),
+ VMSTATE_UINT32_ARRAY(ipmap, LoongArchExtIOICommonState,
+ EXTIOI_IRQS_IPMAP_SIZE / 4),
+ VMSTATE_UINT32_ARRAY(coremap, LoongArchExtIOICommonState,
+ EXTIOI_IRQS / 4),
+ VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongArchExtIOICommonState,
+ num_cpu, vmstate_extioi_core, ExtIOICore),
+ VMSTATE_UINT32(features, LoongArchExtIOICommonState),
+ VMSTATE_UINT32(status, LoongArchExtIOICommonState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static const Property extioi_properties[] = {
+ DEFINE_PROP_UINT32("num-cpu", LoongArchExtIOICommonState, num_cpu, 1),
+ DEFINE_PROP_BIT("has-virtualization-extension", LoongArchExtIOICommonState,
+ features, EXTIOI_HAS_VIRT_EXTENSION, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 16/18] hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common
2024-12-19 8:07 ` [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common Bibo Mao
@ 2024-12-19 8:07 ` Bibo Mao
2024-12-19 8:07 ` [PULL 17/18] hw/intc/loongarch_extioi: Add pre_save interface Bibo Mao
2024-12-19 8:07 ` [PULL 18/18] hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi Bibo Mao
2 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 8:07 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Set TYPE_LOONGARCH_EXTIOI inherit from TYPE_LOONGARCH_EXTIOI_COMMON
object, it shares vmsate and property of TYPE_LOONGARCH_EXTIOI_COMMON,
and has its own realize() function.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi.c | 39 +++++++++++------------
hw/intc/loongarch_extioi_common.c | 39 ++++++++++++++++++++++-
hw/intc/meson.build | 2 +-
include/hw/intc/loongarch_extioi.h | 17 ++++++++--
include/hw/intc/loongarch_extioi_common.h | 12 +++++++
5 files changed, 85 insertions(+), 24 deletions(-)
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index d7471ff165..c4d77a321f 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -318,17 +318,15 @@ static const MemoryRegionOps extioi_virt_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-static int vmstate_extioi_post_load(void *opaque, int version_id);
-#include "loongarch_extioi_common.c"
-
static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(dev);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(dev);
+ LoongArchExtIOIClass *lec = LOONGARCH_EXTIOI_GET_CLASS(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
Error *local_err = NULL;
int i, pin;
- loongarch_extioi_common_realize(dev, &local_err);
+ lec->parent_realize(dev, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -399,24 +397,25 @@ static int vmstate_extioi_post_load(void *opaque, int version_id)
static void loongarch_extioi_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ LoongArchExtIOIClass *lec = LOONGARCH_EXTIOI_CLASS(klass);
+ LoongArchExtIOICommonClass *lecc = LOONGARCH_EXTIOI_COMMON_CLASS(klass);
- dc->realize = loongarch_extioi_realize;
- dc->unrealize = loongarch_extioi_unrealize;
+ device_class_set_parent_realize(dc, loongarch_extioi_realize,
+ &lec->parent_realize);
+ device_class_set_parent_unrealize(dc, loongarch_extioi_unrealize,
+ &lec->parent_unrealize);
device_class_set_legacy_reset(dc, loongarch_extioi_reset);
- device_class_set_props(dc, extioi_properties);
- dc->vmsd = &vmstate_loongarch_extioi;
+ lecc->post_load = vmstate_extioi_post_load;
}
-static const TypeInfo loongarch_extioi_info = {
- .name = TYPE_LOONGARCH_EXTIOI,
- .parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(struct LoongArchExtIOI),
- .class_init = loongarch_extioi_class_init,
+static const TypeInfo loongarch_extioi_types[] = {
+ {
+ .name = TYPE_LOONGARCH_EXTIOI,
+ .parent = TYPE_LOONGARCH_EXTIOI_COMMON,
+ .instance_size = sizeof(LoongArchExtIOIState),
+ .class_size = sizeof(LoongArchExtIOIClass),
+ .class_init = loongarch_extioi_class_init,
+ }
};
-static void loongarch_extioi_register_types(void)
-{
- type_register_static(&loongarch_extioi_info);
-}
-
-type_init(loongarch_extioi_register_types)
+DEFINE_TYPES(loongarch_extioi_types)
diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
index 6c8366a5e5..428d105f78 100644
--- a/hw/intc/loongarch_extioi_common.c
+++ b/hw/intc/loongarch_extioi_common.c
@@ -3,6 +3,12 @@
* Loongson extioi interrupt controller emulation
* Copyright (C) 2024 Loongson Technology Corporation Limited
*/
+#include "qemu/osdep.h"
+#include "qemu/module.h"
+#include "qapi/error.h"
+#include "hw/qdev-properties.h"
+#include "hw/intc/loongarch_extioi_common.h"
+#include "migration/vmstate.h"
static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
{
@@ -16,7 +22,14 @@ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
static int loongarch_extioi_common_post_load(void *opaque, int version_id)
{
- return vmstate_extioi_post_load(opaque, version_id);
+ LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)opaque;
+ LoongArchExtIOICommonClass *lecc = LOONGARCH_EXTIOI_COMMON_GET_CLASS(s);
+
+ if (lecc->post_load) {
+ return lecc->post_load(s, version_id);
+ }
+
+ return 0;
}
static const VMStateDescription vmstate_extioi_core = {
@@ -61,3 +74,27 @@ static const Property extioi_properties[] = {
features, EXTIOI_HAS_VIRT_EXTENSION, 0),
DEFINE_PROP_END_OF_LIST(),
};
+
+static void loongarch_extioi_common_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ LoongArchExtIOICommonClass *lecc = LOONGARCH_EXTIOI_COMMON_CLASS(klass);
+
+ device_class_set_parent_realize(dc, loongarch_extioi_common_realize,
+ &lecc->parent_realize);
+ device_class_set_props(dc, extioi_properties);
+ dc->vmsd = &vmstate_loongarch_extioi;
+}
+
+static const TypeInfo loongarch_extioi_common_types[] = {
+ {
+ .name = TYPE_LOONGARCH_EXTIOI_COMMON,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(LoongArchExtIOICommonState),
+ .class_size = sizeof(LoongArchExtIOICommonClass),
+ .class_init = loongarch_extioi_common_class_init,
+ .abstract = true,
+ }
+};
+
+DEFINE_TYPES(loongarch_extioi_common_types)
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index 848cb6685e..510fdfb688 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -73,4 +73,4 @@ specific_ss.add(when: 'CONFIG_LOONGSON_IPI', if_true: files('loongson_ipi.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_IPI', if_true: files('loongarch_ipi.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c', 'loongarch_pic_common.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_MSI', if_true: files('loongarch_pch_msi.c'))
-specific_ss.add(when: 'CONFIG_LOONGARCH_EXTIOI', if_true: files('loongarch_extioi.c'))
+specific_ss.add(when: 'CONFIG_LOONGARCH_EXTIOI', if_true: files('loongarch_extioi.c', 'loongarch_extioi_common.c'))
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index d6747046b4..cc160c52dc 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -10,7 +10,20 @@
#include "hw/intc/loongarch_extioi_common.h"
-#define LoongArchExtIOI LoongArchExtIOICommonState
#define TYPE_LOONGARCH_EXTIOI "loongarch.extioi"
-OBJECT_DECLARE_SIMPLE_TYPE(LoongArchExtIOI, LOONGARCH_EXTIOI)
+OBJECT_DECLARE_TYPE(LoongArchExtIOIState, LoongArchExtIOIClass, LOONGARCH_EXTIOI)
+
+struct LoongArchExtIOIState {
+ LoongArchExtIOICommonState parent_obj;
+};
+
+struct LoongArchExtIOIClass {
+ LoongArchExtIOICommonClass parent_class;
+
+ DeviceRealize parent_realize;
+ DeviceUnrealize parent_unrealize;
+};
+
+#define LoongArchExtIOI LoongArchExtIOICommonState
+#define LOONGARCH_EXTIOI(obj) ((LoongArchExtIOICommonState *)obj)
#endif /* LOONGARCH_EXTIOI_H */
diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h
index 51243b8092..d45caa45f2 100644
--- a/include/hw/intc/loongarch_extioi_common.h
+++ b/include/hw/intc/loongarch_extioi_common.h
@@ -7,6 +7,7 @@
#ifndef LOONGARCH_EXTIOI_COMMON_H
#define LOONGARCH_EXTIOI_COMMON_H
+#include "qom/object.h"
#include "hw/sysbus.h"
#include "hw/loongarch/virt.h"
@@ -56,6 +57,10 @@
#define EXTIOI_VIRT_COREMAP_START (0x40)
#define EXTIOI_VIRT_COREMAP_END (0x240)
+#define TYPE_LOONGARCH_EXTIOI_COMMON "loongarch_extioi_common"
+OBJECT_DECLARE_TYPE(LoongArchExtIOICommonState,
+ LoongArchExtIOICommonClass, LOONGARCH_EXTIOI_COMMON)
+
typedef struct ExtIOICore {
uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT];
DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS);
@@ -82,4 +87,11 @@ struct LoongArchExtIOICommonState {
MemoryRegion extioi_system_mem;
MemoryRegion virt_extend;
};
+
+struct LoongArchExtIOICommonClass {
+ SysBusDeviceClass parent_class;
+
+ DeviceRealize parent_realize;
+ int (*post_load)(void *s, int version_id);
+};
#endif /* LOONGARCH_EXTIOI_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 17/18] hw/intc/loongarch_extioi: Add pre_save interface
2024-12-19 8:07 ` [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common Bibo Mao
2024-12-19 8:07 ` [PULL 16/18] hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common Bibo Mao
@ 2024-12-19 8:07 ` Bibo Mao
2024-12-19 8:07 ` [PULL 18/18] hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi Bibo Mao
2 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 8:07 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Add vmstate pre_save interface, which can be used extioi kvm driver
in future.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi_common.c | 13 +++++++++++++
include/hw/intc/loongarch_extioi_common.h | 1 +
2 files changed, 14 insertions(+)
diff --git a/hw/intc/loongarch_extioi_common.c b/hw/intc/loongarch_extioi_common.c
index 428d105f78..e50431f124 100644
--- a/hw/intc/loongarch_extioi_common.c
+++ b/hw/intc/loongarch_extioi_common.c
@@ -20,6 +20,18 @@ static void loongarch_extioi_common_realize(DeviceState *dev, Error **errp)
}
}
+static int loongarch_extioi_common_pre_save(void *opaque)
+{
+ LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)opaque;
+ LoongArchExtIOICommonClass *lecc = LOONGARCH_EXTIOI_COMMON_GET_CLASS(s);
+
+ if (lecc->pre_save) {
+ return lecc->pre_save(s);
+ }
+
+ return 0;
+}
+
static int loongarch_extioi_common_post_load(void *opaque, int version_id)
{
LoongArchExtIOICommonState *s = (LoongArchExtIOICommonState *)opaque;
@@ -46,6 +58,7 @@ static const VMStateDescription vmstate_loongarch_extioi = {
.name = "loongarch.extioi",
.version_id = 3,
.minimum_version_id = 3,
+ .pre_save = loongarch_extioi_common_pre_save,
.post_load = loongarch_extioi_common_post_load,
.fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOICommonState,
diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h
index d45caa45f2..f6bc778a85 100644
--- a/include/hw/intc/loongarch_extioi_common.h
+++ b/include/hw/intc/loongarch_extioi_common.h
@@ -92,6 +92,7 @@ struct LoongArchExtIOICommonClass {
SysBusDeviceClass parent_class;
DeviceRealize parent_realize;
+ int (*pre_save)(void *s);
int (*post_load)(void *s, int version_id);
};
#endif /* LOONGARCH_EXTIOI_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PULL 18/18] hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi
2024-12-19 8:07 ` [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common Bibo Mao
2024-12-19 8:07 ` [PULL 16/18] hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common Bibo Mao
2024-12-19 8:07 ` [PULL 17/18] hw/intc/loongarch_extioi: Add pre_save interface Bibo Mao
@ 2024-12-19 8:07 ` Bibo Mao
2 siblings, 0 replies; 26+ messages in thread
From: Bibo Mao @ 2024-12-19 8:07 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, Song Gao
Remove definition about LoongArchExtIOI and LOONGARCH_EXTIOI, and
replace them with LoongArchExtIOICommonState and macro
LOONGARCH_EXTIOI_COMMON separately. Also remove unnecessary header
files.
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
hw/intc/loongarch_extioi.c | 31 ++++++++++++++----------------
include/hw/intc/loongarch_extioi.h | 2 --
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index c4d77a321f..4a1a7c357c 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -10,16 +10,13 @@
#include "qemu/log.h"
#include "qapi/error.h"
#include "hw/irq.h"
-#include "hw/sysbus.h"
#include "hw/loongarch/virt.h"
-#include "hw/qdev-properties.h"
#include "exec/address-spaces.h"
#include "hw/intc/loongarch_extioi.h"
-#include "migration/vmstate.h"
#include "trace.h"
-static void extioi_update_irq(LoongArchExtIOI *s, int irq, int level)
+static void extioi_update_irq(LoongArchExtIOICommonState *s, int irq, int level)
{
int ipnum, cpu, found, irq_index, irq_mask;
@@ -54,7 +51,7 @@ static void extioi_update_irq(LoongArchExtIOI *s, int irq, int level)
static void extioi_setirq(void *opaque, int irq, int level)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(opaque);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
trace_loongarch_extioi_setirq(irq, level);
if (level) {
set_bit32(irq, s->isr);
@@ -67,7 +64,7 @@ static void extioi_setirq(void *opaque, int irq, int level)
static MemTxResult extioi_readw(void *opaque, hwaddr addr, uint64_t *data,
unsigned size, MemTxAttrs attrs)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(opaque);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
unsigned long offset = addr & 0xffff;
uint32_t index, cpu;
@@ -106,7 +103,7 @@ static MemTxResult extioi_readw(void *opaque, hwaddr addr, uint64_t *data,
return MEMTX_OK;
}
-static inline void extioi_enable_irq(LoongArchExtIOI *s, int index,\
+static inline void extioi_enable_irq(LoongArchExtIOICommonState *s, int index,\
uint32_t mask, int level)
{
uint32_t val;
@@ -125,8 +122,8 @@ static inline void extioi_enable_irq(LoongArchExtIOI *s, int index,\
}
}
-static inline void extioi_update_sw_coremap(LoongArchExtIOI *s, int irq,
- uint64_t val, bool notify)
+static inline void extioi_update_sw_coremap(LoongArchExtIOICommonState *s,
+ int irq, uint64_t val, bool notify)
{
int i, cpu;
@@ -162,8 +159,8 @@ static inline void extioi_update_sw_coremap(LoongArchExtIOI *s, int irq,
}
}
-static inline void extioi_update_sw_ipmap(LoongArchExtIOI *s, int index,
- uint64_t val)
+static inline void extioi_update_sw_ipmap(LoongArchExtIOICommonState *s,
+ int index, uint64_t val)
{
int i;
uint8_t ipnum;
@@ -186,7 +183,7 @@ static MemTxResult extioi_writew(void *opaque, hwaddr addr,
uint64_t val, unsigned size,
MemTxAttrs attrs)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(opaque);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
int cpu, index, old_data, irq;
uint32_t offset;
@@ -266,7 +263,7 @@ static const MemoryRegionOps extioi_ops = {
static MemTxResult extioi_virt_readw(void *opaque, hwaddr addr, uint64_t *data,
unsigned size, MemTxAttrs attrs)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(opaque);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
switch (addr) {
case EXTIOI_VIRT_FEATURES:
@@ -286,7 +283,7 @@ static MemTxResult extioi_virt_writew(void *opaque, hwaddr addr,
uint64_t val, unsigned size,
MemTxAttrs attrs)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(opaque);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
switch (addr) {
case EXTIOI_VIRT_FEATURES:
@@ -365,21 +362,21 @@ static void loongarch_extioi_realize(DeviceState *dev, Error **errp)
static void loongarch_extioi_unrealize(DeviceState *dev)
{
- LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI(dev);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(dev);
g_free(s->cpu);
}
static void loongarch_extioi_reset(DeviceState *d)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(d);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(d);
s->status = 0;
}
static int vmstate_extioi_post_load(void *opaque, int version_id)
{
- LoongArchExtIOI *s = LOONGARCH_EXTIOI(opaque);
+ LoongArchExtIOICommonState *s = LOONGARCH_EXTIOI_COMMON(opaque);
int i, start_irq;
for (i = 0; i < (EXTIOI_IRQS / 4); i++) {
diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h
index cc160c52dc..351f18afcf 100644
--- a/include/hw/intc/loongarch_extioi.h
+++ b/include/hw/intc/loongarch_extioi.h
@@ -24,6 +24,4 @@ struct LoongArchExtIOIClass {
DeviceUnrealize parent_unrealize;
};
-#define LoongArchExtIOI LoongArchExtIOICommonState
-#define LOONGARCH_EXTIOI(obj) ((LoongArchExtIOICommonState *)obj)
#endif /* LOONGARCH_EXTIOI_H */
--
2.43.5
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PULL 00/18] loongarch-to-apply queue
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
` (14 preceding siblings ...)
2024-12-19 8:07 ` [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common Bibo Mao
@ 2024-12-20 16:20 ` Stefan Hajnoczi
15 siblings, 0 replies; 26+ messages in thread
From: Stefan Hajnoczi @ 2024-12-20 16:20 UTC (permalink / raw)
To: Bibo Mao; +Cc: Stefan Hajnoczi, qemu-devel, Song Gao
[-- Attachment #1: Type: text/plain, Size: 116 bytes --]
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2024-12-20 16:27 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-19 7:54 [PULL 00/18] loongarch-to-apply queue Bibo Mao
2024-12-19 7:54 ` [PULL 01/18] include: Add loongarch_pic_common header file Bibo Mao
2024-12-19 7:54 ` [PULL 02/18] include: Move struct LoongArchPCHPIC to " Bibo Mao
2024-12-19 7:54 ` [PULL 03/18] hw/intc/loongarch_pch: Merge instance_init() into realize() Bibo Mao
2024-12-19 7:54 ` [PULL 04/18] hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState Bibo Mao
2024-12-19 7:54 ` [PULL 05/18] hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common Bibo Mao
2024-12-19 7:54 ` [PULL 06/18] hw/intc/loongarch_pch: Inherit from loongarch_pic_common Bibo Mao
2024-12-19 7:54 ` [PULL 07/18] hw/intc/loongarch_pch: Add pre_save and post_load interfaces Bibo Mao
2024-12-19 7:54 ` [PULL 08/18] hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic Bibo Mao
2024-12-19 7:54 ` [PULL 09/18] include: Add loongarch_extioi_common header file Bibo Mao
2024-12-19 7:54 ` [PULL 10/18] include: Move struct LoongArchExtIOI to header file loongarch_extioi_common Bibo Mao
2024-12-19 7:54 ` [PULL 11/18] include: Rename LoongArchExtIOI with LoongArchExtIOICommonState Bibo Mao
2024-12-19 7:54 ` [PULL 12/18] hw/intc/loongarch_extioi: " Bibo Mao
2024-12-19 7:54 ` [PULL 13/18] hw/intc/loongarch_extioi: Add common realize interface Bibo Mao
2024-12-19 7:54 ` [PULL 14/18] hw/intc/loongarch_extioi: Add unrealize interface Bibo Mao
2024-12-19 8:07 ` [PULL 15/18] hw/intc/loongarch_extioi: Add common file loongarch_extioi_common Bibo Mao
2024-12-19 8:07 ` [PULL 16/18] hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common Bibo Mao
2024-12-19 8:07 ` [PULL 17/18] hw/intc/loongarch_extioi: Add pre_save interface Bibo Mao
2024-12-19 8:07 ` [PULL 18/18] hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi Bibo Mao
2024-12-20 16:20 ` [PULL 00/18] loongarch-to-apply queue Stefan Hajnoczi
-- strict thread matches above, loose matches on Subject: below --
2024-12-16 1:55 Bibo Mao
2024-12-16 19:19 ` Stefan Hajnoczi
2024-12-18 8:55 ` bibo mao
2024-12-13 9:40 Bibo Mao
2024-12-14 13:39 ` Stefan Hajnoczi
2024-12-16 0:57 ` bibo mao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.