forked from Minki/linux
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: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b4a08a10b1
commit
4fe05bbcd5
|
@ -745,7 +745,7 @@ static char *fault_reason_strings[] =
|
||||||
"non-zero reserved fields in PTE",
|
"non-zero reserved fields in PTE",
|
||||||
"Unknown"
|
"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)
|
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;
|
return iommu;
|
||||||
error_unmap:
|
error_unmap:
|
||||||
iounmap(iommu->reg);
|
iounmap(iommu->reg);
|
||||||
iommu->reg = 0;
|
|
||||||
error:
|
error:
|
||||||
kfree(iommu);
|
kfree(iommu);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -1808,7 +1807,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
|
||||||
if (!domain) {
|
if (!domain) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"Allocating domain for %s failed", pci_name(pdev));
|
"Allocating domain for %s failed", pci_name(pdev));
|
||||||
return 0;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* make sure context mapping is ok */
|
/* make sure context mapping is ok */
|
||||||
|
@ -1818,7 +1817,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"Domain context map for %s failed",
|
"Domain context map for %s failed",
|
||||||
pci_name(pdev));
|
pci_name(pdev));
|
||||||
return 0;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
hi = readl(dmar + reg + 4); \
|
hi = readl(dmar + reg + 4); \
|
||||||
(((u64) hi) << 32) + lo; })
|
(((u64) hi) << 32) + lo; })
|
||||||
*/
|
*/
|
||||||
static inline u64 dmar_readq(void *addr)
|
static inline u64 dmar_readq(void __iomem *addr)
|
||||||
{
|
{
|
||||||
u32 lo, hi;
|
u32 lo, hi;
|
||||||
lo = readl(addr);
|
lo = readl(addr);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user