coreboot-gerrit January 2015

coreboot-gerrit@coreboot.org

1 participants
1236 discussions

New patch to review for coreboot: 4d4b081 NOTFORMERGE: Add infrastructure for radeon native initialization
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8281 -gerrit commit 4d4b081646c353c6fd32ba1d36b6e193c4f02230 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Mon Jan 26 00:55:51 2015 -0600 NOTFORMERGE: Add infrastructure for radeon native initialization This is the way that I'm thinking we should integrate native radeon init into coreboot. It doesn't make sense to have one monolithic init block as different parts are common to several architectures. e.g the VGA_MEMORY base registers seem to have been the same for years. The idea is simple: have a few macro-ops, and dispatch the correct ops to some generic code based on whatever heuristic is appropriate. i.e. we don't have to rely on PCI IDs alone; we can poke the hardware as well before dispatching. Note that a lot of the API is left undefined, or opaque. We'll see how that evolves as we build up the init code path. One thing I'm considering is dropping the PCI IDs list and going on an ops-based approach, where the driver fills in several 'radeon_<component>_ops' structures, though we'll end up with some really big structs. Though it's also possible that the complexity of component ops could end up into the dispatcher, so we're back to those really big structs. If you're looking for some inspiration, I suggest looking at the radeon driver in linux, and doing the exact opposite Change-Id: Ifa95a8da1abfd430452dca50ed9b7ce4b09bc1c7 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/drivers/Kconfig | 1 + src/drivers/Makefile.inc | 1 + src/drivers/amd/Kconfig | 12 +++++ src/drivers/amd/Makefile.inc | 6 +++ src/drivers/amd/radeon/Makefile.inc | 8 +++ src/drivers/amd/radeon/radeon.c | 76 +++++++++++++++++++++++++++ src/drivers/amd/radeon/radeon.h | 31 +++++++++++ src/drivers/amd/radeon/radeon_dispatcher.c | 35 +++++++++++++ src/drivers/amd/radeon/radeon_private.h | 21 ++++++++ src/drivers/amd/radeon/radeon_util.c | 84 ++++++++++++++++++++++++++++++ 10 files changed, 275 insertions(+) diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig index 08de415..db74a73 100644 --- a/src/drivers/Kconfig +++ b/src/drivers/Kconfig @@ -17,6 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +source src/drivers/amd/Kconfig source src/drivers/ams/Kconfig source src/drivers/ati/Kconfig source src/drivers/dec/Kconfig diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc index 151e3f7..418a3ca 100644 --- a/src/drivers/Makefile.inc +++ b/src/drivers/Makefile.inc @@ -17,6 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +subdirs-y += amd subdirs-y += ams subdirs-y += ati subdirs-y += dec diff --git a/src/drivers/amd/Kconfig b/src/drivers/amd/Kconfig new file mode 100644 index 0000000..1971c86 --- /dev/null +++ b/src/drivers/amd/Kconfig @@ -0,0 +1,12 @@ +# +# Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> +# Subject to the GNU GPL v2, or (at your option) any later version. +# + +config DRIVER_AMD_RADEON + bool + default n + help + This is a wrapper shim for various radeon functionality. Selecting + this driver does not guarantee that native graphics initialization + will work, or is supported. diff --git a/src/drivers/amd/Makefile.inc b/src/drivers/amd/Makefile.inc new file mode 100644 index 0000000..51ce627 --- /dev/null +++ b/src/drivers/amd/Makefile.inc @@ -0,0 +1,6 @@ +# +# Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> +# Subject to the GNU GPL v2, or (at your option) any later version. +# + +subdirs-$(CONFIG_DRIVER_AMD_RADEON) += radeon/ diff --git a/src/drivers/amd/radeon/Makefile.inc b/src/drivers/amd/radeon/Makefile.inc new file mode 100644 index 0000000..f5d81df --- /dev/null +++ b/src/drivers/amd/radeon/Makefile.inc @@ -0,0 +1,8 @@ +# +# Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> +# Subject to the GNU GPL v2, or (at your option) any later version. +# + +ramstage-y += radeon.c +ramstage-y += radeon_util.c +ramstage-y += radeon_dispatcher.c diff --git a/src/drivers/amd/radeon/radeon.c b/src/drivers/amd/radeon/radeon.c new file mode 100644 index 0000000..4f93bcd --- /dev/null +++ b/src/drivers/amd/radeon/radeon.c @@ -0,0 +1,76 @@ +/* + * Wrapper for radeon utilty functions + * + * Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> + * Subject to the GNU GPL v2, or (at your option) any later version. + */ + +#include <arch/io.h> +#include <console/console.h> +#include <device/pci.h> +#include <device/pci_ids.h> +#include <stdlib.h> + +#include "radeon.h" + +static void radeon_display_init(struct radeon_device *rdev) +{ + disp_init_t display_init; + struct radeon_disp_path *display; + + display = radeon_get_default_disp_path(); + if (!display) { + printk(BIOS_WARNING, "Could not get a display path\n"); + return; + } + + if (!is_native_init_capable(rdev, display)) { + printk(BIOS_WARNING, "Cannot init given display path\n"); + return; + } + + display_init = dispatch_display_init(rdev); + if (!display) { + printk(BIOS_WARNING, "[BUG!!!] display_init not dispatched\n"); + return; + } + + display_init(rdev, display); +} + +static void radeon_init(device_t dev) +{ + asic_init_t asic_init; + struct radeon_device *rdev; + + rdev = create_radeon_device(dev); + asic_init = dispatch_asic_init(dev); + if (asic_init) { + asic_init(rdev); + } + + if (IS_ENABLED(MAINBOARD_DO_NATIVE_VGA_INIT)) + radeon_display_init(rdev); + + pci_dev_init(dev); +} + +static struct device_operations radeon_operations = { + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = radeon_init, + .disable = device_noop, + .enable = device_noop, + .ops_pci = 0, +}; + +static const uint16_t radeon_ids[] = { + 0 +}; + +static const struct pci_driver radeon_driver __pci_driver = { + .ops = &radeon_operations, + .vendor = PCI_VENDOR_ID_ATI, + .devices = radeon_ids, +}; diff --git a/src/drivers/amd/radeon/radeon.h b/src/drivers/amd/radeon/radeon.h new file mode 100644 index 0000000..824e609 --- /dev/null +++ b/src/drivers/amd/radeon/radeon.h @@ -0,0 +1,31 @@ +/* + * All things radeon + * + * Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> + * Subject to the GNU GPL v2, or (at your option) any later version. + */ + +#ifndef _DRIVERS_AMD_RADEON_RADEON_H +#define _DRIVERS_AMD_RADEON_RADEON_H + +#include <device/device.h> + +/* These structs are intentionally opaque */ +struct radeon_device; +struct radeon_disp_path; + +typedef void (* asic_init_t)(struct radeon_device *); +typedef void (* disp_init_t)(struct radeon_device *, struct radeon_disp_path *); + +asic_init_t dispatch_asic_init(device_t dev); +disp_init_t dispatch_display_init(struct radeon_device *rdev); +struct radeon_device *create_radeon_device(device_t dev); +struct radeon_disp_path *radeon_get_default_disp_path(void); +bool is_native_init_capable(struct radeon_device *, struct radeon_disp_path *); + +void rdev_write(struct radeon_device *rdev, uint32_t reg, uint32_t value); +uint32_t rdev_read(struct radeon_device *rdev, uint32_t reg); +void rdev_mask(struct radeon_device *rdev, uint32_t reg, uint32_t clrbits, + uint32_t setbits); + +#endif /* _DRIVERS_AMD_RADEON_RADEON_H */ diff --git a/src/drivers/amd/radeon/radeon_dispatcher.c b/src/drivers/amd/radeon/radeon_dispatcher.c new file mode 100644 index 0000000..2fa52ae --- /dev/null +++ b/src/drivers/amd/radeon/radeon_dispatcher.c @@ -0,0 +1,35 @@ +/* + * Dispatch initialization functions + * + * Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> + * Subject to the GNU GPL v2, or (at your option) any later version. + */ +#include "radeon.h" +#include "aruba/aruba.h" + +#include <device/pci_ids.h> + +asic_init_t dispatch_asic_init(device_t dev) +{ + if (dev->vendor != PCI_VENDOR_ID_ATI) + return NULL; + + return NULL; +} + +disp_init_t dispatch_display_init(struct radeon_device *rdev) +{ + /* This is a no-op */ + return NULL; +} + +bool is_native_init_capable(struct radeon_device *rdev, + struct radeon_disp_path *display) +{ + return false; +} + +struct radeon_disp_path *radeon_get_default_disp_path(void) +{ + return NULL; +} diff --git a/src/drivers/amd/radeon/radeon_private.h b/src/drivers/amd/radeon/radeon_private.h new file mode 100644 index 0000000..11cb0c9 --- /dev/null +++ b/src/drivers/amd/radeon/radeon_private.h @@ -0,0 +1,21 @@ +/* + * Your code should not need these. If it does, it's wrong. + * + * Copyright (C) 2015 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> + * Subject to the GNU GPL v2, or (at your option) any later version. + */ + +#ifndef _RADEON_PRIVATE_H +#define _RADEON_PRIVATE_H + +#include <device/device.h> + +struct radeon_device { + struct device *cb_dev; + uint16_t pio_base; + uint16_t pio_size; + void *mmio_base; + size_t mmio_size; +}; + +#endif /* _RADEON_PRIVATE_H */ diff --git a/src/drivers/amd/radeon/radeon_util.c b/src/drivers/amd/radeon/radeon_util.c new file mode 100644 index 0000000..04f3682 --- /dev/null +++ b/src/drivers/amd/radeon/radeon_util.c @@ -0,0 +1,84 @@ +/* + * Low-level radeon helpers + * + * Copyright (C) 2013 Alexandru Gagniuc <mr.nuke.me(a)gmail.com> + * Subject to the GNU GPL v2, or (at your option) any later version. + */ + +#include "radeon.h" +#include "radeon_private.h" + +#include <arch/io.h> +#include <device/pci.h> +#include <stdlib.h> +#include <string.h> +#include <console/console.h> + +struct radeon_device *create_radeon_device(device_t dev) +{ + int num_res_found = 0; + struct radeon_device *rdev; + struct resource *res = dev->resource_list; + + rdev = malloc(sizeof(*rdev)); + if (rdev == NULL) + return NULL; + memset(rdev, 0, sizeof(*rdev)); + + rdev->cb_dev = dev; + + while (res) { + /* Register PIO space */ + if (res->index == PCI_BASE_ADDRESS_1) { + if (!(res->flags & IORESOURCE_IO)) + continue; + rdev->pio_base = res->base; + rdev->pio_size = res->size; + num_res_found++; + } + + /* Get the register MMIO space (not the framebuffer) */ + if (res->index == PCI_BASE_ADDRESS_2) { + if (!(res->flags & IORESOURCE_MEM)) + continue; + rdev->mmio_base = (void *)(uintptr_t)res->base; + rdev->mmio_size = res->size; + num_res_found++; + } + /* We care about the register IO and register MMIO resources */ + if (num_res_found == 2) + break; + + res = res->next; + } + + if (num_res_found < 2) { + /* We're missing either the MMIO or PIO base. Can't continue*/ + free(rdev); + return NULL; + } + + return rdev; +} + + +void rdev_write(struct radeon_device *rdev, uint32_t reg, uint32_t value) +{ + unsigned long mmio = (unsigned long)rdev->mmio_base + reg; + write32(mmio, value); +} + +uint32_t rdev_read(struct radeon_device *rdev, uint32_t reg) +{ + unsigned long mmio = (unsigned long)rdev->mmio_base + reg; + return read32(mmio); +} + +void rdev_mask(struct radeon_device *rdev, uint32_t reg, uint32_t clrbits, + uint32_t setbits) +{ + uint32_t reg32 = rdev_read(rdev, reg); + reg32 &= ~clrbits; + reg32 |= setbits; + rdev_write(rdev, reg, reg32); +}

1 0

Patch merged into coreboot/master: d1f840b toolchain.inc: Check toolchain is installed before running it
by gerrit＠coreboot.org 26 Jan '15

26 Jan '15

the following patch was just integrated into master: commit d1f840be86a8af750c7b7a44907e842d7a28a061 Author: Marc Jones <marc.jones(a)se-eng.com> Date: Thu Jan 22 16:18:49 2015 +0800 toolchain.inc: Check toolchain is installed before running it Toolchain.inc fails with strange shell errors if the CC_$(stage) doesn't expands correctly. The cause is that the ARCH_SUPPORTED doesn't have the required toolchain for the stage. Change-Id: Id284ce281546b2b1b166f2b13d087bc6b114440e Signed-off-by: Marc Jones <marc.jones(a)se-eng.com> Reviewed-on: http://review.coreboot.org/8257 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh <furquan(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/8257 for details. -gerrit

1 0

Patch set updated for coreboot: 7a9f71f include/types.h: Provide BIT() macro
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8280 -gerrit commit 7a9f71f29bc3ae1302923ac25591d1918a8288be Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 21:08:42 2015 -0600 include/types.h: Provide BIT() macro This macro is controversial for arches where the bits are numbered MSb first, though we don't support such an arch. We've seen this macro creep into our tree in different places, so provide it in one place. Change-Id: I86cd8a16420f34ef31b615aec4e0f7bd3191ca35 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/include/types.h | 7 +++++++ src/soc/nvidia/tegra/dc.h | 1 - src/soc/qualcomm/ipq806x/clock.c | 1 + src/soc/qualcomm/ipq806x/include/clock.h | 1 - 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/include/types.h b/src/include/types.h index ef5edc1..24ebfaf 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -22,6 +22,13 @@ #include <stdint.h> #include <stddef.h> +/* + * This may mean something else on architectures where the bits are numbered + * from the MSB (e.g. PowerPC), but until we cross that bridge, this macro is + * perfectly fine. + */ +#define BIT(x) (1ul << (x)) + /** * Coreboot error codes * diff --git a/src/soc/nvidia/tegra/dc.h b/src/soc/nvidia/tegra/dc.h index c0b1986..ff36a0b 100644 --- a/src/soc/nvidia/tegra/dc.h +++ b/src/soc/nvidia/tegra/dc.h @@ -367,7 +367,6 @@ struct display_controller { }; check_member(display_controller, winbuf, 0x800 * 4); -#define BIT(pos) (1U << pos) /* DC_CMD_DISPLAY_COMMAND 0x032 */ #define DISP_COMMAND_RAISE (1 << 0) diff --git a/src/soc/qualcomm/ipq806x/clock.c b/src/soc/qualcomm/ipq806x/clock.c index 88056d4..ee2ed64 100644 --- a/src/soc/qualcomm/ipq806x/clock.c +++ b/src/soc/qualcomm/ipq806x/clock.c @@ -3,6 +3,7 @@ */ #include <delay.h> +#include <types.h> #include <clock.h> /** diff --git a/src/soc/qualcomm/ipq806x/include/clock.h b/src/soc/qualcomm/ipq806x/include/clock.h index 98f6661..d9e7834 100644 --- a/src/soc/qualcomm/ipq806x/include/clock.h +++ b/src/soc/qualcomm/ipq806x/include/clock.h @@ -40,7 +40,6 @@ /* UART specific definitions */ -#define BIT(s) (1<<s) #define Uart_ns_val NS(BIT_POS_31,BIT_POS_16,N_VALUE,M_VALUE, 5, 4, 3, 1, 2, 0,3) #define Uart_clk_ns_mask (BM(BIT_POS_31, BIT_POS_16) | BM(BIT_POS_6, BIT_POS_0)) #define Uart_mnd_en_mask BIT(8) * !!(625)

1 0

Patch set updated for coreboot: 8838bd0 include/types.h: Provide BIT() macro
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8280 -gerrit commit 8838bd01597af673e766de3c1ec8162886fb86a4 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 21:08:42 2015 -0600 include/types.h: Provide BIT() macro Change-Id: I86cd8a16420f34ef31b615aec4e0f7bd3191ca35 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/include/types.h | 7 +++++++ src/soc/nvidia/tegra/dc.h | 1 - src/soc/qualcomm/ipq806x/include/clock.h | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/include/types.h b/src/include/types.h index ef5edc1..24ebfaf 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -22,6 +22,13 @@ #include <stdint.h> #include <stddef.h> +/* + * This may mean something else on architectures where the bits are numbered + * from the MSB (e.g. PowerPC), but until we cross that bridge, this macro is + * perfectly fine. + */ +#define BIT(x) (1ul << (x)) + /** * Coreboot error codes * diff --git a/src/soc/nvidia/tegra/dc.h b/src/soc/nvidia/tegra/dc.h index c0b1986..ff36a0b 100644 --- a/src/soc/nvidia/tegra/dc.h +++ b/src/soc/nvidia/tegra/dc.h @@ -367,7 +367,6 @@ struct display_controller { }; check_member(display_controller, winbuf, 0x800 * 4); -#define BIT(pos) (1U << pos) /* DC_CMD_DISPLAY_COMMAND 0x032 */ #define DISP_COMMAND_RAISE (1 << 0) diff --git a/src/soc/qualcomm/ipq806x/include/clock.h b/src/soc/qualcomm/ipq806x/include/clock.h index 98f6661..d9e7834 100644 --- a/src/soc/qualcomm/ipq806x/include/clock.h +++ b/src/soc/qualcomm/ipq806x/include/clock.h @@ -40,7 +40,6 @@ /* UART specific definitions */ -#define BIT(s) (1<<s) #define Uart_ns_val NS(BIT_POS_31,BIT_POS_16,N_VALUE,M_VALUE, 5, 4, 3, 1, 2, 0,3) #define Uart_clk_ns_mask (BM(BIT_POS_31, BIT_POS_16) | BM(BIT_POS_6, BIT_POS_0)) #define Uart_mnd_en_mask BIT(8) * !!(625)

1 0

Patch set updated for coreboot: 7a4ffe0 include/types.h: Provide BIT() macro
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8280 -gerrit commit 7a4ffe0510100ce7f1fd3a7a50c0745538272151 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 21:08:42 2015 -0600 include/types.h: Provide BIT() macro Change-Id: I86cd8a16420f34ef31b615aec4e0f7bd3191ca35 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/include/types.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/include/types.h b/src/include/types.h index ef5edc1..24ebfaf 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -22,6 +22,13 @@ #include <stdint.h> #include <stddef.h> +/* + * This may mean something else on architectures where the bits are numbered + * from the MSB (e.g. PowerPC), but until we cross that bridge, this macro is + * perfectly fine. + */ +#define BIT(x) (1ul << (x)) + /** * Coreboot error codes *

1 0

New patch to review for coreboot: 2b59258 include/types.h: Provide BIT() macro
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8280 -gerrit commit 2b5925820d33858b5d2ac80f412be0fcef7530c1 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 21:08:42 2015 -0600 include/types.h: Provide BIT() macro Change-Id: I86cd8a16420f34ef31b615aec4e0f7bd3191ca35 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/include/types.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/include/types.h b/src/include/types.h index ef5edc1..efdb4a7 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -22,6 +22,13 @@ #include <stdint.h> #include <stddef.h> +/* + * This may mean something else on architectures where the bits are numbered + * from the MSB (e.g. PowerPC), but until we cross that bridge, this macro is + * perfectly fine. + */ +#define BIT(x) (1x << (nr)) + /** * Coreboot error codes *

1 0

Patch set updated for coreboot: 8613d4b src/arch/*/include/stdint.h: Provide definitions for bool type
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8279 -gerrit commit 8613d4b129abc67c4d407cf4f00397d2c4262e3e Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 20:46:55 2015 -0600 src/arch/*/include/stdint.h: Provide definitions for bool type Although bool normally belongs in stdbool.h, for our use cases, providing these definitions in stdint.h is acceptable. Change-Id: I1d0ca1018efacc27d7a4a72aa452912e004401f9 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/arch/arm/include/stdint.h | 4 ++++ src/arch/arm64/include/stdint.h | 3 +++ src/arch/riscv/include/stdint.h | 3 +++ src/arch/x86/include/stdint.h | 3 +++ 4 files changed, 13 insertions(+) diff --git a/src/arch/arm/include/stdint.h b/src/arch/arm/include/stdint.h index 9d41e63..c50e664 100644 --- a/src/arch/arm/include/stdint.h +++ b/src/arch/arm/include/stdint.h @@ -75,6 +75,10 @@ typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; +typedef uint8_t bool; +#define true 1 +#define false 0 + #ifndef UINT32_MAX #define UINT32_MAX (4294967295U) #endif diff --git a/src/arch/arm64/include/stdint.h b/src/arch/arm64/include/stdint.h index 2907d8e..38c2e1e 100644 --- a/src/arch/arm64/include/stdint.h +++ b/src/arch/arm64/include/stdint.h @@ -52,6 +52,9 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +typedef uint8_t bool; +#define true 1 +#define false 0 /* Types for `void *' pointers. */ typedef s64 intptr_t; diff --git a/src/arch/riscv/include/stdint.h b/src/arch/riscv/include/stdint.h index a14d053..24562cd 100644 --- a/src/arch/riscv/include/stdint.h +++ b/src/arch/riscv/include/stdint.h @@ -52,6 +52,9 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +typedef uint8_t bool; +#define true 1 +#define false 0 /* Types for `void *' pointers. */ typedef s64 intptr_t; diff --git a/src/arch/x86/include/stdint.h b/src/arch/x86/include/stdint.h index c491f4b..e8453ab 100644 --- a/src/arch/x86/include/stdint.h +++ b/src/arch/x86/include/stdint.h @@ -75,6 +75,9 @@ typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; +typedef uint8_t bool; +#define true 1 +#define false 0 #ifndef UINT32_MAX #define UINT32_MAX (4294967295U)

1 0

Patch set updated for coreboot: b116892 src/arch/*/include/stdint.h: Provide definitions for bool type . Although bool normally belongs in stdbool.h, for our use cases, providing these definitions in stdint.h is acceptable.
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8279 -gerrit commit b11689277f3ce6fa6c564893571405d088708a9b Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 20:46:55 2015 -0600 src/arch/*/include/stdint.h: Provide definitions for bool type . Although bool normally belongs in stdbool.h, for our use cases, providing these definitions in stdint.h is acceptable. Change-Id: I1d0ca1018efacc27d7a4a72aa452912e004401f9 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/arch/arm/include/stdint.h | 4 ++++ src/arch/arm64/include/stdint.h | 3 +++ src/arch/riscv/include/stdint.h | 3 +++ src/arch/x86/include/stdint.h | 3 +++ 4 files changed, 13 insertions(+) diff --git a/src/arch/arm/include/stdint.h b/src/arch/arm/include/stdint.h index 9d41e63..c50e664 100644 --- a/src/arch/arm/include/stdint.h +++ b/src/arch/arm/include/stdint.h @@ -75,6 +75,10 @@ typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; +typedef uint8_t bool; +#define true 1 +#define false 0 + #ifndef UINT32_MAX #define UINT32_MAX (4294967295U) #endif diff --git a/src/arch/arm64/include/stdint.h b/src/arch/arm64/include/stdint.h index 2907d8e..38c2e1e 100644 --- a/src/arch/arm64/include/stdint.h +++ b/src/arch/arm64/include/stdint.h @@ -52,6 +52,9 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +typedef uint8_t bool; +#define true 1 +#define false 0 /* Types for `void *' pointers. */ typedef s64 intptr_t; diff --git a/src/arch/riscv/include/stdint.h b/src/arch/riscv/include/stdint.h index a14d053..24562cd 100644 --- a/src/arch/riscv/include/stdint.h +++ b/src/arch/riscv/include/stdint.h @@ -52,6 +52,9 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +typedef uint8_t bool; +#define true 1 +#define false 0 /* Types for `void *' pointers. */ typedef s64 intptr_t; diff --git a/src/arch/x86/include/stdint.h b/src/arch/x86/include/stdint.h index c491f4b..e8453ab 100644 --- a/src/arch/x86/include/stdint.h +++ b/src/arch/x86/include/stdint.h @@ -75,6 +75,9 @@ typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; +typedef uint8_t bool; +#define true 1 +#define false 0 #ifndef UINT32_MAX #define UINT32_MAX (4294967295U)

1 0

New patch to review for coreboot: 30f63d0 src/arch/*/include/stdint.h: Provide definitions for bool type
by Alexandru Gagniuc 26 Jan '15

26 Jan '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8279 -gerrit commit 30f63d033655a47d51c64b0457b5d6ccfd1a992a Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sun Jan 25 20:46:55 2015 -0600 src/arch/*/include/stdint.h: Provide definitions for bool type Although bool normally belongs in stdbool.h, for our use cases, providing these definitions in stdint.h is acceptable. Change-Id: I1d0ca1018efacc27d7a4a72aa452912e004401f9 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/arch/arm/include/stdint.h | 4 ++++ src/arch/arm64/include/stdint.h | 3 +++ src/arch/riscv/include/stdint.h | 3 +++ src/arch/x86/include/stdint.h | 3 +++ 4 files changed, 13 insertions(+) diff --git a/src/arch/arm/include/stdint.h b/src/arch/arm/include/stdint.h index 9d41e63..c50e664 100644 --- a/src/arch/arm/include/stdint.h +++ b/src/arch/arm/include/stdint.h @@ -75,6 +75,10 @@ typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; +typedef uint8_t bool; +#define true 1 +#define false 0 + #ifndef UINT32_MAX #define UINT32_MAX (4294967295U) #endif diff --git a/src/arch/arm64/include/stdint.h b/src/arch/arm64/include/stdint.h index 2907d8e..38c2e1e 100644 --- a/src/arch/arm64/include/stdint.h +++ b/src/arch/arm64/include/stdint.h @@ -52,6 +52,9 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +typedef uint8_t bool; +#define true 1 +#define false 0 /* Types for `void *' pointers. */ typedef s64 intptr_t; diff --git a/src/arch/riscv/include/stdint.h b/src/arch/riscv/include/stdint.h index a14d053..24562cd 100644 --- a/src/arch/riscv/include/stdint.h +++ b/src/arch/riscv/include/stdint.h @@ -52,6 +52,9 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; +typedef uint8_t bool; +#define true 1 +#define false 0 /* Types for `void *' pointers. */ typedef s64 intptr_t; diff --git a/src/arch/x86/include/stdint.h b/src/arch/x86/include/stdint.h index c491f4b..e8453ab 100644 --- a/src/arch/x86/include/stdint.h +++ b/src/arch/x86/include/stdint.h @@ -75,6 +75,9 @@ typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; +typedef uint8_t bool; +#define true 1 +#define false 0 #ifndef UINT32_MAX #define UINT32_MAX (4294967295U)

1 0

Patch set updated for coreboot: ec967eb ifdtool: Apply coding style
by Aaron Jin 26 Jan '15

26 Jan '15

Aaron Jin (jin.aaron(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8275 -gerrit commit ec967eb43b247a8f67697dc20cfabfb1ff6d3f89 Author: Aaron Jin <jin.aaron(a)gmail.com> Date: Fri Jan 23 23:35:22 2015 -0800 ifdtool: Apply coding style - Run "indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs *.[ch]" - Fix coding style violations documented in: http://www.coreboot.org/Coding_Style Change-Id: Ibdf51c03cbd17b4a0e1cb526c6de8178920b5db7 Signed-off-by: Aaron Jin <jin.aaron(a)gmail.com> --- util/ifdtool/ifdtool.c | 352 ++++++++++++++++++++++++++----------------------- util/ifdtool/ifdtool.h | 57 ++++---- 2 files changed, 215 insertions(+), 194 deletions(-) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c old mode 100644 new mode 100755 index 9569dfa..3e7fe7c --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -34,20 +34,21 @@ #define NUM_REGIONS 5 static const struct region_name region_names[NUM_REGIONS] = { - { "Flash Descriptor", "fd" }, - { "BIOS", "bios" }, - { "Intel ME", "me" }, - { "GbE", "gbe" }, - { "Platform Data", "pd" } + {"Flash Descriptor", "fd"}, + {"BIOS", "bios"}, + {"Intel ME", "me"}, + {"GbE", "gbe"}, + {"Platform Data", "pd"} }; -static fdbar_t *find_fd(char *image, int size) +static struct fdbar *find_fd(char *image, int size) { - int i, found = 0; + int i; + int found = 0; /* Scan for FD signature */ for (i = 0; i < (size - 4); i += 4) { - if (*(uint32_t *) (image + i) == 0x0FF0A55A) { + if (*(uint32_t *) (image + i) == DESCRIPTOR_SIGNATURE) { found = 1; break; // signature found. } @@ -60,13 +61,16 @@ static fdbar_t *find_fd(char *image, int size) printf("Found Flash Descriptor signature at 0x%08x\n", i); - return (fdbar_t *) (image + i); + return (struct fdbar *)(image + i); } -static region_t get_region(frba_t *frba, int region_type) +static struct region get_region(struct frba *frba, int region_type) { - region_t region; - region.base = 0, region.limit = 0, region.size = 0; + struct region region; + + region.base = 0; + region.limit = 0; + region.size = 0; switch (region_type) { case 0: @@ -91,7 +95,7 @@ static region_t get_region(frba_t *frba, int region_type) break; default: fprintf(stderr, "Invalid region type.\n"); - exit (EXIT_FAILURE); + exit(EXIT_FAILURE); } region.size = region.limit - region.base + 1; @@ -101,32 +105,32 @@ static region_t get_region(frba_t *frba, int region_type) return region; } -static void set_region(frba_t *frba, int region_type, region_t region) +static void set_region(struct frba *frba, int region_type, struct region region) { switch (region_type) { case 0: frba->flreg0 = (((region.limit >> 12) & 0x7fff) << 16) - | ((region.base >> 12) & 0x7fff); + | ((region.base >> 12) & 0x7fff); break; case 1: frba->flreg1 = (((region.limit >> 12) & 0x7fff) << 16) - | ((region.base >> 12) & 0x7fff); + | ((region.base >> 12) & 0x7fff); break; case 2: frba->flreg2 = (((region.limit >> 12) & 0x7fff) << 16) - | ((region.base >> 12) & 0x7fff); + | ((region.base >> 12) & 0x7fff); break; case 3: frba->flreg3 = (((region.limit >> 12) & 0x7fff) << 16) - | ((region.base >> 12) & 0x7fff); + | ((region.base >> 12) & 0x7fff); break; case 4: frba->flreg4 = (((region.limit >> 12) & 0x7fff) << 16) - | ((region.base >> 12) & 0x7fff); + | ((region.base >> 12) & 0x7fff); break; default: fprintf(stderr, "Invalid region type.\n"); - exit (EXIT_FAILURE); + exit(EXIT_FAILURE); } } @@ -134,7 +138,7 @@ static const char *region_name(int region_type) { if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); - exit (EXIT_FAILURE); + exit(EXIT_FAILURE); } return region_names[region_type].pretty; @@ -144,7 +148,7 @@ static const char *region_name_short(int region_type) { if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); - exit (EXIT_FAILURE); + exit(EXIT_FAILURE); } return region_names[region_type].terse; @@ -176,28 +180,29 @@ static const char *region_filename(int region_type) if (region_type < 0 || region_type >= NUM_REGIONS) { fprintf(stderr, "Invalid region type.\n"); - exit (EXIT_FAILURE); + exit(EXIT_FAILURE); } return region_filenames[region_type]; } -static void dump_region(int num, frba_t *frba) +static void dump_region(int num, struct frba *frba) { - region_t region = get_region(frba, num); + struct region region = get_region(frba, num); printf(" Flash Region %d (%s): %08x - %08x %s\n", - num, region_name(num), region.base, region.limit, - region.size < 1 ? "(unused)" : ""); + num, region_name(num), region.base, region.limit, + region.size < 1 ? "(unused)" : ""); } -static void dump_region_layout(char *buf, size_t bufsize, int num, frba_t *frba) +static void dump_region_layout(char *buf, size_t bufsize, int num, + struct frba *frba) { - region_t region = get_region(frba, num); + struct region region = get_region(frba, num); snprintf(buf, bufsize, "%08x:%08x %s\n", - region.base, region.limit, region_name_short(num)); + region.base, region.limit, region_name_short(num)); } -static void dump_frba(frba_t * frba) +static void dump_frba(struct frba *frba) { printf("Found Region Section\n"); printf("FLREG0: 0x%08x\n", frba->flreg0); @@ -212,14 +217,14 @@ static void dump_frba(frba_t * frba) dump_region(4, frba); } -static void dump_frba_layout(frba_t * frba, char *layout_fname) +static void dump_frba_layout(struct frba *frba, char *layout_fname) { char buf[LAYOUT_LINELEN]; size_t bufsize = LAYOUT_LINELEN; int i; int layout_fd = open(layout_fname, O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (layout_fd == -1) { perror("Could not open file"); exit(EXIT_FAILURE); @@ -279,12 +284,12 @@ static void decode_component_density(unsigned int density) } } -static void dump_fcba(fcba_t * fcba) +static void dump_fcba(struct fcba *fcba) { printf("\nFound Component Section\n"); printf("FLCOMP 0x%08x\n", fcba->flcomp); printf(" Dual Output Fast Read Support: %ssupported\n", - (fcba->flcomp & (1 << 30))?"":"not "); + (fcba->flcomp & (1 << 30)) ? "" : "not "); printf(" Read ID/Read Status Clock Frequency: "); decode_spi_frequency((fcba->flcomp >> 27) & 7); printf("\n Write/Erase Clock Frequency: "); @@ -292,7 +297,7 @@ static void dump_fcba(fcba_t * fcba) printf("\n Fast Read Clock Frequency: "); decode_spi_frequency((fcba->flcomp >> 21) & 7); printf("\n Fast Read Support: %ssupported", - (fcba->flcomp & (1 << 20))?"":"not "); + (fcba->flcomp & (1 << 20)) ? "" : "not "); printf("\n Read Clock Frequency: "); decode_spi_frequency((fcba->flcomp >> 17) & 7); printf("\n Component 2 Density: "); @@ -301,20 +306,16 @@ static void dump_fcba(fcba_t * fcba) decode_component_density(fcba->flcomp & 7); printf("\n"); printf("FLILL 0x%08x\n", fcba->flill); - printf(" Invalid Instruction 3: 0x%02x\n", - (fcba->flill >> 24) & 0xff); - printf(" Invalid Instruction 2: 0x%02x\n", - (fcba->flill >> 16) & 0xff); - printf(" Invalid Instruction 1: 0x%02x\n", - (fcba->flill >> 8) & 0xff); - printf(" Invalid Instruction 0: 0x%02x\n", - fcba->flill & 0xff); + printf(" Invalid Instruction 3: 0x%02x\n", (fcba->flill >> 24) & 0xff); + printf(" Invalid Instruction 2: 0x%02x\n", (fcba->flill >> 16) & 0xff); + printf(" Invalid Instruction 1: 0x%02x\n", (fcba->flill >> 8) & 0xff); + printf(" Invalid Instruction 0: 0x%02x\n", fcba->flill & 0xff); printf("FLPB 0x%08x\n", fcba->flpb); printf(" Flash Partition Boundary Address: 0x%06x\n\n", - (fcba->flpb & 0xfff) << 12); + (fcba->flpb & 0xfff) << 12); } -static void dump_fpsba(fpsba_t * fpsba) +static void dump_fpsba(struct fpsba *fpsba) { printf("Found PCH Strap Section\n"); printf("PCHSTRP0: 0x%08x\n", fpsba->pchstrp0); @@ -340,32 +341,32 @@ static void dump_fpsba(fpsba_t * fpsba) static void decode_flmstr(uint32_t flmstr) { printf(" Platform Data Region Write Access: %s\n", - (flmstr & (1 << 28)) ? "enabled" : "disabled"); + (flmstr & (1 << 28)) ? "enabled" : "disabled"); printf(" GbE Region Write Access: %s\n", - (flmstr & (1 << 27)) ? "enabled" : "disabled"); + (flmstr & (1 << 27)) ? "enabled" : "disabled"); printf(" Intel ME Region Write Access: %s\n", - (flmstr & (1 << 26)) ? "enabled" : "disabled"); + (flmstr & (1 << 26)) ? "enabled" : "disabled"); printf(" Host CPU/BIOS Region Write Access: %s\n", - (flmstr & (1 << 25)) ? "enabled" : "disabled"); + (flmstr & (1 << 25)) ? "enabled" : "disabled"); printf(" Flash Descriptor Write Access: %s\n", - (flmstr & (1 << 24)) ? "enabled" : "disabled"); + (flmstr & (1 << 24)) ? "enabled" : "disabled"); printf(" Platform Data Region Read Access: %s\n", - (flmstr & (1 << 20)) ? "enabled" : "disabled"); + (flmstr & (1 << 20)) ? "enabled" : "disabled"); printf(" GbE Region Read Access: %s\n", - (flmstr & (1 << 19)) ? "enabled" : "disabled"); + (flmstr & (1 << 19)) ? "enabled" : "disabled"); printf(" Intel ME Region Read Access: %s\n", - (flmstr & (1 << 18)) ? "enabled" : "disabled"); + (flmstr & (1 << 18)) ? "enabled" : "disabled"); printf(" Host CPU/BIOS Region Read Access: %s\n", - (flmstr & (1 << 17)) ? "enabled" : "disabled"); + (flmstr & (1 << 17)) ? "enabled" : "disabled"); printf(" Flash Descriptor Read Access: %s\n", - (flmstr & (1 << 16)) ? "enabled" : "disabled"); + (flmstr & (1 << 16)) ? "enabled" : "disabled"); printf(" Requester ID: 0x%04x\n\n", - flmstr & 0xffff); + flmstr & 0xffff); } -static void dump_fmba(fmba_t * fmba) +static void dump_fmba(struct fmba *fmba) { printf("Found Master Section\n"); printf("FLMSTR1: 0x%08x (Host CPU/BIOS)\n", fmba->flmstr1); @@ -376,7 +377,7 @@ static void dump_fmba(fmba_t * fmba) decode_flmstr(fmba->flmstr3); } -static void dump_fmsba(fmsba_t * fmsba) +static void dump_fmsba(struct fmsba *fmsba) { printf("Found Processor Strap Section\n"); printf("????: 0x%08x\n", fmsba->data[0]); @@ -388,23 +389,21 @@ static void dump_fmsba(fmsba_t * fmsba) static void dump_jid(uint32_t jid) { printf(" SPI Componend Device ID 1: 0x%02x\n", - (jid >> 16) & 0xff); + (jid >> 16) & 0xff); printf(" SPI Componend Device ID 0: 0x%02x\n", - (jid >> 8) & 0xff); - printf(" SPI Componend Vendor ID: 0x%02x\n", - jid & 0xff); + (jid >> 8) & 0xff); + printf(" SPI Componend Vendor ID: 0x%02x\n", jid & 0xff); } static void dump_vscc(uint32_t vscc) { - printf(" Lower Erase Opcode: 0x%02x\n", - vscc >> 24); + printf(" Lower Erase Opcode: 0x%02x\n", vscc >> 24); printf(" Lower Write Enable on Write Status: 0x%02x\n", - vscc & (1 << 20) ? 0x06 : 0x50); + vscc & (1 << 20) ? 0x06 : 0x50); printf(" Lower Write Status Required: %s\n", - vscc & (1 << 19) ? "Yes" : "No"); + vscc & (1 << 19) ? "Yes" : "No"); printf(" Lower Write Granularity: %d bytes\n", - vscc & (1 << 18) ? 64 : 1); + vscc & (1 << 18) ? 64 : 1); printf(" Lower Block / Sector Erase Size: "); switch ((vscc >> 16) & 0x3) { case 0: @@ -422,13 +421,13 @@ static void dump_vscc(uint32_t vscc) } printf(" Upper Erase Opcode: 0x%02x\n", - (vscc >> 8) & 0xff); + (vscc >> 8) & 0xff); printf(" Upper Write Enable on Write Status: 0x%02x\n", - vscc & (1 << 4) ? 0x06 : 0x50); + vscc & (1 << 4) ? 0x06 : 0x50); printf(" Upper Write Status Required: %s\n", - vscc & (1 << 3) ? "Yes" : "No"); + vscc & (1 << 3) ? "Yes" : "No"); printf(" Upper Write Granularity: %d bytes\n", - vscc & (1 << 2) ? 64 : 1); + vscc & (1 << 2) ? 64 : 1); printf(" Upper Block / Sector Erase Size: "); switch (vscc & 0x3) { case 0: @@ -446,7 +445,7 @@ static void dump_vscc(uint32_t vscc) } } -static void dump_vtba(vtba_t *vtba, int vtl) +static void dump_vtba(struct vtba *vtba, int vtl) { int i; int num = (vtl >> 1) < 8 ? (vtl >> 1) : 8; @@ -461,22 +460,24 @@ static void dump_vtba(vtba_t *vtba, int vtl) printf("\n"); } -static void dump_oem(uint8_t *oem) +static void dump_oem(uint8_t * oem) { - int i, j; + int i; + int j; + printf("OEM Section:\n"); for (i = 0; i < 4; i++) { printf("%02x:", i << 4); for (j = 0; j < 16; j++) - printf(" %02x", oem[(i<<4)+j]); - printf ("\n"); + printf(" %02x", oem[(i << 4) + j]); + printf("\n"); } - printf ("\n"); + printf("\n"); } static void dump_fd(char *image, int size) { - fdbar_t *fdb = find_fd(image, size); + struct fdbar *fdb = find_fd(image, size); if (!fdb) exit(EXIT_FAILURE); @@ -498,57 +499,59 @@ static void dump_fd(char *image, int size) printf("FLUMAP1: 0x%08x\n", fdb->flumap1); printf(" Intel ME VSCC Table Length (VTL): %d\n", - (fdb->flumap1 >> 8) & 0xff); + (fdb->flumap1 >> 8) & 0xff); printf(" Intel ME VSCC Table Base Address (VTBA): 0x%06x\n\n", - (fdb->flumap1 & 0xff) << 4); - dump_vtba((vtba_t *) - (image + ((fdb->flumap1 & 0xff) << 4)), - (fdb->flumap1 >> 8) & 0xff); - dump_oem((uint8_t *)image + 0xf00); - dump_frba((frba_t *) - (image + (((fdb->flmap0 >> 16) & 0xff) << 4))); - dump_fcba((fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4))); - dump_fpsba((fpsba_t *) - (image + (((fdb->flmap1 >> 16) & 0xff) << 4))); - dump_fmba((fmba_t *) (image + (((fdb->flmap1) & 0xff) << 4))); - dump_fmsba((fmsba_t *) (image + (((fdb->flmap2) & 0xff) << 4))); + (fdb->flumap1 & 0xff) << 4); + dump_vtba((struct vtba *) + (image + ((fdb->flumap1 & 0xff) << 4)), + (fdb->flumap1 >> 8) & 0xff); + dump_oem((uint8_t *) image + 0xf00); + dump_frba((struct frba *) + (image + (((fdb->flmap0 >> 16) & 0xff) << 4))); + dump_fcba((struct fcba *)(image + (((fdb->flmap0) & 0xff) << 4))); + dump_fpsba((struct fpsba *) + (image + (((fdb->flmap1 >> 16) & 0xff) << 4))); + dump_fmba((struct fmba *)(image + (((fdb->flmap1) & 0xff) << 4))); + dump_fmsba((struct fmsba *)(image + (((fdb->flmap2) & 0xff) << 4))); } static void dump_layout(char *image, int size, char *layout_fname) { - fdbar_t *fdb = find_fd(image, size); + struct fdbar *fdb = find_fd(image, size); if (!fdb) exit(EXIT_FAILURE); - dump_frba_layout((frba_t *) - (image + (((fdb->flmap0 >> 16) & 0xff) << 4)), - layout_fname); + dump_frba_layout((struct frba *) + (image + (((fdb->flmap0 >> 16) & 0xff) << 4)), + layout_fname); } static void write_regions(char *image, int size) { int i; - fdbar_t *fdb = find_fd(image, size); + struct fdbar *fdb = find_fd(image, size); if (!fdb) exit(EXIT_FAILURE); - frba_t *frba = - (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + struct frba *frba = + (struct frba *)(image + (((fdb->flmap0 >> 16) & 0xff) << 4)); for (i = 0; i < NUM_REGIONS; i++) { - region_t region = get_region(frba, i); + struct region region = get_region(frba, i); dump_region(i, frba); if (region.size > 0) { int region_fd; region_fd = open(region_filename(i), - O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, + O_WRONLY | O_CREAT | O_TRUNC | + O_BINARY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (region_fd < 0) { perror("Error while trying to open file"); exit(EXIT_FAILURE); } - if (write(region_fd, image + region.base, region.size) != region.size) + if (write(region_fd, image + region.base, region.size) + != region.size) perror("Error while writing"); close(region_fd); } @@ -557,7 +560,7 @@ static void write_regions(char *image, int size) static void write_image(char *filename, char *image, int size) { - char new_filename[FILENAME_MAX]; // allow long file names + char new_filename[FILENAME_MAX]; // allow long file names int new_fd; // - 5: leave room for ".new\0" @@ -568,8 +571,8 @@ static void write_image(char *filename, char *image, int size) // Now write out new image new_fd = open(new_filename, - O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (new_fd < 0) { perror("Error while trying to open file"); exit(EXIT_FAILURE); @@ -582,8 +585,9 @@ static void write_image(char *filename, char *image, int size) static void set_spi_frequency(char *filename, char *image, int size, enum spi_frequency freq) { - fdbar_t *fdb = find_fd(image, size); - fcba_t *fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + struct fdbar *fdb = find_fd(image, size); + struct fcba *fcba = + (struct fcba *)(image + (((fdb->flmap0) & 0xff) << 4)); /* clear bits 21-29 */ fcba->flcomp &= ~0x3fe00000; @@ -599,8 +603,9 @@ static void set_spi_frequency(char *filename, char *image, int size, static void set_em100_mode(char *filename, char *image, int size) { - fdbar_t *fdb = find_fd(image, size); - fcba_t *fcba = (fcba_t *) (image + (((fdb->flmap0) & 0xff) << 4)); + struct fdbar *fdb = find_fd(image, size); + struct fcba *fcba = + (struct fcba *)(image + (((fdb->flmap0) & 0xff) << 4)); fcba->flcomp &= ~(1 << 30); set_spi_frequency(filename, image, size, SPI_FREQUENCY_20MHZ); @@ -608,8 +613,9 @@ static void set_em100_mode(char *filename, char *image, int size) static void lock_descriptor(char *filename, char *image, int size) { - fdbar_t *fdb = find_fd(image, size); - fmba_t *fmba = (fmba_t *) (image + (((fdb->flmap1) & 0xff) << 4)); + struct fdbar *fdb = find_fd(image, size); + struct fmba *fmba = + (struct fmba *)(image + (((fdb->flmap1) & 0xff) << 4)); /* TODO: Dynamically take Platform Data Region and GbE Region * into regard. */ @@ -622,8 +628,9 @@ static void lock_descriptor(char *filename, char *image, int size) static void unlock_descriptor(char *filename, char *image, int size) { - fdbar_t *fdb = find_fd(image, size); - fmba_t *fmba = (fmba_t *) (image + (((fdb->flmap1) & 0xff) << 4)); + struct fdbar *fdb = find_fd(image, size); + struct fmba *fmba = + (struct fmba *)(image + (((fdb->flmap1) & 0xff) << 4)); fmba->flmstr1 = 0xffff0000; fmba->flmstr2 = 0xffff0000; fmba->flmstr3 = 0x08080118; @@ -634,16 +641,17 @@ static void unlock_descriptor(char *filename, char *image, int size) void inject_region(char *filename, char *image, int size, int region_type, char *region_fname) { - fdbar_t *fdb = find_fd(image, size); + struct fdbar *fdb = find_fd(image, size); if (!fdb) exit(EXIT_FAILURE); - frba_t *frba = - (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + struct frba *frba = + (struct frba *)(image + (((fdb->flmap0 >> 16) & 0xff) << 4)); - region_t region = get_region(frba, region_type); + struct region region = get_region(frba, region_type); if (region.size <= 0xfff) { - fprintf(stderr, "Region %s is disabled in target. Not injecting.\n", - region_name(region_type)); + fprintf(stderr, + "Region %s is disabled in target. Not injecting.\n", + region_name(region_type)); exit(EXIT_FAILURE); } @@ -661,21 +669,21 @@ void inject_region(char *filename, char *image, int size, int region_type, printf("File %s is %d bytes\n", region_fname, region_size); - if ( (region_size > region.size) || ((region_type != 1) && - (region_size > region.size))) { + if ((region_size > region.size) || ((region_type != 1) && + (region_size > region.size))) { fprintf(stderr, "Region %s is %d(0x%x) bytes. File is %d(0x%x)" - " bytes. Not injecting.\n", - region_name(region_type), region.size, - region.size, region_size, region_size); + " bytes. Not injecting.\n", + region_name(region_type), region.size, + region.size, region_size, region_size); exit(EXIT_FAILURE); } int offset = 0; if ((region_type == 1) && (region_size < region.size)) { fprintf(stderr, "Region %s is %d(0x%x) bytes. File is %d(0x%x)" - " bytes. Padding before injecting.\n", - region_name(region_type), region.size, - region.size, region_size, region_size); + " bytes. Padding before injecting.\n", + region_name(region_type), region.size, + region.size, region_size, region_size); offset = region.size - region_size; memset(image + region.base, 0xff, offset); } @@ -687,7 +695,7 @@ void inject_region(char *filename, char *image, int size, int region_type, } if (read(region_fd, image + region.base + offset, region_size) - != region_size) { + != region_size) { perror("Could not read file"); exit(EXIT_FAILURE); } @@ -717,13 +725,13 @@ unsigned int next_pow2(unsigned int x) * @return 0 if the two regions are seperate * @return 1 if the two regions overlap */ -static int regions_collide(region_t r1, region_t r2) +static int regions_collide(struct region r1, struct region r2) { if ((r1.size == 0) || (r2.size == 0)) return 0; - if ( ((r1.base >= r2.base) && (r1.base <= r2.limit)) || - ((r1.limit >= r2.base) && (r1.limit <= r2.limit)) ) + if (((r1.base >= r2.base) && (r1.base <= r2.limit)) || + ((r1.limit >= r2.base) && (r1.limit <= r2.limit))) return 1; return 0; @@ -734,20 +742,21 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) FILE *romlayout; char tempstr[256]; char layout_region_name[256]; - int i, j; + int i; + int j; int region_number; - region_t current_regions[NUM_REGIONS]; - region_t new_regions[NUM_REGIONS]; + struct region current_regions[NUM_REGIONS]; + struct region new_regions[NUM_REGIONS]; int new_extent = 0; char *new_image; /* load current descriptor map and regions */ - fdbar_t *fdb = find_fd(image, size); + struct fdbar *fdb = find_fd(image, size); if (!fdb) exit(EXIT_FAILURE); - frba_t *frba = - (frba_t *) (image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + struct frba *frba = + (struct frba *)(image + (((fdb->flmap0 >> 16) & 0xff) << 4)); for (i = 0; i < NUM_REGIONS; i++) { current_regions[i] = get_region(frba, i); @@ -766,7 +775,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) char *tstr1, *tstr2; if (2 != fscanf(romlayout, "%255s %255s\n", tempstr, - layout_region_name)) + layout_region_name)) continue; region_number = region_num(layout_region_name); @@ -780,12 +789,12 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) exit(EXIT_FAILURE); } new_regions[region_number].base = strtol(tstr1, - (char **)NULL, 16); + (char **)NULL, 16); new_regions[region_number].limit = strtol(tstr2, - (char **)NULL, 16); + (char **)NULL, 16); new_regions[region_number].size = - new_regions[region_number].limit - - new_regions[region_number].base + 1; + new_regions[region_number].limit - + new_regions[region_number].base + 1; if (new_regions[region_number].size < 0) new_regions[region_number].size = 0; @@ -799,7 +808,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) if (new_regions[i].size < current_regions[i].size) { printf("DANGER: Region %s is shrinking.\n", - region_name(i)); + region_name(i)); printf(" The region will be truncated to fit.\n"); printf(" This may result in an unusable image.\n"); } @@ -828,9 +837,10 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) memset(new_image, 0xff, new_extent); for (i = 0; i < NUM_REGIONS; i++) { int copy_size = new_regions[i].size; - int offset_current = 0, offset_new = 0; - region_t current = current_regions[i]; - region_t new = new_regions[i]; + int offset_current = 0; + int offset_new = 0; + struct region current = current_regions[i]; + struct region new = new_regions[i]; if (new.size == 0) continue; @@ -846,16 +856,15 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) offset_current = current.size - new.size; } - printf("Copy Descriptor %d (%s) (%d bytes)\n", i, - region_name(i), copy_size); + printf("Copy Descriptor %d (%s)(%d bytes)\n", i, + region_name(i), copy_size); printf(" from %08x+%08x:%08x (%10d)\n", current.base, - offset_current, current.limit, current.size); + offset_current, current.limit, current.size); printf(" to %08x+%08x:%08x (%10d)\n", new.base, - offset_new, new.limit, new.size); + offset_new, new.limit, new.size); memcpy(new_image + new.base + offset_new, - image + current.base + offset_current, - copy_size); + image + current.base + offset_current, copy_size); } /* update new descriptor regions */ @@ -863,7 +872,7 @@ void new_layout(char *filename, char *image, int size, char *layout_fname) if (!fdb) exit(EXIT_FAILURE); - frba = (frba_t *) (new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); + frba = (struct frba *)(new_image + (((fdb->flmap0 >> 16) & 0xff) << 4)); for (i = 1; i < NUM_REGIONS; i++) { set_region(frba, i, new_regions[i]); } @@ -904,18 +913,26 @@ static void print_usage(const char *name) " -u | --unlock Unlock firmware descriptor and ME region\n" " -v | --version: print the version\n" " -h | --help: print this help\n\n" - "<region> is one of Descriptor, BIOS, ME, GbE, Platform\n" - "\n"); + "<region> is one of Descriptor, BIOS, ME, GbE, Platform\n" "\n"); } int main(int argc, char *argv[]) { int opt, option_index = 0; - int mode_dump = 0, mode_extract = 0, mode_inject = 0, mode_spifreq = 0; - int mode_em100 = 0, mode_locked = 0, mode_unlocked = 0; - int mode_layout = 0, mode_newlayout = 0; - char *region_type_string = NULL, *region_fname = NULL, *layout_fname = NULL; - int region_type = -1, inputfreq = 0; + int mode_dump = 0; + int mode_extract = 0; + int mode_inject = 0; + int mode_spifreq = 0; + int mode_em100 = 0; + int mode_locked = 0; + int mode_unlocked = 0; + int mode_layout = 0; + int mode_newlayout = 0; + char *region_type_string = NULL; + char *region_fname = NULL; + char *layout_fname = NULL; + int region_type = -1; + int inputfreq = 0; enum spi_frequency spifreq = SPI_FREQUENCY_20MHZ; static struct option long_options[] = { @@ -1017,14 +1034,16 @@ int main(int argc, char *argv[]) case 'l': mode_locked = 1; if (mode_unlocked == 1) { - fprintf(stderr, "Locking/Unlocking FD and ME are mutually exclusive\n"); + fprintf(stderr, + "Locking/Unlocking FD and ME are mutually exclusive\n"); exit(EXIT_FAILURE); } break; case 'u': mode_unlocked = 1; if (mode_locked == 1) { - fprintf(stderr, "Locking/Unlocking FD and ME are mutually exclusive\n"); + fprintf(stderr, + "Locking/Unlocking FD and ME are mutually exclusive\n"); exit(EXIT_FAILURE); } break; @@ -1042,8 +1061,8 @@ int main(int argc, char *argv[]) } if ((mode_dump + mode_layout + mode_extract + mode_inject + - mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked | - mode_locked)) > 1) { + mode_newlayout + (mode_spifreq | mode_em100 | mode_unlocked | + mode_locked)) > 1) { fprintf(stderr, "You may not specify more than one mode.\n\n"); print_usage(argv[0]); exit(EXIT_FAILURE); @@ -1101,8 +1120,7 @@ int main(int argc, char *argv[]) write_regions(image, size); if (mode_inject) - inject_region(filename, image, size, region_type, - region_fname); + inject_region(filename, image, size, region_type, region_fname); if (mode_newlayout) new_layout(filename, image, size, layout_fname); @@ -1113,7 +1131,7 @@ int main(int argc, char *argv[]) if (mode_em100) set_em100_mode(filename, image, size); - if(mode_locked) + if (mode_locked) lock_descriptor(filename, image, size); if (mode_unlocked) diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h old mode 100644 new mode 100755 index ed8f440..19a1258 --- a/util/ifdtool/ifdtool.h +++ b/util/ifdtool/ifdtool.h @@ -21,6 +21,7 @@ #define IFDTOOL_VERSION "1.1" #define LAYOUT_LINELEN 80 +#define DESCRIPTOR_SIGNATURE 0x0FF0A55A enum spi_frequency { SPI_FREQUENCY_20MHZ = 0, @@ -30,41 +31,41 @@ enum spi_frequency { enum component_density { COMPONENT_DENSITY_512KB = 0, - COMPONENT_DENSITY_1MB = 1, - COMPONENT_DENSITY_2MB = 2, - COMPONENT_DENSITY_4MB = 3, - COMPONENT_DENSITY_8MB = 4, - COMPONENT_DENSITY_16MB = 5, + COMPONENT_DENSITY_1MB = 1, + COMPONENT_DENSITY_2MB = 2, + COMPONENT_DENSITY_4MB = 3, + COMPONENT_DENSITY_8MB = 4, + COMPONENT_DENSITY_16MB = 5, }; // flash descriptor -typedef struct { +struct fdbar { uint32_t flvalsig; uint32_t flmap0; uint32_t flmap1; uint32_t flmap2; - uint8_t reserved[0xefc - 0x20]; + uint8_t reserved[0xefc - 0x20]; uint32_t flumap1; -} __attribute__((packed)) fdbar_t; +} __attribute__ ((packed)); // regions -typedef struct { +struct frba { uint32_t flreg0; uint32_t flreg1; uint32_t flreg2; uint32_t flreg3; uint32_t flreg4; -} __attribute__((packed)) frba_t; +} __attribute__ ((packed)); // component section -typedef struct { +struct fcba { uint32_t flcomp; uint32_t flill; uint32_t flpb; -} __attribute__((packed)) fcba_t; +} __attribute__ ((packed)); // pch strap -typedef struct { +struct fpsba { uint32_t pchstrp0; uint32_t pchstrp1; uint32_t pchstrp2; @@ -83,36 +84,38 @@ typedef struct { uint32_t pchstrp15; uint32_t pchstrp16; uint32_t pchstrp17; -} __attribute__((packed)) fpsba_t; +} __attribute__ ((packed)); // master -typedef struct { +struct fmba { uint32_t flmstr1; uint32_t flmstr2; uint32_t flmstr3; -} __attribute__((packed)) fmba_t; +} __attribute__ ((packed)); // processor strap -typedef struct { +struct fmsba { uint32_t data[8]; -} __attribute__((packed)) fmsba_t; +} __attribute__ ((packed)); // ME VSCC -typedef struct { +struct vscc { uint32_t jid; uint32_t vscc; -} vscc_t; +} __attribute__ ((packed)); -typedef struct { +struct vtba { // Actual number of entries specified in vtl - vscc_t entry[8]; -} vtba_t; + struct vscc entry[8]; +} __attribute__ ((packed)); -typedef struct { - int base, limit, size; -} region_t; +struct region { + int base; + int limit; + int size; +} __attribute__ ((packed)); struct region_name { char *pretty; char *terse; -}; +} __attribute__ ((packed));

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2015