October 2013 - coreboot-gerrit

New patch to review for coreboot: 6616d9c libpayload: Add PS/2 keyboard mode setting code back
by Andrew Wu Oct. 8, 2013

Oct. 8, 2013

Andrew Wu (arw(a)dmp.com.tw) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3956 -gerrit commit 6616d9c9a93506e4a9177037e05a254ef901e7aa Author: Andrew Wu <arw(a)dmp.com.tw> Date: Tue Oct 8 17:58:14 2013 +0800 libpayload: Add PS/2 keyboard mode setting code back PS/2 keyboard controller may not set the 'XLATE' bit on boot by default. Revert keyboard.c to earlier version (commit a2d78), which sets the 'XLATE' bit. Add keyboard disabling/enabling during setting mode register to avoid scancode data interference, so the problem mentioned in commit dd6c4 is still fixed. Tested on Vortex86EX hardware with PS/2 keyboard. Change-Id: I42cedfdff2db5cfba39de8811284a72a9793f294 Signed-off-by: Andrew Wu <arw(a)dmp.com.tw> --- payloads/libpayload/drivers/keyboard.c | 74 ++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index e65f085..5fa90dd 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -31,6 +31,13 @@ #include <libpayload-config.h> #include <libpayload.h> +#define I8042_CMD_READ_MODE 0x20 +#define I8042_CMD_WRITE_MODE 0x60 +#define I8042_CMD_DISABLE_KB 0xad +#define I8042_CMD_ENABLE_KB 0xae + +#define I8042_MODE_XLATE 0x40 + struct layout_maps { const char *country; const unsigned short map[4][0x57]; @@ -256,6 +263,54 @@ int keyboard_getchar(void) return ret; } +static int keyboard_wait_read(void) +{ + int retries = 10000; + + while(retries-- && !(inb(0x64) & 0x01)) + udelay(50); + + return (retries <= 0) ? -1 : 0; +} + +static int keyboard_wait_write(void) +{ + int retries = 10000; + + while(retries-- && (inb(0x64) & 0x02)) + udelay(50); + + return (retries <= 0) ? -1 : 0; +} + +static unsigned char keyboard_get_mode(void) +{ + keyboard_wait_write(); + outb(I8042_CMD_READ_MODE, 0x64); + keyboard_wait_read(); + return inb(0x60); +} + +static void keyboard_set_mode(unsigned char mode) +{ + keyboard_wait_write(); + outb(I8042_CMD_WRITE_MODE, 0x64); + keyboard_wait_write(); + outb(mode, 0x60); +} + +static void keyboard_disable(void) +{ + keyboard_wait_write(); + outb(I8042_CMD_DISABLE_KB, 0x64); +} + +static void keyboard_enable(void) +{ + keyboard_wait_write(); + outb(I8042_CMD_ENABLE_KB, 0x64); +} + /** * Set keyboard layout * @param country string describing the keyboard layout language. @@ -287,16 +342,35 @@ static struct console_input_driver cons = { void keyboard_init(void) { + u8 mode; map = &keyboard_layouts[0]; /* If 0x64 returns 0xff, then we have no keyboard * controller */ + if (inb(0x64) == 0xFF) return; /* Empty keyboard buffer */ while (keyboard_havechar()) keyboard_getchar(); + /* Before setup keyboard, lock keyboard input first */ + keyboard_disable(); + + /* Read the current mode */ + mode = keyboard_get_mode(); + + /* Turn on scancode translate mode so that we can + use the scancode set 1 tables */ + + mode |= I8042_MODE_XLATE; + + /* Write the new mode */ + keyboard_set_mode(mode); + + /* Now it is safe to enable keyboard input */ + keyboard_enable(); + console_add_input_driver(&cons); }

1 0

Patch merged into coreboot/master: 4f9bf7e AMD hudson yangtze: Fix corruption of a global ramstage variable
by gerrit＠coreboot.org Oct. 7, 2013

Oct. 7, 2013

the following patch was just integrated into master: commit 4f9bf7e2fb7035725c2899db0d00d77007d9113c Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Sep 9 09:23:19 2013 +0300 AMD hudson yangtze: Fix corruption of a global ramstage variable A late for loop may reference over the current array allocation and corrupt an unrelated global variable. As a quick fix bumb the size of the array allocation uniformly to 6. We missed these boards for commit 9c7d73ca because the arrays had been renamed. Change-Id: Iff2f2a0090d9302576bc72195d2a3f6fa37ce29a Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/3954 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-by: Bruce Griffith <Bruce.Griffith(a)se-eng.com> See http://review.coreboot.org/3954 for details. -gerrit

1 0

New patch to review for coreboot: 87bff5a libpayload/sample: Use settings from .xcompile file to build.
by Andrew Wu Oct. 7, 2013

Oct. 7, 2013

Andrew Wu (arw(a)dmp.com.tw) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3955 -gerrit commit 87bff5ab1a9bdd4cee18e6c6cbf28e263fed0fb7 Author: Andrew Wu <arw(a)dmp.com.tw> Date: Mon Oct 7 16:27:01 2013 +0800 libpayload/sample: Use settings from .xcompile file to build. It is for crossgcc. Change-Id: Ia1d676adfea340b6b80858215459491c9338d614 Signed-off-by: Andrew Wu <arw(a)dmp.com.tw> --- payloads/libpayload/sample/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile index 1a32f3b..67697e8 100644 --- a/payloads/libpayload/sample/Makefile +++ b/payloads/libpayload/sample/Makefile @@ -28,9 +28,18 @@ ## # Sample libpayload Makefile. +include ../.xcompile +include ../.config + +ARCH-$(CONFIG_ARCH_ARMV7) := armv7 +ARCH-$(CONFIG_ARCH_POWERPC) := powerpc +ARCH-$(CONFIG_ARCH_X86) := i386 + +CC := $(CC_$(ARCH-y)) +AS := $(AS_$(ARCH-y)) LIBPAYLOAD_DIR := ../install/libpayload -XCC := CC=$(CC) $(LIBPAYLOAD_DIR)/bin/lpgcc -XAS := AS=$(AS) $(LIBPAYLOAD_DIR)/bin/lpas +XCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc +XAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas CFLAGS := -Wall -Werror -Os TARGET := hello OBJS := $(TARGET).o

1 0

New patch to review for coreboot: 3d0595a AMD hudson yangtze: Fix corruption of a global ramstage variable
by Kyösti Mälkki Oct. 6, 2013

Oct. 6, 2013

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3954 -gerrit commit 3d0595a65b0e10834f43bb1a93ac22215827af65 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Sep 9 09:23:19 2013 +0300 AMD hudson yangtze: Fix corruption of a global ramstage variable A late for loop may reference over the current array allocation and corrupt an unrelated global variable. As a quick fix bumb the size of the array allocation uniformly to 6. We missed these boards for commit 9c7d73ca because the arrays had been renamed. Change-Id: Iff2f2a0090d9302576bc72195d2a3f6fa37ce29a Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/mainboard/amd/olivehill/get_bus_conf.c | 6 ++---- src/mainboard/amd/olivehill/irq_tables.c | 2 +- src/mainboard/amd/olivehill/mptable.c | 2 +- src/mainboard/amd/parmer/get_bus_conf.c | 6 ++---- src/mainboard/amd/parmer/irq_tables.c | 2 +- src/mainboard/amd/parmer/mptable.c | 2 +- src/mainboard/amd/thatcher/get_bus_conf.c | 6 ++---- src/mainboard/amd/thatcher/irq_tables.c | 2 +- src/mainboard/amd/thatcher/mptable.c | 2 +- src/mainboard/asrock/imb-a180/get_bus_conf.c | 6 ++---- src/mainboard/asrock/imb-a180/irq_tables.c | 2 +- src/mainboard/asrock/imb-a180/mptable.c | 2 +- src/mainboard/asus/f2a85-m/get_bus_conf.c | 6 ++---- src/mainboard/asus/f2a85-m/irq_tables.c | 2 +- src/mainboard/asus/f2a85-m/mptable.c | 2 +- 15 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/mainboard/amd/olivehill/get_bus_conf.c b/src/mainboard/amd/olivehill/get_bus_conf.c index 0d379d5..fb63ace 100644 --- a/src/mainboard/amd/olivehill/get_bus_conf.c +++ b/src/mainboard/amd/olivehill/get_bus_conf.c @@ -30,7 +30,7 @@ * and acpi_tables busnum is default. */ u8 bus_isa; -u8 bus_yangtze[3]; +u8 bus_yangtze[6]; u32 apicid_yangtze; /* @@ -100,9 +100,7 @@ void get_bus_conf(void) sbdn_yangtze = 0; - for (i = 0; i < 3; i++) { - bus_yangtze[i] = 0; - } + memset(bus_yangtze, 0, sizeof(bus_yangtze)); for (i = 0; i < 256; i++) { bus_type[i] = 0; /* default ISA bus. */ diff --git a/src/mainboard/amd/olivehill/irq_tables.c b/src/mainboard/amd/olivehill/irq_tables.c index 9779153..9eb3649 100644 --- a/src/mainboard/amd/olivehill/irq_tables.c +++ b/src/mainboard/amd/olivehill/irq_tables.c @@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, } extern u8 bus_isa; -extern u8 bus_yangtze[2]; +extern u8 bus_yangtze[6]; extern unsigned long sbdn_yangtze; unsigned long write_pirq_routing_table(unsigned long addr) diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c index 118f860..83c0b41 100644 --- a/src/mainboard/amd/olivehill/mptable.c +++ b/src/mainboard/amd/olivehill/mptable.c @@ -30,7 +30,7 @@ //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 #define IO_APIC_ID CONFIG_MAX_CPUS -extern u8 bus_yangtze[3]; +extern u8 bus_yangtze[6]; extern u32 bus_type[256]; extern u32 sbdn_yangtze; diff --git a/src/mainboard/amd/parmer/get_bus_conf.c b/src/mainboard/amd/parmer/get_bus_conf.c index d1be8b6..c92fea9 100644 --- a/src/mainboard/amd/parmer/get_bus_conf.c +++ b/src/mainboard/amd/parmer/get_bus_conf.c @@ -30,7 +30,7 @@ * and acpi_tables busnum is default. */ u8 bus_isa; -u8 bus_hudson[3]; +u8 bus_hudson[6]; u32 apicid_hudson; /* @@ -97,9 +97,7 @@ void get_bus_conf(void) sbdn_hudson = 0; - for (i = 0; i < 3; i++) { - bus_hudson[i] = 0; - } + memset(bus_hudson, 0, sizeof(bus_hudson)); for (i = 0; i < 256; i++) { bus_type[i] = 0; /* default ISA bus. */ diff --git a/src/mainboard/amd/parmer/irq_tables.c b/src/mainboard/amd/parmer/irq_tables.c index d7e223b..d5339ad 100644 --- a/src/mainboard/amd/parmer/irq_tables.c +++ b/src/mainboard/amd/parmer/irq_tables.c @@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, } extern u8 bus_isa; -extern u8 bus_hudson[2]; +extern u8 bus_hudson[6]; extern unsigned long sbdn_hudson; unsigned long write_pirq_routing_table(unsigned long addr) diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c index 67f73c4..d106697 100644 --- a/src/mainboard/amd/parmer/mptable.c +++ b/src/mainboard/amd/parmer/mptable.c @@ -30,7 +30,7 @@ //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 #define IO_APIC_ID CONFIG_MAX_CPUS -extern u8 bus_hudson[3]; +extern u8 bus_hudson[6]; extern u32 bus_type[256]; extern u32 sbdn_hudson; diff --git a/src/mainboard/amd/thatcher/get_bus_conf.c b/src/mainboard/amd/thatcher/get_bus_conf.c index d1be8b6..c92fea9 100644 --- a/src/mainboard/amd/thatcher/get_bus_conf.c +++ b/src/mainboard/amd/thatcher/get_bus_conf.c @@ -30,7 +30,7 @@ * and acpi_tables busnum is default. */ u8 bus_isa; -u8 bus_hudson[3]; +u8 bus_hudson[6]; u32 apicid_hudson; /* @@ -97,9 +97,7 @@ void get_bus_conf(void) sbdn_hudson = 0; - for (i = 0; i < 3; i++) { - bus_hudson[i] = 0; - } + memset(bus_hudson, 0, sizeof(bus_hudson)); for (i = 0; i < 256; i++) { bus_type[i] = 0; /* default ISA bus. */ diff --git a/src/mainboard/amd/thatcher/irq_tables.c b/src/mainboard/amd/thatcher/irq_tables.c index d7e223b..d5339ad 100644 --- a/src/mainboard/amd/thatcher/irq_tables.c +++ b/src/mainboard/amd/thatcher/irq_tables.c @@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, } extern u8 bus_isa; -extern u8 bus_hudson[2]; +extern u8 bus_hudson[6]; extern unsigned long sbdn_hudson; unsigned long write_pirq_routing_table(unsigned long addr) diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c index 8253b2c..10d2fea 100644 --- a/src/mainboard/amd/thatcher/mptable.c +++ b/src/mainboard/amd/thatcher/mptable.c @@ -30,7 +30,7 @@ //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 #define IO_APIC_ID CONFIG_MAX_CPUS -extern u8 bus_hudson[3]; +extern u8 bus_hudson[6]; extern u32 bus_type[256]; extern u32 sbdn_hudson; diff --git a/src/mainboard/asrock/imb-a180/get_bus_conf.c b/src/mainboard/asrock/imb-a180/get_bus_conf.c index 0d379d5..fb63ace 100644 --- a/src/mainboard/asrock/imb-a180/get_bus_conf.c +++ b/src/mainboard/asrock/imb-a180/get_bus_conf.c @@ -30,7 +30,7 @@ * and acpi_tables busnum is default. */ u8 bus_isa; -u8 bus_yangtze[3]; +u8 bus_yangtze[6]; u32 apicid_yangtze; /* @@ -100,9 +100,7 @@ void get_bus_conf(void) sbdn_yangtze = 0; - for (i = 0; i < 3; i++) { - bus_yangtze[i] = 0; - } + memset(bus_yangtze, 0, sizeof(bus_yangtze)); for (i = 0; i < 256; i++) { bus_type[i] = 0; /* default ISA bus. */ diff --git a/src/mainboard/asrock/imb-a180/irq_tables.c b/src/mainboard/asrock/imb-a180/irq_tables.c index 9779153..9eb3649 100644 --- a/src/mainboard/asrock/imb-a180/irq_tables.c +++ b/src/mainboard/asrock/imb-a180/irq_tables.c @@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, } extern u8 bus_isa; -extern u8 bus_yangtze[2]; +extern u8 bus_yangtze[6]; extern unsigned long sbdn_yangtze; unsigned long write_pirq_routing_table(unsigned long addr) diff --git a/src/mainboard/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c index 118f860..83c0b41 100644 --- a/src/mainboard/asrock/imb-a180/mptable.c +++ b/src/mainboard/asrock/imb-a180/mptable.c @@ -30,7 +30,7 @@ //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 #define IO_APIC_ID CONFIG_MAX_CPUS -extern u8 bus_yangtze[3]; +extern u8 bus_yangtze[6]; extern u32 bus_type[256]; extern u32 sbdn_yangtze; diff --git a/src/mainboard/asus/f2a85-m/get_bus_conf.c b/src/mainboard/asus/f2a85-m/get_bus_conf.c index d1be8b6..c92fea9 100644 --- a/src/mainboard/asus/f2a85-m/get_bus_conf.c +++ b/src/mainboard/asus/f2a85-m/get_bus_conf.c @@ -30,7 +30,7 @@ * and acpi_tables busnum is default. */ u8 bus_isa; -u8 bus_hudson[3]; +u8 bus_hudson[6]; u32 apicid_hudson; /* @@ -97,9 +97,7 @@ void get_bus_conf(void) sbdn_hudson = 0; - for (i = 0; i < 3; i++) { - bus_hudson[i] = 0; - } + memset(bus_hudson, 0, sizeof(bus_hudson)); for (i = 0; i < 256; i++) { bus_type[i] = 0; /* default ISA bus. */ diff --git a/src/mainboard/asus/f2a85-m/irq_tables.c b/src/mainboard/asus/f2a85-m/irq_tables.c index d7e223b..d5339ad 100644 --- a/src/mainboard/asus/f2a85-m/irq_tables.c +++ b/src/mainboard/asus/f2a85-m/irq_tables.c @@ -44,7 +44,7 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, } extern u8 bus_isa; -extern u8 bus_hudson[2]; +extern u8 bus_hudson[6]; extern unsigned long sbdn_hudson; unsigned long write_pirq_routing_table(unsigned long addr) diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c index 1760303..97df048 100644 --- a/src/mainboard/asus/f2a85-m/mptable.c +++ b/src/mainboard/asus/f2a85-m/mptable.c @@ -31,7 +31,7 @@ //-#define IO_APIC_ID CONFIG_MAX_PHYSICAL_CPUS + 1 #define IO_APIC_ID CONFIG_MAX_CPUS -extern u8 bus_hudson[3]; +extern u8 bus_hudson[6]; extern u32 bus_type[256]; extern u32 sbdn_hudson;

1 0

Patch set updated for coreboot: 96c3ed7 util/lint/lint-stable-003-whitespace: Ignore temporary files ending with a tilde
by Ronald G. Minnich Oct. 3, 2013

Oct. 3, 2013

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3952 -gerrit commit 96c3ed72014572a59765e5557dc3f8e6a8ca09f7 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Wed Oct 2 22:10:11 2013 +0200 util/lint/lint-stable-003-whitespace: Ignore temporary files ending with a tilde Some editors like gedit create auxiliary files ending with a tilde '~'. As these are not checked into the Git repository, do not check these for whitespace errors. Change-Id: I2c4cf00f9d623be73ea3bbb7b2da4f1e1900c8e9 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- util/lint/lint-stable-003-whitespace | 1 + 1 file changed, 1 insertion(+) diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index fceacf7..1e824a1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -32,6 +32,7 @@ find src util -name .svn -type d -prune -o \ -name microcode-\*.h -prune -o \ -name \*.?_shipped -prune -o \ -name \*.[18] -prune -o \ + -name \*~ -prune -o \ -name kconfig -type d -prune -o \ -name romcc -type d -prune -o \ -name crossgcc -type d -prune -o \

1 0

Patch merged into coreboot/master: 11b4780 cpu/x86/mtrr/mtrr.c: Remove superfluous assignment to `type_index`
by gerrit＠coreboot.org Oct. 3, 2013

Oct. 3, 2013

the following patch was just integrated into master: commit 11b47801b2c3abc3bb8c523b722fafa1103bff45 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Wed Oct 2 21:59:38 2013 +0200 cpu/x86/mtrr/mtrr.c: Remove superfluous assignment to `type_index` When building coreboot with the Clang static analyzer scan-build, it reports »Value stored to 'type_index' is never read«. Indeed, in `memranges_each_entry()` `type_index` is assigned a value before being read. So remove that line. Change-Id: I6da2fb8be7157bb98c57281babd4a08ca0d9f7a7 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-on: http://review.coreboot.org/3953 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/3953 for details. -gerrit

1 0

New patch to review for coreboot: 021b75c util/lint/lint-stable-003-whitespace: Ignore temporary files ending with a tilde
by Paul Menzel Oct. 3, 2013

Oct. 3, 2013

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3952 -gerrit commit 021b75ca2226b18fdb4a8206801e235dbbffe9b5 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Wed Oct 2 22:10:11 2013 +0200 util/lint/lint-stable-003-whitespace: Ignore temporary files ending with a tilde Some editors like gedit create auxiliary files ending with a tilde »~«. As these are not checked into the Git repository, do not check these fore whitespace errors. Change-Id: I2c4cf00f9d623be73ea3bbb7b2da4f1e1900c8e9 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- util/lint/lint-stable-003-whitespace | 1 + 1 file changed, 1 insertion(+) diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index fceacf7..1e824a1 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -32,6 +32,7 @@ find src util -name .svn -type d -prune -o \ -name microcode-\*.h -prune -o \ -name \*.?_shipped -prune -o \ -name \*.[18] -prune -o \ + -name \*~ -prune -o \ -name kconfig -type d -prune -o \ -name romcc -type d -prune -o \ -name crossgcc -type d -prune -o \

1 0

New patch to review for coreboot: 3c6c0af cpu/x86/mtrr/mtrr.c: Remove superfluous assignment to `type_index`
by Paul Menzel Oct. 3, 2013

Oct. 3, 2013

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3953 -gerrit commit 3c6c0af4faa847b768104b0d6fa0358c425e54a8 Author: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Wed Oct 2 21:59:38 2013 +0200 cpu/x86/mtrr/mtrr.c: Remove superfluous assignment to `type_index` When building coreboot with the Clang static analyzer scan-build, it reports »Value stored to 'type_index' is never read«. Indeed, in `memranges_each_entry()` `type_index` is assigned a value before being read. So remove that line. Change-Id: I6da2fb8be7157bb98c57281babd4a08ca0d9f7a7 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- src/cpu/x86/mtrr/mtrr.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c index 8f1c35e..d168978 100644 --- a/src/cpu/x86/mtrr/mtrr.c +++ b/src/cpu/x86/mtrr/mtrr.c @@ -261,7 +261,6 @@ static void calc_fixed_mtrrs(void) desc = &fixed_mtrr_desc[0]; last_desc = &fixed_mtrr_desc[ARRAY_SIZE(fixed_mtrr_desc) - 1]; - type_index = desc->range_index; memranges_each_entry(r, phys_addr_space) { begin = range_entry_base_mtrr_addr(r);

1 0

Patch merged into coreboot/master: b142a51 qemu: q35: avoid address conflict
by gerrit＠coreboot.org Oct. 1, 2013

Oct. 1, 2013

the following patch was just integrated into master: commit b142a5154280c00a3e4bc9d162b31bfe4b665f60 Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Tue Sep 17 09:49:02 2013 +0200 qemu: q35: avoid address conflict Qemu has the fw_cfg interface at 0x510, which conflicts with power management base address in coreboot. Move the pmbase to a non-conflicting address. No need to worry about speedstep, it is not supported by qemu and isn't enabled in the qemu config. Change-Id: I3e87d8301988028ca0ea7d96c08b4e26ac15a7c2 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> Reviewed-on: http://review.coreboot.org/3938 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/3938 for details. -gerrit

1 0