Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12275bf0 authored by Robert Richter's avatar Robert Richter Committed by Will Deacon
Browse files

iommu/arm-smmu-v3, acpi: Add temporary Cavium SMMU-V3 IORT model number definitions 

The model number is already defined in acpica and we are actually
waiting for the acpi maintainers to include it:

 https://github.com/acpica/acpica/commit/d00a4eb86e64



Adding those temporary definitions until the change makes it into
include/acpi/actbl2.h. Once that is done this patch can be reverted.

Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 77f34458

drivers/acpi/arm64/iort.c

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
#define IORT_IOMMU_TYPE		((1 << ACPI_IORT_NODE_SMMU) |	\

				(1 << ACPI_IORT_NODE_SMMU_V3))



/* Until ACPICA headers cover IORT rev. C */

#ifndef ACPI_IORT_SMMU_V3_CAVIUM_CN99XX

#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX		0x2

#endif



struct iort_its_msi_chip {

	struct list_head	list;

	struct fwnode_handle	*fw_node;

drivers/iommu/arm-smmu-v3.c

+5 −0
Original line number Diff line number Diff line
@@ -413,6 +413,11 @@ 
#define MSI_IOVA_BASE			0x8000000

#define MSI_IOVA_LENGTH			0x100000



/* Until ACPICA headers cover IORT rev. C */

#ifndef ACPI_IORT_SMMU_V3_CAVIUM_CN99XX

#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX		0x2

#endif



static bool disable_bypass;

module_param_named(disable_bypass, disable_bypass, bool, S_IRUGO);

MODULE_PARM_DESC(disable_bypass,