diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2022-12-05 12:32:11 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2022-12-05 12:32:11 -0800 |
| commit | 02fedf1466567424c336cd11cf368dcf78f2af33 (patch) | |
| tree | 713216a735619af0852b7bdf725271cc0ef8a5b2 /drivers/acpi/acpica/exfield.c | |
| parent | e0f6fa0d425f745a887e640be66e22b45451e169 (diff) | |
| parent | 7a7e6edfca857f490e3a963198c67620de26b7f0 (diff) | |
Merge branch 'for-6.2/cxl-xor' into for-6.2/cxl
Pick up support for "XOR" interleave math when parsing ACPI CFMWS window
structures. Fix up conflicts with the RCH emulation already pending in
cxl/next.
Diffstat (limited to 'drivers/acpi/acpica/exfield.c')
| -rw-r--r-- | drivers/acpi/acpica/exfield.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c index 2b89a496de65..657f4002f9dc 100644 --- a/drivers/acpi/acpica/exfield.c +++ b/drivers/acpi/acpica/exfield.c @@ -141,7 +141,9 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state, || obj_desc->field.region_obj->region.space_id == ACPI_ADR_SPACE_IPMI || obj_desc->field.region_obj->region.space_id == - ACPI_ADR_SPACE_PLATFORM_RT)) { + ACPI_ADR_SPACE_PLATFORM_RT + || obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_FIXED_HARDWARE)) { /* SMBus, GSBus, IPMI serial */ @@ -305,7 +307,9 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc, || obj_desc->field.region_obj->region.space_id == ACPI_ADR_SPACE_IPMI || obj_desc->field.region_obj->region.space_id == - ACPI_ADR_SPACE_PLATFORM_RT)) { + ACPI_ADR_SPACE_PLATFORM_RT + || obj_desc->field.region_obj->region.space_id == + ACPI_ADR_SPACE_FIXED_HARDWARE)) { /* SMBus, GSBus, IPMI serial */ |