Commit 8ea80d78 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86, AMD IOMMU: replace HIGH_U32 macro with upper_32_bits function 



Removes a driver specific macro and replaces it with a generic function already
available in Linux.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: robert.richter@amd.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 431b2a20

arch/x86/kernel/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int iommu_completion_wait(struct amd_iommu *iommu) 


	memset(&cmd, 0, sizeof(cmd));

	cmd.data[0] = LOW_U32(ready_phys) | CMD_COMPL_WAIT_STORE_MASK;

	cmd.data[1] = HIGH_U32(ready_phys);

	cmd.data[1] = upper_32_bits(ready_phys);

	cmd.data[2] = 1; /* value written to 'ready' */

	CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT);
@@ -157,7 +157,7 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu, 
	CMD_SET_TYPE(&cmd, CMD_INV_IOMMU_PAGES);

	cmd.data[1] |= domid;

	cmd.data[2] = LOW_U32(address);

	cmd.data[3] = HIGH_U32(address);

	cmd.data[3] = upper_32_bits(address);

	if (s) /* size bit - we flush more than one 4kb page */

		cmd.data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;

	if (pde) /* PDE bit - we wan't flush everything not only the PTEs */

include/asm-x86/amd_iommu_types.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


/* helper macros */

#define LOW_U32(x) ((x) & ((1ULL << 32)-1))

#define HIGH_U32(x) (LOW_U32((x) >> 32))



/* Length of the MMIO region for the AMD IOMMU */

#define MMIO_REGION_LENGTH       0x4000

CRA Git | Maintained and supported by SUSTech CRA and CCSE