42590a7501
This fixes the regression introduced by the commit
f405d2c023
.
The above commit fixes the following issue:
http://marc.info/?l=linux-kernel&m=126192729110083&w=2
However, it doesn't work properly when you remove and insert the
agp_amd64 module again.
agp_amd64_init() and agp_amd64_cleanup should be called only
when gart_iommu is not called earlier (that is, the GART IOMMU
is not enabled). We need to use 'gart_iommu_aperture' to see if
GART IOMMU is enabled or not.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: mitov@issp.bas.bg
Cc: davej@redhat.com
LKML-Reference: <20100104161603L.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
516 lines
14 KiB
C
516 lines
14 KiB
C
/*
|
|
* Firmware replacement code.
|
|
*
|
|
* Work around broken BIOSes that don't set an aperture, only set the
|
|
* aperture in the AGP bridge, or set too small aperture.
|
|
*
|
|
* If all fails map the aperture over some low memory. This is cheaper than
|
|
* doing bounce buffering. The memory is lost. This is done at early boot
|
|
* because only the bootmem allocator can allocate 32+MB.
|
|
*
|
|
* Copyright 2002 Andi Kleen, SuSE Labs.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/mmzone.h>
|
|
#include <linux/pci_ids.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/suspend.h>
|
|
#include <linux/kmemleak.h>
|
|
#include <asm/e820.h>
|
|
#include <asm/io.h>
|
|
#include <asm/iommu.h>
|
|
#include <asm/gart.h>
|
|
#include <asm/pci-direct.h>
|
|
#include <asm/dma.h>
|
|
#include <asm/k8.h>
|
|
#include <asm/x86_init.h>
|
|
|
|
int gart_iommu_aperture;
|
|
EXPORT_SYMBOL_GPL(gart_iommu_aperture);
|
|
int gart_iommu_aperture_disabled __initdata;
|
|
int gart_iommu_aperture_allowed __initdata;
|
|
|
|
int fallback_aper_order __initdata = 1; /* 64MB */
|
|
int fallback_aper_force __initdata;
|
|
|
|
int fix_aperture __initdata = 1;
|
|
|
|
struct bus_dev_range {
|
|
int bus;
|
|
int dev_base;
|
|
int dev_limit;
|
|
};
|
|
|
|
static struct bus_dev_range bus_dev_ranges[] __initdata = {
|
|
{ 0x00, 0x18, 0x20},
|
|
{ 0xff, 0x00, 0x20},
|
|
{ 0xfe, 0x00, 0x20}
|
|
};
|
|
|
|
static struct resource gart_resource = {
|
|
.name = "GART",
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static void __init insert_aperture_resource(u32 aper_base, u32 aper_size)
|
|
{
|
|
gart_resource.start = aper_base;
|
|
gart_resource.end = aper_base + aper_size - 1;
|
|
insert_resource(&iomem_resource, &gart_resource);
|
|
}
|
|
|
|
/* This code runs before the PCI subsystem is initialized, so just
|
|
access the northbridge directly. */
|
|
|
|
static u32 __init allocate_aperture(void)
|
|
{
|
|
u32 aper_size;
|
|
void *p;
|
|
|
|
/* aper_size should <= 1G */
|
|
if (fallback_aper_order > 5)
|
|
fallback_aper_order = 5;
|
|
aper_size = (32 * 1024 * 1024) << fallback_aper_order;
|
|
|
|
/*
|
|
* Aperture has to be naturally aligned. This means a 2GB aperture
|
|
* won't have much chance of finding a place in the lower 4GB of
|
|
* memory. Unfortunately we cannot move it up because that would
|
|
* make the IOMMU useless.
|
|
*/
|
|
/*
|
|
* using 512M as goal, in case kexec will load kernel_big
|
|
* that will do the on position decompress, and could overlap with
|
|
* that positon with gart that is used.
|
|
* sequende:
|
|
* kernel_small
|
|
* ==> kexec (with kdump trigger path or previous doesn't shutdown gart)
|
|
* ==> kernel_small(gart area become e820_reserved)
|
|
* ==> kexec (with kdump trigger path or previous doesn't shutdown gart)
|
|
* ==> kerne_big (uncompressed size will be big than 64M or 128M)
|
|
* so don't use 512M below as gart iommu, leave the space for kernel
|
|
* code for safe
|
|
*/
|
|
p = __alloc_bootmem_nopanic(aper_size, aper_size, 512ULL<<20);
|
|
/*
|
|
* Kmemleak should not scan this block as it may not be mapped via the
|
|
* kernel direct mapping.
|
|
*/
|
|
kmemleak_ignore(p);
|
|
if (!p || __pa(p)+aper_size > 0xffffffff) {
|
|
printk(KERN_ERR
|
|
"Cannot allocate aperture memory hole (%p,%uK)\n",
|
|
p, aper_size>>10);
|
|
if (p)
|
|
free_bootmem(__pa(p), aper_size);
|
|
return 0;
|
|
}
|
|
printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",
|
|
aper_size >> 10, __pa(p));
|
|
insert_aperture_resource((u32)__pa(p), aper_size);
|
|
register_nosave_region((u32)__pa(p) >> PAGE_SHIFT,
|
|
(u32)__pa(p+aper_size) >> PAGE_SHIFT);
|
|
|
|
return (u32)__pa(p);
|
|
}
|
|
|
|
|
|
/* Find a PCI capability */
|
|
static u32 __init find_cap(int bus, int slot, int func, int cap)
|
|
{
|
|
int bytes;
|
|
u8 pos;
|
|
|
|
if (!(read_pci_config_16(bus, slot, func, PCI_STATUS) &
|
|
PCI_STATUS_CAP_LIST))
|
|
return 0;
|
|
|
|
pos = read_pci_config_byte(bus, slot, func, PCI_CAPABILITY_LIST);
|
|
for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) {
|
|
u8 id;
|
|
|
|
pos &= ~3;
|
|
id = read_pci_config_byte(bus, slot, func, pos+PCI_CAP_LIST_ID);
|
|
if (id == 0xff)
|
|
break;
|
|
if (id == cap)
|
|
return pos;
|
|
pos = read_pci_config_byte(bus, slot, func,
|
|
pos+PCI_CAP_LIST_NEXT);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Read a standard AGPv3 bridge header */
|
|
static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order)
|
|
{
|
|
u32 apsize;
|
|
u32 apsizereg;
|
|
int nbits;
|
|
u32 aper_low, aper_hi;
|
|
u64 aper;
|
|
u32 old_order;
|
|
|
|
printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", bus, slot, func);
|
|
apsizereg = read_pci_config_16(bus, slot, func, cap + 0x14);
|
|
if (apsizereg == 0xffffffff) {
|
|
printk(KERN_ERR "APSIZE in AGP bridge unreadable\n");
|
|
return 0;
|
|
}
|
|
|
|
/* old_order could be the value from NB gart setting */
|
|
old_order = *order;
|
|
|
|
apsize = apsizereg & 0xfff;
|
|
/* Some BIOS use weird encodings not in the AGPv3 table. */
|
|
if (apsize & 0xff)
|
|
apsize |= 0xf00;
|
|
nbits = hweight16(apsize);
|
|
*order = 7 - nbits;
|
|
if ((int)*order < 0) /* < 32MB */
|
|
*order = 0;
|
|
|
|
aper_low = read_pci_config(bus, slot, func, 0x10);
|
|
aper_hi = read_pci_config(bus, slot, func, 0x14);
|
|
aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32);
|
|
|
|
/*
|
|
* On some sick chips, APSIZE is 0. It means it wants 4G
|
|
* so let double check that order, and lets trust AMD NB settings:
|
|
*/
|
|
printk(KERN_INFO "Aperture from AGP @ %Lx old size %u MB\n",
|
|
aper, 32 << old_order);
|
|
if (aper + (32ULL<<(20 + *order)) > 0x100000000ULL) {
|
|
printk(KERN_INFO "Aperture size %u MB (APSIZE %x) is not right, using settings from NB\n",
|
|
32 << *order, apsizereg);
|
|
*order = old_order;
|
|
}
|
|
|
|
printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n",
|
|
aper, 32 << *order, apsizereg);
|
|
|
|
if (!aperture_valid(aper, (32*1024*1024) << *order, 32<<20))
|
|
return 0;
|
|
return (u32)aper;
|
|
}
|
|
|
|
/*
|
|
* Look for an AGP bridge. Windows only expects the aperture in the
|
|
* AGP bridge and some BIOS forget to initialize the Northbridge too.
|
|
* Work around this here.
|
|
*
|
|
* Do an PCI bus scan by hand because we're running before the PCI
|
|
* subsystem.
|
|
*
|
|
* All K8 AGP bridges are AGPv3 compliant, so we can do this scan
|
|
* generically. It's probably overkill to always scan all slots because
|
|
* the AGP bridges should be always an own bus on the HT hierarchy,
|
|
* but do it here for future safety.
|
|
*/
|
|
static u32 __init search_agp_bridge(u32 *order, int *valid_agp)
|
|
{
|
|
int bus, slot, func;
|
|
|
|
/* Poor man's PCI discovery */
|
|
for (bus = 0; bus < 256; bus++) {
|
|
for (slot = 0; slot < 32; slot++) {
|
|
for (func = 0; func < 8; func++) {
|
|
u32 class, cap;
|
|
u8 type;
|
|
class = read_pci_config(bus, slot, func,
|
|
PCI_CLASS_REVISION);
|
|
if (class == 0xffffffff)
|
|
break;
|
|
|
|
switch (class >> 16) {
|
|
case PCI_CLASS_BRIDGE_HOST:
|
|
case PCI_CLASS_BRIDGE_OTHER: /* needed? */
|
|
/* AGP bridge? */
|
|
cap = find_cap(bus, slot, func,
|
|
PCI_CAP_ID_AGP);
|
|
if (!cap)
|
|
break;
|
|
*valid_agp = 1;
|
|
return read_agp(bus, slot, func, cap,
|
|
order);
|
|
}
|
|
|
|
/* No multi-function device? */
|
|
type = read_pci_config_byte(bus, slot, func,
|
|
PCI_HEADER_TYPE);
|
|
if (!(type & 0x80))
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
printk(KERN_INFO "No AGP bridge found\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int gart_fix_e820 __initdata = 1;
|
|
|
|
static int __init parse_gart_mem(char *p)
|
|
{
|
|
if (!p)
|
|
return -EINVAL;
|
|
|
|
if (!strncmp(p, "off", 3))
|
|
gart_fix_e820 = 0;
|
|
else if (!strncmp(p, "on", 2))
|
|
gart_fix_e820 = 1;
|
|
|
|
return 0;
|
|
}
|
|
early_param("gart_fix_e820", parse_gart_mem);
|
|
|
|
void __init early_gart_iommu_check(void)
|
|
{
|
|
/*
|
|
* in case it is enabled before, esp for kexec/kdump,
|
|
* previous kernel already enable that. memset called
|
|
* by allocate_aperture/__alloc_bootmem_nopanic cause restart.
|
|
* or second kernel have different position for GART hole. and new
|
|
* kernel could use hole as RAM that is still used by GART set by
|
|
* first kernel
|
|
* or BIOS forget to put that in reserved.
|
|
* try to update e820 to make that region as reserved.
|
|
*/
|
|
u32 agp_aper_base = 0, agp_aper_order = 0;
|
|
int i, fix, slot, valid_agp = 0;
|
|
u32 ctl;
|
|
u32 aper_size = 0, aper_order = 0, last_aper_order = 0;
|
|
u64 aper_base = 0, last_aper_base = 0;
|
|
int aper_enabled = 0, last_aper_enabled = 0, last_valid = 0;
|
|
|
|
if (!early_pci_allowed())
|
|
return;
|
|
|
|
/* This is mostly duplicate of iommu_hole_init */
|
|
agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp);
|
|
|
|
fix = 0;
|
|
for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) {
|
|
int bus;
|
|
int dev_base, dev_limit;
|
|
|
|
bus = bus_dev_ranges[i].bus;
|
|
dev_base = bus_dev_ranges[i].dev_base;
|
|
dev_limit = bus_dev_ranges[i].dev_limit;
|
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
|
if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00)))
|
|
continue;
|
|
|
|
ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL);
|
|
aper_enabled = ctl & AMD64_GARTEN;
|
|
aper_order = (ctl >> 1) & 7;
|
|
aper_size = (32 * 1024 * 1024) << aper_order;
|
|
aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff;
|
|
aper_base <<= 25;
|
|
|
|
if (last_valid) {
|
|
if ((aper_order != last_aper_order) ||
|
|
(aper_base != last_aper_base) ||
|
|
(aper_enabled != last_aper_enabled)) {
|
|
fix = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
last_aper_order = aper_order;
|
|
last_aper_base = aper_base;
|
|
last_aper_enabled = aper_enabled;
|
|
last_valid = 1;
|
|
}
|
|
}
|
|
|
|
if (!fix && !aper_enabled)
|
|
return;
|
|
|
|
if (!aper_base || !aper_size || aper_base + aper_size > 0x100000000UL)
|
|
fix = 1;
|
|
|
|
if (gart_fix_e820 && !fix && aper_enabled) {
|
|
if (e820_any_mapped(aper_base, aper_base + aper_size,
|
|
E820_RAM)) {
|
|
/* reserve it, so we can reuse it in second kernel */
|
|
printk(KERN_INFO "update e820 for GART\n");
|
|
e820_add_region(aper_base, aper_size, E820_RESERVED);
|
|
update_e820();
|
|
}
|
|
}
|
|
|
|
if (valid_agp)
|
|
return;
|
|
|
|
/* disable them all at first */
|
|
for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) {
|
|
int bus;
|
|
int dev_base, dev_limit;
|
|
|
|
bus = bus_dev_ranges[i].bus;
|
|
dev_base = bus_dev_ranges[i].dev_base;
|
|
dev_limit = bus_dev_ranges[i].dev_limit;
|
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
|
if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00)))
|
|
continue;
|
|
|
|
ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL);
|
|
ctl &= ~AMD64_GARTEN;
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl);
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
static int __initdata printed_gart_size_msg;
|
|
|
|
void __init gart_iommu_hole_init(void)
|
|
{
|
|
u32 agp_aper_base = 0, agp_aper_order = 0;
|
|
u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0;
|
|
u64 aper_base, last_aper_base = 0;
|
|
int fix, slot, valid_agp = 0;
|
|
int i, node;
|
|
|
|
if (gart_iommu_aperture_disabled || !fix_aperture ||
|
|
!early_pci_allowed())
|
|
return;
|
|
|
|
printk(KERN_INFO "Checking aperture...\n");
|
|
|
|
if (!fallback_aper_force)
|
|
agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp);
|
|
|
|
fix = 0;
|
|
node = 0;
|
|
for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) {
|
|
int bus;
|
|
int dev_base, dev_limit;
|
|
|
|
bus = bus_dev_ranges[i].bus;
|
|
dev_base = bus_dev_ranges[i].dev_base;
|
|
dev_limit = bus_dev_ranges[i].dev_limit;
|
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
|
if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00)))
|
|
continue;
|
|
|
|
iommu_detected = 1;
|
|
gart_iommu_aperture = 1;
|
|
x86_init.iommu.iommu_init = gart_iommu_init;
|
|
|
|
aper_order = (read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL) >> 1) & 7;
|
|
aper_size = (32 * 1024 * 1024) << aper_order;
|
|
aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff;
|
|
aper_base <<= 25;
|
|
|
|
printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n",
|
|
node, aper_base, aper_size >> 20);
|
|
node++;
|
|
|
|
if (!aperture_valid(aper_base, aper_size, 64<<20)) {
|
|
if (valid_agp && agp_aper_base &&
|
|
agp_aper_base == aper_base &&
|
|
agp_aper_order == aper_order) {
|
|
/* the same between two setting from NB and agp */
|
|
if (!no_iommu &&
|
|
max_pfn > MAX_DMA32_PFN &&
|
|
!printed_gart_size_msg) {
|
|
printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n");
|
|
printk(KERN_ERR "please increase GART size in your BIOS setup\n");
|
|
printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n");
|
|
printed_gart_size_msg = 1;
|
|
}
|
|
} else {
|
|
fix = 1;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
if ((last_aper_order && aper_order != last_aper_order) ||
|
|
(last_aper_base && aper_base != last_aper_base)) {
|
|
fix = 1;
|
|
goto out;
|
|
}
|
|
last_aper_order = aper_order;
|
|
last_aper_base = aper_base;
|
|
}
|
|
}
|
|
|
|
out:
|
|
if (!fix && !fallback_aper_force) {
|
|
if (last_aper_base) {
|
|
unsigned long n = (32 * 1024 * 1024) << last_aper_order;
|
|
|
|
insert_aperture_resource((u32)last_aper_base, n);
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (!fallback_aper_force) {
|
|
aper_alloc = agp_aper_base;
|
|
aper_order = agp_aper_order;
|
|
}
|
|
|
|
if (aper_alloc) {
|
|
/* Got the aperture from the AGP bridge */
|
|
} else if ((!no_iommu && max_pfn > MAX_DMA32_PFN) ||
|
|
force_iommu ||
|
|
valid_agp ||
|
|
fallback_aper_force) {
|
|
printk(KERN_INFO
|
|
"Your BIOS doesn't leave a aperture memory hole\n");
|
|
printk(KERN_INFO
|
|
"Please enable the IOMMU option in the BIOS setup\n");
|
|
printk(KERN_INFO
|
|
"This costs you %d MB of RAM\n",
|
|
32 << fallback_aper_order);
|
|
|
|
aper_order = fallback_aper_order;
|
|
aper_alloc = allocate_aperture();
|
|
if (!aper_alloc) {
|
|
/*
|
|
* Could disable AGP and IOMMU here, but it's
|
|
* probably not worth it. But the later users
|
|
* cannot deal with bad apertures and turning
|
|
* on the aperture over memory causes very
|
|
* strange problems, so it's better to panic
|
|
* early.
|
|
*/
|
|
panic("Not enough memory for aperture");
|
|
}
|
|
} else {
|
|
return;
|
|
}
|
|
|
|
/* Fix up the north bridges */
|
|
for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) {
|
|
int bus;
|
|
int dev_base, dev_limit;
|
|
|
|
bus = bus_dev_ranges[i].bus;
|
|
dev_base = bus_dev_ranges[i].dev_base;
|
|
dev_limit = bus_dev_ranges[i].dev_limit;
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
|
if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00)))
|
|
continue;
|
|
|
|
/* Don't enable translation yet. That is done later.
|
|
Assume this BIOS didn't initialise the GART so
|
|
just overwrite all previous bits */
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, aper_order << 1);
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE, aper_alloc >> 25);
|
|
}
|
|
}
|
|
|
|
set_up_gart_resume(aper_order, aper_alloc);
|
|
}
|