aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorFrank Arnold <frank.arnold@amd.com>2012-08-27 13:21:04 -0400
committerJoerg Roedel <joerg.roedel@amd.com>2012-09-18 06:33:22 -0400
commitdf805abb28fa49514ab8e231d4be3d30a76a32fb (patch)
tree2dafc591fdd5591978db52badf2c43dea8713852 /drivers/iommu
parent2166f0eefc435b1e99d1b179e1294ee2bf7f7bd9 (diff)
iommu/amd: Fix some typos
Fix some typos in comments and user-visible messages. No functional changes. Signed-off-by: Frank Arnold <frank.arnold@amd.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/amd_iommu.c10
-rw-r--r--drivers/iommu/amd_iommu_init.c10
-rw-r--r--drivers/iommu/amd_iommu_types.h4
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b64502dfa9f4..450b25808d98 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -684,7 +684,7 @@ static void iommu_poll_ppr_log(struct amd_iommu *iommu)
684 684
685 /* 685 /*
686 * Release iommu->lock because ppr-handling might need to 686 * Release iommu->lock because ppr-handling might need to
687 * re-aquire it 687 * re-acquire it
688 */ 688 */
689 spin_unlock_irqrestore(&iommu->lock, flags); 689 spin_unlock_irqrestore(&iommu->lock, flags);
690 690
@@ -802,7 +802,7 @@ static void build_inv_iommu_pages(struct iommu_cmd *cmd, u64 address,
802 CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES); 802 CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES);
803 if (s) /* size bit - we flush more than one 4kb page */ 803 if (s) /* size bit - we flush more than one 4kb page */
804 cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK; 804 cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;
805 if (pde) /* PDE bit - we wan't flush everything not only the PTEs */ 805 if (pde) /* PDE bit - we want to flush everything, not only the PTEs */
806 cmd->data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK; 806 cmd->data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;
807} 807}
808 808
@@ -2153,7 +2153,7 @@ static bool pci_pri_tlp_required(struct pci_dev *pdev)
2153} 2153}
2154 2154
2155/* 2155/*
2156 * If a device is not yet associated with a domain, this function does 2156 * If a device is not yet associated with a domain, this function
2157 * assigns it visible for the hardware 2157 * assigns it visible for the hardware
2158 */ 2158 */
2159static int attach_device(struct device *dev, 2159static int attach_device(struct device *dev,
@@ -2403,7 +2403,7 @@ static struct protection_domain *get_domain(struct device *dev)
2403 if (domain != NULL) 2403 if (domain != NULL)
2404 return domain; 2404 return domain;
2405 2405
2406 /* Device not bount yet - bind it */ 2406 /* Device not bound yet - bind it */
2407 dma_dom = find_protection_domain(devid); 2407 dma_dom = find_protection_domain(devid);
2408 if (!dma_dom) 2408 if (!dma_dom)
2409 dma_dom = amd_iommu_rlookup_table[devid]->default_dom; 2409 dma_dom = amd_iommu_rlookup_table[devid]->default_dom;
@@ -2942,7 +2942,7 @@ static void __init prealloc_protection_domains(void)
2942 alloc_passthrough_domain(); 2942 alloc_passthrough_domain();
2943 dev_data->passthrough = true; 2943 dev_data->passthrough = true;
2944 attach_device(&dev->dev, pt_domain); 2944 attach_device(&dev->dev, pt_domain);
2945 pr_info("AMD-Vi: Using passthough domain for device %s\n", 2945 pr_info("AMD-Vi: Using passthrough domain for device %s\n",
2946 dev_name(&dev->dev)); 2946 dev_name(&dev->dev));
2947 } 2947 }
2948 2948
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 860c1c342cd9..577669fece85 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -177,7 +177,7 @@ u16 *amd_iommu_alias_table;
177struct amd_iommu **amd_iommu_rlookup_table; 177struct amd_iommu **amd_iommu_rlookup_table;
178 178
179/* 179/*
180 * AMD IOMMU allows up to 2^16 differend protection domains. This is a bitmap 180 * AMD IOMMU allows up to 2^16 different protection domains. This is a bitmap
181 * to know which ones are already in use. 181 * to know which ones are already in use.
182 */ 182 */
183unsigned long *amd_iommu_pd_alloc_bitmap; 183unsigned long *amd_iommu_pd_alloc_bitmap;
@@ -477,7 +477,7 @@ static int __init find_last_devid_acpi(struct acpi_table_header *table)
477 477
478/**************************************************************************** 478/****************************************************************************
479 * 479 *
480 * The following functions belong the the code path which parses the ACPI table 480 * The following functions belong to the code path which parses the ACPI table
481 * the second time. In this ACPI parsing iteration we allocate IOMMU specific 481 * the second time. In this ACPI parsing iteration we allocate IOMMU specific
482 * data structures, initialize the device/alias/rlookup table and also 482 * data structures, initialize the device/alias/rlookup table and also
483 * basically initialize the hardware. 483 * basically initialize the hardware.
@@ -690,7 +690,7 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu,
690} 690}
691 691
692/* 692/*
693 * Reads the device exclusion range from ACPI and initialize IOMMU with 693 * Reads the device exclusion range from ACPI and initializes the IOMMU with
694 * it 694 * it
695 */ 695 */
696static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m) 696static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m)
@@ -1140,7 +1140,7 @@ static int __init amd_iommu_init_pci(void)
1140/**************************************************************************** 1140/****************************************************************************
1141 * 1141 *
1142 * The following functions initialize the MSI interrupts for all IOMMUs 1142 * The following functions initialize the MSI interrupts for all IOMMUs
1143 * in the system. Its a bit challenging because there could be multiple 1143 * in the system. It's a bit challenging because there could be multiple
1144 * IOMMUs per PCI BDF but we can call pci_enable_msi(x) only once per 1144 * IOMMUs per PCI BDF but we can call pci_enable_msi(x) only once per
1145 * pci_dev. 1145 * pci_dev.
1146 * 1146 *
@@ -1198,7 +1198,7 @@ enable_faults:
1198 * 1198 *
1199 * The next functions belong to the third pass of parsing the ACPI 1199 * The next functions belong to the third pass of parsing the ACPI
1200 * table. In this last pass the memory mapping requirements are 1200 * table. In this last pass the memory mapping requirements are
1201 * gathered (like exclusion and unity mapping reanges). 1201 * gathered (like exclusion and unity mapping ranges).
1202 * 1202 *
1203 ****************************************************************************/ 1203 ****************************************************************************/
1204 1204
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index d0dab865a8b8..d1390b82b194 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -255,7 +255,7 @@
255#define PAGE_SIZE_ALIGN(address, pagesize) \ 255#define PAGE_SIZE_ALIGN(address, pagesize) \
256 ((address) & ~((pagesize) - 1)) 256 ((address) & ~((pagesize) - 1))
257/* 257/*
258 * Creates an IOMMU PTE for an address an a given pagesize 258 * Creates an IOMMU PTE for an address and a given pagesize
259 * The PTE has no permission bits set 259 * The PTE has no permission bits set
260 * Pagesize is expected to be a power-of-two larger than 4096 260 * Pagesize is expected to be a power-of-two larger than 4096
261 */ 261 */
@@ -404,7 +404,7 @@ struct iommu_dev_data {
404 struct list_head dev_data_list; /* For global dev_data_list */ 404 struct list_head dev_data_list; /* For global dev_data_list */
405 struct iommu_dev_data *alias_data;/* The alias dev_data */ 405 struct iommu_dev_data *alias_data;/* The alias dev_data */
406 struct protection_domain *domain; /* Domain the device is bound to */ 406 struct protection_domain *domain; /* Domain the device is bound to */
407 atomic_t bind; /* Domain attach reverent count */ 407 atomic_t bind; /* Domain attach reference count */
408 u16 devid; /* PCI Device ID */ 408 u16 devid; /* PCI Device ID */
409 bool iommu_v2; /* Device can make use of IOMMUv2 */ 409 bool iommu_v2; /* Device can make use of IOMMUv2 */
410 bool passthrough; /* Default for device is pt_domain */ 410 bool passthrough; /* Default for device is pt_domain */