mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
x86/events, drivers/iommu/amd: Introduce amd_iommu_get_num_iommus()
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 AMD IOMMU perf driver. Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Jörg Rödel <joro@8bytes.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: iommu@lists.linux-foundation.org Link: http://lkml.kernel.org/r/1487926102-13073-6-git-send-email-Suravee.Suthikulpanit@amd.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
0a6d80c70b
commit
6b9376e30f
5 changed files with 15 additions and 8 deletions
|
@ -28,6 +28,8 @@
|
||||||
#define IOMMU_BASE_DEVID 0x0000
|
#define IOMMU_BASE_DEVID 0x0000
|
||||||
|
|
||||||
/* amd_iommu_init.c external support functions */
|
/* amd_iommu_init.c external support functions */
|
||||||
|
extern int amd_iommu_get_num_iommus(void);
|
||||||
|
|
||||||
extern bool amd_iommu_pc_supported(void);
|
extern bool amd_iommu_pc_supported(void);
|
||||||
|
|
||||||
extern u8 amd_iommu_pc_get_max_banks(u16 devid);
|
extern u8 amd_iommu_pc_get_max_banks(u16 devid);
|
||||||
|
|
|
@ -1234,7 +1234,7 @@ static void __domain_flush_pages(struct protection_domain *domain,
|
||||||
|
|
||||||
build_inv_iommu_pages(&cmd, address, size, domain->id, pde);
|
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])
|
if (!domain->dev_iommu[i])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -1278,7 +1278,7 @@ static void domain_flush_complete(struct protection_domain *domain)
|
||||||
{
|
{
|
||||||
int i;
|
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])
|
if (domain && !domain->dev_iommu[i])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -3363,7 +3363,7 @@ static int __flush_pasid(struct protection_domain *domain, int pasid,
|
||||||
* IOMMU TLB needs to be flushed before Device TLB to
|
* IOMMU TLB needs to be flushed before Device TLB to
|
||||||
* prevent device TLB refill from IOMMU TLB
|
* 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)
|
if (domain->dev_iommu[i] == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
|
@ -167,7 +167,9 @@ LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the
|
||||||
|
|
||||||
/* Array to assign indices to IOMMUs*/
|
/* Array to assign indices to IOMMUs*/
|
||||||
struct amd_iommu *amd_iommus[MAX_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? */
|
/* IOMMUs have a non-present cache? */
|
||||||
bool amd_iommu_np_cache __read_mostly;
|
bool amd_iommu_np_cache __read_mostly;
|
||||||
|
@ -272,6 +274,11 @@ static inline unsigned long tbl_size(int entry_size)
|
||||||
return 1UL << shift;
|
return 1UL << shift;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int amd_iommu_get_num_iommus(void)
|
||||||
|
{
|
||||||
|
return amd_iommus_present;
|
||||||
|
}
|
||||||
|
|
||||||
/* Access to l1 and l2 indexed register spaces */
|
/* Access to l1 and l2 indexed register spaces */
|
||||||
|
|
||||||
static u32 iommu_read_l1(struct amd_iommu *iommu, u16 l1, u8 address)
|
static u32 iommu_read_l1(struct amd_iommu *iommu, u16 l1, u8 address)
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "amd_iommu_types.h"
|
#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_dma_ops(void);
|
||||||
extern int amd_iommu_init_passthrough(void);
|
extern int amd_iommu_init_passthrough(void);
|
||||||
extern irqreturn_t amd_iommu_int_thread(int irq, void *data);
|
extern irqreturn_t amd_iommu_int_thread(int irq, void *data);
|
||||||
|
|
|
@ -611,9 +611,6 @@ extern struct list_head amd_iommu_list;
|
||||||
*/
|
*/
|
||||||
extern struct amd_iommu *amd_iommus[MAX_IOMMUS];
|
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
|
* Declarations for the global list of all protection domains
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue