From: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org
Cc: Will.Deacon@arm.com, lorenzo.pieralisi@arm.com, hanjun.guo@linaro.org,
        sudeep.holla@arm.com, robin.murphy@arm.com, joro@8bytes.org,
        rjw@rjwysocki.net, lenb@kernel.org, jnair@caviumnetworks.com,
        gpkulkarni@gmail.com
Subject: [PATCH] acpi/iort, numa: Add numa node mapping for smmuv3 devices
Date: Thu,  1 Jun 2017 19:35:37 +0530
Message-Id: <1496325937-21113-1-git-send-email-ganapatrao.kulkarni@cavium.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2017 14:06:14.2636 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0701MB1685
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1662
Lines: 52

ARM IORT specification has provision to define Proximity domain
in SMMUv3 IORT table. Adding required code to parse Proximity domain of
SMMUv3 IORT table. Parsed Proximity domain is used to set numa_node
of SMMUv3 platform devices.

Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
---
 drivers/iommu/arm-smmu-v3.c | 6 ++++++
 include/acpi/actbl2.h       | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 69d8506..98c2319 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -2667,6 +2667,12 @@ static int arm_smmu_device_acpi_probe(struct platform_device *pdev,
 	if (iort_smmu->flags & ACPI_IORT_SMMU_V3_COHACC_OVERRIDE)
 		smmu->features |= ARM_SMMU_FEAT_COHERENCY;
 
+	/* set numa proximity domain for smmv3 device */
+	if (iort_smmu->flags & ACPI_IORT_SMMU_V3_PXM) {
+		set_dev_node(dev, acpi_map_pxm_to_node(iort_smmu->pxm));
+		dev_info(dev, "on NUMA node %d\n", dev_to_node(dev));
+	}
+
 	return 0;
 }
 #else
diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 4b306a6..c16ced8 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -805,6 +805,9 @@ struct acpi_iort_smmu_v3 {
 	u32 pri_gsiv;
 	u32 gerr_gsiv;
 	u32 sync_gsiv;
+	u8 pxm;
+	u8 reserved1;
+	u16 reserved2;
 };
 
 /* Values for Model field above */
@@ -817,6 +820,7 @@ struct acpi_iort_smmu_v3 {
 
 #define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE   (1)
 #define ACPI_IORT_SMMU_V3_HTTU_OVERRIDE     (1<<1)
+#define ACPI_IORT_SMMU_V3_PXM               (1<<3)
 
 /*******************************************************************************
  *
-- 
1.8.1.4