From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754343AbdEDM44 (ORCPT ); Thu, 4 May 2017 08:56:56 -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 S1753893AbdEDMzo (ORCPT ); Thu, 4 May 2017 08:55:44 -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 5/7] ACPI/IORT: Fixup SMMUv3 resource size for Cavium ThunderX2 SMMUv3 model Date: Thu, 4 May 2017 18:05:37 +0530 Message-Id: <1493901339-14929-6-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: 849c5fd4-08db-4c24-eb03-08d492ecdbd0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:CO2PR07MB2504; X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;3:Jn6q0mDgEKfKmaof+Ak4GkDYL1qknqTCymNDMW6FqB181ARX0HHZrlZekdPNHR8xOhgw6/6OQ3ioGucBDXif8DE/jjDodCryjYmbsWbCM/C6oLmQBm9X5gxwNOAgP37IP/NKwzLmL+ltgMh8OZRM/0kxo4mkUpRe6WFKZkYcVBb3QTOgvd202OjdEtpiEAE5JUkwv+Qie186el1nkd1I46xIXwudVYDRKss3lkfffk55O7e/I8VWo8O8cVQrjameIS9+Z2u9UyIYQEepauWFXrvJYwGJSdr4MUuTj2Jf0dyTFhpwdXJhyPmhXIu1vWXK0wTxDFOY76eA3PZs2xSVRQ==;25:9HORo05v8ZQLNU+Hz4ziwmO8eKc3r/653tDceLuLmIHjvKL0XpXCPyNOfFsUHKUOmfYUpRTL5DdnciW163sONdOLdMoNwuLXg3CXTqF/u2eUC1Et2Wziyb4+Xky3yJdVMz+b8du+pr9f6/K+kuC1CO095yA8jvGjvNqiyws4RUV+p+BpinAv/aMFWvTi4eFUab0XJjUSrHFRzo6RnQ/S9ctmAFfrESjhFfUBQysHaYe7DlbzM91n6BWQWxbeu47jmVHZOZEOWJQhTFIFBKPUmmOG+G8OfL82VK+YzdV+gLTyMDc2QTDqn5lDCgHGS7qGPfq4tZ4PTiMV9uXiQKRTNcXWY8JtBzVuW+X0QRcxY14g2iFk+Kp1xTKAiV7XxnlWeZZMXpTqhyoCz6u4wW1+y5QlW3+fNHahdVL+F4jjMzpxDUDVaVKcQwIu5b/LOZhs+SNyHqn2C4Mar1yHSE2tug== X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;31:UiCzQBfmilwSCT4x02ZLBOaZUjgK0p8cXnHQt0/MuqpuL6UQQnyHpZQrnla+Tovi90Dv8vWlLylbllFJVN9Qx6Egn9LgYmk4ERhxkFj6DGwN5d6L3e9/L4j0VuFUJTZwuZRFiCyscMbg0+xbSW/GvxcGQ85ezq1OR1cvT0rqxMsA+m+t+VMNrSm8kYn0w6zzJ+iwyZMvttbnVXiaunoYclkpWlRNT2E2r2rVj+yyoNBEJCgyrOX8HtfIdflmdIdW;20:7VVfBYI0qrQ4BTlErd2eK8AMnFqTNnp+iU5wnFaffK8SH4QcTpRoJymB9Ds6w/aB4MzrYOdI+1gu3oumygg8fypS7vgr1fXZHdc6hxH9mPflOqKjNAgInAGAn84gOomASpdXxbs5ZTOlHMBJofs6tXnFT316mLisZscXpVpUZP8RAHm1sIRjPE4lPNeWfrDzHTWy1T5XMeSgjJd2mQZSCbI2pq24jRR8X4BP1Vi2krdBARGMdlZ+NX1lzE6lCimoLWW/AaLDyZUjFDlfVhPsBeEfL5MYbuKut8nASToE2ny9wH8bYh/bKbqtDHWPG+OwT60Pi5EJ71Qq/TIQYr18SESzCuwZBRmS2c82euqVlhHpDzFH+7qS6Et+Ei2kXFHvZUUd1ExL4LtHiDygxzQFtKn0EXStsWQYZGL7RfkOld7Wwu1vJAh3k+UmHYXuqtGj0/UfJOOGD+3gwMOOPiuTLFfgSXAynV4FbT1MbRvvQPcSAAw+lafaIORmBt7CicWi+ujqk0lSWw1evNhQbVjOaDGZa1z/UQvvynalCQ5XF6HxNQAYa9tmUYRYMUCgHKErmaut9qaHlyhH8CcU3HCkX1M3VF1sQWq/lGdw+lLSxck= 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:2eBMUXt+w2Vb5DGdWK46dxTBFTedl1GFO5RLYYYgIOhzlv+ftVtQahmIuvc0ceLyoW0+1FNwU+mYPWEZ3rBhlmwUpnKC+jcoYPy19mWWSEijjbOrhwNbL5iFVMq+2pdqchB6mMfplzP1kpkoSxRceEmznscMeC6eatg+4lU3pglFpPGJhZRj8ZTS+mjsrbrjLuTA8glvwK5yrrn8RFMQBReGXmcDJspIS+pm03lEx3IB32OqRCthNKDn618WJWqE6ByYpjHPG4L0lqtgSnjBzRJQcZAQO67SWsZ2kGqoaLR1AD7sptBjcBc43URrpXa4qYZoH7ZlyD+Yw4xTykzD2rmW+iieFijhtBiahrKBGc0lrae2QXVxpVKAp37D4MGSK6swCzvt1yMBFJqgISNfnSzOXZ+iH5wXQXLPHbu+zcVw2RfA3reOJi7fgEPni+gGSj7t6E8WLN/hjYmiYkCQk2uKLd+Ayhtjm68fG5/Ega8L3L0i+LYBAvSNNlUqTnA8treYhIUjSYreO4pv3gwHCgRESHQJg2Znq/UJan0z0PyDCIGKHfE1Pxza5xkeTJoAtceuqq37LDOWd1MZ3Wuy46f5z34zPRsUgUIxPVDJJrcYUV/0deiDlVvleoXCAWlas2SpMdt3x4N7dg5OUBrgKDcY55vR9Ja1qj2jeNL4kJGuVNiNxMG2+UiZOf6SyAj/ 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)(5003940100001)(33646002)(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:wYEUELoF/SoFvB+DZlQ5N3uoQJYcQSpgOcRDnN7GL?= =?us-ascii?Q?8p/xnDCtWJ1fUcB2jZ0YtYuSVELFJ4rc79Af22RlgyGHjCg5BAHWhUsnfgdj?= =?us-ascii?Q?/TFheJMr1Jm0UtTnRn4So7mkeyhtMyPp/iGPBQO0HWW+XE8AR4QsdV1qZHcI?= =?us-ascii?Q?BM5pF61p/0VFnvra2L3TtO+q/Ef0vmvlqjEk7NriNpO97V+Igtsj/rUVa+EB?= =?us-ascii?Q?Xpqr9uzwGJcz5ECLqO4tRLSVpI01zNcmBQoi443I6wZGQXTiuCevTKwrJNQ2?= =?us-ascii?Q?B89efn3Zqw6jF56nrixkhqMZTS6syYgWRnYCVElJdyif7S+eIZF87Cb/SRnu?= =?us-ascii?Q?dObYub2uByKBchiRwTCsEb/dfUfLhy4rBiN3L9LGsky01nHcKIsi2MSVALue?= =?us-ascii?Q?A1iVxTRz4GsAHzpxQzMkQJEAiAyRRRD2+BdAxlDHASMnG+vG2Z5YrtpMO0KO?= =?us-ascii?Q?Qwx8GlV8q1VES+stUz4jpTR7gHs/mkQ0/y32f8kM6ONt68cAemmmyL56h5yg?= =?us-ascii?Q?f7C7EBJ4SKyANmIo9kVZ/SB40wftf0rMjRSQDQt4KeP7Z+cTfQ5QXk7jw0QC?= =?us-ascii?Q?ooUq6lERJKtpcQMO/XaOAoebEgBDIjR5HRHEFt4kKoH4la/3IUrezDuTgn+m?= =?us-ascii?Q?oCxl0SI3kOcAmv/VVa74Wop2HT7FeMA8/YhI7BOERYBxD68W28IkiBc4Ks4F?= =?us-ascii?Q?flxKGqJAlz0R8EFrkGZAq460S0qXqeG/BYP3CImezAxmdvObJx2sIcSXO5yv?= =?us-ascii?Q?4e9hL2ZmXQQZAcN/CCj42APNtgK6mboTOdo9kVg3QbN7Rf5AeH5KPrgBkdl/?= =?us-ascii?Q?0h2HZmnnrmATXoAYrpINsO2L2ywhdsTYyQPsoxzdY9M3ZBHGUjDkqjg112Kr?= =?us-ascii?Q?ehUaDEeGX9LhjC6u+YAcRpcgzLg0bfccpHDAoGbB8iTzNrIOBF5IkT1nGFn5?= =?us-ascii?Q?wTzKjSlS5JSbf4zrgmniuwUrJoEBF+3QXJuY+48egyXeHJya2VSQKWJHYYXH?= =?us-ascii?Q?b9i22UnEbx6jegGm6Uucfk8PwDh7rVMCwmtDzm9GYEr3gEJVrAiErPRtFQEw?= =?us-ascii?Q?bRan4/v7HSmqM1nI+2PA5C2vU8nvSgCPVP/cKWA6Ok9olbhze1elRjXA3W0i?= =?us-ascii?Q?7t2b0J1I9E=3D?= X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;6:Nm9QOazAQAk3NFSGqy1xXLboB6EkFgm23rYVldBs2NFRW80pdSkj+hiyGM8Ht8Crnh8Q5fp3W0LD20adHOQtS3F7Z+eZa0VPiX8uKGxjPevOEuh3ES2+vqSt9wbs4EfBYmurUxUMKdgW7+WmsYuaU/q2lUGw2fLNZyqWjVik5aQtd45KbdHBQKBMrp9YQEPn0gXzLddoebI+WpFlmFj/ad+cTyCk8ekGQeat9JZNdtleSSD8OUBwun+R4SE2lbyT002b+W7oZkIxieUTRU9iqAOdGehI4KrNxbYD6ngS5atYg2vF5bKCmc7DhRcDkkK7GTWL9tHg7XTKSxwN+IFqNS318mUA8EwAgKkh1rBnfGrPUU/5NeYFidCWcDFQykXyUJNip1Hb89kwlGd2/pdJ4AOpWX/Y0p3+ohjZfOyNDJKthVQG5MTXvtM9hfAvMS4diSOVrUpMpEsyqYkI0/qc6PiV26FjaGErC0bJHEqEn3ehYHWHH1IqKXOD8iqzkOzRSl1ZjwN+lq8sXvRzTQAnnw==;5:nKGBvgRJE+HR7vXm3NDh7EwssJYVl9VUYlJScHHrFUM1WwZw3HW4ybh97XVp+VTKoxUrrwmIGra/FrEENv/Y5dHgknNLyMq3fp9Sg3xnQ9FehzUwrmOovYzxEjyG3pBsknskDmgDG+ENpPwQKd8p5w==;24:BWZR0STF3Ctd9Qt+rskyultICZRHHoDoIsf1rCf5BqDMDQniGwC2OV96L1IQS2UhL7GMJr+7c9ikkTeyUgULnwmHgzkhmuv76Yzj7qpwdp0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO2PR07MB2504;7:sY/lrmI6JQoi8gNG6tRMtIXwGeeblmgyyYYxfJ5sgsE7AMYTbIrDaMMjMhKn1vaxlqOajak6N4qMEZUuHSLcAbmkH8gXr0AGzrGbsOQCMgzwF9vnaPkfbtOJIHGMfXUQTWp/24pPNNckypwzj98eUIHfWT8e5SXU7BdadFKS2/JQPCn3gD+Q39YNmoKAuGj7tT0qwAPa5pJtXJPSyM1QMDYxvdKAJ/N7i9JlNjHRTjo2ysVZptQLVCYLsmpafi6s1+m5mEcTu6BLBf/mw4OJY3LXpNAbzwmrpmtV+00nPS88c1LJcFdaWclCd0RCY8/XuUGwqVA22cFfAAXeuHsN8w== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 12:55:31.0176 (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 Cavium ThunderX2 implementation doesn't support second page in SMMU register space. Hence, resource size is set as 64k for this model. Signed-off-by: Linu Cherian Signed-off-by: Geetha Sowjanya --- drivers/acpi/arm64/iort.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index c5fecf9..23c5350 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -833,12 +833,20 @@ static void __init arm_smmu_v3_init_resources(struct resource *res, { struct acpi_iort_smmu_v3 *smmu; int num_res = 0; + unsigned long size = SZ_128K; /* Retrieve SMMUv3 specific data */ smmu = (struct acpi_iort_smmu_v3 *)node->node_data; + /* + * Override the size, for Cavium ThunderX2 implementation + * which doesn't support the page 1 SMMU register space. + */ + if (smmu->model == ACPI_IORT_SMMU_V3_CAVIUM_CN99XX) + size = SZ_64K; + res[num_res].start = smmu->base_address; - res[num_res].end = smmu->base_address + SZ_128K - 1; + res[num_res].end = smmu->base_address + size - 1; res[num_res].flags = IORESOURCE_MEM; num_res++; -- 1.8.3.1