mbox

[PULL,00/17] aspeed queue

Message ID 20240126133217.996306-1-clg@kaod.org (mailing list archive)
State New, archived
Headers show

Pull-request

https://github.com/legoater/qemu/ tags/pull-aspeed-20240126

Message

Cédric Le Goater Jan. 26, 2024, 1:31 p.m. UTC 
The following changes since commit e029fe22caad9b75c7ab69bd4e84853c11fb71e0:

  Merge tag 'pull-qapi-2024-01-26' of https://repo.or.cz/qemu/armbru into staging (2024-01-26 10:21:27 +0000)

are available in the Git repository at:

  https://github.com/legoater/qemu/ tags/pull-aspeed-20240126

for you to fetch changes up to b40769f4b49d15485ffaaa7acade3e3593ee6daa:

  hw/fsi: Update MAINTAINER list (2024-01-26 14:22:08 +0100)

----------------------------------------------------------------
aspeed queue:

* Update of buildroot images to 2023.11 (6.6.3 kernel)
* Check of the valid CPU type supported by aspeed machines
* Simplified models for the IBM's FSI bus and the Aspeed
  controller bridge

----------------------------------------------------------------
Cédric Le Goater (1):
      tests/avocado/machine_aspeed.py: Update buildroot images to 2023.11

Ninad Palsule (11):
      hw/fsi: Introduce IBM's Local bus
      hw/fsi: Introduce IBM's scratchpad device
      hw/fsi: Introduce IBM's FSI Bus
      hw/fsi: Introduce IBM's fsi-slave model
      hw/fsi: Introduce IBM's cfam
      hw/fsi: Introduce IBM's FSI master
      hw/fsi: Aspeed APB2OPB & On-chip peripheral bus
      hw/arm: Hook up FSI module in AST2600
      hw/fsi: Added qtest
      hw/fsi: Added FSI documentation
      hw/fsi: Update MAINTAINER list

Philippe Mathieu-Daudé (5):
      hw/arm/aspeed: Remove dead code
      hw/arm/aspeed: Set default CPU count using aspeed_soc_num_cpus()
      hw/arm/aspeed: Init CPU defaults in a common helper
      hw/arm/aspeed: Introduce aspeed_soc_cpu_type() helper
      hw/arm/aspeed: Check for CPU types in machine_run_board_init()

 MAINTAINERS                     |   9 ++
 docs/specs/fsi.rst              | 122 +++++++++++++++
 docs/specs/index.rst            |   1 +
 meson.build                     |   1 +
 hw/fsi/trace.h                  |   1 +
 include/hw/arm/aspeed_soc.h     |   8 +-
 include/hw/fsi/aspeed_apb2opb.h |  46 ++++++
 include/hw/fsi/cfam.h           |  34 +++++
 include/hw/fsi/fsi-master.h     |  32 ++++
 include/hw/fsi/fsi.h            |  37 +++++
 include/hw/fsi/lbus.h           |  43 ++++++
 hw/arm/aspeed.c                 |  70 ++++-----
 hw/arm/aspeed_ast10x0.c         |   8 +-
 hw/arm/aspeed_ast2400.c         |  15 +-
 hw/arm/aspeed_ast2600.c         |  28 +++-
 hw/arm/aspeed_soc_common.c      |   8 +
 hw/fsi/aspeed_apb2opb.c         | 329 ++++++++++++++++++++++++++++++++++++++++
 hw/fsi/cfam.c                   | 168 ++++++++++++++++++++
 hw/fsi/fsi-master.c             | 170 +++++++++++++++++++++
 hw/fsi/fsi.c                    | 102 +++++++++++++
 hw/fsi/lbus.c                   | 117 ++++++++++++++
 tests/qtest/aspeed-fsi-test.c   | 205 +++++++++++++++++++++++++
 hw/Kconfig                      |   1 +
 hw/arm/Kconfig                  |   1 +
 hw/fsi/Kconfig                  |   7 +
 hw/fsi/meson.build              |   2 +
 hw/fsi/trace-events             |  13 ++
 hw/meson.build                  |   1 +
 tests/avocado/machine_aspeed.py |  18 +--
 tests/qtest/meson.build         |   1 +
 30 files changed, 1540 insertions(+), 58 deletions(-)
 create mode 100644 docs/specs/fsi.rst
 create mode 100644 hw/fsi/trace.h
 create mode 100644 include/hw/fsi/aspeed_apb2opb.h
 create mode 100644 include/hw/fsi/cfam.h
 create mode 100644 include/hw/fsi/fsi-master.h
 create mode 100644 include/hw/fsi/fsi.h
 create mode 100644 include/hw/fsi/lbus.h
 create mode 100644 hw/fsi/aspeed_apb2opb.c
 create mode 100644 hw/fsi/cfam.c
 create mode 100644 hw/fsi/fsi-master.c
 create mode 100644 hw/fsi/fsi.c
 create mode 100644 hw/fsi/lbus.c
 create mode 100644 tests/qtest/aspeed-fsi-test.c
 create mode 100644 hw/fsi/Kconfig
 create mode 100644 hw/fsi/meson.build
 create mode 100644 hw/fsi/trace-events

Comments

Peter Maydell Jan. 26, 2024, 3:56 p.m. UTC | #1 
On Fri, 26 Jan 2024 at 13:33, Cédric Le Goater <clg@kaod.org> wrote:
>
> The following changes since commit e029fe22caad9b75c7ab69bd4e84853c11fb71e0:
>
>   Merge tag 'pull-qapi-2024-01-26' of https://repo.or.cz/qemu/armbru into staging (2024-01-26 10:21:27 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/legoater/qemu/ tags/pull-aspeed-20240126
>
> for you to fetch changes up to b40769f4b49d15485ffaaa7acade3e3593ee6daa:
>
>   hw/fsi: Update MAINTAINER list (2024-01-26 14:22:08 +0100)
>
> ----------------------------------------------------------------
> aspeed queue:
>
> * Update of buildroot images to 2023.11 (6.6.3 kernel)
> * Check of the valid CPU type supported by aspeed machines
> * Simplified models for the IBM's FSI bus and the Aspeed
>   controller bridge
>
> ----------------------------------------------------------------

Looks like you have an endianness bug, either in the device
or in the test. From the s390 runner:

https://gitlab.com/qemu-project/qemu/-/jobs/6029422595

232/847 qemu:qtest+qtest-arm / qtest-arm/aspeed-fsi-test ERROR 0.38s
killed by signal 6 SIGABRT
>>> PYTHON=/home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/build/pyvenv/bin/python3 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon QTEST_QEMU_BINARY=./qemu-system-arm G_TEST_DBUS_DAEMON=/home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/tests/dbus-vmstate-daemon.sh MALLOC_PERTURB_=82 QTEST_QEMU_IMG=./qemu-img /home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/build/tests/qtest/aspeed-fsi-test --tap -k
――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
stderr:
**
ERROR:../tests/qtest/aspeed-fsi-test.c:152:test_fsi0_getcfam_addr0:
assertion failed (curval == 0x152d02c0): (3221368085 == 355271360)
(test program exited with status code -6)

where 3221368085 is 0xC0022D15, and 355271360 is 0x152D02C0...

thanks
-- PMM
Cédric Le Goater Jan. 26, 2024, 4:48 p.m. UTC | #2 
On 1/26/24 16:56, Peter Maydell wrote:
> On Fri, 26 Jan 2024 at 13:33, Cédric Le Goater <clg@kaod.org> wrote:
>>
>> The following changes since commit e029fe22caad9b75c7ab69bd4e84853c11fb71e0:
>>
>>    Merge tag 'pull-qapi-2024-01-26' of https://repo.or.cz/qemu/armbru into staging (2024-01-26 10:21:27 +0000)
>>
>> are available in the Git repository at:
>>
>>    https://github.com/legoater/qemu/ tags/pull-aspeed-20240126
>>
>> for you to fetch changes up to b40769f4b49d15485ffaaa7acade3e3593ee6daa:
>>
>>    hw/fsi: Update MAINTAINER list (2024-01-26 14:22:08 +0100)
>>
>> ----------------------------------------------------------------
>> aspeed queue:
>>
>> * Update of buildroot images to 2023.11 (6.6.3 kernel)
>> * Check of the valid CPU type supported by aspeed machines
>> * Simplified models for the IBM's FSI bus and the Aspeed
>>    controller bridge
>>
>> ----------------------------------------------------------------
> 
> Looks like you have an endianness bug, either in the device
> or in the test. From the s390 runner:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/6029422595
> 
> 232/847 qemu:qtest+qtest-arm / qtest-arm/aspeed-fsi-test ERROR 0.38s
> killed by signal 6 SIGABRT
>>>> PYTHON=/home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/build/pyvenv/bin/python3 QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon QTEST_QEMU_BINARY=./qemu-system-arm G_TEST_DBUS_DAEMON=/home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/tests/dbus-vmstate-daemon.sh MALLOC_PERTURB_=82 QTEST_QEMU_IMG=./qemu-img /home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/build/tests/qtest/aspeed-fsi-test --tap -k
> ――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――
> stderr:
> **
> ERROR:../tests/qtest/aspeed-fsi-test.c:152:test_fsi0_getcfam_addr0:
> assertion failed (curval == 0x152d02c0): (3221368085 == 355271360)
> (test program exited with status code -6)
> 
> where 3221368085 is 0xC0022D15, and 355271360 is 0x152D02C0...


drat. Indeed. I didn't check BE ... Sorry about that.

Ninad,

Some changes are required in fsi_aspeed_apb2opb_write().

Could you please rework the address space accesses to use
address_space_*_le() routines instead of address_space_rw() ?
This will be less concise.

To check, you can use a PPC64 debian (big-endian) on a PPC64
KVM guest or PowerVM LPAR, or a s390x LPAR.


Thanks,

C.
Ninad Palsule Jan. 26, 2024, 11:15 p.m. UTC | #3 
Hello Cedric,

Sure, Let me check.


On 1/26/24 10:48, Cédric Le Goater wrote:
> On 1/26/24 16:56, Peter Maydell wrote:
>> On Fri, 26 Jan 2024 at 13:33, Cédric Le Goater <clg@kaod.org> wrote:
>>>
>>> The following changes since commit 
>>> e029fe22caad9b75c7ab69bd4e84853c11fb71e0:
>>>
>>>    Merge tag 'pull-qapi-2024-01-26' of 
>>> https://repo.or.cz/qemu/armbru into staging (2024-01-26 10:21:27 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>    https://github.com/legoater/qemu/ tags/pull-aspeed-20240126
>>>
>>> for you to fetch changes up to 
>>> b40769f4b49d15485ffaaa7acade3e3593ee6daa:
>>>
>>>    hw/fsi: Update MAINTAINER list (2024-01-26 14:22:08 +0100)
>>>
>>> ----------------------------------------------------------------
>>> aspeed queue:
>>>
>>> * Update of buildroot images to 2023.11 (6.6.3 kernel)
>>> * Check of the valid CPU type supported by aspeed machines
>>> * Simplified models for the IBM's FSI bus and the Aspeed
>>>    controller bridge
>>>
>>> ----------------------------------------------------------------
>>
>> Looks like you have an endianness bug, either in the device
>> or in the test. From the s390 runner:
>>
>> https://gitlab.com/qemu-project/qemu/-/jobs/6029422595
>>
>> 232/847 qemu:qtest+qtest-arm / qtest-arm/aspeed-fsi-test ERROR 0.38s
>> killed by signal 6 SIGABRT
>>>>> PYTHON=/home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/build/pyvenv/bin/python3 
>>>>> QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon 
>>>>> QTEST_QEMU_BINARY=./qemu-system-arm 
>>>>> G_TEST_DBUS_DAEMON=/home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/tests/dbus-vmstate-daemon.sh 
>>>>> MALLOC_PERTURB_=82 QTEST_QEMU_IMG=./qemu-img 
>>>>> /home/gitlab-runner/builds/-LCfcJ2T/0/qemu-project/qemu/build/tests/qtest/aspeed-fsi-test 
>>>>> --tap -k
>> ――――――――――――――――――――――――――――――――――――― ✀ 
>> ―――――――――――――――――――――――――――――――――――――
>> stderr:
>> **
>> ERROR:../tests/qtest/aspeed-fsi-test.c:152:test_fsi0_getcfam_addr0:
>> assertion failed (curval == 0x152d02c0): (3221368085 == 355271360)
>> (test program exited with status code -6)
>>
>> where 3221368085 is 0xC0022D15, and 355271360 is 0x152D02C0...
>
>
> drat. Indeed. I didn't check BE ... Sorry about that.
>
> Ninad,
>
> Some changes are required in fsi_aspeed_apb2opb_write().
>
> Could you please rework the address space accesses to use
> address_space_*_le() routines instead of address_space_rw() ?
> This will be less concise.
>
> To check, you can use a PPC64 debian (big-endian) on a PPC64
> KVM guest or PowerVM LPAR, or a s390x LPAR.
>
>
> Thanks,
>
> C.
>