Commit 3e77eeb7 authored Jul 22, 2019 by Lorenzo Pieralisi Committed by Will Deacon Aug 05, 2019

ACPI/IORT: Rename arm_smmu_v3_set_proximity() 'node' local variable



Commit 36a2ba07 ("ACPI/IORT: Reject platform device creation on NUMA
node mapping failure") introduced a local variable 'node' in
arm_smmu_v3_set_proximity() that shadows the struct acpi_iort_node
pointer function parameter.

Execution was unaffected but it is prone to errors and can lead
to subtle bugs.

Rename the local variable to prevent any issue.

Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Reported-by: Will Deacon <will@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Will Deacon <will@kernel.org>

parent b717480f

drivers/acpi/arm64/iort.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1256,12 +1256,12 @@ static int __init arm_smmu_v3_set_proximity(struct device *dev,

		smmu = (struct acpi_iort_smmu_v3 *)node->node_data;
		if (smmu->flags & ACPI_IORT_SMMU_V3_PXM_VALID) {
		int node = acpi_map_pxm_to_node(smmu->pxm);
		int dev_node = acpi_map_pxm_to_node(smmu->pxm);

		if (node != NUMA_NO_NODE && !node_online(node))
		if (dev_node != NUMA_NO_NODE && !node_online(dev_node))
		return -EINVAL;

		set_dev_node(dev, node);
		set_dev_node(dev, dev_node);
		pr_info("SMMU-v3[%llx] Mapped to Proximity domain %d\n",
		smmu->base_address,
		smmu->pxm);

Admin message