projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
iommu
/
amd_iommu_types.h
diff --git
a/drivers/iommu/amd_iommu_types.h
b/drivers/iommu/amd_iommu_types.h
index 6a0bf1ad523574d8135560524c94d1f30c239e2e..b08cf57bf4554a0a71313d15617e85752f50a8ab 100644
(file)
--- a/
drivers/iommu/amd_iommu_types.h
+++ b/
drivers/iommu/amd_iommu_types.h
@@
-295,9
+295,9
@@
#define IOMMU_PTE_IR (1ULL << 61)
#define IOMMU_PTE_IW (1ULL << 62)
#define IOMMU_PTE_IR (1ULL << 61)
#define IOMMU_PTE_IW (1ULL << 62)
+#define DTE_FLAG_IOTLB (1ULL << 32)
+#define DTE_FLAG_GV (1ULL << 55)
#define DTE_FLAG_MASK (0x3ffULL << 32)
#define DTE_FLAG_MASK (0x3ffULL << 32)
-#define DTE_FLAG_IOTLB (0x01UL << 32)
-#define DTE_FLAG_GV (0x01ULL << 55)
#define DTE_GLX_SHIFT (56)
#define DTE_GLX_MASK (3)
#define DTE_GLX_SHIFT (56)
#define DTE_GLX_MASK (3)
@@
-517,11
+517,6
@@
struct amd_iommu {
/* pci domain of this IOMMU */
u16 pci_seg;
/* pci domain of this IOMMU */
u16 pci_seg;
- /* first device this IOMMU handles. read from PCI */
- u16 first_device;
- /* last device this IOMMU handles. read from PCI */
- u16 last_device;
-
/* start of exclusion range of that IOMMU */
u64 exclusion_start;
/* length of exclusion range of that IOMMU */
/* start of exclusion range of that IOMMU */
u64 exclusion_start;
/* length of exclusion range of that IOMMU */
@@
-529,11
+524,7
@@
struct amd_iommu {
/* command buffer virtual address */
u8 *cmd_buf;
/* command buffer virtual address */
u8 *cmd_buf;
- /* size of command buffer */
- u32 cmd_buf_size;
- /* size of event buffer */
- u32 evt_buf_size;
/* event buffer virtual address */
u8 *evt_buf;
/* event buffer virtual address */
u8 *evt_buf;