From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751341AbdBXJ03 (ORCPT ); Fri, 24 Feb 2017 04:26:29 -0500 Received: from mail-bl2nam02on0078.outbound.protection.outlook.com ([104.47.38.78]:45402 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751187AbdBXJ0N (ORCPT ); Fri, 24 Feb 2017 04:26:13 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v11 05/10] iommu/amd: Introduce amd_iommu_get_num_iommus() Date: Fri, 24 Feb 2017 02:48:17 -0600 Message-ID: <1487926102-13073-6-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487926102-13073-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1487926102-13073-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [114.109.128.54] X-ClientProxiedBy: HK2PR02CA0037.apcprd02.prod.outlook.com (10.163.104.175) To CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) X-MS-Office365-Filtering-Correlation-Id: 05e47095-3bb9-4f2f-2827-08d45c92087e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;3:h4qeGlKOBM6kZPKfeA0kT3ZcDYB7dRtfqL8XPHqbbFtzAuT9gmxXsH2RKb7Ln9aaWNpbSJXmYl4LpsFxvM/tJUZxNa37EQeoLyu7po/GRwTK+36RLimyVr4QB3xtW3jvCs073Bup6YCxLAFdvxTnxuxVfnLzc2Dlc/MhKrVaNs3YAHyy9uzYFjbV//0yu68ngtQJc70gp5aqroe+RN5zbU5WpuKCwLWoN0jWdDpPOCN4+FGWYSE1o05Z6HV4pSpVZ/WStMlyEQ/RNLuzxtjQYyu7BtTrsVaHuLvLnA8RKyA=;25:pMMViSrjswdzVD/uXL8ms0SU/h3NQ9NzVC/NvxvhOzBtt4rayM4DiNPa4S4nsQsZb7BxEJZ1fR5hOQKtynUN6CyHasZxHHZwDXsJz1XfzhnsjOE3IFFEoteyNngQ9BRdQw74CPv5AROSCpKsGiNqqgMmy/4lp0vCBzknOHTPfximMRNuY9UKRTn12mkdzRpOlsVkccLoF8dLtpYSaGv0bId56+EoTKHZjCssVylO8BpvQamLAAnjBIwxydiHuJRGj2OmEsM6V0MqajGQCcYcvb+2yIVSjKMk4T/v/+pVbSh5XNNCk5xZAxWn40n6pvb4RQQOh9e7eYuuMfMGp/7g4Ur/wYql47tGZ2IFb/4jOnzB1bTugD+bc475QExi/MVyVutzdzpBiDS7wbuBaYjeFkM4H7udNN6t1EgqCJ4CQ7f1xwnuhW2Q2dSiSTnEgyRR2+dMWYeJEDYYPJOggjVksw== X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;31:nD9+6uMqRca8+ppHO/LEYWpeHQICM8GUadq+Evhjsc2oeFhtoTW1noD1oK6A8ynlZxLva20GX8qy9qhSdNz6prn1s3JMbrrHwq69GVPK2b1hpX8ezGGxne4fmqzHh1lcahNv4Vvgne3BXiFhtQT64kR7ADyfhBrCOlDQ1i5uOn+UrmRKm3yt9yrgnav1GxMhL6DXN0RjxRQP4U6L4BtIG+j0/07a41nXzkxRL/L2n20=;20:vtCQQQl6ix3vK4ba0D/i1JjgTduHhcEVvPKs/kkrii310ZzMLyMSgyZuKa2T4isbJDFdDr/U8GR9se5ngiZp8X72gwKlcHHjMEQBRvkHZT7b3tznzlhaZ7pItAMPrKTcqxY/COQE8D72ugiq3idk+4lILSSylLebO/DPXFGc2+BfELPFLfMDwS8/30X8pwx2m0PmAXOd0u8klbnQPggYxroG4rc/FQbgdtLGagwH/xKtNFXNautoo0m4X0Mqc9SYLNORTcJwX4PTDctYQrbMIxd4ThT2blpezMRdxZ3RDDpBRiLy6gkYh961kyh53apfZgoJ2E+dbkJr1lRgfrS7n/+qPoFFnZUKEpL9py2ChSFXF9TjjJVvrl33JobxVo6jTgrQAXq0kShEqWNzzZrQrHdZjkO1nS4aGyyWTpLT8mBm/1bpfL9X9RbmcXQWXgdf4PUyNSW0ArktbFjB4CJXQjSVGeqbNzkHrqFfUlelf0QnqZ/sm+ieSVqT0X1TtpWZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148);SRVR:CY4PR12MB1447;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;4:b8qq1RELdLrQPPul+5OokMUxBrQTuX74lfT/9QmR3zHZJkppbGA0tqvFqxQiQS519xSe/9vwRIqQTpymHIrLxspZNZuzwGKn93bKGxkOwpnzIGuYrRW7S1/6Rz8SNZdgPJUB6Wz52nE9/5UWeNU11YriaTT5sGxTinLdPrM0vdekI//bPeT0i15eR28ZQ2WWpVJaw2v0cGN6oa1jb/dNfyRVuhz0zVHJP9YlfR9Wr2s11ddCxKlWStyuAm9H428OyZzGeKKB2CR9sjm/rk53hg18vbS0ycehazxpy+m9mu2530yu9a3tT5GSho2vq21A5bJBCVRQk9G0ydsU2aXo1VjEAG+TLAaERWBx2E4EGRc2hjUyPJWKh3S5y5VN1AVownHPsG5Sa9xZCWvNrd2WV8eOyKBgBFunKt/1kdeeIK78+yNIG9MJmS9HWElrQuvunpcCHrx8B8G81iDCoHHoROYp2xm7wZ1JXW5OHy5gQVjV1uY2Ku+jJzfbZ8h/yg2SnW1qAhjj5t6tModBptTR0Mvs4ScsEraL00HOizYFhfcAooxn4EXJliemCH/QQP1FFYCVULzyuBpIN5MT2CLyMgPWFOx0CetFnPW6YSWKVoxPEkFelnTHYMSiG2RZ3RJQfMz+kQ+6qQ+Oo5PHeEo846I0OXfYS8AoJefeWbUdoHf90k1wgfiNMo76iTDCTZhK X-Forefront-PRVS: 0228DDDDD7 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39860400002)(39850400002)(39410400002)(39840400002)(39450400003)(189002)(199003)(3846002)(4326007)(105586002)(47776003)(6116002)(76176999)(305945005)(36756003)(86362001)(50986999)(6506006)(101416001)(106356001)(38730400002)(53936002)(6486002)(7736002)(66066001)(575784001)(68736007)(25786008)(8676002)(48376002)(5660300001)(5003940100001)(54906002)(92566002)(2906002)(189998001)(50466002)(6666003)(81156014)(2950100002)(4720700003)(50226002)(6512007)(81166006)(97736004)(42186005);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR12MB1447;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR12MB1447;23:cFuQs7RpKv9j0SCxBesqIOkwy9Ru+ZuGYpAo/mATg?= =?us-ascii?Q?osvXQLx1TQZ1onw6pQJqLGxh4HcXA/9a9IOgpTtYqZfSqX2HN/6RVJNulbLA?= =?us-ascii?Q?7xm4TyTEIyKQfU4cOAKNACJYxgF4xsapvpUbgAoC08B44QB7bvetKW/K6UKa?= =?us-ascii?Q?H6F5PSAlM5WZnB2YsjdjIVmWmh6ls9M5esti39hJELGUsfSwlGidY6wAHu2A?= =?us-ascii?Q?Uzu7HtcPQWWz341oaEWuE23TuEPWeAn5IEArmlZzoHAE8RvjSpYif0X2SGl4?= =?us-ascii?Q?l+vj9daegn9fBT8myYSM6wYZfYM73Fc64fQvhG/thznyLJvTiGcatg6efaD0?= =?us-ascii?Q?NXnopVn3JY5dbUHindz6+acJZq49mDivLCocaSZt+SMNMQJSL5vFyYJ37AKp?= =?us-ascii?Q?4kUttQLcJfzjw8Tbz7GNgvTw/VGSp29pfLq9JWk7TuPQzHySW+a83u9z/yaZ?= =?us-ascii?Q?MF2YAVL1Qbluo1zzPht8uiNWfuYqzddU4vm9utadwKesWpVA3iRn/qY9PmSG?= =?us-ascii?Q?EpmtNQTTxNdC/WcizFE9pMSU7YfkumbaWc8KvyGQYKUpExN/yZRxxGsOyoAC?= =?us-ascii?Q?7DrU6hTAnYlLPtxboIJTOSZDoCyV6dMbVqOMDJgcekrSewPSyWNmKwd/FXs1?= =?us-ascii?Q?Knis4ZTeEkrSmfp0DmeCQ6cHikkr4mm+K2rQ9lHoLHXlNUHk3TKOU+Hyi3z7?= =?us-ascii?Q?+0qRuj9NY38gqnjxo4ngzjR+foMI0nIIPNpYBZy0KXD+5CVk9YYM66l2ewm2?= =?us-ascii?Q?k5MmJjiwvDSqIYmmcycIIwEmHD6hlXVlBqtu3UfQDp7AUP+8Kv0UHl5WaFvL?= =?us-ascii?Q?9UZQ8yt7up+b4GJ3vhkSqlR9MOJefCN81NJs71rSlYvbw3J+tdXi01L8SG1L?= =?us-ascii?Q?Be11PS/dF079BS4nj6gb3NW4ILmi+R5JmgfQdFkUXmbVfyzBuTFNwkB7sUZ0?= =?us-ascii?Q?E6asGFHEC1KUP60yks7XnqFGI5Gbq4qlYvfu7FRzL2jgjMs/EH6eloji6K72?= =?us-ascii?Q?uFmg4vwBM9GVz1rE1Y2sZiGLo+4dXO5ISeTlimzKzU6hbuaB5V3y4MbMdovq?= =?us-ascii?Q?PQXR4GlCm+6hP48GhgdLz6vBjjQ885sE9xNZYwWUn5rDaT5R3Blt0dIWbhlT?= =?us-ascii?Q?Vf5+ZnHm4bGTw+vymycEJi6hrCz10bWt1naXumnpr2RjXJTeKC6pp/K4RpGZ?= =?us-ascii?Q?HmBO9Us26JHPIUw1xeRNOEYdTypbR1Y8RWv?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;6:iQFNP27dID6+wM7IOCJVk7Bvs8K3Nrx/qL/WctBj1q7nNvmCXZUbhe1yhW9iJHwH2Z3bikbwnKPxyy2opRcoWJDOzR7lukypoNiFgLHDvlGkwtvWyc7AhfLdDMdiMtt8rVJZscA+drQtCFm/aBLNWy7l6UBefz4UE+tCdr9gfAkd5R+nK+FieATKG4Yzn2g1urRg2t4EnNCXoi4uv5AjXeJUPCbccsQQlFiegMhqlY1Jr+bgD/0Hdt5/FkQ2zCIqN4c5RlJLCpA3FA0EuurbX+k+TPl0Spi7JP1BPqdrwSy0Im3mhySrMM5ICDQqLRHRx6451bY6QD7N1UHBixQuSpck3aE9r5E7CKghrV0d2UQfNvPvEd3ulUTFwQQnt+YvhBVxDwp5w6rAEjalrAsUG9vfPSVoCqWC6sgyxBmq6CU=;5:1zcJCcqdtLCFXfW85g1O0d9fmlnFqy5z3fsyR7Qaoq9wa4XysY/QOWiH5QiC6zg8jfsbYfqXrXEsXv+l7rtmYNrOCoVS4SLMj/M7dvOwxPy7G1BFFDhZaMbQ02Aw8UvZuMHAuhBOusW1jTk1KH4bPpQrpTublVmbYbFJFW8hl8Y=;24:I+6zqyGfehkg0HZulWSk0qBz8Hl4Ry2OKZnVuwMuA4nsM1oWNGiua60ReqT/W77rcj0IPJVllDt3h64elAvD8CPXkNm2/RII9XNmjqK72ME= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;7:XTkAvL7vETWjnp2LzUe+Fd8wU4r+T7DhQmDWRgKdE3hrS9/2qC6BZx/POXZOVdFe1ytDwDidJHfV2mgIWcQnwRZ8921BFRrAZXyucoV4n9PKLlESj6q13dyk2MBz2hofxjT6ha4XZ4anE6HZG/UddIBZfbYt54X9Nlxz6VvKRUA1YhYSRjxsLIOfjfU9kcP3ZEP7TOvSEEEv8NiISes+J0H64XuPW6pT8EhtE7/cuiqVlkuUo1PwzgHiU2YbqLe0Gihh7ouaKA27WFiSbabCfE9tq2BRrcU3S8qtl64+hpjZ1t+AjAw3i7jjmciqbBnXn+7a92VVQta+n00/g2oDzA==;20:nt7IbKnrv7UvTK9hcSJ/qGOJ4Rjoz45pU02WiPgvdbkUEM+Rqe3mX2sxyIRqqGfkjXqeVrke1oiwXf4yQXnHXg3dlhrt8KIMZfI1wEQa33wzmRyrVLVVBxmUtRNLm5N+epNlgwxyYo8cONEx9vyet17NTh548RU1UlB3xiqAsd465wC+Aj1UtokeQVPT1Z5/IjkOU531jbhJRqg43nf+1LqvE7F0WAx0tcGwY6lcgikxRRsKYnkotkS9xAp3JRZs X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2017 08:49:21.9318 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1447 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce amd_iommu_get_num_iommus(), which returns the value of amd_iommus_present. The function is used to replace direct access to the variable, which is now declared as static. This function will also be used by Perf AMD IOMMU driver. Cc: Borislav Petkov Cc: Joerg Roedel Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.h | 2 ++ drivers/iommu/amd_iommu.c | 6 +++--- drivers/iommu/amd_iommu_init.c | 11 +++++++++-- drivers/iommu/amd_iommu_proto.h | 1 + drivers/iommu/amd_iommu_types.h | 3 --- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h index 845d173..5c5c932 100644 --- a/arch/x86/events/amd/iommu.h +++ b/arch/x86/events/amd/iommu.h @@ -28,6 +28,8 @@ #define IOMMU_BASE_DEVID 0x0000 /* amd_iommu_init.c external support functions */ +extern int amd_iommu_get_num_iommus(void); + extern bool amd_iommu_pc_supported(void); extern u8 amd_iommu_pc_get_max_banks(u16 devid); diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 3ef0f42..04085a4 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1230,7 +1230,7 @@ static void __domain_flush_pages(struct protection_domain *domain, build_inv_iommu_pages(&cmd, address, size, domain->id, pde); - for (i = 0; i < amd_iommus_present; ++i) { + for (i = 0; i < amd_iommu_get_num_iommus(); ++i) { if (!domain->dev_iommu[i]) continue; @@ -1274,7 +1274,7 @@ static void domain_flush_complete(struct protection_domain *domain) { int i; - for (i = 0; i < amd_iommus_present; ++i) { + for (i = 0; i < amd_iommu_get_num_iommus(); ++i) { if (domain && !domain->dev_iommu[i]) continue; @@ -3343,7 +3343,7 @@ static int __flush_pasid(struct protection_domain *domain, int pasid, * IOMMU TLB needs to be flushed before Device TLB to * prevent device TLB refill from IOMMU TLB */ - for (i = 0; i < amd_iommus_present; ++i) { + for (i = 0; i < amd_iommu_get_num_iommus(); ++i) { if (domain->dev_iommu[i] == 0) continue; diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index c7edc18..17d7f44 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -165,7 +165,9 @@ struct ivmd_header { /* Array to assign indices to IOMMUs*/ struct amd_iommu *amd_iommus[MAX_IOMMUS]; -int amd_iommus_present; + +/* Number of IOMMUs present in the system */ +static int amd_iommus_present; /* IOMMUs have a non-present cache? */ bool amd_iommu_np_cache __read_mostly; @@ -270,6 +272,11 @@ static inline unsigned long tbl_size(int entry_size) return 1UL << shift; } +int amd_iommu_get_num_iommus(void) +{ + return amd_iommus_present; +} + /* Access to l1 and l2 indexed register spaces */ static u32 iommu_read_l1(struct amd_iommu *iommu, u16 l1, u8 address) @@ -1334,7 +1341,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) /* Add IOMMU to internal data structures */ list_add_tail(&iommu->list, &amd_iommu_list); - iommu->index = amd_iommus_present++; + iommu->index = amd_iommus_present++; if (unlikely(iommu->index >= MAX_IOMMUS)) { WARN(1, "AMD-Vi: System has more IOMMUs than supported by this driver\n"); diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h index 7eb60c1..e8f0710 100644 --- a/drivers/iommu/amd_iommu_proto.h +++ b/drivers/iommu/amd_iommu_proto.h @@ -21,6 +21,7 @@ #include "amd_iommu_types.h" +extern int amd_iommu_get_num_iommus(void); extern int amd_iommu_init_dma_ops(void); extern int amd_iommu_init_passthrough(void); extern irqreturn_t amd_iommu_int_thread(int irq, void *data); diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h index 0d91785..09d7a11 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h @@ -606,9 +606,6 @@ struct devid_map { */ extern struct amd_iommu *amd_iommus[MAX_IOMMUS]; -/* Number of IOMMUs present in the system */ -extern int amd_iommus_present; - /* * Declarations for the global list of all protection domains */ -- 1.8.3.1