From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754063AbdEDMzz (ORCPT ); Thu, 4 May 2017 08:55:55 -0400 Received: from mail-sn1nam02on0051.outbound.protection.outlook.com ([104.47.36.51]:56000 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753214AbdEDMzi (ORCPT ); Thu, 4 May 2017 08:55:38 -0400 Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=caviumnetworks.com; From: Geetha sowjanya To: will.deacon@arm.com, robin.murphy@arm.com, lorenzo.pieralisi@arm.com, hanjun.guo@linaro.org, sudeep.holla@arm.com, iommu@lists.linux-foundation.org Cc: jcm@redhat.com, linux-kernel@vger.kernel.org, robert.richter@cavium.com, catalin.marinas@arm.com, sgoutham@cavium.com, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, geethasowjanya.akula@gmail.com, linu.cherian@cavium.com, Charles.Garcia-Tobin@arm.com, Geetha Sowjanya Subject: [PATCH v2 4/7] iommu/arm-smmu-v3: For ACPI based device probing, set PAGE0_REGS_ONLY option for ThunderX2 SMMUv3 implementation. Date: Thu, 4 May 2017 18:05:36 +0530 Message-Id: <1493901339-14929-5-git-send-email-gakula@caviumnetworks.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1493901339-14929-1-git-send-email-gakula@caviumnetworks.com> References: <1493901339-14929-1-git-send-email-gakula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: MA1PR01CA0079.INDPRD01.PROD.OUTLOOK.COM (10.174.56.19) To CO2PR07MB2504.namprd07.prod.outlook.com (10.166.200.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a323ff4-d281-4aa9-bcfc-08d492ecd6ff X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:CO2PR07MB2504; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;3:KtF7o80IGdmYPIQmEpqi0FH5N9k/6WX4Sm2ApWL2I1fIP57/XRjLkZOdZL879rEpQOvbqJhTgFL0rYXl27j5zL7TgcKkUJkIBvPAKnLZfGiyasrGSrF1QFb2PYgBYYNCdT2mwmNm4edlwTwfNl2rSX+UJBM8IjNVhy15rFxBE2DdavVuK65A5kt5qppVkhgajhHpdKQyRJgO5BhWiO3B1KwMW8j7HKTYOxHVVOHXPNLy4mvBNuwdCBBZ9Djp91A1jkN3MxX2C1aGbTXFzvrgctK+iyMI9g6H1zKIXxTqlgqad2tIaA6FU+ILamIhHGrU4/1OKiZdAyib6UUm1fzFNQ==;25:H95q5Dvyg4EiDWlT5gQClF+jvT7Z5y6gitGzaIPdLqptXNh1n/qdK/FQSoTOAbx3zcRcT+bWfbgAbF+mRIdPqfDhS/0PqAG1W1YDJ1or22C7OgrgRtKkauOfa3D3AMVvDPirDwAvxR2GLC8u4iHCLCHzmSHjGXxtV0igHYrDF3FLDQEOamJ59s6YbMmyJJJ4NB61ddu2Lh8C5LrIqRwDyHfJsYA1QKLqr1v4LOdejFXY3q7yx59ulYzLGO2pC4hszxe+18maz8w5KJgmVOXP1v0JCOdrDX8fyYohxnMFjJESeTSMEb3oRhS6R8SBhABkwZFjsEDqOVp3OQHQ8l8AJVHhDDIySbsl5HVCZ6TBMv3qdi8OHaJB6yJdOEqhxeFKnLwFfRNlriK0gHJ8fb0y4vz+y3xduhSN9GKd2DEAHbjQ2TnfbKUnxLKXNmjBu+Tpj+CToZbeahjYQLSkt4XsQA== X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;31:d3QTNZpO7FCpH5tGGYlETtsKC6tZ7IZtjLGA5GvWNq85MIig2sJHgoTH6MI+qiRM00ktgtY79Ai2lXFTIdR2f9w+olqTHYQ/HOrw1988FArJSwzwZjYyv2ts4wZSpRGPE7vOofVCju0U/lv9eyTQuEdPJMc+DEF4J/LImiFZ4IpZOs8UUEuP71l1PzgyWIBG1csb5mjXWWRdTFU6DtU7r6EJwf4L+4AXKvc4sLW68rqFtQyhqXVzlmgURtBTlD6H;20:1F60xxIIeBOiT6eeOQYFAWlrbv4bocY7Z8FetlAK0CijV5xT8CY9v4CyBv9h+y20hxM5ZK3JiQK0LzdIPuQtnmZRYMHUT3/2ttVlU5Vc2F8SCj4WTOx6Pa6THpI8RdVEcsNl6MjgHTIU6D1uug4u7TxqIx6p+HpNIrCL7BdZn10BZ1DSWIwz6q60qFJbFDTF+89+sqPVt1JO3qNnHz9Q0KkwkznM2VcCpb+pUvoEvxxhHGxyTT4RUuCcWuH5cDirQB14+5lnzowhgvNgXBU7UIHMpDUnQeLicyqooRvUtzDOhZzxB00ZMtQmxC7xQhEIZ3/T3/sDKTL1IA1gsW/H68NmKLgJbrQ5MhJczAWwPY+ExLRBq5yW64SFr7hheGkyWqUnoYH08U0utYqa8blmI4FH/uADMI5f/bLvwk0QPDRkmvIBd5WETe6LvDJzn8XDAWurxohs2Nr5VtsTX1A3jor2p0GPL4GXmk9u5tfNvxakFYidqNH4adFi9i/7uW387vNeuuurZV0YUxx71JTZgMoxYqdpVA0YdmKCIzTcwMl/kUMcGFOJt3Iqukb/CHpTnFLThgSQMLMNC4IdrzKWjxuJ+S3uOi3oDCQj4gAjtTU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:CO2PR07MB2504;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB2504; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;4:r5SNDq4Nrkv7gLSV/0x7aksgGqm+viYcHFdi25DSabkXr5OZgcFlY8G8yfThHjM3o0aiOmCoV7SJRzab4E+Jt518tuOn9sf/11pv+UbyDLmFDcN4kaXaYneaSaJXkRhMQw+WMAoWzsgARoPHfDUhtbjLKRXlsbpbGRyDZaxNlWs2NJnIYSbzktcyfujB6yXwNd5rOF1tdBH8EuvLiLulp2DwTRZhPKDqoe3G5Cw/7UrBaaIi9WlI+9MLd+iZmYvATU/6Cu/779Bh0kJjfoDoPIjSy2s1PkLxJNrnd4q/dBQmX4O6OPBW+9qflGHUi13a6auePXLD3qxTbphaWhwzNKJ1zxk/VObwgJElnD4H0WVtNRK22rlre6dW1lh1S6zdSaOSV76T1/A2RknH3qEyXdqbQe0wneu0/6F7wuXcV+8/caL8EdmAR/WnsHuXsBjEMS+V84WV5R0nlAulKv3B97tDKWXPn0XuW2HLigIkYer/AxYq7t+QHa44jAHlYo0T3GY7yVWjPkg5eummGyRkK23Uw2oDJ+Fc5wN2hOWhg1YUanbMmxvyNMox2GUVgKBVNXIGXeT2zVGGUYU5/qizIeiT5Ey9w8gtk948/3zj9H/cI+QSxd5zrcCT7B+TJIUYqwZg7/rEHCHPp7P51lCzXvRB3snFkghlSVGtRL1i4BC/xmMQnRbkL/onh6pr9EgK X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6069001)(6009001)(39850400002)(39410400002)(39450400003)(39400400002)(39840400002)(25786009)(6512007)(48376002)(5009440100003)(36756003)(50466002)(508600001)(53936002)(3846002)(7736002)(6116002)(2906002)(50226002)(305945005)(8676002)(189998001)(81166006)(4326008)(6486002)(50986999)(42186005)(76176999)(107886003)(110136004)(6666003)(5003940100001)(33646002)(230783001)(66066001)(38730400002)(47776003)(5660300001)(42882006)(7416002)(6506006)(2950100002)(110426004)(42262002);DIR:OUT;SFP:1101;SCL:1;SRVR:CO2PR07MB2504;H:localhost.localdomain;FPR:;SPF:None;MLV:nov;PTR:InfoNoRecords;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO2PR07MB2504;23:EdlMcbRtcqAvcIU2qXyBjLXnjVWgL0+oRs4s5zpUE?= =?us-ascii?Q?B0IgLS9Vla/bfxAhzAtfEUfVur7mUufA40EemajWBFNsaA7wryYsXc9k8hDt?= =?us-ascii?Q?Na57TJ6nzWwguaAOtAXWkYb+cxdWqmty/AsmkvBsn+LtKPBEtHw6rwhzeHEO?= =?us-ascii?Q?iMA5XBGxqfM8wF4MPKA3u59RHQ0UJoGOrq9k1xFqf6WXlk+rLZTkuhGz/7vK?= =?us-ascii?Q?ZKCtXDMItxp5HBGMJ5pr6u8aBPrnOhP3JrOO+i50tqPgFovsswlyrqtyRFsi?= =?us-ascii?Q?nWTf7kxBrhFPLZsFEzF8LkqXidhEKylhVwqE2rZssmZvl5gtQqTX+so6Po8Q?= =?us-ascii?Q?KpgO9MUZCnEs99RmKs+Z7LW1sVF+NoQ4sFKJxOMwBsaeLib44jdT+wLDJxVB?= =?us-ascii?Q?DRZblUfs0LexggiQ+POjDrDd1gBADAeWa3w48sr1mda59u+4Sgio4KH/xRm6?= =?us-ascii?Q?XU0aFzXF5xllBHFPD9RJ9+BNYyEaZ9zSnXJfv9PyQFrVIACLa2/+tGu4Zoxi?= =?us-ascii?Q?kxBu8kh8ue7S8fJIVo4//Psu6MNGJlx7nzqMtxCHlUTJ1hkQNfH1up5oh/cc?= =?us-ascii?Q?4/E99gxP+FawAuglGXowYjg119Gm9PdwYl+o7ji9ML8gY5Bvz0U/hwnIBaNs?= =?us-ascii?Q?PHgDxuMWtuORT6r+MIny00pD5W36VGRXhqa9MapjTWs47iXonabucldRoHAk?= =?us-ascii?Q?9Fv57WlYvGfvj4O6b/XF9khdz5QbTN+tCDUNd3c6Kbj5ZPdzDCnBpa8t/eq9?= =?us-ascii?Q?SVIlOz4KsCLFljtCwzuV4MFFgOepCb/KaL67JgHFHBDuKQNXOtISrk6VhjEq?= =?us-ascii?Q?5vT/onat10IXqejtlNQTx//9sOOi2ww4xt2I5b3Yzq9HX7EAGu2+SOGWvjdo?= =?us-ascii?Q?ADhV6UpeiNrffeByG855Gllt9te64TpucoYS7xuzwZjasA7pUNwtszhKbaCe?= =?us-ascii?Q?2ohic72jtIdZ/A88l2zDvhVAXLYMOlHlYk+OKiUKi9Xmp50jbwGZPpRfjh4U?= =?us-ascii?Q?Eb+ZL0I1PoybWaC9lPNCQ9GlAFZNf1P4Xc2BjWoBk4aGrq1PVGZMulyrbvb3?= =?us-ascii?Q?C1Tbxjj6WUQ4NX7hRqSt2KHVAbs5IgqjketogiNxjqL1XxKpsfe4wicbNuqZ?= =?us-ascii?Q?eekIiLTqXPoM9GKSxXjHcuFMTvyoSw/hba0jcw6MJxhkOBfb5OrHQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;6:2jCMu/8ix3orq7+MKs22McQLa1gYGQNQEyqIV8v5fXqVphsPmMWIS7g3KD+1gqgPw4PdzU/c4gy63oMqsVfKuUsYR6jKE9Roe0ngi3CV3T70x92omydGAekOKNvMoKSaGqlK6/JzWJ748Ex8wVGgtmzi1dq7J4w27Av4GNJpIu/BIlzRKrMNjD2hYDMZxZGgm+i0vogrAUVqNQa3nBLIlAob+z1gkZx9ikO3wa/RO9X0mYZGqZCGWFz2zo7kPzzRyqCCQ3MTrforbQd55j3RVVA2SqWRu13P4bausPEt66TUdUb++DSoUHd5IYCkhC3y0ug7UXr0R910DrCRAQ6UeW9VqwfWBPDNONNjyD8c+0Kfad7nFSqs+yWye0kK8eZ5etcsuFZIb1f+yZ0PWe37rgOIVy2XFFlqYtNVoMelyzrY2vD1u/aXKvNi8V9F+zMWzwxD1tZbh0OSRnDXJHFU52333PXVwhZh0hhQ+fD+CYMkrJUVHSUmAaW+334iPf8QynB0tJUzS66Wu1t1cxLpRw==;5:/91sbblHCH64bdqsrsKYCmL8GsDf3rKuKIyzgj6aYAc/SvF+Ja+huUTobQAhO0zutCSeCxwXYqkHG20kIUxR4MnJRWSgAv7Wcc+SOKA3oaUvZhGwm5KwkWbOKKICXbu1cfsi28WKlA/bQgodceWPlA==;24:lQl53MVZbnVyXJugu62+CZd+8BUFVV9NMPwwkP81Drdug0aoiGuy4RK9/u+MLsno7UDYKHhkgMYRCb7HWfKQiN93SpGgsPdLKZyQ0jlktgg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;7:LNo0farFG0UtAHw/DpSL2wGr/2EW5ZAu2Z5l9Ap9258hAKgRxTV4JuN+lMDCLICP8VqrVKpJvEkxBCBd1JUIAlPsYvyOJRtinbgQszKxQHIpRz+d5w8tEdTXAF330okQkR2lLISZpp54kuFaWJ0YXJ45CTubYxtlPdpG4BFsqHq40bdZMm8Uw3/RYt8a12KLRoSmPxNdkVV2+dU0/J3ud05V9KJi4E0rn2vGAFWQvx77Yrd5Ucn/nPRnmY6ADDdUdVVP12r4mkL6mgJ8aFV88NmSi5/MaPNyuyAVVo77Z5+WW+aLicWhuR04t+c97QcXoeWKqQhX+EjhN42qUVmzqg== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 12:55:22.8208 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB2504 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linu Cherian Enable PAGE0_REGS_ONLY option for Cavium ThunderX2 SMMUv3 model. Signed-off-by: Linu Cherian Signed-off-by: Geetha Sowjanya --- drivers/iommu/arm-smmu-v3.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index f027676..8f7d8ad 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2625,6 +2625,14 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) } #ifdef CONFIG_ACPI +static void acpi_smmu_get_options(u32 model, struct arm_smmu_device *smmu) +{ + if (model == ACPI_IORT_SMMU_V3_CAVIUM_CN99XX) + smmu->options |= ARM_SMMU_OPT_PAGE0_REGS_ONLY; + + dev_notice(smmu->dev, "option mask 0x%x\n", smmu->options); +} + static int arm_smmu_device_acpi_probe(struct platform_device *pdev, struct arm_smmu_device *smmu) { @@ -2637,6 +2645,8 @@ static int arm_smmu_device_acpi_probe(struct platform_device *pdev, /* Retrieve SMMUv3 specific data */ iort_smmu = (struct acpi_iort_smmu_v3 *)node->node_data; + acpi_smmu_get_options(iort_smmu->model, smmu); + if (iort_smmu->flags & ACPI_IORT_SMMU_V3_COHACC_OVERRIDE) smmu->features |= ARM_SMMU_FEAT_COHERENCY; -- 1.8.3.1