From: Andrew Cooper Date: Tue, 11 Feb 2020 14:59:41 +0000 (+0000) Subject: AMD/IOMMU: Remove unused iommu_get_addr_{lo,hi}_from_cmd() helpers X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8767ab6b11b5b37a27094bd16a2ab5765456dcaa;p=people%2Fdwmw2%2Fxen.git AMD/IOMMU: Remove unused iommu_get_addr_{lo,hi}_from_cmd() helpers These were introduced in 262bb227a4 in 2012, and have never had any users. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- diff --git a/xen/drivers/passthrough/amd/iommu-defs.h b/xen/drivers/passthrough/amd/iommu-defs.h index 50613ca150..5eb7fc7ffb 100644 --- a/xen/drivers/passthrough/amd/iommu-defs.h +++ b/xen/drivers/passthrough/amd/iommu-defs.h @@ -485,11 +485,6 @@ struct amd_iommu_pte { #define IOMMU_CMD_DEVICE_ID_MASK 0x0000FFFF #define IOMMU_CMD_DEVICE_ID_SHIFT 0 -#define IOMMU_CMD_ADDR_LOW_MASK 0xFFFFF000 -#define IOMMU_CMD_ADDR_LOW_SHIFT 12 -#define IOMMU_CMD_ADDR_HIGH_MASK 0xFFFFFFFF -#define IOMMU_CMD_ADDR_HIGH_SHIFT 0 - #define IOMMU_REG_BASE_ADDR_LOW_MASK 0xFFFFF000 #define IOMMU_REG_BASE_ADDR_LOW_SHIFT 12 #define IOMMU_REG_BASE_ADDR_HIGH_MASK 0x000FFFFF diff --git a/xen/drivers/passthrough/amd/iommu.h b/xen/drivers/passthrough/amd/iommu.h index 1abfdc685a..2297ac8e73 100644 --- a/xen/drivers/passthrough/amd/iommu.h +++ b/xen/drivers/passthrough/amd/iommu.h @@ -391,19 +391,6 @@ static inline void iommu_set_devid_to_cmd(uint32_t *cmd, uint16_t id) IOMMU_CMD_DEVICE_ID_SHIFT, cmd); } -/* access address field from iommu cmd */ -static inline uint32_t iommu_get_addr_lo_from_cmd(uint32_t cmd) -{ - return get_field_from_reg_u32(cmd, IOMMU_CMD_ADDR_LOW_MASK, - IOMMU_CMD_ADDR_LOW_SHIFT); -} - -static inline uint32_t iommu_get_addr_hi_from_cmd(uint32_t cmd) -{ - return get_field_from_reg_u32(cmd, IOMMU_CMD_ADDR_LOW_MASK, - IOMMU_CMD_ADDR_HIGH_SHIFT); -} - /* access iommu base addresses field from mmio regs */ static inline void iommu_set_addr_lo_to_reg(uint32_t *reg, uint32_t addr) {