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

Commit 4c6f40d4 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86/amd-iommu: replace "AMD IOMMU" by "AMD-Vi" 



This patch replaces the "AMD IOMMU" printk strings with the
official name for the hardware: "AMD-Vi".

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent f2430bd1

arch/x86/include/asm/amd_iommu_types.h

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ extern bool amd_iommu_dump; 
#define DUMP_printk(format, arg...)					\

	do {								\

		if (amd_iommu_dump)						\

			printk(KERN_INFO "AMD IOMMU: " format, ## arg);	\

			printk(KERN_INFO "AMD-Vi: " format, ## arg);	\

	} while(0);



/*

arch/x86/kernel/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static void iommu_print_event(void *__evt) 
	int flags = (event[1] >> EVENT_FLAGS_SHIFT) & EVENT_FLAGS_MASK;

	u64 address = (u64)(((u64)event[3]) << 32) | event[2];



	printk(KERN_ERR "AMD IOMMU: Event logged [");

	printk(KERN_ERR "AMD-Vi: Event logged [");



	switch (type) {

	case EVENT_TYPE_ILL_DEV:

arch/x86/kernel/amd_iommu_init.c

+6 −6
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit) 
/* Function to enable the hardware */

static void iommu_enable(struct amd_iommu *iommu)

{

	printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at %s cap 0x%hx\n",

	printk(KERN_INFO "AMD-Vi: Enabling IOMMU at %s cap 0x%hx\n",

	       dev_name(&iommu->dev->dev), iommu->cap_ptr);



	iommu_feature_enable(iommu, CONTROL_IOMMU_EN);
@@ -902,7 +902,7 @@ static int __init iommu_setup_msi(struct amd_iommu *iommu) 


	r = request_irq(iommu->dev->irq, amd_iommu_int_handler,

			IRQF_SAMPLE_RANDOM,

			"AMD IOMMU",

			"AMD-Vi",

			NULL);



	if (r) {
@@ -1150,7 +1150,7 @@ int __init amd_iommu_init(void) 




	if (no_iommu) {

		printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n");

		printk(KERN_INFO "AMD-Vi disabled by kernel command line\n");

		return 0;

	}
@@ -1248,16 +1248,16 @@ int __init amd_iommu_init(void) 


	enable_iommus();



	printk(KERN_INFO "AMD IOMMU: device isolation ");

	printk(KERN_INFO "AMD-Vi: device isolation ");

	if (amd_iommu_isolate)

		printk("enabled\n");

	else

		printk("disabled\n");



	if (amd_iommu_unmap_flush)

		printk(KERN_INFO "AMD IOMMU: IO/TLB flush on unmap enabled\n");

		printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n");

	else

		printk(KERN_INFO "AMD IOMMU: Lazy IO/TLB flushing enabled\n");

		printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");



out:

	return ret;