Commit ddc351da authored Dec 05, 2024 by Qinxin Xia Committed by zhangyuyang Dec 09, 2024

ACPI/IORT: Add PMCG platform information for HiSilicon HIP09A

mainline inclusion
from mainline-v6.13-rc2
commit c2b46ae022704a2d845e59461fa24431ad627022
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IBA28M
CVE: NA

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



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

HiSilicon HIP09A platforms using the same SMMU PMCG with HIP09
and thus suffers the same erratum. List them in the PMCG platform
information list without introducing a new SMMU PMCG Model.

Update the silicon-errata.rst as well.

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>
Acked-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Qinxin Xia <xiaqinxin@huawei.com>
Link: https://lore.kernel.org/r/20241205013331.1484017-1-xiaqinxin@huawei.com


Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Qizhi Zhang <zhangqizhi3@h-partners.com>

parent 0bbe5606

Documentation/arch/arm64/silicon-errata.rst

+3 −2

Original line number	Diff line number	Diff line
		@@ -244,8 +244,9 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| Hisilicon \| Hip08 SMMU PMCG \| #162001800 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Hisilicon \| Hip{08,09,10,10C\| #162001900 \| N/A \|
		\| \| ,11} SMMU PMCG \| \| \|
		\| Hisilicon \| Hip{08,09,09A,10\| #162001900 \| N/A \|
		\| \| ,10C,11} \| \| \|
		\| \| SMMU PMCG \| \| \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Hisilicon \| LINXICORE9100 \| #162100125 \| HISILICON_ERRATUM_162100125 \|
		+----------------+-----------------+-----------------+-----------------------------+

drivers/acpi/arm64/iort.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1725,6 +1725,8 @@ static struct acpi_platform_list pmcg_plat_info[] __initdata = {
		/* HiSilicon Hip09 Platform */
		{"HISI ", "HIP09 ", 0, ACPI_SIG_IORT, greater_than_or_equal,
		"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},
		{"HISI ", "HIP09A ", 0, ACPI_SIG_IORT, greater_than_or_equal,
		"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},
		/* HiSilicon Hip10/11 Platform uses the same SMMU IP with Hip09 */
		{"HISI ", "HIP10 ", 0, ACPI_SIG_IORT, greater_than_or_equal,
		"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},