diff options
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 10 |
1 files changed, 5 insertions, 5 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 | */ |
| 2159 | static int attach_device(struct device *dev, | 2159 | static 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 | ||
