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

Commit 4fe05bbc authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

intel-iommu fixes 



 - off by one in dmar_get_fault_reason() (maximal index in array is
   ARRAY_SIZE()-1, not ARRAY_SIZE())
 - NULL noise removal
 - __iomem annotation fix

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4a08a10

drivers/pci/intel-iommu.c

+3 −4
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static char *fault_reason_strings[] = 
	"non-zero reserved fields in PTE",

	"Unknown"

};

#define MAX_FAULT_REASON_IDX 	ARRAY_SIZE(fault_reason_strings)

#define MAX_FAULT_REASON_IDX 	ARRAY_SIZE(fault_reason_strings) - 1



char *dmar_get_fault_reason(u8 fault_reason)

{
@@ -995,7 +995,6 @@ static struct intel_iommu *alloc_iommu(struct dmar_drhd_unit *drhd) 
	return iommu;

error_unmap:

	iounmap(iommu->reg);

	iommu->reg = 0;

error:

	kfree(iommu);

	return NULL;
@@ -1808,7 +1807,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev) 
	if (!domain) {

		printk(KERN_ERR

			"Allocating domain for %s failed", pci_name(pdev));

		return 0;

		return NULL;

	}



	/* make sure context mapping is ok */
@@ -1818,7 +1817,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev) 
			printk(KERN_ERR

				"Domain context map for %s failed",

				pci_name(pdev));

			return 0;

			return NULL;

		}

	}

drivers/pci/intel-iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
		hi = readl(dmar + reg + 4); \

		(((u64) hi) << 32) + lo; })

*/

static inline u64 dmar_readq(void *addr)

static inline u64 dmar_readq(void __iomem *addr)

{

	u32 lo, hi;

	lo = readl(addr);