From f3d34aacd97eecc25774d3e24865c80cd4907895 Mon Sep 17 00:00:00 2001 From: patrick Date: Sat, 23 Jan 2021 20:01:01 +0000 Subject: [PATCH] Fix IORT struct for Context and PMU interrupts. I misread bytes with bits. ok kettenis@ --- sys/dev/acpi/acpireg.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpi/acpireg.h b/sys/dev/acpi/acpireg.h index 20c6686172e..985dddcb1cb 100644 --- a/sys/dev/acpi/acpireg.h +++ b/sys/dev/acpi/acpireg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acpireg.h,v 1.51 2021/01/17 14:27:24 patrick Exp $ */ +/* $OpenBSD: acpireg.h,v 1.52 2021/01/23 20:01:01 patrick Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert * Copyright (c) 2005 Marco Peereboom @@ -744,15 +744,13 @@ struct acpi_iort_smmu_global_interrupt { } __packed; struct acpi_iort_smmu_context_interrupt { - uint8_t gsiv_flags; -#define ACPI_IORT_SMMU_CONTEXT_INTERRUPT_GSIV(x) ((x) >> 0 & 0xf) -#define ACPI_IORT_SMMU_CONTEXT_INTERRUPT_FLAGS(x) ((x) >> 4 & 0xf) + uint32_t gsiv; + uint32_t flags; } __packed; struct acpi_iort_smmu_pmu_interrupt { - uint8_t gsiv_flags; -#define ACPI_IORT_SMMU_PMU_INTERRUPT_GSIV(x) ((x) >> 0 & 0xf) -#define ACPI_IORT_SMMU_PMU_INTERRUPT_FLAGS(x) ((x) >> 4 & 0xf) + uint32_t gsiv; + uint32_t flags; } __packed; struct acpi_iort_mapping { -- 2.20.1