Commit d6512433 authored Jun 09, 2023 by Erik Kaneda Committed by Yu Liao Jun 09, 2023

ACPICA: ACPI 6.4: PPTT: add new version of subtable type 1

mainline inclusion
from mainline-v5.13-rc1
commit 5e2e86c0
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I77UDW
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5e2e86c0b9970e6f70869e76a1c6417036fd3a7e

--------------------------------

This commit squashes the following:

ACPICA commit 475c5e89f8f701ccdfee6ca567e33c854ecd6c9e
ACPICA commit 82cf78ac175a4b7d8842c5b786be24031c817cfd

This new subtable is only valid for PPTT version 3.

Elyes fixed a misspelled identifier in this commit.

Link: https://github.com/acpica/acpica/commit/475c5e89
Link: https://github.com/acpica/acpica/commit/82cf78ac


Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Yu Liao <liaoyu15@huawei.com>

parent 6143a624

include/acpi/actbl2.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -1806,6 +1806,12 @@ struct acpi_pptt_cache {
		u16 line_size;
		};

		/* 1: Cache Type Structure for PPTT version 3 */

		struct acpi_pptt_cache_v1 {
		u32 cache_id;
		};

		/* Flags */

		#define ACPI_PPTT_SIZE_PROPERTY_VALID (1) /* Physical property valid */
		@@ -1815,6 +1821,7 @@ struct acpi_pptt_cache {
		#define ACPI_PPTT_CACHE_TYPE_VALID (1<<4) /* Cache type valid */
		#define ACPI_PPTT_WRITE_POLICY_VALID (1<<5) /* Write policy valid */
		#define ACPI_PPTT_LINE_SIZE_VALID (1<<6) /* Line size valid */
		#define ACPI_PPTT_CACHE_ID_VALID (1<<7) /* Cache ID valid */

		/* Masks for Attributes */