lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'iommu-fixes-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Browse Source 
Pull IOMMU fixes from Joerg Roedel:
 "Two fixes this time:

   1. Another fix for a broken BIOS to detect when AMD IOMMU interrupt
      remapping can not work reliably
   2. Typo fix for NVidia IOMMU driver"

* tag 'iommu-fixes-v3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/tegra: smmu: Fix deadly typo
  iommu/amd: Work around wrong IOAPIC device-id in IVRS table
This commit is contained in:
Linus Torvalds
2012-10-24 17:05:21 -07:00
parent 99103f7748 d0078e7231
commit 735f0a985a
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/iommu/amd_iommu_init.c
View File

@@ -1599,21 +1599,46 @@ static void __init free_on_init_error(void)
#endif #endif
} }
/* SB IOAPIC is always on this device in AMD systems */
#define IOAPIC_SB_DEVID ((0x00 << 8) | PCI_DEVFN(0x14, 0))
static bool __init check_ioapic_information(void) static bool __init check_ioapic_information(void)
{ {
bool ret, has_sb_ioapic;
int idx; int idx;
has_sb_ioapic = false;
ret = false;
for (idx = 0; idx < nr_ioapics; idx++) { for (idx = 0; idx < nr_ioapics; idx++) {
int id = mpc_ioapic_id(idx); int devid, id = mpc_ioapic_id(idx);
if (get_ioapic_devid(id) < 0) { devid = get_ioapic_devid(id);
pr_err(FW_BUG "AMD-Vi: IO-APIC[%d] not in IVRS table\n", id); if (devid < 0) {
pr_err("AMD-Vi: Disabling interrupt remapping due to BIOS Bug\n"); pr_err(FW_BUG "AMD-Vi: IOAPIC[%d] not in IVRS table\n", id);
return false; ret = false;
} else if (devid == IOAPIC_SB_DEVID) {
has_sb_ioapic = true;
ret = true;
} }
} }
return true; if (!has_sb_ioapic) {
/*
* We expect the SB IOAPIC to be listed in the IVRS
* table. The system timer is connected to the SB IOAPIC
* and if we don't have it in the list the system will
* panic at boot time. This situation usually happens
* when the BIOS is buggy and provides us the wrong
* device id for the IOAPIC in the system.
*/
pr_err(FW_BUG "AMD-Vi: No southbridge IOAPIC found in IVRS table\n");
}
if (!ret)
pr_err("AMD-Vi: Disabling interrupt remapping due to BIOS Bug(s)\n");
return ret;
} }
static void __init free_dma_resources(void) static void __init free_dma_resources(void)

2
drivers/iommu/tegra-smmu.c
View File

@@ -200,7 +200,7 @@ enum {
#define SMMU_ADDR_TO_PFN(addr) ((addr) >> 12) #define SMMU_ADDR_TO_PFN(addr) ((addr) >> 12)
#define SMMU_ADDR_TO_PDN(addr) ((addr) >> 22) #define SMMU_ADDR_TO_PDN(addr) ((addr) >> 22)
#define SMMU_PDN_TO_ADDR(addr) ((pdn) << 22) #define SMMU_PDN_TO_ADDR(pdn) ((pdn) << 22)
#define _READABLE (1 << SMMU_PTB_DATA_ASID_READABLE_SHIFT) #define _READABLE (1 << SMMU_PTB_DATA_ASID_READABLE_SHIFT)
#define _WRITABLE (1 << SMMU_PTB_DATA_ASID_WRITABLE_SHIFT) #define _WRITABLE (1 << SMMU_PTB_DATA_ASID_WRITABLE_SHIFT)