coreboot-gerrit August 2014

coreboot-gerrit@coreboot.org

1 participants
1011 discussions

Patch set updated for coreboot: 4a8e63a Remove inessential mappings in cbfs_media
by Naman Govil 06 Aug '14

06 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6507 -gerrit commit 4a8e63af3cf7bd70a851392f16b973c0e5841d46 Author: Naman Govil <namangov(a)gmail.com> Date: Wed Aug 6 11:46:17 2014 +0530 Remove inessential mappings in cbfs_media Reducing sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s Change-Id: I6e49543f5bb30936162ebea11a3ca8cee8213dc2 Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/arch/x86/boot/smbios.c | 3 +-- src/include/cbfs_core.h | 10 +++++----- src/lib/cbfs.c | 2 +- src/lib/cbfs_core.c | 20 ++++++-------------- src/lib/loaders/cbfs_payload_loader.c | 6 ++---- 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index ec3e5e8..37c4b80 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -153,9 +153,8 @@ static int smbios_write_type0(unsigned long *current, int handle) { struct cbfs_header header; u32 romsize = CONFIG_ROM_SIZE; - if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) { + if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) romsize = header.romsize; - } t->bios_rom_size = (romsize / 65535) - 1; } diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 11de0ee..ecfee36 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -232,18 +232,18 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); int cbfs_decompress(int algo, void *src, void *dst, int len); /* finds the CBFS master header and fills it in a cbfs_header structure, - return 0 on success and <0 if header not found */ + * return 0 on success and <0 if header not found */ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); /* Returns success (0) on finding the file requested by verifying name; - -1 if file not found - The absolute data_offset to the file is stored */ + * -1 if file not found + * The absolute data_offset to the file is stored */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name); /* Returns success (0) on finding the file requested by verifying name and type; - -1 if file not found - The absolute data_offset to the file is stored */ + * -1 if file not found + * The absolute data_offset to the file is stored */ int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type); diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 5442ddc..41a871f 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -138,7 +138,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); if (c < 0) { - ERROR("Stage not loaded\n"); + ERROR("Stage not loaded.\n"); return (void *)-1; } diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index 164473e..348ff77 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -191,15 +191,6 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type) { - struct cbfs_media default_media; - - if (media == CBFS_DEFAULT_MEDIA) { - media = &default_media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media/\n"); - return -1; - } - } if (cbfs_find_file(media, f, name) < 0) { ERROR("Failed to find file\n"); @@ -211,10 +202,7 @@ int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, return 0; } else - { - ERROR("File of matching type not found\n"); return -1; - } } @@ -277,8 +265,12 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) return NULL; } - fileptr = media->map(media, f.data_offset, f.data_len); - return fileptr; + fileptr = media->map(media, f.data_offset - f.file.offset, f.data_len + f.file.offset); + + if (fileptr == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index d1ebd84..2fa42c4 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -25,11 +25,9 @@ static int cbfs_locate_payload(struct payload *payload) { const int type = CBFS_TYPE_PAYLOAD; - struct cbfs_media default_media, *m; + struct cbfs_media *m; - m = &default_media; - if (init_default_cbfs_media(m) != 0) - return -1; + m = CBFS_DEFAULT_MEDIA; if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1;

1 0

New patch to review for coreboot: 331974c Remove inessential mappings in cbfs_media
by Naman Govil 06 Aug '14

06 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6507 -gerrit commit 331974c5691a2e8c63eb8122586097d0b25f3146 Author: Naman Govil <namangov(a)gmail.com> Date: Wed Aug 6 11:46:17 2014 +0530 Remove inessential mappings in cbfs_media Reducing sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s Change-Id: I6e49543f5bb30936162ebea11a3ca8cee8213dc2 Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/arch/x86/boot/smbios.c | 3 +-- src/include/cbfs_core.h | 10 +++++----- src/lib/cbfs.c | 2 +- src/lib/cbfs_core.c | 22 ++++++---------------- src/lib/loaders/cbfs_payload_loader.c | 6 ++---- 5 files changed, 15 insertions(+), 28 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index ec3e5e8..37c4b80 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -153,9 +153,8 @@ static int smbios_write_type0(unsigned long *current, int handle) { struct cbfs_header header; u32 romsize = CONFIG_ROM_SIZE; - if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) { + if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) romsize = header.romsize; - } t->bios_rom_size = (romsize / 65535) - 1; } diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 11de0ee..ecfee36 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -232,18 +232,18 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); int cbfs_decompress(int algo, void *src, void *dst, int len); /* finds the CBFS master header and fills it in a cbfs_header structure, - return 0 on success and <0 if header not found */ + * return 0 on success and <0 if header not found */ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); /* Returns success (0) on finding the file requested by verifying name; - -1 if file not found - The absolute data_offset to the file is stored */ + * -1 if file not found + * The absolute data_offset to the file is stored */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name); /* Returns success (0) on finding the file requested by verifying name and type; - -1 if file not found - The absolute data_offset to the file is stored */ + * -1 if file not found + * The absolute data_offset to the file is stored */ int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type); diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 5442ddc..41a871f 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -138,7 +138,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); if (c < 0) { - ERROR("Stage not loaded\n"); + ERROR("Stage not loaded.\n"); return (void *)-1; } diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index 164473e..915ec76 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -191,15 +191,6 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type) { - struct cbfs_media default_media; - - if (media == CBFS_DEFAULT_MEDIA) { - media = &default_media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media/\n"); - return -1; - } - } if (cbfs_find_file(media, f, name) < 0) { ERROR("Failed to find file\n"); @@ -210,11 +201,6 @@ int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, DEBUG("File of matching type has been found\n"); return 0; } - else - { - ERROR("File of matching type not found\n"); - return -1; - } } @@ -277,8 +263,12 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) return NULL; } - fileptr = media->map(media, f.data_offset, f.data_len); - return fileptr; + fileptr = media->map(media, f.data_offset - f.file.offset, f.data_len + f.file.offset); + + if (fileptr == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index d1ebd84..2fa42c4 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -25,11 +25,9 @@ static int cbfs_locate_payload(struct payload *payload) { const int type = CBFS_TYPE_PAYLOAD; - struct cbfs_media default_media, *m; + struct cbfs_media *m; - m = &default_media; - if (init_default_cbfs_media(m) != 0) - return -1; + m = CBFS_DEFAULT_MEDIA; if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1;

1 0

Patch set updated for coreboot: 8d654ca superio/smsc/sio1036: Fix hardcoded TTY0 base addr and .c include
by Edward O'Callaghan 06 Aug '14

06 Aug '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6463 -gerrit commit 8d654cac7fd27ad265887ce40886d6efff1ca8ca Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat Aug 2 20:08:35 2014 +1000 superio/smsc/sio1036: Fix hardcoded TTY0 base addr and .c include Compile romstage component as link-time symbols. Pass CONFIG_TTY0_BASE as argument instead of hard coding and playing funny business with the pre-processor. Fix board to match. Change-Id: If6d0d5389bd4e7765bb6056cf488c94fd45915c2 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/amd/dinar/Kconfig | 1 + src/mainboard/amd/dinar/devicetree.cb | 2 +- src/mainboard/amd/dinar/romstage.c | 10 +++------ src/superio/smsc/sio1036/Makefile.inc | 1 + src/superio/smsc/sio1036/sio1036.h | 5 +++++ src/superio/smsc/sio1036/sio1036_early_init.c | 32 +++++++++++++-------------- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig index e826459..b71c5a5 100644 --- a/src/mainboard/amd/dinar/Kconfig +++ b/src/mainboard/amd/dinar/Kconfig @@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_AMD_AGESA_FAMILY15 select NORTHBRIDGE_AMD_CIMX_RD890 select SOUTHBRIDGE_AMD_CIMX_SB700 + select SUPERIO_SMSC_SIO1036 select SUPERIO_SMSC_SCH4037 select BOARD_ROMSIZE_KB_2048 select HAVE_OPTION_TABLE diff --git a/src/mainboard/amd/dinar/devicetree.cb b/src/mainboard/amd/dinar/devicetree.cb index 09becd4..7a59fd2 100644 --- a/src/mainboard/amd/dinar/devicetree.cb +++ b/src/mainboard/amd/dinar/devicetree.cb @@ -85,7 +85,7 @@ chip northbridge/amd/agesa/family15/root_complex irq 0x70 = 1 # PS/2 keyboard interrupt irq 0x72 = 12 # PS/2 mouse interrupt end - end #SIO SMSC307 + end #SIO SMSC SCH4037 end #LPC device pci 14.4 on end # PCI bridge, 0x4384 device pci 14.5 on end # USB 3 diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c index 842b4f0..8cc3d9a 100644 --- a/src/mainboard/amd/dinar/romstage.c +++ b/src/mainboard/amd/dinar/romstage.c @@ -33,12 +33,12 @@ #include <northbridge/amd/agesa/agesawrapper_call.h> #include "cpu/x86/bist.h" #include "superio/smsc/sch4037/sch4037_early_init.c" -#include "superio/smsc/sio1036/sio1036_early_init.c" +#include <superio/smsc/sio1036/sio1036.h> #include "cpu/x86/lapic.h" #include "nb_cimx.h" #include <sb_cimx.h> -#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +#define SERIAL_DEV PNP_DEV(0x4e, SIO1036_SP1) void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { @@ -50,11 +50,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) sch4037_early_init(0x2e); - /* Detect SMSC SIO1036 LPC Debug Card status */ - if (detect_sio1036_chip(0x4E)) { - /* Found SMSC SIO1036 LPC Debug Card */ - sio1036_early_init(0x4E); - } + sio1036_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); post_code(0x31); console_init(); diff --git a/src/superio/smsc/sio1036/Makefile.inc b/src/superio/smsc/sio1036/Makefile.inc index f09d451..c4b6138 100644 --- a/src/superio/smsc/sio1036/Makefile.inc +++ b/src/superio/smsc/sio1036/Makefile.inc @@ -17,4 +17,5 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +romstage-$(CONFIG_SUPERIO_SMSC_SIO1036) += sio1036_early_init.c ramstage-$(CONFIG_SUPERIO_SMSC_SIO1036) += superio.c diff --git a/src/superio/smsc/sio1036/sio1036.h b/src/superio/smsc/sio1036/sio1036.h index e61b600..fa52a1a 100644 --- a/src/superio/smsc/sio1036/sio1036.h +++ b/src/superio/smsc/sio1036/sio1036.h @@ -26,4 +26,9 @@ #define LPT_POWER_DOWN (1 << 2) #define IR_OUPUT_MUX (1 << 6) +#include <arch/io.h> +#include <stdint.h> + +void sio1036_enable_serial(device_t dev, u16 iobase); + #endif /* SUPERIO_SMSC_1306_H */ diff --git a/src/superio/smsc/sio1036/sio1036_early_init.c b/src/superio/smsc/sio1036/sio1036_early_init.c index 52232a5..30f1607 100644 --- a/src/superio/smsc/sio1036/sio1036_early_init.c +++ b/src/superio/smsc/sio1036/sio1036_early_init.c @@ -20,32 +20,33 @@ /* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */ #include <arch/io.h> +#include <stdint.h> + #include "sio1036.h" -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3F8 -#endif static inline void sio1036_enter_conf_state(device_t dev) { - unsigned port = dev>>8; + unsigned port = dev >> 8; outb(0x55, port); } static inline void sio1036_exit_conf_state(device_t dev) { - unsigned port = dev>>8; + unsigned port = dev >> 8; outb(0xaa, port); } +/* Detect SMSC SIO1036 LPC Debug Card status */ static u8 detect_sio1036_chip(unsigned port) { - device_t dev; - dev = PNP_DEV (port, SIO1036_SP1); + device_t dev = PNP_DEV(port, SIO1036_SP1); unsigned data; + sio1036_enter_conf_state (dev); data = pnp_read_config (dev, 0x0D); sio1036_exit_conf_state(dev); - /* detect smsc sio1036 chip */ + + /* Detect SMSC SIO1036 chip */ if (data == 0x82) { /* Found SMSC SIO1036 chip */ return 0; @@ -55,15 +56,14 @@ static u8 detect_sio1036_chip(unsigned port) }; } -static inline void sio1036_early_init(unsigned port) +void sio1036_enable_serial(device_t dev, u16 iobase) { - device_t dev; - dev = PNP_DEV (port, SIO1036_SP1); + unsigned port = dev >> 8; + + if (detect_sio1036_chip(port) != 0) + return; /* Not found SMSC SIO1036 */ + /* Found SMSC SIO1036 LPC Debug Card */ - if (detect_sio1036_chip(port) != 0) { - /* Not found SMSC SIO1036 */ - return; - } sio1036_enter_conf_state (dev); /* Enable SMSC UART 0 */ @@ -91,7 +91,7 @@ static inline void sio1036_early_init(unsigned port) /* Enable SMSC UART 0 */ /*Set base io address */ - pnp_write_config (dev, 0x25, (u8)((u16)CONFIG_TTYS0_BASE >> 2)); + pnp_write_config (dev, 0x25, (u8)(iobase >> 2)); /* Set UART IRQ onto 0x04 */ pnp_write_config (dev, 0x28, 0x04);

1 0

Patch set updated for coreboot: ed60b8d superio/smsc/sio1036: Clean up RAMstage superio.c component
by Edward O'Callaghan 06 Aug '14

06 Aug '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6465 -gerrit commit ed60b8d6a9d859c57548e7068e8df2212ea3c4cd Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat Aug 2 20:45:13 2014 +1000 superio/smsc/sio1036: Clean up RAMstage superio.c component Remove spurious includes, unused variables and some wasted new lines. Re-organise things to be consistent with other superio's. Change-Id: I959bab2f7a83a1b9160d7f010a0de9638b30cf07 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/superio/smsc/sio1036/superio.c | 42 ++++++++++++-------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c index d2bfd8d..e9ed6c3 100644 --- a/src/superio/smsc/sio1036/superio.c +++ b/src/superio/smsc/sio1036/superio.c @@ -24,20 +24,16 @@ #include <device/pnp.h> #include <superio/conf_mode.h> #include <console/console.h> -#include <device/smbus.h> -#include <string.h> -#include <pc80/keyboard.h> #include <stdlib.h> -#include "sio1036.h" -/* Forward declarations */ -static void enable_dev(device_t dev); -static void sio1036_init(device_t dev); +#include "sio1036.h" -struct chip_operations superio_smsc_sio1036_ops = { - CHIP_NAME("SMSC SIO1036 Super I/O") - .enable_dev = enable_dev -}; +static void sio1036_init(device_t dev) +{ + if (!dev->enabled) { + return; + } +} static struct device_operations ops = { .read_resources = pnp_read_resources, @@ -49,27 +45,15 @@ static struct device_operations ops = { }; static struct pnp_info pnp_dev_info[] = { - {}, + { &ops, SIO1036_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, }; static void enable_dev(device_t dev) { - pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } -static void sio1036_init(device_t dev) -{ - struct resource *res0, *res1; - - - - if (!dev->enabled) { - return; - } - - switch(dev->path.pnp.device) { - - default: - break; - } -} +struct chip_operations superio_smsc_sio1036_ops = { + CHIP_NAME("SMSC SIO1036 Super I/O") + .enable_dev = enable_dev +};

1 0

Patch set updated for coreboot: 05d1739 mainboard/amd: De-ASCIIartify AGESA board headers
by Edward O'Callaghan 06 Aug '14

06 Aug '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6290 -gerrit commit 05d1739357557b006bc35e6d8d4b1fa187095d02 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Wed Jul 16 19:50:52 2014 +1000 mainboard/amd: De-ASCIIartify AGESA board headers As was done for the reference boards in: cd30951 mainboard/amd: De-ASCIIartify reference boards Change-Id: Ie34aa5269388b771daa6934f8aff0314ac6778d5 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/amd/dinar/gpio.h | 4 --- src/mainboard/amd/torpedo/gpio.h | 4 --- src/mainboard/asrock/e350m1/agesawrapper.h | 31 ---------------------- src/mainboard/asrock/imb-a180/agesawrapper.h | 29 -------------------- src/mainboard/asus/f2a85-m/agesawrapper.h | 29 -------------------- src/mainboard/gizmosphere/gizmo/agesawrapper.h | 29 -------------------- src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h | 29 -------------------- .../lippert/frontrunner-af/agesawrapper.h | 29 -------------------- src/mainboard/lippert/toucan-af/agesawrapper.h | 29 -------------------- src/mainboard/supermicro/h8qgi/agesawrapper.h | 29 -------------------- src/mainboard/supermicro/h8scm/agesawrapper.h | 30 --------------------- src/mainboard/tyan/s8226/agesawrapper.h | 31 ---------------------- 12 files changed, 303 deletions(-) diff --git a/src/mainboard/amd/dinar/gpio.h b/src/mainboard/amd/dinar/gpio.h index a3caeb3..9589cfc 100644 --- a/src/mainboard/amd/dinar/gpio.h +++ b/src/mainboard/amd/dinar/gpio.h @@ -1752,10 +1752,6 @@ #define GPIO_RSVD_ZONE1_S GPIO_120 #define GPIO_RSVD_ZONE1_E GPIO_127 -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ typedef enum _GPIO_COUNT { GPIO_00=0, diff --git a/src/mainboard/amd/torpedo/gpio.h b/src/mainboard/amd/torpedo/gpio.h index 1092d57..f8516a2 100644 --- a/src/mainboard/amd/torpedo/gpio.h +++ b/src/mainboard/amd/torpedo/gpio.h @@ -1752,10 +1752,6 @@ #define GPIO_RSVD_ZONE1_S GPIO_120 #define GPIO_RSVD_ZONE1_E GPIO_127 -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ typedef enum _GPIO_COUNT { GPIO_00=0, diff --git a/src/mainboard/asrock/e350m1/agesawrapper.h b/src/mainboard/asrock/e350m1/agesawrapper.h index f28b10d..9937fb2 100644 --- a/src/mainboard/asrock/e350m1/agesawrapper.h +++ b/src/mainboard/asrock/e350m1/agesawrapper.h @@ -17,12 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -30,10 +24,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -51,27 +41,6 @@ enum { }; - -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.h b/src/mainboard/asrock/imb-a180/agesawrapper.h index 60c4add..acaa2b3 100644 --- a/src/mainboard/asrock/imb-a180/agesawrapper.h +++ b/src/mainboard/asrock/imb-a180/agesawrapper.h @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -29,10 +24,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -49,26 +40,6 @@ enum { PICK_IVRS, /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */ }; -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/asus/f2a85-m/agesawrapper.h b/src/mainboard/asus/f2a85-m/agesawrapper.h index 23fcd1b..d4a6106 100644 --- a/src/mainboard/asus/f2a85-m/agesawrapper.h +++ b/src/mainboard/asus/f2a85-m/agesawrapper.h @@ -17,21 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ #include <stdint.h> #include <vendorcode/amd/agesa/f15tn/AGESA.h> -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -48,26 +39,6 @@ enum { PICK_IVRS, /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */ }; -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/gizmosphere/gizmo/agesawrapper.h b/src/mainboard/gizmosphere/gizmo/agesawrapper.h index 8be8030..b8c3f6c 100755 --- a/src/mainboard/gizmosphere/gizmo/agesawrapper.h +++ b/src/mainboard/gizmosphere/gizmo/agesawrapper.h @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -30,10 +25,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -49,26 +40,6 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ }; -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h index 0773eb9..29c0ee8 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h +++ b/src/mainboard/hp/pavilion_m6_1035dx/agesawrapper.h @@ -17,21 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ #include <stdint.h> #include <vendorcode/amd/agesa/f15tn/AGESA.h> -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -48,26 +39,6 @@ enum { PICK_IVRS, /* IOMMU ACPI IVRS(I/O Virtualization Reporting Structure) table */ }; -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/lippert/frontrunner-af/agesawrapper.h b/src/mainboard/lippert/frontrunner-af/agesawrapper.h index 93c2873..a74a800 100644 --- a/src/mainboard/lippert/frontrunner-af/agesawrapper.h +++ b/src/mainboard/lippert/frontrunner-af/agesawrapper.h @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -29,10 +24,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -48,26 +39,6 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ }; -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/lippert/toucan-af/agesawrapper.h b/src/mainboard/lippert/toucan-af/agesawrapper.h index 93c2873..a74a800 100644 --- a/src/mainboard/lippert/toucan-af/agesawrapper.h +++ b/src/mainboard/lippert/toucan-af/agesawrapper.h @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -29,10 +24,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ /* Define AMD Ontario APPU SSID/SVID */ #define AMD_APU_SVID 0x1022 #define AMD_APU_SSID 0x1234 @@ -48,26 +39,6 @@ enum { PICK_ALIB, /* SACPI SSDT table with ALIB implementation */ }; -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/supermicro/h8qgi/agesawrapper.h b/src/mainboard/supermicro/h8qgi/agesawrapper.h index c99714d..fec1ada 100644 --- a/src/mainboard/supermicro/h8qgi/agesawrapper.h +++ b/src/mainboard/supermicro/h8qgi/agesawrapper.h @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -30,10 +25,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ #define PCIE_BASE_ADDRESS CONFIG_MMCONF_BASE_ADDRESS enum { @@ -48,26 +39,6 @@ enum { -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/supermicro/h8scm/agesawrapper.h b/src/mainboard/supermicro/h8scm/agesawrapper.h index c99714d..e01c2ac 100644 --- a/src/mainboard/supermicro/h8scm/agesawrapper.h +++ b/src/mainboard/supermicro/h8scm/agesawrapper.h @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -30,10 +25,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ #define PCIE_BASE_ADDRESS CONFIG_MMCONF_BASE_ADDRESS enum { @@ -47,27 +38,6 @@ enum { }; - -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void); diff --git a/src/mainboard/tyan/s8226/agesawrapper.h b/src/mainboard/tyan/s8226/agesawrapper.h index c99714d..66a827d 100644 --- a/src/mainboard/tyan/s8226/agesawrapper.h +++ b/src/mainboard/tyan/s8226/agesawrapper.h @@ -17,12 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/*---------------------------------------------------------------------------------------- - * M O D U L E S U S E D - *---------------------------------------------------------------------------------------- - */ - - #ifndef _AGESAWRAPPER_H_ #define _AGESAWRAPPER_H_ @@ -30,10 +24,6 @@ #include "Porting.h" #include "AGESA.h" -/*---------------------------------------------------------------------------------------- - * D E F I N I T I O N S A N D M A C R O S - *---------------------------------------------------------------------------------------- - */ #define PCIE_BASE_ADDRESS CONFIG_MMCONF_BASE_ADDRESS enum { @@ -47,27 +37,6 @@ enum { }; - -/*---------------------------------------------------------------------------------------- - * T Y P E D E F S A N D S T R U C T U R E S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * P R O T O T Y P E S O F L O C A L F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*---------------------------------------------------------------------------------------- - * E X P O R T E D F U N C T I O N S - *---------------------------------------------------------------------------------------- - */ - -/*--------------------------------------------------------------------------------------- - * L O C A L F U N C T I O N S - *--------------------------------------------------------------------------------------- - */ - AGESA_STATUS agesawrapper_amdinitreset(void); AGESA_STATUS agesawrapper_amdinitearly(void); AGESA_STATUS agesawrapper_amdinitenv(void);

1 0

Patch merged into coreboot/master: 5103cc3 lenovo/t530/mainboard.c: Include header `h8.h` for prototype
by gerrit＠coreboot.org 06 Aug '14

06 Aug '14

the following patch was just integrated into master: commit 5103cc3d531b3adf45a7ed70d0d05caa6b43335a Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Tue Jul 29 20:49:55 2014 +1000 lenovo/t530/mainboard.c: Include header `h8.h` for prototype Change-Id: I05cea020e77051bd3bc0e93b0c70e12b9b985d05 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/6398 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/6398 for details. -gerrit

1 0

New patch to review for coreboot: f0486b1 Exynos5420: tighten up display port delays
by Isaac Christensen 06 Aug '14

06 Aug '14

Isaac Christensen (isaac.christensen(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6506 -gerrit commit f0486b187d184523d1b413801d786c278ff9e90e Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Aug 16 19:53:41 2013 -0700 Exynos5420: tighten up display port delays Shorten a few delays, and make some delays shorter but let the loops have a higher termination count (i.e. give it the same amount of time to warm up, but check more frequently). Change-Id: Id9fe846ae3a8d792b14d62aea4e98d8aad05be43 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: https://gerrit.chromium.org/gerrit/66156 Commit-Queue: Ronald G. Minnich <rminnich(a)chromium.org> Tested-by: Ronald G. Minnich <rminnich(a)chromium.org> Reviewed-by: Stefan Reinauer <reinauer(a)google.com> (cherry picked from commit a112e77f2f21f41f982ca22bebdac213cc8d233a) Signed-off-by: Isaac Christensen <isaac.christensen(a)se-eng.com> --- src/cpu/samsung/exynos5420/dp.h | 2 +- src/cpu/samsung/exynos5420/dp_lowlevel.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/samsung/exynos5420/dp.h b/src/cpu/samsung/exynos5420/dp.h index d260c88..4d9d26b 100644 --- a/src/cpu/samsung/exynos5420/dp.h +++ b/src/cpu/samsung/exynos5420/dp.h @@ -1187,7 +1187,7 @@ static inline u32 exynos_fimd_get_base_offset(void) #define EXYNOS_DP_CLK_ENABLE (1 << 1) #define EXYNOS_MIE_CLK_ENABLE (3 << 0) -#define DP_TIMEOUT_LOOP_COUNT 100 +#define DP_TIMEOUT_LOOP_COUNT 1000 #define MAX_CR_LOOP 5 #define MAX_EQ_LOOP 4 diff --git a/src/cpu/samsung/exynos5420/dp_lowlevel.c b/src/cpu/samsung/exynos5420/dp_lowlevel.c index 64a2962..16b9a7f 100644 --- a/src/cpu/samsung/exynos5420/dp_lowlevel.c +++ b/src/cpu/samsung/exynos5420/dp_lowlevel.c @@ -452,7 +452,7 @@ unsigned int exynos_dp_detect_hpd(void) while (exynos_dp_get_plug_in_status() != 0) { if (timeout_loop == 0) return -1; - mdelay(10); + mdelay(1); timeout_loop--; } @@ -865,7 +865,7 @@ void exynos_dp_reset_macro(void) lwrite32(reg, &dp_regs->phy_test); /* 10 us is the minimum Macro reset time. */ - mdelay(1); + udelay(50); reg &= ~MACRO_RST; lwrite32(reg, &dp_regs->phy_test);

1 0

New patch to review for coreboot: c6d5a4e Exynos5: Remove unneeded USB delays
by Isaac Christensen 06 Aug '14

06 Aug '14

Isaac Christensen (isaac.christensen(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6505 -gerrit commit c6d5a4e1e93b633f00dfc00a1f1e2f3972b4aa24 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Wed Aug 14 17:14:39 2013 -0700 Exynos5: Remove unneeded USB delays Change-Id: I1144e9d6d6c4278842fdd36743c8a88555f81707 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/65912 Reviewed-by: Ronald G. Minnich <rminnich(a)chromium.org> Commit-Queue: Stefan Reinauer <reinauer(a)chromium.org> Tested-by: Stefan Reinauer <reinauer(a)chromium.org> (cherry picked from commit 95b518877edc88347ce9725ffee32f3aed0de7dc) Signed-off-by: Isaac Christensen <isaac.christensen(a)se-eng.com> --- src/cpu/samsung/exynos5250/usb.c | 9 +++++---- src/cpu/samsung/exynos5420/usb.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/cpu/samsung/exynos5250/usb.c b/src/cpu/samsung/exynos5250/usb.c index d8e07da..5084707 100644 --- a/src/cpu/samsung/exynos5250/usb.c +++ b/src/cpu/samsung/exynos5250/usb.c @@ -88,10 +88,11 @@ static void setup_usb_phy(struct usb_phy *usb, int hsic_gpio) udelay(10); clrbits_le32(&usb->hsicphyctrl1, HOST_CTRL0_PHYSWRST); - /* PHY clock and power setup time */ - // FIXME If this happens more than 50ms before executing the payload, - // we might not need this delay. - mdelay(50); + /* At this point we need to wait for 50ms before talking to + * the USB controller (PHY clock and power setup time) + * By the time we are actually in the payload, these 50ms + * will have passed. + */ } void usb_init(device_t dev) diff --git a/src/cpu/samsung/exynos5420/usb.c b/src/cpu/samsung/exynos5420/usb.c index 4d07699..6e79ef1 100644 --- a/src/cpu/samsung/exynos5420/usb.c +++ b/src/cpu/samsung/exynos5420/usb.c @@ -88,10 +88,11 @@ static void setup_usb_phy(struct usb_phy *usb, int hsic_gpio) udelay(10); clrbits_le32(&usb->hsicphyctrl1, HOST_CTRL0_PHYSWRST); - /* PHY clock and power setup time */ - // FIXME If this happens more than 50ms before executing the payload, - // we might not need this delay. - mdelay(50); + /* At this point we need to wait for 50ms before talking to + * the USB controller (PHY clock and power setup time) + * By the time we are actually in the payload, these 50ms + * will have passed. + */ } void usb_init(device_t dev)

1 0

New patch to review for coreboot: 11c53dc exynos5420: Fix mmc clock source.
by Isaac Christensen 05 Aug '14

05 Aug '14

Isaac Christensen (isaac.christensen(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6504 -gerrit commit 11c53dc4db8df6ee4255ecfab0e0c04f8c782def Author: Hung-Te Lin <hungte(a)chromium.org> Date: Thu Aug 22 23:56:35 2013 +0800 exynos5420: Fix mmc clock source. The DWMMC controller internally divided clock by values in CLKSEL registers, so we must adjust MMC clock for that. Change-Id: I44f55b634cfc6fd81d76631595b6928c862a219f Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/66657 Commit-Queue: Ronald G. Minnich <rminnich(a)chromium.org> Reviewed-by: Ronald G. Minnich <rminnich(a)chromium.org> Tested-by: Ronald G. Minnich <rminnich(a)chromium.org> Reviewed-by: David Hendricks <dhendrix(a)chromium.org> (cherry picked from commit 89ed6c9154f16c6b8d01af03c0b78914773eb469) Signed-off-by: Isaac Christensen <isaac.christensen(a)se-eng.com> --- src/cpu/samsung/exynos5420/clock.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/cpu/samsung/exynos5420/clock.c b/src/cpu/samsung/exynos5420/clock.c index 7ecb717..8a8e589 100644 --- a/src/cpu/samsung/exynos5420/clock.c +++ b/src/cpu/samsung/exynos5420/clock.c @@ -333,16 +333,29 @@ int clock_set_dwmci(enum periph_id peripheral) { /* Request MMC clock value to 52MHz. */ const unsigned long freq = 52000000; - unsigned long sclk, div; + unsigned long sdclkin, cclkin; int device_index = (int)peripheral - (int)PERIPH_ID_SDMMC0; ASSERT(device_index >= 0 && device_index < 4); - sclk = get_mmc_clk(device_index); - if (!sclk) { + sdclkin = get_mmc_clk(device_index); + if (!sdclkin) { return -1; } - div = CEIL_DIV(sclk, freq); - set_mmc_clk(device_index, div); + + /* The SDCLKIN is divided insided controller by the DIVRATIO field in + * CLKSEL register, so we must calculate clock value as + * cclk_in = SDCLKIN / (DIVRATIO + 1) + * Currently the RIVRATIO must be 3 for MMC0 and MMC2 on Exynos5420 + * (and must be configured in payload). + */ + if (device_index == 0 || device_index == 2){ + int divratio = 3; + sdclkin /= (divratio + 1); + } + printk(BIOS_DEBUG, "%s(%d): sdclkin: %ld\n", __func__, device_index, sdclkin); + + cclkin = CEIL_DIV(sdclkin, freq); + set_mmc_clk(device_index, cclkin); return 0; }

1 0

New patch to review for coreboot: 9c8bd6a Exynos5: Remove unneeded USB delays
by Isaac Christensen 05 Aug '14

05 Aug '14

Isaac Christensen (isaac.christensen(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6503 -gerrit commit 9c8bd6a53aef2ce3bafa19098cea3c5ae6820d2f Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Wed Aug 14 17:14:39 2013 -0700 Exynos5: Remove unneeded USB delays Old-Change-Id: I1144e9d6d6c4278842fdd36743c8a88555f81707 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/65912 Reviewed-by: Ronald G. Minnich <rminnich(a)chromium.org> Commit-Queue: Stefan Reinauer <reinauer(a)chromium.org> Tested-by: Stefan Reinauer <reinauer(a)chromium.org> (cherry picked from commit 95b518877edc88347ce9725ffee32f3aed0de7dc) Exynos5420: tighten up display port delays Shorten a few delays, and make some delays shorter but let the loops have a higher termination count (i.e. give it the same amount of time to warm up, but check more frequently). Old-Change-Id: Id9fe846ae3a8d792b14d62aea4e98d8aad05be43 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: https://gerrit.chromium.org/gerrit/66156 Commit-Queue: Ronald G. Minnich <rminnich(a)chromium.org> Tested-by: Ronald G. Minnich <rminnich(a)chromium.org> Reviewed-by: Stefan Reinauer <reinauer(a)google.com> (cherry picked from commit a112e77f2f21f41f982ca22bebdac213cc8d233a) Squashed two small commits for Exynos. Change-Id: Iee753eaddb759d2e7df98e73cb793ec4053773dd Signed-off-by: Isaac Christensen <isaac.christensen(a)se-eng.com> --- src/cpu/samsung/exynos5250/usb.c | 9 +++++---- src/cpu/samsung/exynos5420/dp.h | 2 +- src/cpu/samsung/exynos5420/dp_lowlevel.c | 4 ++-- src/cpu/samsung/exynos5420/usb.c | 9 +++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/cpu/samsung/exynos5250/usb.c b/src/cpu/samsung/exynos5250/usb.c index d8e07da..5084707 100644 --- a/src/cpu/samsung/exynos5250/usb.c +++ b/src/cpu/samsung/exynos5250/usb.c @@ -88,10 +88,11 @@ static void setup_usb_phy(struct usb_phy *usb, int hsic_gpio) udelay(10); clrbits_le32(&usb->hsicphyctrl1, HOST_CTRL0_PHYSWRST); - /* PHY clock and power setup time */ - // FIXME If this happens more than 50ms before executing the payload, - // we might not need this delay. - mdelay(50); + /* At this point we need to wait for 50ms before talking to + * the USB controller (PHY clock and power setup time) + * By the time we are actually in the payload, these 50ms + * will have passed. + */ } void usb_init(device_t dev) diff --git a/src/cpu/samsung/exynos5420/dp.h b/src/cpu/samsung/exynos5420/dp.h index d260c88..4d9d26b 100644 --- a/src/cpu/samsung/exynos5420/dp.h +++ b/src/cpu/samsung/exynos5420/dp.h @@ -1187,7 +1187,7 @@ static inline u32 exynos_fimd_get_base_offset(void) #define EXYNOS_DP_CLK_ENABLE (1 << 1) #define EXYNOS_MIE_CLK_ENABLE (3 << 0) -#define DP_TIMEOUT_LOOP_COUNT 100 +#define DP_TIMEOUT_LOOP_COUNT 1000 #define MAX_CR_LOOP 5 #define MAX_EQ_LOOP 4 diff --git a/src/cpu/samsung/exynos5420/dp_lowlevel.c b/src/cpu/samsung/exynos5420/dp_lowlevel.c index 64a2962..16b9a7f 100644 --- a/src/cpu/samsung/exynos5420/dp_lowlevel.c +++ b/src/cpu/samsung/exynos5420/dp_lowlevel.c @@ -452,7 +452,7 @@ unsigned int exynos_dp_detect_hpd(void) while (exynos_dp_get_plug_in_status() != 0) { if (timeout_loop == 0) return -1; - mdelay(10); + mdelay(1); timeout_loop--; } @@ -865,7 +865,7 @@ void exynos_dp_reset_macro(void) lwrite32(reg, &dp_regs->phy_test); /* 10 us is the minimum Macro reset time. */ - mdelay(1); + udelay(50); reg &= ~MACRO_RST; lwrite32(reg, &dp_regs->phy_test); diff --git a/src/cpu/samsung/exynos5420/usb.c b/src/cpu/samsung/exynos5420/usb.c index 4d07699..6e79ef1 100644 --- a/src/cpu/samsung/exynos5420/usb.c +++ b/src/cpu/samsung/exynos5420/usb.c @@ -88,10 +88,11 @@ static void setup_usb_phy(struct usb_phy *usb, int hsic_gpio) udelay(10); clrbits_le32(&usb->hsicphyctrl1, HOST_CTRL0_PHYSWRST); - /* PHY clock and power setup time */ - // FIXME If this happens more than 50ms before executing the payload, - // we might not need this delay. - mdelay(50); + /* At this point we need to wait for 50ms before talking to + * the USB controller (PHY clock and power setup time) + * By the time we are actually in the payload, these 50ms + * will have passed. + */ } void usb_init(device_t dev)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2014