Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df805abb authored by Frank Arnold's avatar Frank Arnold Committed by Joerg Roedel
Browse files

iommu/amd: Fix some typos 



Fix some typos in comments and user-visible messages. No
functional changes.

Signed-off-by: default avatarFrank Arnold <frank.arnold@amd.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 2166f0ee

drivers/iommu/amd_iommu.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -684,7 +684,7 @@ static void iommu_poll_ppr_log(struct amd_iommu *iommu) 




		/*

		/*

		 * Release iommu->lock because ppr-handling might need to

		 * Release iommu->lock because ppr-handling might need to

		 * re-aquire it

		 * re-acquire it

		 */

		 */

		spin_unlock_irqrestore(&iommu->lock, flags);

		spin_unlock_irqrestore(&iommu->lock, flags);
@@ -802,7 +802,7 @@ static void build_inv_iommu_pages(struct iommu_cmd *cmd, u64 address, 
	CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES);

	CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES);

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

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

		cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;

		cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;

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

	if (pde) /* PDE bit - we want to flush everything, not only the PTEs */

		cmd->data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;

		cmd->data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;

}

}
@@ -2153,7 +2153,7 @@ static bool pci_pri_tlp_required(struct pci_dev *pdev) 
}

}





/*

/*

 * If a device is not yet associated with a domain, this function does

 * If a device is not yet associated with a domain, this function

 * assigns it visible for the hardware

 * assigns it visible for the hardware

 */

 */

static int attach_device(struct device *dev,

static int attach_device(struct device *dev,
@@ -2403,7 +2403,7 @@ static struct protection_domain *get_domain(struct device *dev) 
	if (domain != NULL)

	if (domain != NULL)

		return domain;

		return domain;





	/* Device not bount yet - bind it */

	/* Device not bound yet - bind it */

	dma_dom = find_protection_domain(devid);

	dma_dom = find_protection_domain(devid);

	if (!dma_dom)

	if (!dma_dom)

		dma_dom = amd_iommu_rlookup_table[devid]->default_dom;

		dma_dom = amd_iommu_rlookup_table[devid]->default_dom;
@@ -2942,7 +2942,7 @@ static void __init prealloc_protection_domains(void) 
			alloc_passthrough_domain();

			alloc_passthrough_domain();

			dev_data->passthrough = true;

			dev_data->passthrough = true;

			attach_device(&dev->dev, pt_domain);

			attach_device(&dev->dev, pt_domain);

			pr_info("AMD-Vi: Using passthough domain for device %s\n",

			pr_info("AMD-Vi: Using passthrough domain for device %s\n",

				dev_name(&dev->dev));

				dev_name(&dev->dev));

		}

		}

drivers/iommu/amd_iommu_init.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ u16 *amd_iommu_alias_table; 
struct amd_iommu **amd_iommu_rlookup_table;

struct amd_iommu **amd_iommu_rlookup_table;





/*

/*

 * AMD IOMMU allows up to 2^16 differend protection domains. This is a bitmap

 * AMD IOMMU allows up to 2^16 different protection domains. This is a bitmap

 * to know which ones are already in use.

 * to know which ones are already in use.

 */

 */

unsigned long *amd_iommu_pd_alloc_bitmap;

unsigned long *amd_iommu_pd_alloc_bitmap;
@@ -477,7 +477,7 @@ static int __init find_last_devid_acpi(struct acpi_table_header *table) 




/****************************************************************************

/****************************************************************************

 *

 *

 * The following functions belong the the code path which parses the ACPI table

 * The following functions belong to the code path which parses the ACPI table

 * the second time. In this ACPI parsing iteration we allocate IOMMU specific

 * the second time. In this ACPI parsing iteration we allocate IOMMU specific

 * data structures, initialize the device/alias/rlookup table and also

 * data structures, initialize the device/alias/rlookup table and also

 * basically initialize the hardware.

 * basically initialize the hardware.
@@ -690,7 +690,7 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu, 
}

}





/*

/*

 * Reads the device exclusion range from ACPI and initialize IOMMU with

 * Reads the device exclusion range from ACPI and initializes the IOMMU with

 * it

 * it

 */

 */

static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m)

static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m)
@@ -1140,7 +1140,7 @@ static int __init amd_iommu_init_pci(void) 
/****************************************************************************

/****************************************************************************

 *

 *

 * The following functions initialize the MSI interrupts for all IOMMUs

 * The following functions initialize the MSI interrupts for all IOMMUs

 * in the system. Its a bit challenging because there could be multiple

 * in the system. It's a bit challenging because there could be multiple

 * IOMMUs per PCI BDF but we can call pci_enable_msi(x) only once per

 * IOMMUs per PCI BDF but we can call pci_enable_msi(x) only once per

 * pci_dev.

 * pci_dev.

 *

 *
@@ -1198,7 +1198,7 @@ static int iommu_init_msi(struct amd_iommu *iommu) 
 *

 *

 * The next functions belong to the third pass of parsing the ACPI

 * The next functions belong to the third pass of parsing the ACPI

 * table. In this last pass the memory mapping requirements are

 * table. In this last pass the memory mapping requirements are

 * gathered (like exclusion and unity mapping reanges).

 * gathered (like exclusion and unity mapping ranges).

 *

 *

 ****************************************************************************/

 ****************************************************************************/

drivers/iommu/amd_iommu_types.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ 
#define PAGE_SIZE_ALIGN(address, pagesize) \

#define PAGE_SIZE_ALIGN(address, pagesize) \

		((address) & ~((pagesize) - 1))

		((address) & ~((pagesize) - 1))

/*

/*

 * Creates an IOMMU PTE for an address an a given pagesize

 * Creates an IOMMU PTE for an address and a given pagesize

 * The PTE has no permission bits set

 * The PTE has no permission bits set

 * Pagesize is expected to be a power-of-two larger than 4096

 * Pagesize is expected to be a power-of-two larger than 4096

 */

 */
@@ -404,7 +404,7 @@ struct iommu_dev_data { 
	struct list_head dev_data_list;	  /* For global dev_data_list */

	struct list_head dev_data_list;	  /* For global dev_data_list */

	struct iommu_dev_data *alias_data;/* The alias dev_data */

	struct iommu_dev_data *alias_data;/* The alias dev_data */

	struct protection_domain *domain; /* Domain the device is bound to */

	struct protection_domain *domain; /* Domain the device is bound to */

	atomic_t bind;			  /* Domain attach reverent count */

	atomic_t bind;			  /* Domain attach reference count */

	u16 devid;			  /* PCI Device ID */

	u16 devid;			  /* PCI Device ID */

	bool iommu_v2;			  /* Device can make use of IOMMUv2 */

	bool iommu_v2;			  /* Device can make use of IOMMUv2 */

	bool passthrough;		  /* Default for device is pt_domain */

	bool passthrough;		  /* Default for device is pt_domain */