From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753718AbdBGImn (ORCPT ); Tue, 7 Feb 2017 03:42:43 -0500 Received: from mail-sn1nam02on0078.outbound.protection.outlook.com ([104.47.36.78]:47320 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752043AbdBGIld (ORCPT ); Tue, 7 Feb 2017 03:41:33 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v9 4/8] iommu/amd: Introduce amd_iommu_get_num_iommus() Date: Tue, 7 Feb 2017 02:40:32 -0600 Message-ID: <1486456836-17428-5-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1486456836-17428-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1486456836-17428-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: SIXPR04CA0023.apcprd04.prod.outlook.com (10.162.171.13) To MWHPR12MB1455.namprd12.prod.outlook.com (10.172.55.136) X-MS-Office365-Filtering-Correlation-Id: dc51d57b-2e6f-4b3f-a224-08d44f351b12 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:MWHPR12MB1455; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;3:dDw4Q/F8BsaDsXFfpZzgZqb6wOFeDSvxXvMPWgHhKKqCyIE4FNELmPW7sSWeqhex4RR9waMrk9fR09EcG4KGtjFvNU6EnEuLO6RzNSBUmPgecicZdbb5DS/G2Ki4XykET9odWmjrB4rnMUiVShj2T7yRSZG7KZ3/ekSUIxVSZYfDzsuuUtpoQI1OSU5nrx8adE7mLK4bGG5mZE+4dIKOYMJ2B05crmQZiVYYlJgsvA145o64/QfVOObYK6sNZs76bVyEno8Dod+VeL8+/RnhQMMkhMveBH1ph7D5Ye1F/nY=;25:hEWIS2FdFPDAnmhf1cwakukGxIYAbH1g3y9PkOxEiI+h6Zx02D8DG4fGltxR63bhWRv5EXe99IDyGb7aIGDE4K1tnU27XfKMkiqYO0nDgoUHLlXaz2AO4tW4qQngG++CBZn7qMkfAh6UweHaBGKqoHNft0KuWmX2SpurltHhi/HsKByFmP7hE014b4p6E5E4ukqAWvTukvnyGeU+ndvIVu65STywCYsHPeDc/Vy/rXE9aW7Z4QnwWIVuq+guY8m4DTeIRcBHvhU+ekzy0/4WGMxIhIY5gUQ4lWGP4QoB3Qw8criUHLlzjhSfBAxNweIAbdwX3RbCFDhPC2HlaCGMR7WkuKEu34u5PDw8HS+U6HwtfThW0OceAubN2PR6P8UkDIcxSqlA72tlTmIyza+GibAHNIz+XggKnx7RF1pD1MQWkAaDenlT4/TGGeYI48fghIEErZ2XG4Nh3sCnpA8MYw== X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;31:lMIii3FemmYcIjGsKf+AdOLsG36J6iitTtjyYj1L92GG14YdqSrKHwsEGKShGaEYwVRkvgquUKO/JVlumkraiUBp7MjAp1tn3pScczUER1NAhSuLtKkSg7y9JFhJHaNvmcYCYJ5FQS5Nnuuqaf2a3UoJuL93tP4rImSALAzcch5Chg804CSxcm11WQmSDkDds8V/jXe0cTnMIGd5oORexDK/YQ7qc2eDM+hMTLWplRsvS1Dblx4faaRNL0HurBCpTN1u6GLpFLC9PuxH8pud8A==;20:gbVzQEP5C+2T1f9c0DfjuTmFkmDyh4At11zxUA5GRG5E7VtBterOhoZ82UgLsiwXAw1PYJAld7wZzKGmRK49PfRXvRYYl4sz82j1pIIzb7XW+aja61zpyYd1Sinv3Q8QPXdr62awkeXiZAv40ZPv4/IuUnOSRPx5qS+0UKfsDT92j5MqwvlL4kfhDUcwwey4ljfiqd1Bbb9djn0NE0iAZZgXM21kLWqYbCuBa9RWpjiNd3QAb0SRxWvJzBxS+q9O6KimPqivdJ2a/KHYopOKhcAcDlj2N2mwpvSX7ci96V/MPUS7cF0UjIamDJioZB3Tj6c46lLLXjNcgpgu2E3i1WYBbHkEVj4l/iswSW6eil5bzvJ1fGQgMVO6feNvfqbsdFkso32FR/6ml3aaB8RsB1LKGZ4PxkH6b+g63VrbooIkZ95UcbBh6BZUfes8SMcNGvoeJyb9bCCy2Ov0Q0vjc6VhQRDCH+Qrr1TNsmHzDZ2SWTBkMdT8EU6FZxTAZd38 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)(2017020603029)(8121501046)(5005006)(20170203043)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123560025)(20161123555025)(20161123564025)(6072148);SRVR:MWHPR12MB1455;BCL:0;PCL:0;RULEID:;SRVR:MWHPR12MB1455; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;4:Qff46CBaMUWyqtk88xPCcdggG0e2rcLwO1b7XjPUMkuf5Di1BQyANCTU5SIuEN2M7Ga7OVrXYpWDRDr1sFmltISE3B98V5BsoKmx3FvzmJ31RlCkx2vNqUOzHo9lYLTcjQ8EfcgfDcv66Hq5Sl8yOjmzYBhQuxrP1ggzU3arS3c+gSgCqYsNPB01YS48xoylPnEiR7hbGi9C0PleOboI/mp63IgC6v0guSpM8EOew07InZ91snjqBsMgDkT+P1eFcN1ku+sCxPYzlPjodmqt2gMnXZMG4WxTNTi1urAlHfjEDaIJXv2XxF0mQkqr2RYiYwiCwsQ6NmB5G5F9n2FbD27be4g2RO06HS04saiDHsi1qmy30AdSokNoLVhwiuE6itwNv6ZtIBUnHR+WzitMORTA6W6AtnLtWzT7rRYrQPZBZSsyiPBcLdXbL4eesSv8VRZI/T0ZzFPigBM1w3Y+mf5iCLHrCrzlWMwf/C+3iCu0F2CjK6KvTXAtrmOmK+Svd7oWw/PwRbydG+QUXBSgKKUTrWKxJCtab3BvwrqKKak5wbiqkgkgb6UOQsCm35wNq4OzaGCboAc+u85tl73DqHnOjYGEuu+NSK7QMSIokOCq1vqD3KG1wgIfdqqq44mUQehM0f35mFXLEYEr9KNmfp0do+9m2CExiJ6k/NEDNEclxs/fYVhYtX3QbLaXVKT0brpnC4jhubA0fFrQ59HQaSF92dyDTEphbrW5u5743CzJPrJwkgtEJaxXbEmfwyDL X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39850400002)(39840400002)(39860400002)(39450400003)(39410400002)(189002)(199003)(575784001)(25786008)(38730400002)(5003940100001)(4326007)(6486002)(305945005)(105586002)(6506006)(7736002)(81156014)(92566002)(68736007)(2906002)(6512007)(54906002)(53936002)(8676002)(50466002)(81166006)(36756003)(42186005)(106356001)(47776003)(6116002)(66066001)(48376002)(3846002)(101416001)(6666003)(4720700003)(2950100002)(86362001)(97736004)(5660300001)(50986999)(76176999)(189998001)(50226002);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1455;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR12MB1455;23:ekgyuBfxh9IztlbrnaIH8HVPGEKHJI/U6Z32heNSa?= =?us-ascii?Q?keLrxTRgxGHYw/6Aug0zeoI1c16eAVnUtsmjmmP+0moTyQM7E2IUwzlJCiGR?= =?us-ascii?Q?HmJPZTUbiwrvYQN8bpavMfpu0W4h2oN9+NYS8fu26FASSn2wXV/N7zEkd83I?= =?us-ascii?Q?f4uy7xXEYDYFI+HMyhgGFj9lOVuZi1JUU+xZE1yPVfQ9bRwZggee1xNKsDlQ?= =?us-ascii?Q?r7Y6MD686nlxl58c2BpCtXYhmOOksIo7wTLuN5PCAbcZs0GMvEVjg4bLVAgq?= =?us-ascii?Q?P/OCY7F+/L09n291ZFbLM86+bWIgGHJk4q49MnB9W32fx/3Cnm0tCFjsmtmv?= =?us-ascii?Q?QoH62bsbQNccUCzy90wli933V1VaKc9DItvcxnpoGlCH8Akk32DPkzyjDrv5?= =?us-ascii?Q?riGyCHhHpfl8hpHuEgyEXhdrIHAA5125jknYsMz4I5iD6kTq4pARTKgoCgLM?= =?us-ascii?Q?4bGk6xPrKbSbzybYzN6IqpAnrBcjMUHf1q8+igUeYVGGOIHxnnkJRWYqgM6I?= =?us-ascii?Q?6DL6KfpE0cU8o9w1vqWwVXV7KN5YvZOgiFIlIKedXsjqdGiq4sxtyvW7VHkg?= =?us-ascii?Q?EZfv6YSQHNKu2DPgv7T5BB+jFeIEkqocQF58kK3SCZmCsl8rPrAC0jnFh4Y2?= =?us-ascii?Q?KI0hNAyrnqhyPI6/fGTXAUeNYVPVBUZ5ncArSExQl7HUvCQOuRliIsiHLbRd?= =?us-ascii?Q?dDJCTOJSgdpXl/VXx5kXLYVpFR3lM6bjwYW5+1iv8U8vhd1opRHOoB9iZ74j?= =?us-ascii?Q?27w+ReYJhw8cJaTcInTnsKS22Ab3fXvpc3mB0W8s5mWyF/kDWVYXngR4gGvU?= =?us-ascii?Q?0x0EZexi9YjpDOoG0D7HP9DHkhh3Gf64w8ISPaac5VYSPPyQUsfqt45lCjix?= =?us-ascii?Q?Jd3WIqvOZugByyIN9hOmuzTRuHhdo4pwNVafkbS34ck+nDcmvucuMHHsP4tC?= =?us-ascii?Q?N29omhigP0vIwM8JiFr9y9xdm0YSg1YddztiHATK7BvorIP/IGHcFItfiVvN?= =?us-ascii?Q?VimIokg8jmSEpxr9nIDFf7qXDeoWSm4by2Rdhshsd689hyTW39fbc19p9X4W?= =?us-ascii?Q?Rxk/wgGSlfOy52wZks/0uXJu6XFbIDb2CYev1JrInTrl1AX5ZQz27pgj9zHJ?= =?us-ascii?Q?+K3SxUybfIJKghuxNhyNB+C3fuyHldaymY1x7x2N09MUshSAxGP44qejvdpt?= =?us-ascii?Q?IsvHk/EqhjFCwd5NgZGZGYoSyaSb57YsN8s?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;6:dcTeIC2YhJQFMuie6WTY1clR+bIUiveUr/9oNbzjJSF/CbbK8pF0R1OT9JnsqVFe2r2LKlFUbxiHt6Ncrk9r3KFMwUnt/DcOHNn+WORHTCn8wNHxLUpZM8NtggBTlRTpF1AyZDdYR5/Gs/binKCR7kmV6G4/+cIskNwm8yL/JN4I+VzkrKNlZhqj60rZyH6PuVDHNivSQOi23duI5VQU7nUh+KciM4srfbCdF8CUI9Jy+5z4GgwBBQm1AZS2jZdW0XNQ5bnEd6hIPMY3QestM34EHsEUfYZbXdNHhz9B5qZNhPYd7z9uL7aq2Pdf9PI3YNdcy4tiFk0nNr/5JA4rEESsS1SAXSRCuzxNe5u/NqWXy1feJNDyep9P0lxa0+e/rJyBrFay2pmPuDgRQXn4pVWVABTMLOD7py5MB/mgMb0=;5:ifLVnSZXKdnX4tod7rQ350ZdgQG0cv/0M9NNT4Tnldb7g5bPo8z9Gtp0nDOfNlGOFxwapxhNTNswTMhF2z5a06vcihUUgfSNWSMTPpdD/4eVP9zgpzasKARilP9/P3ozbkCqd9+9P5tghnxuxiKojGr5hxgdiPH9YTzUnmGk/Yk=;24:JGIKyuWgyF7xgUBKNjvuI37ske4rcTNX4ShTyU0OFz+fvkZTFy5urpndtrhNZyyI9ZoeKs5Psa9032MX71R3GWNsQult5MuKhj3LxXvaKvw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;7:XLw2r8L51NhoDRCPvxzKscYtKjD86GEWKdDymnQUC/LHubq2WKXz9LWZ8yvr+ZZcQEKf3VsLl1Od0h8GCOtlhomkg0nzr+0S9dP/wZiJ/mh8HCTiWQyp4YFqSf3YCLep1M7ZJVW0w1CSrYajsiculL+AEJ48K0ffUyaS2cMrMGzfXzxlaOGjohRxWEsNW0h4HPuCBNhCar+Y4CY0QcNcNy4njXtMipu4gOGJm8goI6oG58TurW/8vDOHs2nJYAWjTFs7GupbLJGoJROFwq1QtMWQPIjBDi5eLDvqPSN/NhvqfCFmOl052lBOKZJ3iB7Cv6u4BFx6aIShOVQy11gO+yHmc54oYBTYzScvZV3SVRrNoMzoj0H9j+Tscx3H0E4Sam18T1zSb1ktPELzQN4cb6PxqLMWCgC0735MlBruekREwJSB/h/HZxKHYQolmMARBojuEsoQxmIylKRyXFv9cxl5LjoJ6rnqmHlCNEIBnPetdy5ahGcqgf3vQgSCSnercx3rcQEf1rLQ/qy1kEZ/DA==;20:B5PIcaUbM+rrm/H92lpNvOt0uA6AgL0Dz1kRBW1EC81XLamOFOjjyw9XSgqxZR6jemaCb5mlDlgTyIUK7eeCU/RCDIeOnl6fpj9pZvp73MhCfni3K6StZgkMqaiaCusLLCfYBw3Eyrwf/t5BbvDs7pTzMnaVdykYfY+iYv3kmhJBDuubDXpFdEUQQc/x4mVQ5BzgQjRAjVm2GuAUD9wYoxL1o32aYFZboohQr8T90MsxUlcZeoXocWQqSNUvA9L0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 08:41:25.1281 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1455 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 6799cf9..1b5adb4 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