Skip to content

Commit f3b78b4

Browse files
Yicong Yangwilldeacon
authored andcommitted
ACPI/IORT: Add PMCG platform information for HiSilicon HIP10/11
HiSilicon HIP10/11 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. Signed-off-by: Yicong Yang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent ba8b7f7 commit f3b78b4

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ stable kernels.
249249
+----------------+-----------------+-----------------+-----------------------------+
250250
| Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
251251
+----------------+-----------------+-----------------+-----------------------------+
252-
| Hisilicon | Hip08 SMMU PMCG | #162001900 | N/A |
253-
| | Hip09 SMMU PMCG | | |
252+
| Hisilicon | Hip{08,09,10,10C| #162001900 | N/A |
253+
| | ,11} SMMU PMCG | | |
254254
+----------------+-----------------+-----------------+-----------------------------+
255255
+----------------+-----------------+-----------------+-----------------------------+
256256
| Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |

drivers/acpi/arm64/iort.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,6 +1703,13 @@ static struct acpi_platform_list pmcg_plat_info[] __initdata = {
17031703
/* HiSilicon Hip09 Platform */
17041704
{"HISI ", "HIP09 ", 0, ACPI_SIG_IORT, greater_than_or_equal,
17051705
"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},
1706+
/* HiSilicon Hip10/11 Platform uses the same SMMU IP with Hip09 */
1707+
{"HISI ", "HIP10 ", 0, ACPI_SIG_IORT, greater_than_or_equal,
1708+
"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},
1709+
{"HISI ", "HIP10C ", 0, ACPI_SIG_IORT, greater_than_or_equal,
1710+
"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},
1711+
{"HISI ", "HIP11 ", 0, ACPI_SIG_IORT, greater_than_or_equal,
1712+
"Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},
17061713
{ }
17071714
};
17081715

0 commit comments

Comments
 (0)