Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b9376e3 authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Ingo Molnar
Browse files

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: default avatarSuravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent 0a6d80c7

arch/x86/events/amd/iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

drivers/iommu/amd_iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -1234,7 +1234,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;
@@ -1278,7 +1278,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;
@@ -3363,7 +3363,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;

drivers/iommu/amd_iommu_init.c

+9 −2
Original line number Diff line number Diff line
@@ -167,7 +167,9 @@ LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the 


/* 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;
@@ -272,6 +274,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)

drivers/iommu/amd_iommu_proto.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/iommu/amd_iommu_types.h

+0 −3
Original line number Diff line number Diff line
@@ -611,9 +611,6 @@ extern struct list_head amd_iommu_list; 
 */

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

 */