From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753894AbdEEM2d (ORCPT ); Fri, 5 May 2017 08:28:33 -0400 Received: from mail-by2nam03on0075.outbound.protection.outlook.com ([104.47.42.75]:31232 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753803AbdEEM2a (ORCPT ); Fri, 5 May 2017 08:28:30 -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 v3 4/7] iommu/arm-smmu-v3: For ACPI based device probing, set PAGE0_REGS_ONLY option for ThunderX2 SMMUv3 implementation. Date: Fri, 5 May 2017 17:38:08 +0530 Message-Id: <1493986091-30521-5-git-send-email-gakula@caviumnetworks.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1493986091-30521-1-git-send-email-gakula@caviumnetworks.com> References: <1493986091-30521-1-git-send-email-gakula@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: MA1PR01CA0114.INDPRD01.PROD.OUTLOOK.COM (10.174.56.158) To BN3PR07MB2499.namprd07.prod.outlook.com (10.167.4.136) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84122d23-f22d-4c3c-3346-08d493b23838 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:BN3PR07MB2499; X-Microsoft-Exchange-Diagnostics: 1;BN3PR07MB2499;3:/iXKqsiXE6eatvkkAK2ECXAlUx1+u/IV72INlPYxihgiSkEm6DzE4/K81T2LsLi7taOgGchPb7loTqw1ccFzdO01j/FMMeY+fwPZH1gBUjFB3hoE5E743JVa767luAveLqCT3TbR3gGaLqs3y/25HvZmtVnn1G1i6jv81V22R7OcrOfickIqO8cQrCXYnK5SlQYTcACBTd63hL6JKfkRaYKRPEpXwopNzx6OjhqcyP3+Snqrpd6320K/3VX8JLzxVtu0DHul9bMo9j2oW7OS1cY8j5Xf0LlqeV7FMVDPHBOUhxp+C/XOH+j+DIPGQTkE/iGFZDTKA8bN85kdCLz/Xg==;25:FPnUJWaFHgPOarxjJKSlIjCt7QoBDEF8KtZ9lz3njNUr1SATo88ePplB8UOlrPUq2qIrVSUsiMUQ6Axq4sF8xjTF00Mu8GBP2hgqfiqq6hips3lEVAtLqn9NykJqiqMsoBEUzYCoVE6T4bvKPDlQhumWLyie370wmURoOCvfcW1CL2kedQ1IFvSxRTz6W7A2/nI+YeVEdONX442xW/O4/APaK4CFRRm0s8F1lZYeRq+6SAh+5gpwUoePbEukh2owxlbn3Xh4EJmAfoGOfyNyb8vYY2U2EULS57Wh73BTztf0SlUrL9aQZSbBLewhVwAdiGwaOlHu3viiJFU4bKawTxSyiWYYZbqJnqrorY8RzyDa+7/gKiVE13OzihIJZro02dFsQ1E1JDIYquorxmPZpVxGzB4mktDD686g8M1DGVI5EdtMuymTb3IAVcyI4S4Bo4GElyH6wl+HhEH6tjgwI7sALBD1GFBZSZZfzCCH76s= X-Microsoft-Exchange-Diagnostics: 1;BN3PR07MB2499;31:hgMlCRRcNSrv8joRdXCrr+w3JJk0TIWsBiDq0NgD6YjYhO57em6JVLfWq1hnF/gJl+Vrf3UhrLwaOauLWKvblF63iwo8W1ub19rsXcSQM64QuOe4bipue5tDvvBc+oWRK/Qb0cq/hZYv5DE3jPynw8R/yFAP6AjQmgoWpoEKZFqKmliOmbhjj3TWAxzSkLipit3pQ2qh6txOsqqHOX3UfiZ6xY6xuBcwr8iMMCXtOVw=;20:+FIRkVH/q4gYEC9G7N/O1cRxTdIRtwajh7c1yUlRc5XueTB7lI4zrL2rFxCPWunUeVfvAMfYoVRtg/n9dCx+9HQ5b6sK6+PBAou+teOU3Au+lCfq8FufUd7UGuJZmGmJadHL8VGhjaXfaq+XchTk3Zb+gtB+rAxVDTpVvse+s/gsgiABGBVFYopCMZY4ANEDWfAys+Qz0BoxyMyBK0x29+mTgxiEuaHEFsKSW+tteflvqf3ewmmnv63hK7ui31GsyF6oPWyQ+AUPAf5AcUKglJY9LG2Ir1opWbcFhCp6/teuGKJ0MVvd/BGcX15dD0auBvmuXmIc2bVE56J0ZGPUN8cvCKpKGx5+c0FprRZSMqjv7e3fHyQx+LOfl7jW0I5WEyKHIA9zOtRmil+g0H2/ABszYt2QGJ8RzPLs58IxhViEZB1uprU0ZyOQBMht14T5dMVKIEwFJa46jGPV8CXQ32SNSnG3vHxW5iLqfyCe4qgbAkKpXfz2DY/SIlvuWBCfZN6Wl0pGRKzFKwbRPqj35xAA99pYsuzZHUhn7Em1iKnJ03lx02/XbhLeZws4a4ZQnG7Nz9xwVqEIzuJRYksvG3baxD71tG40UIJmmjO25AM= 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)(93006095)(10201501046)(3002001)(6041248)(20161123562025)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(6072148);SRVR:BN3PR07MB2499;BCL:0;PCL:0;RULEID:;SRVR:BN3PR07MB2499; X-Microsoft-Exchange-Diagnostics: 1;BN3PR07MB2499;4:JIBtySItiJIvxkXPEdYaTibZ4WC1JXpYSieKm2qb7zNX0l8ECCEvjtqIzjbtbfJlR1aZrtz8wUExOz+8MOCKVkdNVXWGQekfPyL2fctk+2mc9l4Ei8T4AzuIN5HEKyb1nyHPE0mmDJobKaXBc1jeaKwNTqdHdJi0violdBB9f7Mqo07vwBmE9puIFFcJSV0ko3muASqJaizyH97Tckfstu4yTy0+DJnmLgGV5sboVNwWLQrr/U1tkFaMWS4f23etL7oXzLkGo24UH02UzkNxCo/VvGw2dm4PmGKsskRC8d3lu0Zm0zIYa43SWenM086F9hQuTboxap1z6nXqnT/1mFzARP+WOmz1dNNJqLI+R1pG1z3VkdqeGBt6l72+O4PRANnc4aZrsNEuipey9S/ELdlQNUG5PdEKd9wb7lxQa91jjDhXT9baiKuamT7scDqQ6/MwNxAf+GsaSrwxzcy9gmRygPLHlM6m4+E72xfsnf5sMi8s4PbCtNOwdvxGH7ZC8psrGdxVuaeHTmbr+ZWsoSosW2LNhwWk9F6mYuYraYN23KFDobes0mpYpQKBpNOv5tSopX97T1y6Oi+phhqL7q1dVwbtJcNYIamytNlkOS8g0bOOkX+OsGNtwTVPiWd0KlMv6gFf0sFxHCgm1qa8bNzjijOGmocYv+a4cc0LksdORCaxUS4t6Epyl5VuE+q81X/DBBb4k6JPF3szrGvUX07xl7vuyR8nfh+Qiqc+6Vq5qBot6LvZhqy2EZRwr3W0e5ekoaWPQW7kmagHZ0GVKQ== X-Forefront-PRVS: 02981BE340 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6069001)(39450400003)(39840400002)(39400400002)(39410400002)(39850400002)(36756003)(5660300001)(230783001)(53936002)(33646002)(50466002)(5003940100001)(42882006)(2950100002)(25786009)(6666003)(189998001)(305945005)(7416002)(7736002)(42186005)(107886003)(38730400002)(4326008)(110136004)(5009440100003)(6116002)(3846002)(50986999)(76176999)(2906002)(6506006)(66066001)(48376002)(6486002)(47776003)(478600001)(6512007)(81166006)(8676002)(50226002)(110426004)(42262002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR07MB2499;H:localhost.localdomain;FPR:;SPF:None;MLV:nov;PTR:InfoNoRecords;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN3PR07MB2499;23:aUriw41MqMFo0e2D53E44G+XankPOJUAWn40SVevW?= =?us-ascii?Q?JEiG8uC01glkMY8oqULUigWSGIrlg92FBuZ8FqHdU5O/w7Frn8IRpIAD8Pmq?= =?us-ascii?Q?HBXfHGFCKYdhhs1wyzctAswtv5GIc+cpXi1cozsQWktOsdwTQusG4EKOhD7a?= =?us-ascii?Q?n8+BggawnT/M6SNNJZJYC84ahq1egIRsHeyCKUTtdYp5z/rKF4DXaeCFzFb1?= =?us-ascii?Q?Ls7HA4gnzK9P/8UP0KtUs+1ICZBH8bTWSeRMBjwzmtmmP1pnpzIkka1dGf+F?= =?us-ascii?Q?ifaBOoRe4QN/EwksRdkRdIo1qaZ0n3mk87Tfb2eyq8FClhlN1u63c3rkoSz7?= =?us-ascii?Q?c0shxHbdmV9HDRpcoDpezm/lQRr5wTIV1yG8Hvo7U9ZkejpH2wprF96Jj5jn?= =?us-ascii?Q?kHalyd3Gyth3biF+St7PTiAheV26WwTIXQ9JADQlpPcbE5iRDK2YPR0UqKr3?= =?us-ascii?Q?GcFfVQPI952G/wdnKJ8VLmp0pKXoMT0XMoA9IBNVBY71OeItTGNRZ4z1EPdR?= =?us-ascii?Q?7d90RB6pZ6zlX7WjcSV/zdE0yF/HsiPMkQl+asSj1OxXjmsIursHmAxRK1tc?= =?us-ascii?Q?ugHHh6HDBm6HuJHvCI8bwFIIbxKgvCfZ39GQQzSpDdH+TEY7GPKOe9iuxicU?= =?us-ascii?Q?g6fNv7jUtKt2xYsic34OvPR14ppPHuoVtUWW1S1ME0sLEfZEhy6laIhYmgTo?= =?us-ascii?Q?BgYP22X88sYoNM5ReC2sprq0xWLgF4rlix6n+kUPnfJ3xQonS/oaQ9t+Nu9m?= =?us-ascii?Q?43FRjepEh7q4mnEuSYFLna6gL9UXGwIWVbjIR0sb/bFe04KNdb1E55J+P1gu?= =?us-ascii?Q?Lzmesq8eD7UL4dOPeJnlLwvRZaR2SFjJhVa1o6EShd0da/GxxJX27GJdW8kC?= =?us-ascii?Q?IcSoDm4O+zYUD+R2WVdnQG0VAFYkFsbO6AUFlCPsjoXDFS/59uT1JyRvS+4a?= =?us-ascii?Q?Au9uCWQnKVCcdtAwJOeRug0LmieNNIuuRKiJxbNqugiYp15cXN8gyacidKXL?= =?us-ascii?Q?BddIQMR7k6yLlwn7w89jzZSbYDH8MnpsY7A09jywM65Tx46h/7IW5QF5bCLj?= =?us-ascii?Q?U9iZmhddMPA0qiD2Hh7Ko6AWOc/ovn2BGaHNTgXyJb7vmxTTW78xlzcIJuMW?= =?us-ascii?Q?NJxsDAeGQ2rEDCdXqF/I5DxI3fv5+59BcEMt3643RB0mB0rlw4T0Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR07MB2499;6:aLIxbX8rvtps1Ho7OqTu3QI5tPBTC51mZaDSfdk6KzTJeXTcu7c5WiS39RdVEcZQC4A1RfCv2wfE837H6BCmFSZQh5NOp//HUGvZkWtM6zqezU3CjRONS1/wM4CymY9heFC/jvJIf0AY5gg47P3OzkxVD56TXtKyQAxUaopVhA06xRBV//NIJ5q/19MAFBsGEC0FXKJW8SLyvThAXe8m92R7g3URfz34z0o+dC16YfQRt+JyBogjsYYPov+YWRl4GyJnbDK7CM3Ys5LOlE9mpkFWe+dI7ki2muBHRkfvtcR5yhWxIEubmfbQ2CjeFIA2gOcObjYEEkic3/IGJJPz5Nn88YfC/ELQMvROxfGZTMcKFWP/z8hEWKGp1OXAmp+2XuVbXmbmyfYRSeEDq37qd/uT8jn1Ff6eVWejFLYFIhNqubjBE58VL2DPcVxB3gLkC9lfWp41EDt+swTj5ys+mPyp7z6ifwe6nLGRjkFjdGEo89Dn7AdlrzHnl0ejY4MRA3jsw8Ywoux2q+9kx4fhBA==;5:7+OjvQIaOR44ytx82yzGK1M10rezag3KxyHdU5GE0NgBiJy7YpCSkfQAjknHK7ISMfS4w8W3MEgaAatqZ2IB7Szwo75r9+EUGWKYjkATR50foQm+nWSsfnNxx8jrwuNrCRIrhh/g5pSkeg/7nX6bcw==;24:Oj2cW3szh0mXmyv5ty6HVnx8khIRLdVVqGTYHkWdU1NcbY/1AGN3kK5fzat/XutdAXG7W1dAvCnDfd/9HQ6rokG/tJHwltnn6EwpMV+0sVI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN3PR07MB2499;7:kE9R6S48zk8+NAEPP4BT5RQ2uCZeh0xhFNoSYt4DaP8wUf4a7V0gdojyDmR41bcJcwOhCK6rl6awTJspMJrK8ZF1zFKTfvVBjSM9526yhRMTenukR67x3zT5TJLjblVLh0bzPG9RgbDcZq3xNH3Y5ZymKrtEKGqL4EvxBr1v7TO8dPUVdI3zhF2sHywoH14GQ7CWzkX1AN01mQ1ecNDrHgVnyB6quMZWhA21N6PGwvMOqMksMOVw64/9KXAad2/vhSioCfKphxneBccFl15NPZaeHUjKGgfoY99x3Dw28ecvtT1J6n8piTzlxQLagUp8V0z+RvXC/4F2mD7lRNYEiw== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2017 12:28:14.1804 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR07MB2499 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