driver inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9840 ---------------------------------------------------------------------- Add ACPI platform matching for quirk framework, When a specific device cannot be identified through the IIDR or in the case of a specific MSC combination, the workaround can be enabled based on the ACPI firmware information. Signed-off-by: Yifan Wu <wuyifan50@huawei.com> Signed-off-by: Hongye Lin <linhongye@h-partners.com> --- drivers/platform/mpam/mpam_devices.c | 3 ++- drivers/platform/mpam/mpam_internal.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/platform/mpam/mpam_devices.c b/drivers/platform/mpam/mpam_devices.c index 748e2de48f54..39dd2826a7b3 100644 --- a/drivers/platform/mpam/mpam_devices.c +++ b/drivers/platform/mpam/mpam_devices.c @@ -625,7 +625,8 @@ static void mpam_enable_quirks(struct mpam_msc *msc) for (quirk = &mpam_quirks[0]; quirk->iidr_mask; quirk++) { int err = 0; - if (quirk->iidr != (msc->iidr & quirk->iidr_mask)) + if ((!quirk->iidr || quirk->iidr != (msc->iidr & quirk->iidr_mask)) && + (!quirk->plat || acpi_match_platform_list(quirk->plat) < 0)) continue; if (quirk->init) diff --git a/drivers/platform/mpam/mpam_internal.h b/drivers/platform/mpam/mpam_internal.h index 5239eaf6fc21..f70ad200beb9 100644 --- a/drivers/platform/mpam/mpam_internal.h +++ b/drivers/platform/mpam/mpam_internal.h @@ -160,6 +160,7 @@ struct mpam_quirk { u32 iidr; u32 iidr_mask; + struct acpi_platform_list *plat; enum mpam_device_quirks workaround; }; -- 2.33.0