coreboot-gerrit December 2020

coreboot-gerrit@coreboot.org

1 participants
3165 discussions

Change in coreboot[master]: soc/mediatek/mt8192: Initialize audio pll tuner frequency
by Yidi Lin (Code Review) 16 Dec '20

16 Dec '20

Hello Weiyi Lu, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/46400 to review the following change. Change subject: soc/mediatek/mt8192: Initialize audio pll tuner frequency ...................................................................... soc/mediatek/mt8192: Initialize audio pll tuner frequency Add AUDPLL TUNER init code. TEST=Boots correctly on MT8192EVB. Signed-off-by: Weiyi Lu <weiyi.lu(a)mediatek.com> Change-Id: I1f1b5b55a0a16d42311b16b89b15b31e1aa04670 --- M src/soc/mediatek/mt8192/pll.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/46400/1 diff --git a/src/soc/mediatek/mt8192/pll.c b/src/soc/mediatek/mt8192/pll.c index 11750d2..24cfafd 100644 --- a/src/soc/mediatek/mt8192/pll.c +++ b/src/soc/mediatek/mt8192/pll.c @@ -392,6 +392,10 @@ for (i = 0; i < ARRAY_SIZE(rates); i++) pll_set_rate(&plls[rates[i].id], rates[i].rate); + /* AUDPLL Tuner Frequency Set */ + write32(&mtk_apmixed->apll1_tuner_con0, read32(&mtk_apmixed->apll1_con2) + 1); + write32(&mtk_apmixed->apll2_tuner_con0, read32(&mtk_apmixed->apll2_con2) + 1); + /* xPLL Frequency Enable */ for (i = 0; i < APMIXED_PLL_MAX; i++) { if (i == APMIXED_USBPLL) -- To view, visit https://review.coreboot.org/c/coreboot/+/46400 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1f1b5b55a0a16d42311b16b89b15b31e1aa04670 Gerrit-Change-Number: 46400 Gerrit-PatchSet: 1 Gerrit-Owner: Yidi Lin <yidi.lin(a)mediatek.com> Gerrit-Reviewer: Weiyi Lu <weiyi.lu(a)mediatek.com> Gerrit-MessageType: newchange

3 5

Change in coreboot[master]: soc/intel/xeon_sp: Lock down DMIC
by Arthur Heymans (Code Review) 16 Dec '20

16 Dec '20

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47449 ) Change subject: soc/intel/xeon_sp: Lock down DMIC ...................................................................... soc/intel/xeon_sp: Lock down DMIC This is required for CBnT. Change-Id: I290742c163f5f067c8d529ddca8e2d8572ab6e6a Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/soc/intel/xeon_sp/pch.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/47449/1 diff --git a/src/soc/intel/xeon_sp/pch.c b/src/soc/intel/xeon_sp/pch.c index 5427952..2b35223 100644 --- a/src/soc/intel/xeon_sp/pch.c +++ b/src/soc/intel/xeon_sp/pch.c @@ -39,6 +39,9 @@ reg32 = (0x3f << 18) | ACPI_BASE_ADDRESS | 1; pcr_write32(PID_DMI, PCR_DMI_ACPIBA, reg32); pcr_write32(PID_DMI, PCR_DMI_ACPIBDID, 0x23a8); + + reg32 = pcr_read32(PID_DMI, PCR_DMI_DMICTL); + pcr_write32(PID_DMI, PCR_DMI_DMICTL, reg32 | PCR_DMI_DMICTL_SRLOCK); } void bootblock_pch_init(void) -- To view, visit https://review.coreboot.org/c/coreboot/+/47449 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I290742c163f5f067c8d529ddca8e2d8572ab6e6a Gerrit-Change-Number: 47449 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

5 10

Change in em100[master]: em100: Add trace console command
by Stefan Reinauer (Code Review) 16 Dec '20

16 Dec '20

Hello Duncan Laurie, I'd like you to do a code review. Please visit https://review.coreboot.org/c/em100/+/48599 to review the following change. Change subject: em100: Add trace console command ...................................................................... em100: Add trace console command Add a command which allows a realtime console output from em100 when using the CONFIG_SPI_FLASH_CONSOLE option in coreboot. Provide the offset and lenght of the region defined in the FMAP and it will watch for the host to write to that area, and when it sees a write it will print it to stdout. Change-Id: I78162585bcd73a3bb3a8aa590f43a96092946109 Signed-off-by: Duncan Laurie <dlaurie(a)google.com> Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- M em100.c M em100.h M trace.c 3 files changed, 135 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/99/48599/1 diff --git a/em100.c b/em100.c index 4b0a121..f808ed6 100644 --- a/em100.c +++ b/em100.c @@ -787,6 +787,8 @@ {"list-devices", 0, 0, 'l'}, {"update-files", 0, 0, 'U'}, {"terminal", 0, 0, 'T'}, + {"traceconsole", 0, 0, 'R'}, + {"length", 1, 0, 'L'}, {"compatible", 0, 0, 'C'}, {NULL, 0, 0, 0} }; @@ -807,6 +809,8 @@ " -t|--trace: trace mode\n" " -O|--offset HEX_VAL: address offset for trace mode\n" " -T|--terminal: terminal mode\n" + " -R|--traceconsole: trace console mode\n" + " -L|--length HEX_VAL: length of buffer for traceconsole mode\n" " -F|--firmware-update FILE|auto: update EM100pro firmware (dangerous)\n" " -f|--firmware-dump FILE: export raw EM100pro firmware to file\n" " -g|--firmware-write FILE: export EM100pro firmware to DPFW file\n" @@ -832,18 +836,18 @@ const char *firmware_in = NULL, *firmware_out = NULL; const char *holdpin = NULL; int do_start = 0, do_stop = 0; - int verify = 0, trace = 0, terminal=0; + int verify = 0, trace = 0, terminal=0, traceconsole=0; int compatibility = 0; int bus = 0, device = 0; int firmware_is_dpfw = 0; unsigned int serial_number = 0; - unsigned long address_offset = 0; + unsigned long address_offset = 0, address_length = 0; unsigned int spi_start_address = 0; const char *voltage = NULL; struct sigaction signal_action; struct em100 *em100 = &em100_state; - while ((opt = getopt_long(argc, argv, "c:d:a:m:u:rsvtO:F:f:g:S:V:p:DCx:lUhT", + while ((opt = getopt_long(argc, argv, "c:d:a:m:u:rsvtO:F:f:g:S:V:p:DCx:lUhTRL:", longopts, &idx)) != -1) { switch (opt) { case 'c': @@ -919,6 +923,12 @@ case 'U': update_all_files(); return 0; + case 'R': + traceconsole = 1; + break; + case 'L': + sscanf(optarg, "%lx", &address_length); + break; case 'C': compatibility = 1; break; @@ -1206,7 +1216,7 @@ set_state(em100, 1); } - if (trace || terminal) { + if (trace || terminal || traceconsole) { int usb_errors = 0; if ((holdpin == NULL) && (!set_hold_pin_state(em100, 3))) { @@ -1220,7 +1230,7 @@ printf ("Starting "); - if (trace) { + if (trace || traceconsole) { reset_spi_trace(em100); printf("trace%s", terminal ? " & " : ""); } @@ -1234,13 +1244,18 @@ while (!exit_requested && usb_errors < MAX_USB_ERRORS) { int ret; - if (trace) { + + if (traceconsole) + ret = read_spi_trace_console(em100, address_offset, address_length); + else if (trace) ret = read_spi_trace(em100, terminal, address_offset); - } else { + else if (terminal) ret = read_spi_terminal(em100, 0); - } + if (ret == 0) usb_errors++; + if (ret < 0) + break; } if (usb_errors >= MAX_USB_ERRORS) printf("Error: Bailed out with too many USB errors.\n"); diff --git a/em100.h b/em100.h index ecb74d2..bf1bb87 100644 --- a/em100.h +++ b/em100.h @@ -172,6 +172,8 @@ unsigned long addr_offset); int read_spi_terminal(struct em100 *em100, int print_counter); int init_spi_terminal(struct em100 *em100); +int read_spi_trace_console(struct em100 *em100, unsigned long addr_offset, + unsigned long addr_len); /* Archive handling */ typedef struct { diff --git a/trace.c b/trace.c index 88265b5..7fe6ab8 100644 --- a/trace.c +++ b/trace.c @@ -305,6 +305,116 @@ return 1; } +int read_spi_trace_console(struct em100 *em100, unsigned long addr_offset, + unsigned long addr_len) +{ + unsigned char reportdata[REPORT_BUFFER_COUNT][REPORT_BUFFER_LENGTH] = + {{0}}; + unsigned char *data; + unsigned int count, i, report; + static int additional_pad_bytes = 0; + static unsigned int address = 0; + static int do_write = 0; + static struct spi_cmd_values *spi_cmd_vals = &spi_command_list[3]; + int addr_bytes = 4; + + if (addr_offset == 0) { + printf("Address offset for console buffer required\n"); + return -1; + } + if (addr_len == 0) { + printf("Console buffer length required\n"); + return -1; + } + + if (!read_report_buffer(em100, reportdata)) + return -1; + + for (report = 0; report < REPORT_BUFFER_COUNT; report++) { + data = &reportdata[report][0]; + count = (data[0] << 8) | data[1]; + if (!count) + continue; + if (count > 1023) { + printf("Warning: EM100pro sends too much data: %d.\n", count); + count = 1023; + } + for (i = 0; i < count; i++) { + unsigned int j = additional_pad_bytes; + unsigned int address_bytes = 0; + additional_pad_bytes = 0; + unsigned char cmd = data[2 + i*8]; + + /* from here, it must be data */ + if (cmd != cmdid) { + unsigned char spi_command = data[i * 8 + 4]; + spi_cmd_vals = get_command_vals(spi_command); + + /* new command */ + cmdid = cmd; + + /* set up address if used by this command */ + if (!spi_cmd_vals->uses_address) { + j = 1; /* skip command byte */ + } else { + /* If address_mode > 1 -> always decode 4 bytes */ + address_bytes = + (spi_cmd_vals->uses_address == 1) ? address_mode : 4; + + if (address_mode == 3) + address = (data[i * 8 + 5] << 16) + (data[i * 8 + 6] << 8) + data[i * 8 + 7]; + else + address = (data[i * 8 + 5] << 24) + (data[i * 8 + 6] << 16) + (data[i * 8 + 7] << 8) + data[i * 8 + 8]; + + /* skip command, address bytes, and padding */ + j = address_bytes + 1 + spi_cmd_vals->pad_bytes; + if (j > MAX_TRACE_BLOCKLENGTH) { + additional_pad_bytes = j - + MAX_TRACE_BLOCKLENGTH; + j = MAX_TRACE_BLOCKLENGTH; + } + } + +#if 0 + if (spi_cmd_vals->uses_address) + printf("0x%02x @ 0x%08x (%s)\n", + spi_command, address, spi_cmd_vals->cmd_name); + else + printf("0x%02x (%s)\n", + spi_command, spi_cmd_vals->cmd_name); +#endif + + curpos = 0; + if (spi_command == 0x02) + do_write = 1; + else + do_write = 0; + } + + if (do_write == 0 || + (spi_cmd_vals->uses_address == 0 || + address < addr_offset || + address > (addr_offset + addr_len))) { + curpos = data[2 + i*8 + 1] + 0x10; + continue; + } + + /* this exploits 8bit wrap around in curpos */ + unsigned char blocklen = (data[2 + i*8 + 1] - curpos); + blocklen /= 8; + + for (; j < blocklen; j++) { + printf("%c", data[i * 8 + addr_bytes + j]); + } + + /* this is because the em100 counts funny */ + curpos = data[2 + i*8 + 1] + 0x10; + fflush(stdout); + } + } + return 1; +} + #define UFIFO_SIZE 512 #define UFIFO_TIMEOUT 0x00 -- To view, visit https://review.coreboot.org/c/em100/+/48599 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I78162585bcd73a3bb3a8aa590f43a96092946109 Gerrit-Change-Number: 48599 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-MessageType: newchange

3 10

Change in coreboot[master]: soc/intel/skylake: Drop duplicate PmConfigPciClockRun configuration
by Felix Singer (Code Review) 16 Dec '20

16 Dec '20

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48325 ) Change subject: soc/intel/skylake: Drop duplicate PmConfigPciClockRun configuration ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/48325 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I65e85015bdd0f766ca8021a3d4c0b0d799f0ccc5 Gerrit-Change-Number: 48325 Gerrit-PatchSet: 3 Gerrit-Owner: Benjamin Doron <benjamin.doron00(a)gmail.com> Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 16 Dec 2020 01:39:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: soc/intel/skylake: Drop duplicate PmConfigPciClockRun configuration
by Benjamin Doron (Code Review) 16 Dec '20

16 Dec '20

Benjamin Doron has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48325 ) Change subject: soc/intel/skylake: Drop duplicate PmConfigPciClockRun configuration ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://review.coreboot.org/c/coreboot/+/48325 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I65e85015bdd0f766ca8021a3d4c0b0d799f0ccc5 Gerrit-Change-Number: 48325 Gerrit-PatchSet: 3 Gerrit-Owner: Benjamin Doron <benjamin.doron00(a)gmail.com> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 16 Dec 2020 00:04:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: [WIP] soc/amd/picasso/smi: add missing bits to GEVENT_MASK
by Felix Held (Code Review) 15 Dec '20

15 Dec '20

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48483 ) Change subject: [WIP] soc/amd/picasso/smi: add missing bits to GEVENT_MASK ...................................................................... [WIP] soc/amd/picasso/smi: add missing bits to GEVENT_MASK GEVENT_MASK should cover all GEVENT pins, but was missing SMITYPE_G_AGPIO9 and SMITYPE_G_AGPIO8. TODO: Find out if this is intentional or a bug. Change-Id: Ia676476e2d2cf468d82d6d90e9fc11d34f56f153 Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> --- M src/soc/amd/picasso/include/soc/smi.h 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/48483/1 diff --git a/src/soc/amd/picasso/include/soc/smi.h b/src/soc/amd/picasso/include/soc/smi.h index ad7edbc..e86809e 100644 --- a/src/soc/amd/picasso/include/soc/smi.h +++ b/src/soc/amd/picasso/include/soc/smi.h @@ -64,7 +64,9 @@ | (1 << SMITYPE_G_FANIN0) \ | (1 << SMITYPE_G_SYSRESET_L) \ | (1 << SMITYPE_G_AGPIO40) \ - | (1 << SMITYPE_G_PWR_BTN_L)) + | (1 << SMITYPE_G_PWR_BTN_L) \ + | (1 << SMITYPE_G_AGPIO9) \ + | (1 << SMITYPE_G_AGPIO8)) #define SMITYPE_MP2_WAKE 24 #define SMITYPE_MP2_GPIO0 25 #define SMITYPE_ESPI_SYS 26 -- To view, visit https://review.coreboot.org/c/coreboot/+/48483 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia676476e2d2cf468d82d6d90e9fc11d34f56f153 Gerrit-Change-Number: 48483 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

3 6

Change in coreboot[master]: [WIP] soc/amd/common/block/acpimmio: Redo acpimmio for psp_verstage a...
by Kyösti Mälkki (Code Review) 15 Dec '20

15 Dec '20

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42523 ) Change subject: [WIP] soc/amd/common/block/acpimmio: Redo acpimmio for psp_verstage again ...................................................................... [WIP] soc/amd/common/block/acpimmio: Redo acpimmio for psp_verstage again Change-Id: I3cb1b5a90023ebc4359835be716c5e3f9451df60 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/soc/amd/common/block/acpimmio/Makefile.inc M src/soc/amd/common/block/acpimmio/mmio_util.c D src/soc/amd/common/block/acpimmio/mmio_util_psp.c A src/soc/amd/common/block/acpimmio/psp_verstage_stub.c M src/soc/amd/common/block/include/amdblocks/acpimmio.h M src/soc/amd/common/block/include/amdblocks/acpimmio_map.h D src/soc/amd/common/block/include/amdblocks/acpimmio_psp.h 7 files changed, 67 insertions(+), 245 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/42523/1 diff --git a/src/soc/amd/common/block/acpimmio/Makefile.inc b/src/soc/amd/common/block/acpimmio/Makefile.inc index 13864e4..28d78d5 100644 --- a/src/soc/amd/common/block/acpimmio/Makefile.inc +++ b/src/soc/amd/common/block/acpimmio/Makefile.inc @@ -13,5 +13,5 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_ACPIMMIO),y) verstage-$(CONFIG_ARCH_VERSTAGE_X86_32) += biosram.c verstage-$(CONFIG_ARCH_VERSTAGE_X86_32) += mmio_util.c -verstage-$(CONFIG_ARCH_VERSTAGE_ARM) += mmio_util_psp.c +verstage-$(CONFIG_ARCH_VERSTAGE_ARM) += mmio_util.c endif diff --git a/src/soc/amd/common/block/acpimmio/mmio_util.c b/src/soc/amd/common/block/acpimmio/mmio_util.c index c5f82f9..2bfa878 100644 --- a/src/soc/amd/common/block/acpimmio/mmio_util.c +++ b/src/soc/amd/common/block/acpimmio/mmio_util.c @@ -2,9 +2,12 @@ #include <types.h> #include <arch/io.h> -#include <amdblocks/acpimmio_map.h> #include <amdblocks/acpimmio.h> +#if CONSTANT_ACPIMMIO_BASE_ADDRESS +#include <amdblocks/acpimmio_map.h> +#endif + DECLARE_ACPIMMIO(acpimmio_sm_pci, SM_PCI); DECLARE_ACPIMMIO(acpimmio_gpio_100, GPIO_100); DECLARE_ACPIMMIO(acpimmio_smi, SMI); diff --git a/src/soc/amd/common/block/acpimmio/mmio_util_psp.c b/src/soc/amd/common/block/acpimmio/mmio_util_psp.c deleted file mode 100644 index 75f71e4..0000000 --- a/src/soc/amd/common/block/acpimmio/mmio_util_psp.c +++ /dev/null @@ -1,163 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <stdint.h> -#include <arch/io.h> -#include <device/mmio.h> -#include <amdblocks/acpimmio.h> - -static uintptr_t iomux_bar; - -void iomux_set_bar(void *bar) -{ - iomux_bar = (uintptr_t)bar; -} - -u8 iomux_read8(u8 reg) -{ - return read8((void *)(iomux_bar + reg)); -} - -u16 iomux_read16(u8 reg) -{ - return read16((void *)(iomux_bar + reg)); -} - -u32 iomux_read32(u8 reg) -{ - return read32((void *)(iomux_bar + reg)); -} - -void iomux_write8(u8 reg, u8 value) -{ - write8((void *)(iomux_bar + reg), value); -} - -void iomux_write16(u8 reg, u16 value) -{ - write16((void *)(iomux_bar + reg), value); -} - -void iomux_write32(u8 reg, u32 value) -{ - write32((void *)(iomux_bar + reg), value); -} - -static uintptr_t misc_bar; - -void misc_set_bar(void *bar) -{ - misc_bar = (uintptr_t)bar; -} - -u8 misc_read8(u8 reg) -{ - return read8((void *)(misc_bar + reg)); -} - -u16 misc_read16(u8 reg) -{ - return read16((void *)(misc_bar + reg)); -} - -u32 misc_read32(u8 reg) -{ - return read32((void *)(misc_bar + reg)); -} - -void misc_write8(u8 reg, u8 value) -{ - write8((void *)(misc_bar + reg), value); -} - -void misc_write16(u8 reg, u16 value) -{ - write16((void *)(misc_bar + reg), value); -} - -void misc_write32(u8 reg, u32 value) -{ - write32((void *)(misc_bar + reg), value); -} - -static uintptr_t gpio_bar; - -void gpio_set_bar(void *bar) -{ - gpio_bar = (uintptr_t)bar; -} - -void *gpio_get_bar(void) -{ - return (void *)gpio_bar; -} - -static uintptr_t aoac_bar; - -void aoac_set_bar(void *bar) -{ - aoac_bar = (uintptr_t)bar; -} - -u8 aoac_read8(u8 reg) -{ - return read8((void *)(aoac_bar + reg)); -} - -void aoac_write8(u8 reg, u8 value) -{ - write8((void *)(aoac_bar + reg), value); -} - -static uintptr_t io_bar; - -void io_set_bar(void *bar) -{ - io_bar = (uintptr_t)bar; -} - -u8 io_read8(u16 reg) -{ - return read8((void *)(io_bar + reg)); -} - -void io_write8(u16 reg, u8 value) -{ - write8((void *)(io_bar + reg), value); -} - -/* PM registers are accessed a byte at a time via CD6/CD7 */ -uint8_t pm_io_read8(uint8_t reg) -{ - outb(reg, PM_INDEX); - return inb(PM_DATA); -} - -uint16_t pm_io_read16(uint8_t reg) -{ - return (pm_io_read8(reg + sizeof(uint8_t)) << 8) | pm_io_read8(reg); -} - -uint32_t pm_io_read32(uint8_t reg) -{ - return (pm_io_read16(reg + sizeof(uint16_t)) << 16) | pm_io_read16(reg); -} - -void pm_io_write8(uint8_t reg, uint8_t value) -{ - outb(reg, PM_INDEX); - outb(value, PM_DATA); -} - -void pm_io_write16(uint8_t reg, uint16_t value) -{ - pm_io_write8(reg, value & 0xff); - value >>= 8; - pm_io_write8(reg + sizeof(uint8_t), value & 0xff); -} - -void pm_io_write32(uint8_t reg, uint32_t value) -{ - pm_io_write16(reg, value & 0xffff); - value >>= 16; - pm_io_write16(reg + sizeof(uint16_t), value & 0xffff); -} diff --git a/src/soc/amd/common/block/acpimmio/psp_verstage_stub.c b/src/soc/amd/common/block/acpimmio/psp_verstage_stub.c new file mode 100644 index 0000000..9c74f8f --- /dev/null +++ b/src/soc/amd/common/block/acpimmio/psp_verstage_stub.c @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include <acpimmio.h> + +static void iomux_set_bar(void *bar) +{ + acpimmio_iomux_bar = bar; +} + +static void misc_set_bar(void *bar) +{ + acpimmio_misc_bar = bar; +} + +static void gpio_set_bar(void *bar) +{ + acpimmio_gpio0_bar = bar; +} + +static void aoac_set_bar(void *bar) +{ + acpimmio_aoac_bar = bar; +} + +static void io_set_bar(void *bar) +{ + acpimmio_io_bar = bar; +} diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h index 3caed11..3f00ae2 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h @@ -6,6 +6,40 @@ #include <device/mmio.h> #include <types.h> +/* For x86 base is constant, while PSP does mapping runtime. */ +#define CONSTANT_ACPIMMIO_BASE_ADDRESS ENV_X86 + +#if CONSTANT_ACPIMMIO_BASE_ADDRESS +#define MAYBE_CONST const +#define DECLARE_ACPIMMIO(ptr, bank) \ + uint8_t *const ptr = (void *)(AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ ## bank ## _BANK) +#else +#define MAYBE_CONST +#define DECLARE_ACPIMMIO(ptr, bank) uint8_t *ptr +#endif + +extern uint8_t *MAYBE_CONST acpimmio_gpio_100; +extern uint8_t *MAYBE_CONST acpimmio_sm_pci; +extern uint8_t *MAYBE_CONST acpimmio_smi; +extern uint8_t *MAYBE_CONST acpimmio_pmio; +extern uint8_t *MAYBE_CONST acpimmio_pmio2; +extern uint8_t *MAYBE_CONST acpimmio_biosram; +extern uint8_t *MAYBE_CONST acpimmio_cmosram; +extern uint8_t *MAYBE_CONST acpimmio_cmos; +extern uint8_t *MAYBE_CONST acpimmio_acpi; +extern uint8_t *MAYBE_CONST acpimmio_asf; +extern uint8_t *MAYBE_CONST acpimmio_smbus; +extern uint8_t *MAYBE_CONST acpimmio_wdt; +extern uint8_t *MAYBE_CONST acpimmio_hpet; +extern uint8_t *MAYBE_CONST acpimmio_iomux; +extern uint8_t *MAYBE_CONST acpimmio_misc; +extern uint8_t *MAYBE_CONST acpimmio_dpvga; +extern uint8_t *MAYBE_CONST acpimmio_gpio0; +extern uint8_t *MAYBE_CONST acpimmio_xhci_pm; +extern uint8_t *MAYBE_CONST acpimmio_acdc_tmr; +extern uint8_t *MAYBE_CONST acpimmio_aoac; + +#undef MAYBE_CONST /* Enable the AcpiMmio range at 0xfed80000 */ @@ -23,13 +57,6 @@ void pm_io_write16(uint8_t reg, uint16_t value); void pm_io_write32(uint8_t reg, uint32_t value); -#if !ENV_X86 - -#include <amdblocks/acpimmio_psp.h> - -#else - -#include <amdblocks/acpimmio_map.h> static inline uint8_t sm_pci_read8(uint8_t reg) { @@ -384,6 +411,4 @@ write8(acpimmio_aoac + reg, value); } -#endif /* ENV_X86 */ - #endif /* __AMDBLOCKS_ACPIMMIO_H__ */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h index 912e891..5d71287 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio_map.h @@ -112,20 +112,8 @@ * across family/model products. */ -/* For x86 base is constant, while PSP does mapping runtime. */ -#define CONSTANT_ACPIMMIO_BASE_ADDRESS ENV_X86 - #define AMD_SB_ACPI_MMIO_ADDR 0xfed80000 -#if CONSTANT_ACPIMMIO_BASE_ADDRESS -#define MAYBE_CONST const -#define DECLARE_ACPIMMIO(ptr, bank) \ - uint8_t *const ptr = (void *)(AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ ## bank ## _BANK) -#else -#define MAYBE_CONST -#define DECLARE_ACPIMMIO(ptr, bank) uint8_t *ptr -#endif - #ifdef __ACPI__ /* ASL fails on additions. */ @@ -161,29 +149,6 @@ #define ACPIMMIO_ASF_BASE (AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ASF_BANK) #define ACPIMMIO_SMBUS_BASE (AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_SMBUS_BANK) -extern uint8_t *MAYBE_CONST acpimmio_gpio_100; -extern uint8_t *MAYBE_CONST acpimmio_sm_pci; -extern uint8_t *MAYBE_CONST acpimmio_smi; -extern uint8_t *MAYBE_CONST acpimmio_pmio; -extern uint8_t *MAYBE_CONST acpimmio_pmio2; -extern uint8_t *MAYBE_CONST acpimmio_biosram; -extern uint8_t *MAYBE_CONST acpimmio_cmosram; -extern uint8_t *MAYBE_CONST acpimmio_cmos; -extern uint8_t *MAYBE_CONST acpimmio_acpi; -extern uint8_t *MAYBE_CONST acpimmio_asf; -extern uint8_t *MAYBE_CONST acpimmio_smbus; -extern uint8_t *MAYBE_CONST acpimmio_wdt; -extern uint8_t *MAYBE_CONST acpimmio_hpet; -extern uint8_t *MAYBE_CONST acpimmio_iomux; -extern uint8_t *MAYBE_CONST acpimmio_misc; -extern uint8_t *MAYBE_CONST acpimmio_dpvga; -extern uint8_t *MAYBE_CONST acpimmio_gpio0; -extern uint8_t *MAYBE_CONST acpimmio_xhci_pm; -extern uint8_t *MAYBE_CONST acpimmio_acdc_tmr; -extern uint8_t *MAYBE_CONST acpimmio_aoac; - -#undef MAYBE_CONST - #endif #endif /* __AMDBLOCKS_ACPIMMIO_MAP_H__ */ diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio_psp.h b/src/soc/amd/common/block/include/amdblocks/acpimmio_psp.h deleted file mode 100644 index b8ca7b5..0000000 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio_psp.h +++ /dev/null @@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#ifndef __AMDBLOCKS_ACPIMMIO_PSP_H__ -#define __AMDBLOCKS_ACPIMMIO_PSP_H__ - -#include <device/mmio.h> -#include <types.h> - -void iomux_set_bar(void *bar); -void *iomux_get_bar(void); -void misc_set_bar(void *bar); -void *misc_get_bar(void); -void gpio_set_bar(void *bar); -void *gpio_get_bar(void); -void aoac_set_bar(void *bar); -void *aoac_get_bar(void); -void io_set_bar(void *bar); -u8 io_read8(u16 reg); -void io_write8(u16 reg, u8 value); - -u8 iomux_read8(u8 reg); -u16 iomux_read16(u8 reg); -u32 iomux_read32(u8 reg); -void iomux_write8(u8 reg, u8 value); -void iomux_write16(u8 reg, u16 value); -void iomux_write32(u8 reg, u32 value); -u8 misc_read8(u8 reg); -u16 misc_read16(u8 reg); -u32 misc_read32(u8 reg); -void misc_write8(u8 reg, u8 value); -void misc_write16(u8 reg, u16 value); -void misc_write32(u8 reg, u32 value); -u8 aoac_read8(u8 reg); -void aoac_write8(u8 reg, u8 value); - -#endif -- To view, visit https://review.coreboot.org/c/coreboot/+/42523 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3cb1b5a90023ebc4359835be716c5e3f9451df60 Gerrit-Change-Number: 42523 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

5 27

Change in coreboot[master]: soc/amd/common: Move lpc_util to verstage_x86
by Kyösti Mälkki (Code Review) 15 Dec '20

15 Dec '20

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43328 ) Change subject: soc/amd/common: Move lpc_util to verstage_x86 ...................................................................... soc/amd/common: Move lpc_util to verstage_x86 The file seems to be all about PCI configuration access. Change-Id: I1e64d3d7df3caa33ee92961fe7246d03f2707ab4 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- M src/soc/amd/common/block/lpc/Makefile.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/43328/1 diff --git a/src/soc/amd/common/block/lpc/Makefile.inc b/src/soc/amd/common/block/lpc/Makefile.inc index 7db176b..b55004c 100644 --- a/src/soc/amd/common/block/lpc/Makefile.inc +++ b/src/soc/amd/common/block/lpc/Makefile.inc @@ -1,7 +1,7 @@ ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc.c bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c -verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c +verstage_x86-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c -- To view, visit https://review.coreboot.org/c/coreboot/+/43328 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1e64d3d7df3caa33ee92961fe7246d03f2707ab4 Gerrit-Change-Number: 43328 Gerrit-PatchSet: 1 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

3 8

Change in em100[master]: trace: Handle empty and oversized packets
by Stefan Reinauer (Code Review) 15 Dec '20

15 Dec '20

Hello Duncan Laurie, I'd like you to do a code review. Please visit https://review.coreboot.org/c/em100/+/48587 to review the following change. Change subject: trace: Handle empty and oversized packets ...................................................................... trace: Handle empty and oversized packets Signed-off-by: Duncan Laurie <dlaurie(a)google.com> Change-Id: I24f5d5973b47652ff1357756d9a01b85c41c1682 --- M trace.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/87/48587/1 diff --git a/trace.c b/trace.c index 46b52b2..933575e 100644 --- a/trace.c +++ b/trace.c @@ -193,9 +193,11 @@ for (report = 0; report < REPORT_BUFFER_COUNT; report++) { data = &reportdata[report][0]; count = (data[0] << 8) | data[1]; - if (count > 1022) { + if (!count) + continue; + if (count > 1023) { printf("Warning: EM100pro sends too much data.\n"); - count = 1022; + count = 1023; } for (i = 0; i < count; i++) { unsigned int j = additional_pad_bytes; -- To view, visit https://review.coreboot.org/c/em100/+/48587 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I24f5d5973b47652ff1357756d9a01b85c41c1682 Gerrit-Change-Number: 48587 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-MessageType: newchange

3 4

Change in em100[master]: Add more traceable SPI commands
by Stefan Reinauer (Code Review) 15 Dec '20

15 Dec '20

Hello Duncan Laurie, I'd like you to do a code review. Please visit https://review.coreboot.org/c/em100/+/48584 to review the following change. Change subject: Add more traceable SPI commands ...................................................................... Add more traceable SPI commands Some commands always require 4 byte addresses, some require 3 or 2 depending on the mode, and some don't require an address. Adjust the table accordingly. This is inspired by some code from Duncan. Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Signed-off-by: Duncan Laurie <dlaurie(a)google.com> Change-Id: I9002253bf6eb7d60c90cdb75492076d5c5c48f21 --- M trace.c 1 file changed, 47 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/84/48584/1 diff --git a/trace.c b/trace.c index 108691b..46b52b2 100644 --- a/trace.c +++ b/trace.c @@ -110,27 +110,49 @@ }; struct spi_cmd_values spi_command_list[] = { - /* name cmd, addr, pad */ - {"write status register", 0x01, 0, 0}, - {"page program", 0x02, 1, 0}, - {"read", 0x03, 1, 0}, - {"write disable", 0x04, 0, 0}, - {"read status register", 0x05, 0, 0}, - {"write enable", 0x06, 0, 0}, - {"fast read", 0x0b, 1, 1}, - {"EM100 specific", 0x11, 0, 0}, - {"fast dual read", 0x3b, 1, 2}, - {"chip erase", 0x60, 0, 0}, - {"read JEDEC ID", 0x9f, 0, 0}, - {"chip erase", 0xc7, 0, 0}, - {"sector erase", 0xd8, 1, 0}, - {"enter 4-byte address mode", 0xb7, 0, 0}, - {"exit 4-byte address mode", 0xe9, 0, 0}, - {"enter quad i/o mode", 0x35, 0, 0}, - {"exit quad i/o mode", 0xf5, 0, 0}, - {"read SFDP Table", 0x5a, 1, 0}, + /* name cmd, addr, pad */ + {"read SFDP", 0x5a, 1, 0}, + {"write status register", 0x01, 0, 0}, + {"page program", 0x02, 1, 0}, + {"read", 0x03, 1, 0}, + {"write disable", 0x04, 0, 0}, + {"read status register", 0x05, 0, 0}, + {"write enable", 0x06, 0, 0}, + {"fast read", 0x0b, 1, 1}, + {"EM100 specific", 0x11, 0, 0}, + {"fast dual read", 0x3b, 1, 2}, + {"chip erase", 0x60, 0, 0}, + {"read JEDEC ID", 0x9f, 0, 0}, + {"chip erase c7h", 0xc7, 0, 0}, + {"chip erase 60h", 0x60, 0, 0}, + {"sector erase", 0xd8, 1, 0}, + {"dual I/O read", 0xbb, 1, 2}, + {"quad I/O read", 0xeb, 1, 0}, + {"quad read", 0x6b, 1, 0}, + {"quad I/O dt read", 0xed, 1, 0}, + {"quad page program", 0x38, 1, 0}, + {"sector erase", 0x20, 1, 0}, + {"block erase 32KB", 0x52, 1, 0}, + {"block erase 64KB", 0xd8, 1, 0}, + {"enter 4b mode", 0xb7, 0, 0}, + {"exit 4b mode", 0xe9, 0, 0}, + {"read 4b", 0x13, 2, 0}, + {"fast read 4b", 0x0c, 2, 0}, + {"dual I/O read 4b", 0xbc, 2, 0}, + {"dual out read 4b", 0x3c, 2, 0}, + {"quad I/O read 4b", 0xec, 2, 0}, + {"quad out read 4b", 0x6c, 2, 0}, + {"quad I/O dt read 4b", 0xee, 2, 0}, + {"page program 4b", 0x12, 2, 0}, + {"quad page program 4b", 0x3e, 2, 0}, + {"block erase 64KB 4b", 0xdc, 2, 0}, + {"block erase 32KB 4b", 0x5c, 2, 0}, + {"sector erase 4b", 0x21, 2, 0}, + {"enter quad I/O mode", 0x35, 0, 0}, + {"exit quad I/O mode", 0xf5, 0, 0}, - {"unknown command", 0xff, 0, 0} + {"unknown command", 0xff, 0, 0} + }; static struct spi_cmd_values * get_command_vals(uint8_t command) @@ -221,13 +243,17 @@ if (!spi_cmd_vals->uses_address) { j = 1; /* skip command byte */ } else { + /* If address_mode > 1 -> always decode 4 bytes */ + int address_bytes = + (spi_cmd_vals->uses_address == 1) ? address_mode : 4; + if (address_mode == 3) address = (data[i * 8 + 5] << 16) + (data[i * 8 + 6] << 8) + data[i * 8 + 7]; else address = (data[i * 8 + 5] << 24) + (data[i * 8 + 6] << 16) + (data[i * 8 + 7] << 8) + data[i * 8 + 8]; /* skip command, address bytes, and padding */ - j = 1 + address_mode + spi_cmd_vals->pad_bytes; + j = 1 + address_bytes + spi_cmd_vals->pad_bytes; if (j > MAX_TRACE_BLOCKLENGTH) { additional_pad_bytes = j - MAX_TRACE_BLOCKLENGTH; -- To view, visit https://review.coreboot.org/c/em100/+/48584 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I9002253bf6eb7d60c90cdb75492076d5c5c48f21 Gerrit-Change-Number: 48584 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Duncan Laurie <dlaurie(a)chromium.org> Gerrit-MessageType: newchange

3 11

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2020