coreboot-gerrit October 2020

coreboot-gerrit@coreboot.org

1 participants
3474 discussions

Change in coreboot[master]: mb/lippert/frontrunner-af: Rename to `f14-halfboards`
by Angel Pons (Code Review) 01 Mar '21

01 Mar '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43289 ) Change subject: mb/lippert/frontrunner-af: Rename to `f14-halfboards` ...................................................................... mb/lippert/frontrunner-af: Rename to `f14-halfboards` There are two different boards inside this folder. Change-Id: I2a44af225f5e22dcee83009f0fdcb00d8a2bd1a0 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- R src/mainboard/lippert/f14-halfboards/Kconfig R src/mainboard/lippert/f14-halfboards/Kconfig.name R src/mainboard/lippert/f14-halfboards/Makefile.inc R src/mainboard/lippert/f14-halfboards/OptionsIds.h R src/mainboard/lippert/f14-halfboards/acpi/routing.asl R src/mainboard/lippert/f14-halfboards/acpi/sata.asl R src/mainboard/lippert/f14-halfboards/acpi/superio.asl R src/mainboard/lippert/f14-halfboards/acpi/usb.asl R src/mainboard/lippert/f14-halfboards/acpi_tables.c R src/mainboard/lippert/f14-halfboards/board_info.txt R src/mainboard/lippert/f14-halfboards/buildOpts.c R src/mainboard/lippert/f14-halfboards/cmos.layout R src/mainboard/lippert/f14-halfboards/dsdt.asl R src/mainboard/lippert/f14-halfboards/irq_tables.c R src/mainboard/lippert/f14-halfboards/mptable.c R src/mainboard/lippert/f14-halfboards/platform_cfg.h R src/mainboard/lippert/f14-halfboards/sema.c R src/mainboard/lippert/f14-halfboards/sema.h R src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/BiosCallOuts.c R src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/OemCustomize.c R src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/board_info.txt R src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/bootblock.c R src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/devicetree.cb R src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/mainboard.c R src/mainboard/lippert/f14-halfboards/variants/toucan-af/BiosCallOuts.c R src/mainboard/lippert/f14-halfboards/variants/toucan-af/OemCustomize.c R src/mainboard/lippert/f14-halfboards/variants/toucan-af/board_info.txt R src/mainboard/lippert/f14-halfboards/variants/toucan-af/bootblock.c R src/mainboard/lippert/f14-halfboards/variants/toucan-af/devicetree.cb R src/mainboard/lippert/f14-halfboards/variants/toucan-af/mainboard.c 30 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/43289/1 diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/f14-halfboards/Kconfig similarity index 100% rename from src/mainboard/lippert/frontrunner-af/Kconfig rename to src/mainboard/lippert/f14-halfboards/Kconfig diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig.name b/src/mainboard/lippert/f14-halfboards/Kconfig.name similarity index 100% rename from src/mainboard/lippert/frontrunner-af/Kconfig.name rename to src/mainboard/lippert/f14-halfboards/Kconfig.name diff --git a/src/mainboard/lippert/frontrunner-af/Makefile.inc b/src/mainboard/lippert/f14-halfboards/Makefile.inc similarity index 100% rename from src/mainboard/lippert/frontrunner-af/Makefile.inc rename to src/mainboard/lippert/f14-halfboards/Makefile.inc diff --git a/src/mainboard/lippert/frontrunner-af/OptionsIds.h b/src/mainboard/lippert/f14-halfboards/OptionsIds.h similarity index 100% rename from src/mainboard/lippert/frontrunner-af/OptionsIds.h rename to src/mainboard/lippert/f14-halfboards/OptionsIds.h diff --git a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl b/src/mainboard/lippert/f14-halfboards/acpi/routing.asl similarity index 100% rename from src/mainboard/lippert/frontrunner-af/acpi/routing.asl rename to src/mainboard/lippert/f14-halfboards/acpi/routing.asl diff --git a/src/mainboard/lippert/frontrunner-af/acpi/sata.asl b/src/mainboard/lippert/f14-halfboards/acpi/sata.asl similarity index 100% rename from src/mainboard/lippert/frontrunner-af/acpi/sata.asl rename to src/mainboard/lippert/f14-halfboards/acpi/sata.asl diff --git a/src/mainboard/lippert/frontrunner-af/acpi/superio.asl b/src/mainboard/lippert/f14-halfboards/acpi/superio.asl similarity index 100% rename from src/mainboard/lippert/frontrunner-af/acpi/superio.asl rename to src/mainboard/lippert/f14-halfboards/acpi/superio.asl diff --git a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl b/src/mainboard/lippert/f14-halfboards/acpi/usb.asl similarity index 100% rename from src/mainboard/lippert/frontrunner-af/acpi/usb.asl rename to src/mainboard/lippert/f14-halfboards/acpi/usb.asl diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/f14-halfboards/acpi_tables.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/acpi_tables.c rename to src/mainboard/lippert/f14-halfboards/acpi_tables.c diff --git a/src/mainboard/lippert/frontrunner-af/board_info.txt b/src/mainboard/lippert/f14-halfboards/board_info.txt similarity index 100% rename from src/mainboard/lippert/frontrunner-af/board_info.txt rename to src/mainboard/lippert/f14-halfboards/board_info.txt diff --git a/src/mainboard/lippert/frontrunner-af/buildOpts.c b/src/mainboard/lippert/f14-halfboards/buildOpts.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/buildOpts.c rename to src/mainboard/lippert/f14-halfboards/buildOpts.c diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/f14-halfboards/cmos.layout similarity index 100% rename from src/mainboard/lippert/frontrunner-af/cmos.layout rename to src/mainboard/lippert/f14-halfboards/cmos.layout diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/f14-halfboards/dsdt.asl similarity index 100% rename from src/mainboard/lippert/frontrunner-af/dsdt.asl rename to src/mainboard/lippert/f14-halfboards/dsdt.asl diff --git a/src/mainboard/lippert/frontrunner-af/irq_tables.c b/src/mainboard/lippert/f14-halfboards/irq_tables.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/irq_tables.c rename to src/mainboard/lippert/f14-halfboards/irq_tables.c diff --git a/src/mainboard/lippert/frontrunner-af/mptable.c b/src/mainboard/lippert/f14-halfboards/mptable.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/mptable.c rename to src/mainboard/lippert/f14-halfboards/mptable.c diff --git a/src/mainboard/lippert/frontrunner-af/platform_cfg.h b/src/mainboard/lippert/f14-halfboards/platform_cfg.h similarity index 100% rename from src/mainboard/lippert/frontrunner-af/platform_cfg.h rename to src/mainboard/lippert/f14-halfboards/platform_cfg.h diff --git a/src/mainboard/lippert/frontrunner-af/sema.c b/src/mainboard/lippert/f14-halfboards/sema.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/sema.c rename to src/mainboard/lippert/f14-halfboards/sema.c diff --git a/src/mainboard/lippert/frontrunner-af/sema.h b/src/mainboard/lippert/f14-halfboards/sema.h similarity index 100% rename from src/mainboard/lippert/frontrunner-af/sema.h rename to src/mainboard/lippert/f14-halfboards/sema.h diff --git a/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/BiosCallOuts.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/BiosCallOuts.c rename to src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/BiosCallOuts.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/OemCustomize.c b/src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/OemCustomize.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/OemCustomize.c rename to src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/OemCustomize.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/board_info.txt b/src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/board_info.txt similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/board_info.txt rename to src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/board_info.txt diff --git a/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/bootblock.c b/src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/bootblock.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/bootblock.c rename to src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/bootblock.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/devicetree.cb b/src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/devicetree.cb similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/devicetree.cb rename to src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/devicetree.cb diff --git a/src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/mainboard.c b/src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/mainboard.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/frontrunner-af/mainboard.c rename to src/mainboard/lippert/f14-halfboards/variants/frontrunner-af/mainboard.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/f14-halfboards/variants/toucan-af/BiosCallOuts.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/toucan-af/BiosCallOuts.c rename to src/mainboard/lippert/f14-halfboards/variants/toucan-af/BiosCallOuts.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/toucan-af/OemCustomize.c b/src/mainboard/lippert/f14-halfboards/variants/toucan-af/OemCustomize.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/toucan-af/OemCustomize.c rename to src/mainboard/lippert/f14-halfboards/variants/toucan-af/OemCustomize.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/toucan-af/board_info.txt b/src/mainboard/lippert/f14-halfboards/variants/toucan-af/board_info.txt similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/toucan-af/board_info.txt rename to src/mainboard/lippert/f14-halfboards/variants/toucan-af/board_info.txt diff --git a/src/mainboard/lippert/frontrunner-af/variants/toucan-af/bootblock.c b/src/mainboard/lippert/f14-halfboards/variants/toucan-af/bootblock.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/toucan-af/bootblock.c rename to src/mainboard/lippert/f14-halfboards/variants/toucan-af/bootblock.c diff --git a/src/mainboard/lippert/frontrunner-af/variants/toucan-af/devicetree.cb b/src/mainboard/lippert/f14-halfboards/variants/toucan-af/devicetree.cb similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/toucan-af/devicetree.cb rename to src/mainboard/lippert/f14-halfboards/variants/toucan-af/devicetree.cb diff --git a/src/mainboard/lippert/frontrunner-af/variants/toucan-af/mainboard.c b/src/mainboard/lippert/f14-halfboards/variants/toucan-af/mainboard.c similarity index 100% rename from src/mainboard/lippert/frontrunner-af/variants/toucan-af/mainboard.c rename to src/mainboard/lippert/f14-halfboards/variants/toucan-af/mainboard.c -- To view, visit https://review.coreboot.org/c/coreboot/+/43289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2a44af225f5e22dcee83009f0fdcb00d8a2bd1a0 Gerrit-Change-Number: 43289 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 6

Change in coreboot[master]: tests: Add lib/imd-test test case
by Jan Dabros (Code Review) 01 Mar '21

01 Mar '21

Hello Anna Karaś, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/44669 to review the following change. Change subject: tests: Add lib/imd-test test case ...................................................................... tests: Add lib/imd-test test case Implement unit tests for src/lib/imd.c module. Signed-off-by: Anna Karas <aka(a)semihalf.com> Signed-off-by: Jan Dabros <jsd(a)semihalf.com> Change-Id: I9d3ab45c3da2a21c910f52a84526b60c39ff1fe7 --- M tests/lib/Makefile.inc A tests/lib/imd-test.c 2 files changed, 813 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/44669/1 diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.inc index b66d386..3062bca 100644 --- a/tests/lib/Makefile.inc +++ b/tests/lib/Makefile.inc @@ -3,6 +3,7 @@ tests-y += string-test tests-y += b64_decode-test tests-y += hexstrtobin-test +tests-y += imd-test string-test-srcs += tests/lib/string-test.c string-test-srcs += src/lib/string.c @@ -13,3 +14,7 @@ hexstrtobin-test-srcs += tests/lib/hexstrtobin-test.c hexstrtobin-test-srcs += src/lib/hexstrtobin.c + +imd-test-srcs += tests/lib/imd-test.c +imd-test-srcs += tests/stubs/console.c +imd-test-srcs += src/lib/imd.c \ No newline at end of file diff --git a/tests/lib/imd-test.c b/tests/lib/imd-test.c new file mode 100644 index 0000000..01a9e19 --- /dev/null +++ b/tests/lib/imd-test.c @@ -0,0 +1,808 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <imd.h> +#include <cbmem.h> +#include <stdlib.h> +#include <stdio.h> +#include <types.h> +#include <tests/test.h> +#include <limits.h> +#include <commonlib/bsd/helpers.h> + +void *calloc(size_t nitems, size_t size); +void *memset(void * ptr, int value, size_t num); + +/* In-memory data structures. */ +struct imd_root_pointer { + uint32_t magic; + /* Relative to upper limit/offset. */ + int32_t root_offset; +} __packed; + +struct imd_entry { + uint32_t magic; + /* start is located relative to imd_root */ + int32_t start_offset; + uint32_t size; + uint32_t id; +} __packed; + +struct imd_root { + uint32_t max_entries; + uint32_t num_entries; + uint32_t flags; + uint32_t entry_align; + /* Used for fixing the size of an imd. Relative to the root. */ + int32_t max_offset; + struct imd_entry entries[0]; +} __packed; + +/* Auxiliary functions and definitions. */ + +#define CBMEM_ID_IMD_ROOT 0xff4017ff +#define CBMEM_ID_IMD_SMALL 0x53a11439 + +#define IMD_FLAG_LOCKED 1 + +const uint32_t IMD_ROOT_PTR_MAGIC = 0xc0389481; +const uint32_t IMD_ENTRY_MAGIC = ~0xc0389481; +const uint32_t SMALL_REGION_ID = CBMEM_ID_IMD_SMALL; + +#define LIMIT_SZ (LIMIT_ALIGN + 1) +#define RP_SZ sizeof(struct imd_root_pointer) +#define ROOT_SZ sizeof(struct imd_root) +#define ENTRY_SZ sizeof(struct imd_entry) +#define IMD_SZ sizeof(struct imd) +#define CURSOR_SZ sizeof(struct imd_cursor) + +#define LG_ROOT_SIZE align_up_pow2(sizeof(struct imd_root_pointer) +\ + sizeof(struct imd_root) + 3 * sizeof(struct imd_entry)) +#define LG_ENTRY_ALIGN (2 * sizeof(int32_t)) +#define LG_ENTRY_SIZE (2 * sizeof(int32_t)) +#define LG_ENTRY_ID 0xA001 + +#define SM_ROOT_SIZE LG_ROOT_SIZE +#define SM_ENTRY_ALIGN sizeof(uint32_t) +#define SM_ENTRY_SIZE sizeof(uint32_t) +#define SM_ENTRY_ID 0xB001 + +uint32_t align_up_pow2(uint32_t x) { + return (IS_POWER_OF_2(x) ? x : 1 << (32 - __builtin_clz(x - 1))); +} + +size_t max_entries(size_t root_size) { + return (root_size - RP_SZ - ROOT_SZ) / ENTRY_SZ; +} + +/* + * Mainly, we should check that imd_handle_init() aligns upper_limit properly + * for various inputs. Upper limit is the _exclusive_ address, so we expect + * ALIGN_DOWN. + */ +static void test_imd_handle_init(void **state) +{ + int i; + void *base; + struct imd imd; + uintptr_t test_inputs[] = {0, 0xDEAA, 0xF0F0F0F0, ((1ULL << 32) + 4), + ((1ULL << 60) - 100)}; + + for (i = 0; i < ARRAY_SIZE(test_inputs); i++) { + base = (void *)test_inputs[i]; + + imd_handle_init(&imd, (void *)base); + + assert_int_equal(imd.lg.limit % LIMIT_ALIGN, 0); + assert_int_equal(imd.lg.limit, ALIGN_DOWN(test_inputs[i], LIMIT_ALIGN)); + assert_ptr_equal(imd.lg.r, NULL); + + /* Small allocations not initialized */ + assert_ptr_equal(imd.sm.limit, NULL); + assert_ptr_equal(imd.sm.r, NULL); + } +} + +static void test_imd_handle_init_partial_recovery(void **state) +{ + void *base; + struct imd imd = {0}; + const struct imd_entry *entry; + struct imdr *imdr; + struct imd_root *r; + + imd_handle_init_partial_recovery(&imd); + assert_null(imd.lg.limit); + assert_null(imd.sm.limit); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + imd_handle_init_partial_recovery(&imd); + + assert_non_null(imd.lg.r); + assert_null(imd.sm.limit); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + entry = imd_entry_add(&imd, SMALL_REGION_ID, LG_ENTRY_SIZE); + assert_non_null(entry); + + imd_handle_init_partial_recovery(&imd); + + assert_non_null(imd.lg.r); + assert_non_null(imd.sm.limit); + + imdr = &imd.lg; + r = (struct imd_root *) (imdr->r); + + assert_ptr_equal(((void *)r + entry->start_offset + LG_ENTRY_SIZE), imd.sm.limit); + assert_non_null(imd.sm.r); + + free(base); +} + +static void test_imd_create_empty(void **state) +{ + struct imd imd = {0}; + void *base; + struct imdr *imdr; + struct imd_root *r; + struct imd_entry *e; + + /* Expect failure, since imd handle is not initialized */ + assert_int_equal(-1, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + base = malloc(sizeof(struct imd_root_pointer) + sizeof(struct imd_root)); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + /* Try incorrect sizes */ + assert_int_equal(-1, imd_create_empty(&imd, sizeof(struct imd_root_pointer) + + sizeof(struct imd_root), LG_ENTRY_ALIGN)); + assert_int_equal(-1, imd_create_empty(&imd, LG_ROOT_SIZE, 2 * LG_ROOT_SIZE)); + + /* Working case */ + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + + /* Only large allocation initialized with one entry for the root region */ + imdr = &imd.lg; + r = (struct imd_root *) (imdr->r); + assert_non_null(r); + + e = &r->entries[r->num_entries - 1]; + + assert_int_equal(max_entries(LG_ROOT_SIZE), r->max_entries); + assert_int_equal(1, r->num_entries); + assert_int_equal(0, r->flags); + assert_int_equal(LG_ENTRY_ALIGN, r->entry_align); + assert_int_equal(0, r->max_offset); + assert_ptr_equal(e, &r->entries); + + assert_int_equal(IMD_ENTRY_MAGIC, e->magic); + assert_int_equal(0, e->start_offset); + assert_int_equal(LG_ROOT_SIZE, e->size); + assert_int_equal(CBMEM_ID_IMD_ROOT, e->id); + + free(base); +} + +static void test_imd_create_tiered_empty(void **state) +{ + void *base; + size_t sm_region_size, lg_region_wrong_size; + struct imd imd = {0}; + struct imd_root *r; + struct imd_entry *fst_lg_entry, *snd_lg_entry, *sm_entry; + + /* Uninitialized imd handle */ + assert_int_equal(-1, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + LG_ROOT_SIZE, SM_ENTRY_ALIGN)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + /* Too small root_size for small region */ + assert_int_equal(-1, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + sizeof(int32_t), 2 * sizeof(int32_t))); + + /* Fail when large region doesn't have capacity for more than 1 entry */ + lg_region_wrong_size = sizeof(struct imd_root_pointer) + sizeof(struct imd_root) + + sizeof(struct imd_entry); + assert_int_equal(-1, imd_create_tiered_empty(&imd, lg_region_wrong_size, + LG_ENTRY_ALIGN, SM_ROOT_SIZE, + SM_ENTRY_ALIGN)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + + r = imd.lg.r; + + /* One entry for root_region and one for small allocations */ + assert_int_equal(2, r->num_entries); + + fst_lg_entry = &r->entries[0]; + assert_int_equal(IMD_ENTRY_MAGIC, fst_lg_entry->magic); + assert_int_equal(0, fst_lg_entry->start_offset); + assert_int_equal(LG_ROOT_SIZE, fst_lg_entry->size); + assert_int_equal(CBMEM_ID_IMD_ROOT, fst_lg_entry->id); + + sm_region_size = SM_ROOT_SIZE - RP_SZ - ROOT_SZ; + sm_region_size /= ENTRY_SZ; + sm_region_size *= SM_ENTRY_ALIGN; + sm_region_size += SM_ROOT_SIZE; + sm_region_size = ALIGN_UP(sm_region_size, LG_ENTRY_ALIGN); + + snd_lg_entry = &r->entries[1]; + assert_int_equal(IMD_ENTRY_MAGIC, snd_lg_entry->magic); + assert_int_equal(-sm_region_size, snd_lg_entry->start_offset); + assert_int_equal(CBMEM_ID_IMD_SMALL, snd_lg_entry->id); + + assert_int_equal(sm_region_size, snd_lg_entry->size); + + r = imd.sm.r; + assert_int_equal(1, r->num_entries); + + sm_entry = &r->entries[0]; + assert_int_equal(IMD_ENTRY_MAGIC, sm_entry->magic); + assert_int_equal(0, sm_entry->start_offset); + assert_int_equal(SM_ROOT_SIZE, sm_entry->size); + assert_int_equal(CBMEM_ID_IMD_ROOT, sm_entry->id); + + free(base); +} + +/* Tests for imdr_recover. */ +static void test_imd_recover(void **state) +{ + int32_t offset_copy; + uint32_t rp_magic_copy, num_entries_copy, e_magic_copy; + uint32_t size_copy, diff; + void *base; + struct imd imd = {0}; + struct imdr *imdr; + struct imd_root_pointer *rp; + struct imd_root *r; + struct imd_entry *lg_root_entry, *sm_root_entry, *ptr; + const struct imd_entry *lg_entry; + + /* Fail when the limit for lg was not set. */ + imdr = &imd.lg; + imdr->limit = (uintptr_t) NULL; + assert_int_equal(-1, imd_recover(&imd)); + + /* Set the limit for lg. */ + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + /* Fail when the root pointer is not valid. */ + rp = (void *)imdr->limit - RP_SZ; + assert_non_null(rp); + + rp_magic_copy = rp->magic; + rp->magic = 0; + assert_int_equal(-1, imd_recover(&imd)); + rp->magic = rp_magic_copy; + + /* Set the root pointer. */ + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + r = imd.lg.r; + assert_int_equal(2, r->num_entries); + r = imd.sm.r; + assert_int_equal(1, r->num_entries); + r = imd.lg.r; + + /* Fail if the number of entries exceeds the maximum number of entries. */ + num_entries_copy = r->num_entries; + r->num_entries = r->max_entries + 1; + assert_int_equal(-1, imd_recover(&imd)); + r->num_entries = num_entries_copy; + + /* Fail if entry align is not a power of 2. */ + r->entry_align += 1; + assert_int_equal(-1, imd_recover(&imd)); + r->entry_align--; + + + /* Fail when an entry is not valid. */ + lg_root_entry = &r->entries[0]; + e_magic_copy = lg_root_entry->magic; + lg_root_entry->magic = 0; + assert_int_equal(-1, imd_recover(&imd)); + lg_root_entry->magic = e_magic_copy; + + /* Add new entries: large and small. */ + lg_entry = imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE); + assert_non_null(lg_entry); + assert_int_equal(3, r->num_entries); + + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, SM_ENTRY_SIZE)); + r = imd.sm.r; + assert_int_equal(2, r->num_entries); + r = imd.lg.r; + + /* Fail when start_addr is lower than low_limit. */ + r->max_offset = lg_entry->start_offset + sizeof(int32_t); + assert_int_equal(-1, imd_recover(&imd)); + r->max_offset = 0; + + /* Fail when start_addr is at least imdr->limit. */ + offset_copy = lg_entry->start_offset; + ptr = (struct imd_entry *)lg_entry; + ptr->start_offset = (void *)imdr->limit - (void *)r; + assert_int_equal(-1, imd_recover(&imd)); + ptr->start_offset = offset_copy; + + /* Fail when (start_addr + e->size) is higher than imdr->limit. */ + size_copy = lg_entry->size; + diff = (void *)imdr->limit - ((void *)r + lg_entry->start_offset); + ptr->size = diff + 1; + assert_int_equal(-1, imd_recover(&imd)); + ptr->size = size_copy; + + /* End of tests for imdr_recover(). */ + + /* Succeed if small region is not present. */ + sm_root_entry = &r->entries[1]; + sm_root_entry->id = 0; + assert_int_equal(0, imd_recover(&imd)); + sm_root_entry->id = SMALL_REGION_ID; + + /* Continue if small region is present. */ + assert_int_equal(0, imd_recover(&imd)); + + free(base); +} + +static void test_imd_limit_size(void **state) +{ + void *base; + struct imd imd = {0}; + size_t root_size, max_size; + struct imdr *imdr; + + max_size = align_up_pow2(RP_SZ + ROOT_SZ + 3 * ENTRY_SZ); + + assert_int_equal(-1, imd_limit_size(&imd, max_size)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + imdr = &imd.lg; + root_size = align_up_pow2(RP_SZ + ROOT_SZ + 2 * ENTRY_SZ); + imdr->r = (void *)imdr->limit - root_size; + + imd_create_empty(&imd, root_size, LG_ENTRY_ALIGN); + assert_int_equal(-1, imd_limit_size(&imd, root_size - 1)); + assert_int_equal(0, imd_limit_size(&imd, max_size)); + + /* Cannot create such a big entry */ + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, max_size - root_size + 1)); + + free(base); +} + +static void test_imd_lockdown(void **state) +{ + struct imd imd = {0}; + struct imdr *imdr; + struct imd_root *r_lg, *r_sm; + + assert_int_equal(-1, imd_lockdown(&imd)); + + imdr = &imd.lg; + imdr->r = malloc(ROOT_SZ); + if (imdr->r == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + r_lg = (struct imd_root *) (imdr->r); + + assert_int_equal(0, imd_lockdown(&imd)); + assert_true(r_lg->flags & IMD_FLAG_LOCKED); + + imdr = &imd.sm; + imdr->r = malloc(ROOT_SZ); + if (imdr->r == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + r_sm = (struct imd_root *) (imdr->r); + + assert_int_equal(0, imd_lockdown(&imd)); + assert_true(r_sm->flags & IMD_FLAG_LOCKED); + + free(imd.lg.r); + free(imd.sm.r); +} + +static void test_imd_region_used(void **state) +{ + struct imd imd = {0}; + struct imd_entry *first_entry, *new_entry; + struct imdr *imdr; + struct imd_root *r; + size_t size; + void *imd_base; + void *base; + + assert_int_equal(-1, imd_region_used(&imd, &base, &size)); + + imd_base = malloc(LIMIT_SZ); + if (imd_base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)imd_base)); + + assert_int_equal(-1, imd_region_used(&imd, &base, &size)); + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + assert_int_equal(0, imd_region_used(&imd, &base, &size)); + + imdr = &imd.lg; + r = (struct imd_root *) (imdr->r); + first_entry = &r->entries[r->num_entries - 1]; + + assert_int_equal(r + first_entry->start_offset, (uintptr_t)base); + assert_int_equal(first_entry->size, size); + + assert_non_null(imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + assert_int_equal(2, r->num_entries); + + assert_int_equal(0, imd_region_used(&imd, &base, &size)); + + new_entry = &r->entries[r->num_entries - 1]; + + assert_true((void *)r + new_entry->start_offset == base); + assert_int_equal(first_entry->size + new_entry->size, size); + + free(imd_base); +} + +static void test_imd_entry_add(void **state) +{ + int i; + struct imd imd = {0}; + size_t entry_size = 0; + size_t used_size; + ssize_t entry_offset; + void *base; + struct imd_root *r, *sm_r, *lg_r; + struct imd_entry *first_entry, *new_entry; +__unused struct imd_root_pointer *rp; + + /* No small region case. */ + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + + r = (struct imd_root *)imd.lg.r; + first_entry = &r->entries[r->num_entries - 1]; + + /* Fail when root is locked. */ + r->flags = IMD_FLAG_LOCKED; + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + r->flags = 0; + + /* Fail when the maximum number of entries has been reached. */ + r->num_entries = r->max_entries; + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + r->num_entries = 1; + + /* Fail when entry size is 0 */ + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, 0)); + + /* Fail when entry size (after alignment) overflows imd total size. */ + entry_size = 2049; + r->max_offset = -entry_size; + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + r->max_offset = 0; + entry_size = 2 * sizeof(int32_t); + + /* Finally succeed. */ + assert_non_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + assert_int_equal(2, r->num_entries); + + new_entry = &r->entries[r->num_entries - 1]; + assert_int_equal(ENTRY_SZ, (void *)new_entry - (void *)first_entry); + + assert_int_equal(IMD_ENTRY_MAGIC, new_entry->magic); + assert_int_equal(LG_ENTRY_ID, new_entry->id); + assert_int_equal(entry_size, new_entry->size); + + used_size = ALIGN_UP(entry_size, r->entry_align); + entry_offset = first_entry->start_offset - used_size; + assert_int_equal(entry_offset, new_entry->start_offset); + + /* Use small region case. */ + imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, SM_ROOT_SIZE, + SM_ENTRY_ALIGN); + + lg_r = imd.lg.r; + sm_r = imd.sm.r; + + /* All five new entries should be added to small allocations */ + for (i = 0; i < 5; i++) { + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, SM_ENTRY_SIZE)); + assert_int_equal(i+2, sm_r->num_entries); + assert_int_equal(2, lg_r->num_entries); + } + + /* But next should fall back on large region */ + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, SM_ENTRY_SIZE)); + assert_int_equal(6, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + /* + * Small allocation is created when occupies less than 1/4 of available + * small region. Verify this. + */ + imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, SM_ROOT_SIZE, + SM_ENTRY_ALIGN); + + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, -sm_r->max_offset / 4 + 1)); + assert_int_equal(1, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + /* Next two should go into small region */ + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, -sm_r->max_offset / 4)); + assert_int_equal(2, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + /* (1/4 * 3/4) */ + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, -sm_r->max_offset / 16 * 3)); + assert_int_equal(3, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + free(base); +} + +static void test_imd_entry_find(void **state) +{ + struct imd imd = {0}; + void *base; + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + + assert_non_null(imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + + assert_non_null(imd_entry_find(&imd, LG_ENTRY_ID)); + assert_non_null(imd_entry_find(&imd, SMALL_REGION_ID)); + + /* Try random id, should fail */ + assert_null(imd_entry_find(&imd, 0xC001)); + + free(base); +} + +static void test_imd_entry_find_or_add(void **state) +{ + struct imd imd = {0}; + const struct imd_entry *entry; + struct imd_root *r; + void *base; + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_null(imd_entry_find_or_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + entry = imd_entry_find_or_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE); + assert_non_null(entry); + + r = (struct imd_root *)imd.lg.r; + + assert_int_equal(entry->id, LG_ENTRY_ID); + assert_int_equal(2, r->num_entries); + assert_non_null(imd_entry_find_or_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + assert_int_equal(2, r->num_entries); + + free(base); +} + +static void test_imd_entry_size(void **state) +{ + struct imd_entry entry = { .size = LG_ENTRY_SIZE }; + + assert_int_equal(LG_ENTRY_SIZE, imd_entry_size(&entry)); + + entry.size = 0; + assert_int_equal(0, imd_entry_size(&entry)); +} + +static void test_imd_entry_at(void **state) +{ + struct imd imd = {0}; + struct imd_root *r; + struct imd_entry *e = NULL; + const struct imd_entry *entry; + void *base; + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + + /* Fail when entry is NULL */ + assert_null(imd_entry_at(&imd, e)); + + entry = imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE); + assert_non_null(entry); + + r = (struct imd_root *) (imd.lg.r); + assert_ptr_equal((void *)r + entry->start_offset, imd_entry_at(&imd, entry)); + + free(base); +} + +static void test_imd_entry_id(void **state) +{ + struct imd_entry entry = { .id = LG_ENTRY_ID }; + + assert_int_equal(LG_ENTRY_ID, imd_entry_id(&entry)); +} + +static void test_imd_entry_remove(void **state) +{ + void *base; + struct imd imd = {0}; + struct imd_root *r; + const struct imd_entry *fst_lg_entry, *snd_lg_entry, *fst_sm_entry; + const struct imd_entry *e = NULL; + + /* Uninitialized handle */ + assert_int_equal(-1, imd_entry_remove(&imd, e)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + LG_ROOT_SIZE, SM_ENTRY_ALIGN)); + + r = imd.lg.r; + assert_int_equal(2, r->num_entries); + fst_lg_entry = &r->entries[0]; + snd_lg_entry = &r->entries[1]; + + /* Only last entry can be removed */ + assert_int_equal(-1, imd_entry_remove(&imd, fst_lg_entry)); + + r->flags = IMD_FLAG_LOCKED; + assert_int_equal(-1, imd_entry_remove(&imd, snd_lg_entry)); + r->flags = 0; + + r = imd.sm.r; + assert_int_equal(1, r->num_entries); + fst_sm_entry = &r->entries[0]; + + /* Fail trying to remove root entry */ + assert_int_equal(-1, imd_entry_remove(&imd, fst_sm_entry)); + assert_int_equal(1, r->num_entries); + + r = imd.lg.r; + assert_int_equal(0, imd_entry_remove(&imd, snd_lg_entry)); + assert_int_equal(1, r->num_entries); + + /* Fail trying to remove root entry */ + assert_int_equal(-1, imd_entry_remove(&imd, fst_lg_entry)); + assert_int_equal(1, r->num_entries); + + free(base); +} + +static void test_imd_cursor_init(void **state) +{ + struct imd imd = {0}; + struct imd_cursor cursor; + + assert_int_equal(-1, imd_cursor_init(NULL, NULL)); + assert_int_equal(-1, imd_cursor_init(NULL, &cursor)); + assert_int_equal(-1, imd_cursor_init(&imd, NULL)); + assert_int_equal(0, imd_cursor_init(&imd, &cursor)); + + assert_ptr_equal(cursor.imdr[0], &imd.lg); + assert_ptr_equal(cursor.imdr[1], &imd.sm); +} + +static void test_imd_cursor_next(void **state) +{ + void *base; + struct imd imd = {0}; + struct imd_cursor cursor; + struct imd_root *r; + const struct imd_entry *entry; + struct imd_entry *fst_lg_entry, *snd_lg_entry, *fst_sm_entry; + assert_int_equal(0, imd_cursor_init(&imd, &cursor)); + + cursor.current_imdr = 3; + cursor.current_entry = 0; + assert_null(imd_cursor_next(&cursor)); + + cursor.current_imdr = 0; + assert_null(imd_cursor_next(&cursor)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + + r = imd.lg.r; + entry = imd_cursor_next(&cursor); + assert_non_null(entry); + + fst_lg_entry = &r->entries[0]; + assert_int_equal(fst_lg_entry->id, entry->id); + assert_ptr_equal(fst_lg_entry, entry); + + entry = imd_cursor_next(&cursor); + assert_non_null(entry); + + snd_lg_entry = &r->entries[1]; + assert_int_equal(snd_lg_entry->id, entry->id); + assert_ptr_equal(snd_lg_entry, entry); + + entry = imd_cursor_next(&cursor); + assert_non_null(entry); + + r = imd.sm.r; + fst_sm_entry = &r->entries[0]; + assert_int_equal(fst_sm_entry->id, entry->id); + assert_ptr_equal(fst_sm_entry, entry); + + entry = imd_cursor_next(&cursor); + assert_null(entry); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_imd_handle_init), + cmocka_unit_test(test_imd_handle_init_partial_recovery), + cmocka_unit_test(test_imd_create_empty), + cmocka_unit_test(test_imd_create_tiered_empty), + cmocka_unit_test(test_imd_recover), + cmocka_unit_test(test_imd_limit_size), + cmocka_unit_test(test_imd_lockdown), + cmocka_unit_test(test_imd_region_used), + cmocka_unit_test(test_imd_entry_add), + cmocka_unit_test(test_imd_entry_find), + cmocka_unit_test(test_imd_entry_find_or_add), + cmocka_unit_test(test_imd_entry_size), + cmocka_unit_test(test_imd_entry_at), + cmocka_unit_test(test_imd_entry_id), + cmocka_unit_test(test_imd_entry_remove), + cmocka_unit_test(test_imd_cursor_init), + cmocka_unit_test(test_imd_cursor_next), + }; + + return cmocka_run_group_tests(tests, NULL, NULL); +} + -- To view, visit https://review.coreboot.org/c/coreboot/+/44669 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I9d3ab45c3da2a21c910f52a84526b60c39ff1fe7 Gerrit-Change-Number: 44669 Gerrit-PatchSet: 1 Gerrit-Owner: Jan Dabros <jsd(a)semihalf.com> Gerrit-Reviewer: Anna Karaś <aka(a)semihalf.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

6 17

Change in coreboot[master]: fix: gemini lake device id is LPC
by Name of user not set (Code Review) 01 Mar '21

01 Mar '21

coreboot(a)s.paape.io has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40755 ) Change subject: fix: gemini lake device id is LPC ...................................................................... fix: gemini lake device id is LPC Change-Id: If6a22a28f2a4ca1f984b669b00bc0c07f5588328 --- M util/inteltool/gpio.c M util/inteltool/inteltool.c M util/inteltool/inteltool.h M util/inteltool/pcr.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/40755/1 diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c index 471485c..e11d848 100644 --- a/util/inteltool/gpio.c +++ b/util/inteltool/gpio.c @@ -1035,7 +1035,7 @@ case PCI_DEVICE_ID_INTEL_QM170: case PCI_DEVICE_ID_INTEL_HM170: case PCI_DEVICE_ID_INTEL_CM236: - case PCI_DEVICE_ID_INTEL_GLK: + case PCI_DEVICE_ID_INTEL_GLK_LPC: case PCI_DEVICE_ID_INTEL_APL_LPC: case PCI_DEVICE_ID_INTEL_DNV_LPC: case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE: diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index a4bfdcb..475f701 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -316,7 +316,7 @@ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C224, "C224"}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C226, "C226"}, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H81, "H81"}, - { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK, "Gemini Lake" }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK_LPC, "Gemini Lake" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_APL_LPC, "Apollo Lake" }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DNV_LPC, "Denverton" }, /* Intel GPUs */ diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 9f5d8aa..9eff45d 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -267,7 +267,7 @@ #define PCI_DEVICE_ID_INTEL_BAYTRAIL_GFX 0x0f31 #define CPUID_BAYTRAIL 0x30670 -#define PCI_DEVICE_ID_INTEL_GLK 0x31e8 +#define PCI_DEVICE_ID_INTEL_GLK_LPC 0x31e8 #define PCI_DEVICE_ID_INTEL_APL_LPC 0x5ae8 #define PCI_DEVICE_ID_INTEL_DNV_LPC 0x19dc diff --git a/util/inteltool/pcr.c b/util/inteltool/pcr.c index 963a8b4..4733458 100644 --- a/util/inteltool/pcr.c +++ b/util/inteltool/pcr.c @@ -120,7 +120,7 @@ p2sb = pci_get_dev(sb->access, 0, 0, 0x1f, 1); break; case PCI_DEVICE_ID_INTEL_APL_LPC: - case PCI_DEVICE_ID_INTEL_GLK: + case PCI_DEVICE_ID_INTEL_GLK_LPC: p2sb = pci_get_dev(sb->access, 0, 0, 0x0d, 0); break; case PCI_DEVICE_ID_INTEL_H310: -- To view, visit https://review.coreboot.org/c/coreboot/+/40755 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If6a22a28f2a4ca1f984b669b00bc0c07f5588328 Gerrit-Change-Number: 40755 Gerrit-PatchSet: 1 Gerrit-Owner: coreboot(a)s.paape.io Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange

3 5

Change in coreboot[master]: nb/intel/sandybridge: Clean up `dram_timing` function
by Angel Pons (Code Review) 01 Mar '21

01 Mar '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45501 ) Change subject: nb/intel/sandybridge: Clean up `dram_timing` function ...................................................................... nb/intel/sandybridge: Clean up `dram_timing` function Compute timings first, then display them. Drop unneeded comments and a double empty line before the start of the function. Tested on Asus P8Z77-V LX2, still boots. Change-Id: I121cf9c4db76ec0ced36caf764b1a1a51e47b552 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/northbridge/intel/sandybridge/raminit_native.c 1 file changed, 11 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/45501/1 diff --git a/src/northbridge/intel/sandybridge/raminit_native.c b/src/northbridge/intel/sandybridge/raminit_native.c index a469910..64a381d 100644 --- a/src/northbridge/intel/sandybridge/raminit_native.c +++ b/src/northbridge/intel/sandybridge/raminit_native.c @@ -302,7 +302,6 @@ ctrl->CAS = val; } - static void dram_timing(ramctr_timing *ctrl) { /* @@ -424,42 +423,15 @@ else ctrl->CWL = get_CWL(ctrl->tCK); - printk(BIOS_DEBUG, "Selected CWL latency : %uT\n", ctrl->CWL); - - /* Find tRCD */ ctrl->tRCD = DIV_ROUND_UP(ctrl->tRCD, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tRCD : %uT\n", ctrl->tRCD); - ctrl->tRP = DIV_ROUND_UP(ctrl->tRP, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tRP : %uT\n", ctrl->tRP); - - /* Find tRAS */ ctrl->tRAS = DIV_ROUND_UP(ctrl->tRAS, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tRAS : %uT\n", ctrl->tRAS); - - /* Find tWR */ ctrl->tWR = DIV_ROUND_UP(ctrl->tWR, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tWR : %uT\n", ctrl->tWR); - - /* Find tFAW */ ctrl->tFAW = DIV_ROUND_UP(ctrl->tFAW, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tFAW : %uT\n", ctrl->tFAW); - - /* Find tRRD */ ctrl->tRRD = DIV_ROUND_UP(ctrl->tRRD, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tRRD : %uT\n", ctrl->tRRD); - - /* Find tRTP */ ctrl->tRTP = DIV_ROUND_UP(ctrl->tRTP, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tRTP : %uT\n", ctrl->tRTP); - - /* Find tWTR */ ctrl->tWTR = DIV_ROUND_UP(ctrl->tWTR, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tWTR : %uT\n", ctrl->tWTR); - - /* Refresh-to-Active or Refresh-to-Refresh (tRFC) */ ctrl->tRFC = DIV_ROUND_UP(ctrl->tRFC, ctrl->tCK); - printk(BIOS_DEBUG, "Selected tRFC : %uT\n", ctrl->tRFC); ctrl->tREFI = get_REFI(ctrl->FRQ, ctrl->base_freq); ctrl->tMOD = get_MOD(ctrl->FRQ, ctrl->base_freq); @@ -469,6 +441,17 @@ ctrl->tXPDLL = get_XPDLL(ctrl->FRQ, ctrl->base_freq); ctrl->tXP = get_XP(ctrl->FRQ, ctrl->base_freq); ctrl->tAONPD = get_AONPD(ctrl->FRQ, ctrl->base_freq); + + printk(BIOS_DEBUG, "Selected CWL latency : %uT\n", ctrl->CWL); + printk(BIOS_DEBUG, "Selected tRCD : %uT\n", ctrl->tRCD); + printk(BIOS_DEBUG, "Selected tRP : %uT\n", ctrl->tRP); + printk(BIOS_DEBUG, "Selected tRAS : %uT\n", ctrl->tRAS); + printk(BIOS_DEBUG, "Selected tWR : %uT\n", ctrl->tWR); + printk(BIOS_DEBUG, "Selected tFAW : %uT\n", ctrl->tFAW); + printk(BIOS_DEBUG, "Selected tRRD : %uT\n", ctrl->tRRD); + printk(BIOS_DEBUG, "Selected tRTP : %uT\n", ctrl->tRTP); + printk(BIOS_DEBUG, "Selected tWTR : %uT\n", ctrl->tWTR); + printk(BIOS_DEBUG, "Selected tRFC : %uT\n", ctrl->tRFC); } static void dram_freq(ramctr_timing *ctrl) -- To view, visit https://review.coreboot.org/c/coreboot/+/45501 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I121cf9c4db76ec0ced36caf764b1a1a51e47b552 Gerrit-Change-Number: 45501 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

4 5

Change in libgfxinit[master]: [HACK] Implement WaHardHangonHotPlug: cnp
by Angel Pons (Code Review) 28 Feb '21

28 Feb '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/libgfxinit/+/46632 ) Change subject: [HACK] Implement WaHardHangonHotPlug: cnp ...................................................................... [HACK] Implement WaHardHangonHotPlug: cnp Change-Id: I861a1f4c7257dbe40af64c7aafac7add94651dfd Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M common/haswell_shared/hw-gfx-gma-port_detect.adb 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/32/46632/1 diff --git a/common/haswell_shared/hw-gfx-gma-port_detect.adb b/common/haswell_shared/hw-gfx-gma-port_detect.adb index 5765941..18d5402 100644 --- a/common/haswell_shared/hw-gfx-gma-port_detect.adb +++ b/common/haswell_shared/hw-gfx-gma-port_detect.adb @@ -29,6 +29,8 @@ SHOTPLUG_CTL_DETECT_MASK : constant := 16#0303_0303#; + CHASSIS_CLK_REQ_DURATION_MASK : constant := 16#f# * 2 ** 8 + type Digital_Port_Value is array (Digital_Port) of Word32; DDI_PORT_DETECTED : constant Digital_Port_Value := (DIGI_B => 1 * 2 ** 2, @@ -87,6 +89,13 @@ Config.Valid_Port (Analog) := not (DDI_A_X4 or DAC_Disabled); end if; + -- Display WA #1179 WaHardHangonHotPlug: cnp + if Config.CPU_Coffeelake then + Registers.Set_Mask + (Register => PCH_FDI_CHICKEN_B_C, + Mask => CHASSIS_CLK_REQ_DURATION_MASK); + end if; + -- DDI_A if Config.Has_Presence_Straps and not Config.Ignore_Presence_Straps then Registers.Is_Set_Mask -- To view, visit https://review.coreboot.org/c/libgfxinit/+/46632 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: I861a1f4c7257dbe40af64c7aafac7add94651dfd Gerrit-Change-Number: 46632 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 3

Change in libgfxinit[master]: [HACK] Implement WaSouthDisplayDisablePWMCGEGating: cnp
by Angel Pons (Code Review) 28 Feb '21

28 Feb '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/libgfxinit/+/46633 ) Change subject: [HACK] Implement WaSouthDisplayDisablePWMCGEGating: cnp ...................................................................... [HACK] Implement WaSouthDisplayDisablePWMCGEGating: cnp Change-Id: I566397be4bb23c0c3bc56847414033885c51fde7 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M common/skylake/hw-gfx-gma-power_and_clocks.adb 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/33/46633/1 diff --git a/common/skylake/hw-gfx-gma-power_and_clocks.adb b/common/skylake/hw-gfx-gma-power_and_clocks.adb index 4c8b6ac..c860e1b 100644 --- a/common/skylake/hw-gfx-gma-power_and_clocks.adb +++ b/common/skylake/hw-gfx-gma-power_and_clocks.adb @@ -80,6 +80,8 @@ LCPLL1_CTL_PLL_ENABLE : constant := 1 * 2 ** 31; LCPLL1_CTL_PLL_LOCK : constant := 1 * 2 ** 30; + CNP_PWM_CGE_GATING_DISABLE : constant := 1 * 2 ** 13; + ---------------------------------------------------------------------------- CDCLK_CTL_CD_FREQ_SELECT_MASK : constant := 3 * 2 ** 26; @@ -333,6 +335,11 @@ (Register => Registers.LCPLL1_CTL, Mask => LCPLL1_CTL_PLL_LOCK); + -- Display WA #1181 WaSouthDisplayDisablePWMCGEGating: cnp + Registers.Set_Mask + (Register => Registers.PCH_DSPCLK_GATE_D, + Mask => CNP_PWM_CGE_GATING_DISABLE); + Get_Cur_CDClk (Config.CDClk); Get_Max_CDClk (Config.Max_CDClk); Set_CDClk (Config.Default_CDClk_Freq); -- To view, visit https://review.coreboot.org/c/libgfxinit/+/46633 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: I566397be4bb23c0c3bc56847414033885c51fde7 Gerrit-Change-Number: 46633 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 3

Change in coreboot[master]: nb/intel/ironlake: Avoid casting pointers to structs
by Angel Pons (Code Review) 27 Feb '21

27 Feb '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45367 ) Change subject: nb/intel/ironlake: Avoid casting pointers to structs ...................................................................... nb/intel/ironlake: Avoid casting pointers to structs Instead, convert the struct to a union and pass in a pointer to it. Without the initialization of `reply.command`, Packard Bell MS2290 does not change. This might be due to incorrect compiler optimizations. Change-Id: I60e3dca7ad101d840759bdc0c88c50d9f07d65e2 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/northbridge/intel/ironlake/raminit.c 1 file changed, 16 insertions(+), 11 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/45367/1 diff --git a/src/northbridge/intel/ironlake/raminit.c b/src/northbridge/intel/ironlake/raminit.c index aa73d99..9ee2253 100644 --- a/src/northbridge/intel/ironlake/raminit.c +++ b/src/northbridge/intel/ironlake/raminit.c @@ -1724,8 +1724,20 @@ return 0; } +union uma_reply { + struct { + u8 group_id; + u8 command; + u8 reserved; + u8 result; + u8 field2; + u8 unk3[0x48 - 4 - 1]; + }; + u32 dwords[0x48 / sizeof(u32)]; +} __packed; + /* FIXME: Add timeout. */ -static int recv_heci_message(u32 *message, u32 *message_size) +static int recv_heci_message(union uma_reply *message, u32 *message_size) { struct mei_header head; int current_position; @@ -1735,7 +1747,7 @@ u32 current_size; current_size = *message_size - current_position; if (recv_heci_packet - (&head, message + (current_position >> 2), + (&head, message->dwords + (current_position >> 2), &current_size) == -1) break; if (!current_size) @@ -1755,14 +1767,7 @@ static void send_heci_uma_message(const u64 heci_uma_addr, const unsigned int heci_uma_size) { - struct uma_reply { - u8 group_id; - u8 command; - u8 reserved; - u8 result; - u8 field2; - u8 unk3[0x48 - 4 - 1]; - } __packed reply; + union uma_reply reply; /* FIXME: recv_heci_message() does not always initialize 'reply' */ reply.command = 0; @@ -1791,7 +1796,7 @@ send_heci_message((u8 *) &msg, sizeof(msg), 0, 7); reply_size = sizeof(reply); - if (recv_heci_message((u32 *) &reply, &reply_size) == -1) + if (recv_heci_message(&reply, &reply_size) == -1) return; if (reply.command != (MKHI_SET_UMA | (1 << 7))) -- To view, visit https://review.coreboot.org/c/coreboot/+/45367 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I60e3dca7ad101d840759bdc0c88c50d9f07d65e2 Gerrit-Change-Number: 45367 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

3 9

Change in coreboot[master]: nb/intel/haswell/northbridge.c: Correct DPR handling
by Angel Pons (Code Review) 26 Feb '21

26 Feb '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46987 ) Change subject: nb/intel/haswell/northbridge.c: Correct DPR handling ...................................................................... nb/intel/haswell/northbridge.c: Correct DPR handling DPR size is in MiB, but the range boundaries are expressed in KiB. In addition, DPR and TSEG use the same attributes, so unify both regions. Also improve a comment about DPR, since `is special` is uninformative. Change-Id: I4479483e17890b5a4c39165138fa1c5f8215bc84 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/northbridge/intel/haswell/northbridge.c 1 file changed, 11 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/46987/1 diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c index 64a274d..e31337b 100644 --- a/src/northbridge/intel/haswell/northbridge.c +++ b/src/northbridge/intel/haswell/northbridge.c @@ -289,7 +289,12 @@ mc_read_map_entries(dev, &mc_values[0]); mc_report_map_entries(dev, &mc_values[0]); - /* The DPR register is special */ + /* + * DMA Protected Range can be reserved below TSEG for PCODE patch + * or TXT/BootGuard related data. Rather than report a base address, + * the DPR register reports the TOP of the region, which is the same + * as TSEG base. The region size is reported in MiB in bits 11:4. + */ const union dpr_register dpr = { .raw = pci_read_config32(dev, DPR), }; @@ -328,23 +333,15 @@ size_k = (0xa0000 >> 10) - base_k; ram_resource(dev, index++, base_k, size_k); - /* 0xc0000 -> DPR base */ + /* 0xc0000 -> TSEG - DPR */ base_k = 0xc0000 >> 10; - size_k = (unsigned long)(mc_values[TSEG_REG] >> 10) - (base_k + dpr.size); + size_k = (unsigned long)(mc_values[TSEG_REG] >> 10) - base_k; + size_k -= dpr.size >> 10; ram_resource(dev, index++, base_k, size_k); - /* DPR base -> TSEG */ - if (dpr.size) { - resource = new_resource(dev, index++); - resource->base = (dpr.top - dpr.size) * MiB; - resource->size = dpr.size * MiB; - resource->flags = IORESOURCE_MEM | IORESOURCE_STORED | IORESOURCE_CACHEABLE | - IORESOURCE_RESERVE | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - } - - /* TSEG -> BGSM */ + /* TSEG - DPR -> BGSM */ resource = new_resource(dev, index++); - resource->base = mc_values[TSEG_REG]; + resource->base = mc_values[TSEG_REG] - dpr.size; resource->size = mc_values[BGSM_REG] - resource->base; resource->flags = IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_RESERVE | IORESOURCE_ASSIGNED | IORESOURCE_CACHEABLE; -- To view, visit https://review.coreboot.org/c/coreboot/+/46987 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4479483e17890b5a4c39165138fa1c5f8215bc84 Gerrit-Change-Number: 46987 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

4 6

Change in coreboot[master]: mb/google/poppy: Tell front sensor driver not to power it on during p...
by Sakari Ailus (Code Review) 26 Feb '21

26 Feb '21

Sakari Ailus has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45171 ) Change subject: mb/google/poppy: Tell front sensor driver not to power it on during probe ...................................................................... mb/google/poppy: Tell front sensor driver not to power it on during probe Use i2c-allow-low-power-probe boolean property to tell the driver of the front sensor to keep the device in low power state during probe. As powering on the sensor will briefly lit the privacy LED, the side effect of this patch is also that the LED remains powered off during the entire boot process. Signed-off-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Change-Id: I21946a9b0667b5c4486b96e907a14f8446617015 --- M src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/45171/1 diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl index 7e20575..8a80e14 100644 --- a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl +++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/cam1.asl @@ -35,6 +35,7 @@ ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "clock-frequency", 19200000 }, + Package () { "i2c-allow-low-power-probe", 1 }, } }) -- To view, visit https://review.coreboot.org/c/coreboot/+/45171 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I21946a9b0667b5c4486b96e907a14f8446617015 Gerrit-Change-Number: 45171 Gerrit-PatchSet: 1 Gerrit-Owner: Sakari Ailus <sakari.ailus+coreboot.org(a)linux.intel.com> Gerrit-MessageType: newchange

1 2

Change in coreboot[master]: soc/intel/xeon_sp: add ACPI to control GPIO [WIP]
by Maxim Polyakov (Code Review) 25 Feb '21

25 Feb '21

Maxim Polyakov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39979 ) Change subject: soc/intel/xeon_sp: add ACPI to control GPIO [WIP] ...................................................................... soc/intel/xeon_sp: add ACPI to control GPIO [WIP] Change-Id: I07c882077eb3c035faae81641bc860e69db224b4 Signed-off-by: Maxim Polyakov <max.senia.poliak(a)gmail.com> --- A src/soc/intel/xeon_sp/acpi/gpio.asl 1 file changed, 177 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/39979/1 diff --git a/src/soc/intel/xeon_sp/acpi/gpio.asl b/src/soc/intel/xeon_sp/acpi/gpio.asl new file mode 100644 index 0000000..4a981b7 --- /dev/null +++ b/src/soc/intel/xeon_sp/acpi/gpio.asl @@ -0,0 +1,177 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* This file is part of the coreboot project. */ +#include <soc/gpio.h> + +#define GPIOTXSTATE_MASK 0x1 +#define GPIORXSTATE_MASK 0x1 + +Device (GPIO) +{ + Name (_HID, "INT3536") + Name (_UID, 1) + Name (_DDN, "GPIO Controller") + + Name (RBUF, ResourceTemplate() + { + Memory32Fixed (ReadWrite, 0, 0, COM0) + Memory32Fixed (ReadWrite, 0, 0, COM1) + Memory32Fixed (ReadWrite, 0, 0, COM3) + Memory32Fixed (ReadWrite, 0, 0, COM4) + Memory32Fixed (ReadWrite, 0, 0, COM5) + Interrupt (ResourceConsumer, Level, ActiveLow, Shared,,, GIRQ) + { 0 } + }) + + Method (_CRS, 0, NotSerialized) + { + /* GPIO Community 0 */ + CreateDWordField (^RBUF, ^COM0._BAS, BAS0) + CreateDWordField (^RBUF, ^COM0._LEN, LEN0) + Store (^^PCRB (PID_GPIOCOM0), BAS0) + Store (GPIO_BASE_SIZE, LEN0) + + /* GPIO Community 1 */ + CreateDWordField (^RBUF, ^COM1._BAS, BAS1) + CreateDWordField (^RBUF, ^COM1._LEN, LEN1) + Store (^^PCRB (PID_GPIOCOM1), BAS1) + Store (GPIO_BASE_SIZE, LEN1) + + /* GPIO Community 3 */ + CreateDWordField (^RBUF, ^COM3._BAS, BAS3) + CreateDWordField (^RBUF, ^COM3._LEN, LEN3) + Store (^^PCRB (PID_GPIOCOM3), BAS3) + Store (GPIO_BASE_SIZE, LEN3) + + /* GPIO Community 4 */ + CreateDWordField (^RBUF, ^COM4._BAS, BAS4) + CreateDWordField (^RBUF, ^COM4._LEN, LEN4) + Store (^^PCRB (PID_GPIOCOM4), BAS4) + Store (GPIO_BASE_SIZE, LEN4) + + /* GPIO Community 5 */ + CreateDWordField (^RBUF, ^COM5._BAS, BAS5) + CreateDWordField (^RBUF, ^COM5._LEN, LEN5) + Store (^^PCRB (PID_GPIOCOM5), BAS5) + Store (GPIO_BASE_SIZE, LEN5) + + CreateDWordField (^RBUF, ^GIRQ._INT, IRQN) + And (^^PCRR (PID_GPIOCOM0, GPIO_MISCCFG), + GPIO_DRIVER_IRQ_ROUTE_MASK, Local0) + + /* TODO: Check this! + If (LEqual (Local0, GPIO_DRIVER_IRQ_ROUTE_IRQ14)) { + Store (GPIO_IRQ14, IRQN) + } Else { + Store (GPIO_IRQ15, IRQN) + } + */ + + Return (RBUF) + } + + Method (_STA, 0, NotSerialized) + { + Return (0xF) + } +} + +/* + * Get GPIO DW0 Address + * Arg0 - GPIO Number + */ +Method (GADD, 1, NotSerialized) +{ + /* GPIO Community 0 */ + If (LAnd (LGreaterEqual (Arg0, GPP_A0), LLessEqual (Arg0, GPP_F23))) + { + Store (PID_GPIOCOM0, Local0) + Subtract (Arg0, GPP_A0, Local1) + } + /* GPIO Community 1 */ + If (LAnd (LGreaterEqual (Arg0, GPP_C0), LLessEqual (Arg0, GPP_H23))) + { + Store (PID_GPIOCOM1, Local0) + Subtract (Arg0, GPP_C0, Local1) + } + /* GPIO Community 3 */ + If (LAnd (LGreaterEqual (Arg0, GPP_I0), LLessEqual (Arg0, GPP_I10))) + { + Store (PID_GPIOCOM3, Local0) + Subtract (Arg0, GPP_I0, Local1) + } + /* GPIO Community 4 */ + If (LAnd (LGreaterEqual (Arg0, GPP_J0), LLessEqual (Arg0, GPP_K10))) + { + Store (PID_GPIOCOM4, Local0) + Subtract (Arg0, GPP_J0, Local1) + } + /* GPIO Community 5 */ + If (LAnd (LGreaterEqual (Arg0, GPP_G0), LLessEqual (Arg0, GPP_L19))) + { + Store (PID_GPIOCOM5, Local0) + Subtract (Arg0, GPP_G0, Local1) + } + Store (PCRB (Local0), Local2) + Add (Local2, PAD_CFG_BASE, Local2) + Return (Add (Local2, Multiply (Local1, 8))) +} + +/* + * Get GPIO Rx Value + * Arg0 - GPIO Number + */ +Method (GRXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + And (GPIORXSTATE_MASK, ShiftRight (VAL0, PAD_CFG0_RX_STATE_BIT), Local0) + + Return (Local0) +} + +/* + * Get GPIO Tx Value + * Arg0 - GPIO Number + */ +Method (GTXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + And (GPIOTXSTATE_MASK, ShiftRight (VAL0, PAD_CFG0_TX_STATE_BIT), Local0) + + Return (Local0) +} + +/* + * Set GPIO Tx Value + * Arg0 - GPIO Number + */ +Method (STXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + Or (GPIOTXSTATE_MASK, VAL0, VAL0) +} + +/* + * Clear GPIO Tx Value + * Arg0 - GPIO Number + */ +Method (CTXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + And (Not (GPIOTXSTATE_MASK), VAL0, VAL0) +} -- To view, visit https://review.coreboot.org/c/coreboot/+/39979 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I07c882077eb3c035faae81641bc860e69db224b4 Gerrit-Change-Number: 39979 Gerrit-PatchSet: 1 Gerrit-Owner: Maxim Polyakov <max.senia.poliak(a)gmail.com> Gerrit-MessageType: newchange

7 48

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit October 2020