On Wed, Jun 05, 2024 at 07:04:55PM +0100, Jonathan Cameron wrote:
> Treating the HID as an integer caused it to get bit reversed
> on big endian hosts running little endian guests. Treat it
> as a character array instead.
>
> Fixes hw/acpi: Generic Port Affinity Structure Support
> Tested-by: Richard Henderson <[email protected]>
> Signed-off-by: Jonathan Cameron <[email protected]>
>
> ---
> Richard ran the version posted in the thread on an s390 instance.
> Thanks for the help!
>
> Difference from version in thread:
> - Instantiate i in the for loop.
>
> Sending out now so Michael can decide whether to fold this in, or
> drop the GP series for now from his pull request (in which case
> I'll do an updated version with this and Markus' docs feedback
> folded in.)
Dropped for now.
> ---
> include/hw/acpi/acpi_generic_initiator.h | 2 +-
> hw/acpi/acpi_generic_initiator.c | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/acpi/acpi_generic_initiator.h
> b/include/hw/acpi/acpi_generic_initiator.h
> index 1a899af30f..5baefda33a 100644
> --- a/include/hw/acpi/acpi_generic_initiator.h
> +++ b/include/hw/acpi/acpi_generic_initiator.h
> @@ -61,7 +61,7 @@ typedef struct PCIDeviceHandle {
> uint16_t bdf;
> };
> struct {
> - uint64_t hid;
> + char hid[8];
> uint32_t uid;
> };
> };
I think there is another issue:
+ memcpy(&dev_handle.hid, hid, sizeof(dev_handle.hid));
not nice since there is no check that 8 will hold all of
+ const char *hid = "ACPI0016";
and won't access buffer out of range.
> diff --git a/hw/acpi/acpi_generic_initiator.c
> b/hw/acpi/acpi_generic_initiator.c
> index 78b80dcf08..f064753b67 100644
> --- a/hw/acpi/acpi_generic_initiator.c
> +++ b/hw/acpi/acpi_generic_initiator.c
> @@ -151,7 +151,9 @@ build_srat_generic_node_affinity(GArray *table_data, int
> node,
> build_append_int_noprefix(table_data, 0, 12);
> } else {
> /* Device Handle - ACPI */
> - build_append_int_noprefix(table_data, handle->hid, 8);
> + for (int i = 0; i < sizeof(handle->hid); i++) {
> + build_append_int_noprefix(table_data, handle->hid[i], 1);
> + }
> build_append_int_noprefix(table_data, handle->uid, 4);
> build_append_int_noprefix(table_data, 0, 4);
> }
> --
> 2.39.2
