Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, gart: Set DISTLBWALKPRB bit always

The DISTLBWALKPRB bit must be set for the GART because the
gatt table is mapped UC. But the current code does not set
the bit at boot when the BIOS setup the aperture correctly.
Fix that by setting this bit when enabling the GART instead
of the other places.

Cc: <stable@kernel.org>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Link: http://lkml.kernel.org/r/1303134346-5805-4-git-send-email-joerg.roedel@amd.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

authored by

Joerg Roedel and committed by
H. Peter Anvin
c34151a7 af289bfe

+3 -3
+2 -2
arch/x86/include/asm/gart.h
··· 66 66 * Don't enable translation but enable GART IO and CPU accesses. 67 67 * Also, set DISTLBWALKPRB since GART tables memory is UC. 68 68 */ 69 - ctl = DISTLBWALKPRB | order << 1; 69 + ctl = order << 1; 70 70 71 71 pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); 72 72 } ··· 83 83 84 84 /* Enable GART translation for this hammer. */ 85 85 pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl); 86 - ctl |= GARTEN; 86 + ctl |= GARTEN | DISTLBWALKPRB; 87 87 ctl &= ~(DISGARTCPU | DISGARTIO); 88 88 pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); 89 89 }
+1 -1
arch/x86/kernel/aperture_64.c
··· 499 499 * Don't enable translation yet but enable GART IO and CPU 500 500 * accesses and set DISTLBWALKPRB since GART table memory is UC. 501 501 */ 502 - u32 ctl = DISTLBWALKPRB | aper_order << 1; 502 + u32 ctl = aper_order << 1; 503 503 504 504 bus = amd_nb_bus_dev_ranges[i].bus; 505 505 dev_base = amd_nb_bus_dev_ranges[i].dev_base;