Commit d2ea6380 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/acpi' into for-next/core 

* for-next/acpi:
  ACPI/IORT: Add PMCG platform information for HiSilicon HIP10/11
  ACPI: ARM64: add acpi_iort.h to MAINTAINERS
  ACPI/IORT: Switch to use kmemdup_array()
parents 7c626ce4 f3b78b47

Documentation/arch/arm64/silicon-errata.rst

+2 −2
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip08 SMMU PMCG | #162001900      | N/A                         |

|                | Hip09 SMMU PMCG |                 |                             |

| Hisilicon      | Hip{08,09,10,10C| #162001900      | N/A                         |

|                | ,11} SMMU PMCG  |                 |                             |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ L: linux-acpi@vger.kernel.org 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/acpi/arm64

F:	include/linux/acpi_iort.h









ACPI FOR RISC-V (ACPI/riscv)









M:	Sunil V L <sunilvl@ventanamicro.com>
































drivers/acpi/arm64/iort.c



+8
−1






























Original line number
Diff line number
Diff line







@@ -822,7 +822,7 @@ static struct iommu_iort_rmr_data *iort_rmr_alloc(







		return NULL;



















	/* Create a copy of SIDs array to associate with this rmr_data */









	sids_copy = kmemdup(sids, num_sids * sizeof(*sids), GFP_KERNEL);









	sids_copy = kmemdup_array(sids, num_sids, sizeof(*sids), GFP_KERNEL);









	if (!sids_copy) {









		kfree(rmr_data);









		return NULL;








@@ -1703,6 +1703,13 @@ 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},









	/* 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},









	{"HISI  ", "HIP10C  ", 0, ACPI_SIG_IORT, greater_than_or_equal,









	 "Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},









	{"HISI  ", "HIP11   ", 0, ACPI_SIG_IORT, greater_than_or_equal,









	 "Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09},









	{ }









};