Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1431
-gerrit
commit b264e861c9d5af4f0667769d651d7986456421d0 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Fri Aug 10 13:28:00 2012 +0300
Rename IORESOURCE_UMA_FB to IORESOURCE_UNCACHEABLE
Previously UMA_FB had a special use as a workaround for AMD TOPMEM setup. With the workaround removed, this can now be treated as a generic flag to force an uncached MTRR setup.
Change-Id: I6243a662f7ce012842e1d9f908699018d60a3280 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/cpu/x86/mtrr/mtrr.c | 3 +-- src/include/device/device.h | 2 +- src/include/device/resource.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index a061b54..9417a49 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -354,8 +354,7 @@ void set_var_mtrr_resource(void *gp, struct device *dev, struct resource *res) basek = resk(res->base); sizek = resk(res->size);
- if (res->flags & IORESOURCE_UMA_FB) { - /* FIXME: could I use Write-Combining for Frame Buffer ? */ + if (res->flags & IORESOURCE_UNCACHEABLE) { state->reg = range_to_mtrr(state->reg, basek, sizek, 0, MTRR_TYPE_UNCACHEABLE, state->address_bits, state->above4gb); return; diff --git a/src/include/device/device.h b/src/include/device/device.h index 772b737..c711c7a 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -195,7 +195,7 @@ void fixed_mem_resource(device_t dev, unsigned long index, fixed_mem_resource(dev, idx, basek, sizek, IORESOURCE_RESERVE | IORESOURCE_IGNORE_MTRR)
#define uma_resource(dev, idx, basek, sizek) \ - fixed_mem_resource(dev, idx, basek, sizek, IORESOURCE_RESERVE | IORESOURCE_UMA_FB) + fixed_mem_resource(dev, idx, basek, sizek, IORESOURCE_RESERVE | IORESOURCE_UNCACHEABLE)
#define mmio_resource(dev, idx, basek, sizek) \ fixed_mem_resource(dev, idx, basek, sizek, IORESOURCE_RESERVE | IORESOURCE_IGNORE_MTRR) diff --git a/src/include/device/resource.h b/src/include/device/resource.h index ddedc2f..057b898 100644 --- a/src/include/device/resource.h +++ b/src/include/device/resource.h @@ -21,7 +21,7 @@ * to the bus below. */ #define IORESOURCE_BRIDGE 0x00080000 /* The IO resource has a bus below it. */ -#define IORESOURCE_UMA_FB 0x00100000 /* UMA framebuffer */ +#define IORESOURCE_UNCACHEABLE 0x00100000 /* The resource creates an explicit un-cached MTRR hole. */ #define IORESOURCE_IGNORE_MTRR 0x00200000 /* The resource does not affect MTRR setup. */
#define IORESOURCE_RESERVE 0x10000000 /* The resource needs to be reserved in the coreboot table */