coreboot-gerrit December 2019

coreboot-gerrit@coreboot.org

1 participants
1761 discussions

Change in coreboot[master]: soc/mediatek/mt8183: TX RX window donot fast K for High frequency
by huayang duan (Code Review) 12 Dec '19

12 Dec '19

huayang duan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36921 ) Change subject: soc/mediatek/mt8183: TX RX window donot fast K for High frequency ...................................................................... soc/mediatek/mt8183: TX RX window donot fast K for High frequency TX RX window can do fast calibraton at lower frquency, like 1600Mbps, 2400Mbps, but High frequency can't do fast calibraton. BUG=b:80501386,b:142358843 BRANCH=kukui TEST=Boots correctly on Kukui Change-Id: I00d563ece4cf91ef5e8e12b6cf7f777849375a24 --- M src/soc/mediatek/mt8183/dramc_pi_calibration_api.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/36921/1 diff --git a/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c b/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c old mode 100644 new mode 100755 index 16f2878..414133a --- a/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c +++ b/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c @@ -1788,7 +1788,7 @@ u8 fsp = get_freq_fsq(freq_group); u8 vref_range = !fsp; - bool bypass_tx = !fsp; + bool bypass_tx_rx = !fsp; dramc_get_vref_prop(rank, type, fsp, &vref_scan_enable, &vref_begin, &vref_end); @@ -1826,9 +1826,9 @@ vref_step = 2; } - if (fast_calib && bypass_tx && + if (fast_calib && bypass_tx_rx && (type == TX_WIN_DQ_ONLY || type == TX_WIN_DQ_DQM)) { - dramc_set_tx_best_dly(chn, rank, true, vref_dly.perbit_dly, + dramc_set_tx_best_dly(chn, rank, bypass_tx_rx, vref_dly.perbit_dly, type, freq_group, dq_precal_result, dly_cell_unit, params, fast_calib); @@ -1872,7 +1872,7 @@ RX_DQ, FIRST_DQ_DELAY); } - if (fast_calib && + if (fast_calib && bypass_tx_rx && (type == RX_WIN_RD_DQC || type == RX_WIN_TEST_ENG)) { dramc_dbg("bypass RX params\n"); for (size_t bit = 0; bit < DQ_DATA_WIDTH; bit++) { -- To view, visit https://review.coreboot.org/c/coreboot/+/36921 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I00d563ece4cf91ef5e8e12b6cf7f777849375a24 Gerrit-Change-Number: 36921 Gerrit-PatchSet: 1 Gerrit-Owner: huayang duan <huayangduan(a)gmail.com> Gerrit-MessageType: newchange

7 17

Change in coreboot[4.11_branch]: mb/ocp/monolake: Override SMBIOS data with IPMI read FRU data
by Patrick Georgi (Code Review) 12 Dec '19

12 Dec '19

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37445 ) Change subject: mb/ocp/monolake: Override SMBIOS data with IPMI read FRU data ...................................................................... mb/ocp/monolake: Override SMBIOS data with IPMI read FRU data SMBIOS type 1 data fields are overwritten by FRU product info area data, SMBIOS type 2 fields are overwritten by FRU board info area data. Tested on OCP Mono Lake. Change-Id: I58cbe95055dea053b115e99f354f40d5902c6a35 Signed-off-by: Johnny Lin <johnny_lin(a)wiwynn.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37445 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M src/mainboard/ocp/monolake/Kconfig M src/mainboard/ocp/monolake/mainboard.c 2 files changed, 89 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/src/mainboard/ocp/monolake/Kconfig b/src/mainboard/ocp/monolake/Kconfig index 7d85bbb..bbc29a3 100644 --- a/src/mainboard/ocp/monolake/Kconfig +++ b/src/mainboard/ocp/monolake/Kconfig @@ -60,4 +60,6 @@ config IPMI_KCS_REGISTER_SPACING default 4 +config IPMI_FRU_SINGLE_RW_SZ + default 16 endif # BOARD_OCP_MONOLAKE diff --git a/src/mainboard/ocp/monolake/mainboard.c b/src/mainboard/ocp/monolake/mainboard.c index a75aae7..9a1c995 100644 --- a/src/mainboard/ocp/monolake/mainboard.c +++ b/src/mainboard/ocp/monolake/mainboard.c @@ -30,6 +30,9 @@ #define VPD_LEN 10 /* Default countdown is 15 minutes. */ #define DEFAULT_COUNTDOWN 9000 +#define FRU_DEVICE_ID 0 + +static struct fru_info_str fru_strings; static void init_frb2_wdt(void) { @@ -76,6 +79,7 @@ clear_ipmi_flags(&rsp); system_reset(); } + read_fru_areas(BMC_KCS_BASE, FRU_DEVICE_ID, 0, &fru_strings); } struct chip_operations mainboard_ops = { @@ -101,3 +105,86 @@ { ipmi_get_system_guid(BMC_KCS_BASE, uuid); } +/* Override SMBIOS type 1 data. */ +const char *smbios_system_manufacturer(void) +{ + if (fru_strings.prod_info.manufacturer != NULL) + return (const char *)fru_strings.prod_info.manufacturer; + else + return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; +} + +const char *smbios_system_product_name(void) +{ + char *prod_name_partnumber; + /* Concatenates IPMI FRU Product Info product name + * and product part number. */ + if (fru_strings.prod_info.product_name != NULL) { + if (fru_strings.prod_info.product_partnumber != NULL) { + /* Append a space after product_name. */ + prod_name_partnumber = strconcat(fru_strings.prod_info.product_name, + " "); + if (!prod_name_partnumber) + return (const char *)fru_strings.prod_info.product_name; + + prod_name_partnumber = strconcat(prod_name_partnumber, + fru_strings.prod_info.product_partnumber); + if (!prod_name_partnumber) + return (const char *)fru_strings.prod_info.product_name; + + return (const char *)prod_name_partnumber; + } else { + return (const char *)fru_strings.prod_info.product_name; + } + } else { + return CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME; + } +} + +const char *smbios_system_serial_number(void) +{ + if (fru_strings.prod_info.serial_number != NULL) + return (const char *)fru_strings.prod_info.serial_number; + else + return CONFIG_MAINBOARD_SERIAL_NUMBER; +} + +const char *smbios_system_version(void) +{ + if (fru_strings.prod_info.product_version != NULL) + return (const char *)fru_strings.prod_info.product_version; + else + return CONFIG_MAINBOARD_SERIAL_NUMBER; +} +/* Override SMBIOS type 2 data. */ +const char *smbios_mainboard_version(void) +{ + if (fru_strings.board_info.part_number != NULL) + return (const char *)fru_strings.board_info.part_number; + else + return CONFIG_MAINBOARD_VERSION; +} + +const char *smbios_mainboard_manufacturer(void) +{ + if (fru_strings.board_info.manufacturer != NULL) + return (const char *)fru_strings.board_info.manufacturer; + else + return CONFIG_MAINBOARD_SMBIOS_MANUFACTURER; +} + +const char *smbios_mainboard_product_name(void) +{ + if (fru_strings.board_info.product_name != NULL) + return (const char *)fru_strings.board_info.product_name; + else + return CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME; +} + +const char *smbios_mainboard_serial_number(void) +{ + if (fru_strings.board_info.serial_number != NULL) + return (const char *)fru_strings.board_info.serial_number; + else + return CONFIG_MAINBOARD_SERIAL_NUMBER; +} -- To view, visit https://review.coreboot.org/c/coreboot/+/37445 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: 4.11_branch Gerrit-Change-Id: I58cbe95055dea053b115e99f354f40d5902c6a35 Gerrit-Change-Number: 37445 Gerrit-PatchSet: 12 Gerrit-Owner: Johnny Lin Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Jingle Hsu Gerrit-Reviewer: Johnny Lin Gerrit-Reviewer: Jonathan Zhang <jonzhang(a)fb.com> Gerrit-Reviewer: Morgan Jang Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[4.11_branch]: drivers/ipmi: Add IPMI Read FRU function
by Patrick Georgi (Code Review) 12 Dec '19

12 Dec '19

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37444 ) Change subject: drivers/ipmi: Add IPMI Read FRU function ...................................................................... drivers/ipmi: Add IPMI Read FRU function Implemented according to IPMI "Platform Management FRU Information Storage Definition" specification v1.0 for reading FRU data Product Info Area and Board Info Area. SMBIOS data can be updated with the FRU data. Tested on OCP Mono Lake. Change-Id: Id6353f5ce3f7ddd3bb161b91364b3cf276d020b8 Signed-off-by: Johnny Lin <johnny_lin(a)wiwynn.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37444 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M src/drivers/ipmi/Kconfig M src/drivers/ipmi/Makefile.inc A src/drivers/ipmi/ipmi_fru.c M src/drivers/ipmi/ipmi_kcs.h M src/drivers/ipmi/ipmi_ops.h 5 files changed, 494 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/src/drivers/ipmi/Kconfig b/src/drivers/ipmi/Kconfig index 0f7152d..37cfc0d 100644 --- a/src/drivers/ipmi/Kconfig +++ b/src/drivers/ipmi/Kconfig @@ -8,3 +8,13 @@ depends on IPMI_KCS help KCS status and command register IO port address spacing + +config IPMI_FRU_SINGLE_RW_SZ + int + default 16 + depends on IPMI_KCS + help + The data size in a single IPMI FRU read/write command. + IPMB messages are limited to 32-bytes total. When the + data size is larger than this value, IPMI can complete + reading/writing the data over multiple commands. diff --git a/src/drivers/ipmi/Makefile.inc b/src/drivers/ipmi/Makefile.inc index 9d5b3d4..973fff8 100644 --- a/src/drivers/ipmi/Makefile.inc +++ b/src/drivers/ipmi/Makefile.inc @@ -1,3 +1,4 @@ ramstage-$(CONFIG_IPMI_KCS) += ipmi_kcs.c ramstage-$(CONFIG_IPMI_KCS) += ipmi_kcs_ops.c ramstage-$(CONFIG_IPMI_KCS) += ipmi_ops.c +ramstage-$(CONFIG_IPMI_KCS) += ipmi_fru.c diff --git a/src/drivers/ipmi/ipmi_fru.c b/src/drivers/ipmi/ipmi_fru.c new file mode 100644 index 0000000..a5e6ea6 --- /dev/null +++ b/src/drivers/ipmi/ipmi_fru.c @@ -0,0 +1,409 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2019 Wiwynn Corp. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <console/console.h> +#include <string.h> +#include <delay.h> +#include "ipmi_ops.h" + +#define MAX_FRU_BUSY_RETRY 5 +#define READ_FRU_DATA_RETRY_INTERVAL_MS 30 /* From IPMI spec v2.0 rev 1.1 */ +#define OFFSET_LENGTH_MULTIPLIER 8 /* offsets/lengths are multiples of 8 */ +#define NUM_DATA_BYTES(t) (t & 0x3f) /* Encoded in type/length byte */ + +static enum cb_err ipmi_read_fru(const int port, struct ipmi_read_fru_data_req *req, + uint8_t *fru_data) +{ + int ret; + uint8_t total_size; + uint16_t offset = 0; + struct ipmi_read_fru_data_rsp rsp; + int retry_count = 0; + + if (req == NULL || fru_data == NULL) { + printk(BIOS_ERR, "%s failed, null pointer parameter\n", + __func__); + return CB_ERR; + } + + total_size = req->count; + do { + if (req->count > CONFIG_IPMI_FRU_SINGLE_RW_SZ) + req->count = CONFIG_IPMI_FRU_SINGLE_RW_SZ; + + while (retry_count <= MAX_FRU_BUSY_RETRY) { + ret = ipmi_kcs_message(port, IPMI_NETFN_STORAGE, 0x0, + IPMI_READ_FRU_DATA, (const unsigned char *) req, + sizeof(*req), (unsigned char *) &rsp, sizeof(rsp)); + if (rsp.resp.completion_code == 0x81) { + /* Device is busy */ + if (retry_count == MAX_FRU_BUSY_RETRY) { + printk(BIOS_ERR, "IPMI: %s command failed, " + "device busy timeout\n", __func__); + return CB_ERR; + } + printk(BIOS_ERR, "IPMI: FRU device is busy, " + "retry count:%d\n", retry_count); + retry_count++; + mdelay(READ_FRU_DATA_RETRY_INTERVAL_MS); + } else if (ret < sizeof(struct ipmi_rsp) || rsp.resp.completion_code) { + printk(BIOS_ERR, "IPMI: %s command failed (ret=%d resp=0x%x)\n", + __func__, ret, rsp.resp.completion_code); + return CB_ERR; + } + break; + } + retry_count = 0; + memcpy(fru_data + offset, rsp.data, rsp.count); + offset += rsp.count; + total_size -= rsp.count; + req->fru_offset += rsp.count; + req->count = total_size; + } while (total_size > 0); + + return CB_SUCCESS; +} + +/* data: data to check, offset: offset to checksum. */ +static uint8_t checksum(uint8_t *data, int offset) +{ + uint8_t c = 0; + for (; offset > 0; offset--, data++) + c += *data; + return -c; +} + +static uint8_t data2str(const uint8_t *frudata, char *stringdata, uint8_t length) +{ + uint8_t type; + + /* bit[7:6] is the type code. */ + type = ((frudata[0] & 0xc0) >> 6); + if (type != ASCII_8BIT) { + printk(BIOS_ERR, "%s typecode %d is unsupported, FRU string only " + "supports 8-bit ASCII + Latin 1 for now.\n", __func__, type); + return 0; + } + /* In the spec the string data is always the next byte to the type/length byte. */ + memcpy(stringdata, frudata + 1, length); + stringdata[length] = '\0'; + return length; +} + +static void read_fru_board_info_area(const int port, const uint8_t id, + uint8_t offset, struct fru_board_info *info) +{ + uint8_t length; + struct ipmi_read_fru_data_req req; + uint8_t *data_ptr; + + offset = offset * OFFSET_LENGTH_MULTIPLIER; + if (!offset) + return; + req.fru_device_id = id; + /* Read Board Info Area length first. */ + req.fru_offset = offset + 1; + req.count = sizeof(length); + if (ipmi_read_fru(port, &req, &length) != CB_SUCCESS || !length) { + printk(BIOS_ERR, "%s failed, length: %d\n", __func__, length); + return; + } + length = length * OFFSET_LENGTH_MULTIPLIER; + data_ptr = (uint8_t *)malloc(length); + if (!data_ptr) { + printk(BIOS_ERR, "malloc %d bytes for board info failed\n", length); + return; + } + + /* Read Board Info Area data. */ + req.fru_offset = offset; + req.count = length; + if (ipmi_read_fru(port, &req, data_ptr) != CB_SUCCESS) { + printk(BIOS_ERR, "%s failed to read fru\n", __func__); + goto out; + } + if (checksum(data_ptr, length)) { + printk(BIOS_ERR, "Bad FRU board info checksum.\n"); + goto out; + } + /* Read manufacturer string, bit[5:0] is the string length. */ + length = NUM_DATA_BYTES(data_ptr[BOARD_MAN_TYPE_LEN_OFFSET]); + data_ptr += BOARD_MAN_TYPE_LEN_OFFSET; + if (length > 0) { + info->manufacturer = malloc(length + 1); + if (!info->manufacturer) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "manufacturer.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->manufacturer, length)) + free(info->manufacturer); + } + + /* Read product name string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->product_name = malloc(length+1); + if (!info->product_name) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "product_name.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->product_name, length)) + free(info->product_name); + } + + /* Read serial number string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->serial_number = malloc(length + 1); + if (!info->serial_number) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "serial_number.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->serial_number, length)) + free(info->serial_number); + } + + /* Read part number string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->part_number = malloc(length + 1); + if (!info->part_number) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "part_number.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->part_number, length)) + free(info->part_number); + } + +out: + free(data_ptr); +} + +static void read_fru_product_info_area(const int port, const uint8_t id, + uint8_t offset, struct fru_product_info *info) +{ + uint8_t length; + struct ipmi_read_fru_data_req req; + uint8_t *data_ptr; + + offset = offset * OFFSET_LENGTH_MULTIPLIER; + if (!offset) + return; + + req.fru_device_id = id; + /* Read Product Info Area length first. */ + req.fru_offset = offset + 1; + req.count = sizeof(length); + if (ipmi_read_fru(port, &req, &length) != CB_SUCCESS || !length) { + printk(BIOS_ERR, "%s failed, length: %d\n", __func__, length); + return; + } + length = length * OFFSET_LENGTH_MULTIPLIER; + data_ptr = (uint8_t *)malloc(length); + if (!data_ptr) { + printk(BIOS_ERR, "malloc %d bytes for product info failed\n", length); + return; + } + + /* Read Product Info Area data. */ + req.fru_offset = offset; + req.count = length; + if (ipmi_read_fru(port, &req, data_ptr) != CB_SUCCESS) { + printk(BIOS_ERR, "%s failed to read fru\n", __func__); + goto out; + } + if (checksum(data_ptr, length)) { + printk(BIOS_ERR, "Bad FRU product info checksum.\n"); + goto out; + } + /* Read manufacturer string, bit[5:0] is the string length. */ + length = NUM_DATA_BYTES(data_ptr[PRODUCT_MAN_TYPE_LEN_OFFSET]); + data_ptr += PRODUCT_MAN_TYPE_LEN_OFFSET; + if (length > 0) { + info->manufacturer = malloc(length + 1); + if (!info->manufacturer) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "manufacturer.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->manufacturer, length)) + free(info->manufacturer); + } + + /* Read product_name string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->product_name = malloc(length + 1); + if (!info->product_name) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "product_name.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->product_name, length)) + free(info->product_name); + } + + /* Read product part/model number. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->product_partnumber = malloc(length + 1); + if (!info->product_partnumber) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "product_partnumber.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->product_partnumber, length)) + free(info->product_partnumber); + } + + /* Read product version string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->product_version = malloc(length + 1); + if (!info->product_version) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "product_version.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->product_version, length)) + free(info->product_version); + } + + /* Read serial number string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->serial_number = malloc(length + 1); + if (!info->serial_number) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "serial_number.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->serial_number, length)) + free(info->serial_number); + } + + /* Read asset tag string. */ + data_ptr += length + 1; + length = NUM_DATA_BYTES(data_ptr[0]); + if (length > 0) { + info->asset_tag = malloc(length + 1); + if (!info->asset_tag) { + printk(BIOS_ERR, "%s failed to malloc %d bytes for " + "asset_tag.\n", __func__, length + 1); + goto out; + } + if (!data2str((const uint8_t *)data_ptr, info->asset_tag, length)) + free(info->serial_number); + } + +out: + free(data_ptr); +} + +void read_fru_areas(const int port, const uint8_t id, uint16_t offset, + struct fru_info_str *fru_info_str) +{ + struct ipmi_read_fru_data_req req; + struct ipmi_fru_common_hdr fru_common_hdr; + + /* Set all the char pointers to 0 first, to avoid mainboard + * overwriting SMBIOS string with any non-NULL char pointer + * by accident. */ + memset(fru_info_str, 0, sizeof(*fru_info_str)); + req.fru_device_id = id; + req.fru_offset = offset; + req.count = sizeof(fru_common_hdr); + /* Read FRU common header first */ + if (ipmi_read_fru(port, &req, (uint8_t *)&fru_common_hdr) == CB_SUCCESS) { + if (checksum((uint8_t *)&fru_common_hdr, sizeof(fru_common_hdr))) { + printk(BIOS_ERR, "Bad FRU common header checksum.\n"); + return; + } + printk(BIOS_DEBUG, "FRU common header: format_version: %x\n" + "product_area_offset: %x\n" + "board_area_offset: %x\n" + "chassis_area_offset: %x\n", + fru_common_hdr.format_version, + fru_common_hdr.product_area_offset, + fru_common_hdr.board_area_offset, + fru_common_hdr.chassis_area_offset); + } else { + printk(BIOS_ERR, "Read FRU common header failed\n"); + return; + } + + read_fru_product_info_area(port, id, fru_common_hdr.product_area_offset, + &fru_info_str->prod_info); + read_fru_board_info_area(port, id, fru_common_hdr.board_area_offset, + &fru_info_str->board_info); + /* ToDo: Add read_fru_chassis_info_area(). */ +} + +void read_fru_one_area(const int port, const uint8_t id, uint16_t offset, + struct fru_info_str *fru_info_str, enum fru_area fru_area) +{ + struct ipmi_read_fru_data_req req; + struct ipmi_fru_common_hdr fru_common_hdr; + + req.fru_device_id = id; + req.fru_offset = offset; + req.count = sizeof(fru_common_hdr); + if (ipmi_read_fru(port, &req, (uint8_t *)&fru_common_hdr) == CB_SUCCESS) { + if (checksum((uint8_t *)&fru_common_hdr, sizeof(fru_common_hdr))) { + printk(BIOS_ERR, "Bad FRU common header checksum.\n"); + return; + } + printk(BIOS_DEBUG, "FRU common header: format_version: %x\n" + "product_area_offset: %x\n" + "board_area_offset: %x\n" + "chassis_area_offset: %x\n", + fru_common_hdr.format_version, + fru_common_hdr.product_area_offset, + fru_common_hdr.board_area_offset, + fru_common_hdr.chassis_area_offset); + } else { + printk(BIOS_ERR, "Read FRU common header failed\n"); + return; + } + + switch (fru_area) { + case PRODUCT_INFO_AREA: + memset(&fru_info_str->prod_info, 0, sizeof(fru_info_str->prod_info)); + read_fru_product_info_area(port, id, fru_common_hdr.product_area_offset, + &fru_info_str->prod_info); + break; + case BOARD_INFO_AREA: + memset(&fru_info_str->board_info, 0, sizeof(fru_info_str->board_info)); + read_fru_board_info_area(port, id, fru_common_hdr.board_area_offset, + &fru_info_str->board_info); + break; + /* ToDo: Add case for CHASSIS_INFO_AREA. */ + default: + printk(BIOS_ERR, "Invalid fru_area: %d\n", fru_area); + break; + } +} diff --git a/src/drivers/ipmi/ipmi_kcs.h b/src/drivers/ipmi/ipmi_kcs.h index b377521..9a04377 100644 --- a/src/drivers/ipmi/ipmi_kcs.h +++ b/src/drivers/ipmi/ipmi_kcs.h @@ -31,6 +31,7 @@ #define IPMI_NETFN_FIRMWARE 0x08 #define IPMI_NETFN_STORAGE 0x0a +#define IPMI_READ_FRU_DATA 0x11 #define IPMI_NETFN_TRANSPORT 0x0c #define IPMI_CMD_ACPI_POWERON 0x06 diff --git a/src/drivers/ipmi/ipmi_ops.h b/src/drivers/ipmi/ipmi_ops.h index 77fc727..dd12786 100644 --- a/src/drivers/ipmi/ipmi_ops.h +++ b/src/drivers/ipmi/ipmi_ops.h @@ -49,6 +49,70 @@ struct ipmi_rsp resp; uint8_t data[16]; } __packed; + +struct ipmi_read_fru_data_req { + uint8_t fru_device_id; + uint16_t fru_offset; + uint8_t count; /* count to read, 1-based. */ +} __packed; + +struct ipmi_read_fru_data_rsp { + struct ipmi_rsp resp; + uint8_t count; /* count returned, 1-based. */ + uint8_t data[CONFIG_IPMI_FRU_SINGLE_RW_SZ]; +} __packed; + +/* Platform Management FRU Information Storage Definition Spec. */ +#define PRODUCT_MAN_TYPE_LEN_OFFSET 3 +#define BOARD_MAN_TYPE_LEN_OFFSET 6 + +struct ipmi_fru_common_hdr { + uint8_t format_version; + uint8_t internal_use_area_offset; + uint8_t chassis_area_offset; + uint8_t board_area_offset; + uint8_t product_area_offset; + uint8_t multirecord_area_offset; + uint8_t pad; + uint8_t checksum; +} __packed; + +/* The fru_xxx_info only declares the strings that may be added to SMBIOS. */ +struct fru_product_info { + char *manufacturer; + char *product_name; + char *product_partnumber; + char *product_version; + char *serial_number; + char *asset_tag; +}; + +struct fru_board_info { + char *manufacturer; + char *product_name; + char *serial_number; + char *part_number; +}; + +struct fru_info_str { + struct fru_product_info prod_info; + struct fru_board_info board_info; +}; + +enum typecode { + BINARY = 0, + BCD_PLUS = 1, + ASCII_6BIT = 2, + ASCII_8BIT = 3, +}; + +enum fru_area { + INTERNAL_USE_AREA = 0, + CHASSIS_INFO_AREA = 1, + BOARD_INFO_AREA = 2, + PRODUCT_INFO_AREA = 3, + MULTIRECORD_INFO_AREA = 4, +}; /* * Initialize and start BMC FRB2 watchdog timer with the * provided timer countdown and action values. @@ -62,4 +126,13 @@ /* IPMI get BMC system GUID and store it to parameter uuid. * Returns CB_SUCCESS on success and CB_ERR if an error occurred */ enum cb_err ipmi_get_system_guid(const int port, uint8_t *uuid); + +/* Read all FRU inventory areas string data into fru_info_str with + * the same FRU device id. */ +void read_fru_areas(const int port, uint8_t id, uint16_t offset, + struct fru_info_str *fru_info_str); + +/* Read a particular FRU inventory area into fru_info_str. */ +void read_fru_one_area(const int port, uint8_t id, uint16_t offset, + struct fru_info_str *fru_info_str, enum fru_area fru_area); #endif -- To view, visit https://review.coreboot.org/c/coreboot/+/37444 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: 4.11_branch Gerrit-Change-Id: Id6353f5ce3f7ddd3bb161b91364b3cf276d020b8 Gerrit-Change-Number: 37444 Gerrit-PatchSet: 9 Gerrit-Owner: Johnny Lin Gerrit-Reviewer: Andrey Petrov <andrey.petrov(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Jingle Hsu Gerrit-Reviewer: Johnny Lin Gerrit-Reviewer: Jonathan Zhang <jonzhang(a)fb.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Morgan Jang Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/google/hatch: Add new SKU ID 3 and 4
by Peichao Li (Code Review) 12 Dec '19

12 Dec '19

Peichao Li has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37498 ) Change subject: mb/google/hatch: Add new SKU ID 3 and 4 ...................................................................... mb/google/hatch: Add new SKU ID 3 and 4 1. SKU ID 1 and 3 for eMMC 2. SKU ID 2 and 4 for SSD BUG=b:144815890 TEST=FW_NAME="akemi" emerge-hatch coreboot chromeos-bootimage Signed-off-by: Peichao Wang <peichao.wang(a)bitland.corp-partner.google.com> Change-Id: I25f0c4142be024ba55f671491601d1f6ec26d68a --- M src/mainboard/google/hatch/variants/akemi/gpio.c M src/mainboard/google/hatch/variants/akemi/variant.c 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/37498/1 diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c index 4be3c34..0780ddb 100644 --- a/src/mainboard/google/hatch/variants/akemi/gpio.c +++ b/src/mainboard/google/hatch/variants/akemi/gpio.c @@ -164,7 +164,7 @@ { uint32_t sku_id = get_board_sku(); /* For SSD SKU */ - if (sku_id == 2) { + if ((sku_id == 2) || (sku_id == 4)) { *num = ARRAY_SIZE(ssd_sku_gpio_table); return ssd_sku_gpio_table; } diff --git a/src/mainboard/google/hatch/variants/akemi/variant.c b/src/mainboard/google/hatch/variants/akemi/variant.c index c648a52..fed3e4f 100644 --- a/src/mainboard/google/hatch/variants/akemi/variant.c +++ b/src/mainboard/google/hatch/variants/akemi/variant.c @@ -27,17 +27,17 @@ emmc_host = pcidev_path_on_root(PCH_DEVFN_EMMC); ssd_host = pcidev_path_on_root(PCH_DEVFN_SATA); - /* SKU ID 2 doesn't have a eMMC device, hence disable it. */ + /* SKU ID 2 and 4 install SSD device, hence disable it. */ sku_id = get_board_sku(); - if (sku_id == 2) { + if ((sku_id == 2) || (sku_id == 4)) { if (emmc_host == NULL) return; emmc_host->enabled = 0; cfg->ScsEmmcHs400Enabled = 0; } - /* SKU ID 1 doesn't have a SSD device, hence disable it. */ - if (sku_id == 1) { + /* SKU ID 1 and 3 install eMMC device, hence disable it. */ + if ((sku_id == 1) || (sku_id == 3)) { if (ssd_host == NULL) return; ssd_host->enabled = 0; -- To view, visit https://review.coreboot.org/c/coreboot/+/37498 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I25f0c4142be024ba55f671491601d1f6ec26d68a Gerrit-Change-Number: 37498 Gerrit-PatchSet: 1 Gerrit-Owner: Peichao Li <peichao.wang(a)bitland.corp-partner.google.com> Gerrit-MessageType: newchange

5 9

Change in coreboot[master]: mb/**/hda_verb.c: Clean up formatting
by Angel Pons (Code Review) 12 Dec '19

12 Dec '19

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37541 ) Change subject: mb/**/hda_verb.c: Clean up formatting ...................................................................... mb/**/hda_verb.c: Clean up formatting Change-Id: Ibe2d92990d0074266aa05ada749e9dad55e609a2 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/mainboard/apple/macbook21/hda_verb.c M src/mainboard/apple/macbookair4_2/hda_verb.c M src/mainboard/asrock/b75pro3-m/hda_verb.c M src/mainboard/asrock/h110m/hda_verb.c M src/mainboard/asus/h61m-cs/hda_verb.c M src/mainboard/asus/p8h61-m_pro/hda_verb.c M src/mainboard/asus/p8z77-m_pro/hda_verb.c M src/mainboard/compulab/intense_pc/hda_verb.c M src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c M src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c M src/mainboard/google/butterfly/hda_verb.c M src/mainboard/hp/2570p/hda_verb.c M src/mainboard/hp/2760p/hda_verb.c M src/mainboard/hp/8460p/hda_verb.c M src/mainboard/hp/8770w/hda_verb.c M src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c M src/mainboard/hp/folio_9470m/hda_verb.c M src/mainboard/hp/revolve_810_g1/hda_verb.c M src/mainboard/hp/z220_sff_workstation/hda_verb.c M src/mainboard/intel/dcp847ske/hda_verb.c M src/mainboard/lenovo/l520/hda_verb.c M src/mainboard/lenovo/s230u/hda_verb.c M src/mainboard/lenovo/t410/hda_verb.c M src/mainboard/lenovo/t420/hda_verb.c M src/mainboard/lenovo/t420s/hda_verb.c M src/mainboard/lenovo/t430/hda_verb.c M src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c M src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c M src/mainboard/lenovo/t440p/hda_verb.c M src/mainboard/lenovo/t520/hda_verb.c M src/mainboard/lenovo/t530/hda_verb.c M src/mainboard/lenovo/t60/hda_verb.c M src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c M src/mainboard/lenovo/x201/hda_verb.c M src/mainboard/lenovo/x220/hda_verb.c M src/mainboard/lenovo/x230/hda_verb.c M src/mainboard/lenovo/x60/hda_verb.c M src/mainboard/msi/ms7707/hda_verb.c M src/mainboard/packardbell/ms2290/hda_verb.c M src/mainboard/sapphire/pureplatinumh61/hda_verb.c 40 files changed, 539 insertions(+), 1,434 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/37541/1 diff --git a/src/mainboard/apple/macbook21/hda_verb.c b/src/mainboard/apple/macbook21/hda_verb.c index 3d87d3d..0d4149c 100644 --- a/src/mainboard/apple/macbook21/hda_verb.c +++ b/src/mainboard/apple/macbook21/hda_verb.c @@ -17,80 +17,34 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ 0x83847680, /* Codec Vendor / Device ID: SigmaTel STAC9221 A1 */ -#if CONFIG(BOARD_APPLE_MACBOOK11) || \ - CONFIG(BOARD_APPLE_MACBOOK21) +#if CONFIG(BOARD_APPLE_MACBOOK11) || CONFIG(BOARD_APPLE_MACBOOK21) 0x106b2200, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ - AZALIA_SUBVENDOR(0x0, 0x106B2200), - - /* NID 0x0A. */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x0321E21F), - - /* NID 0x0B. */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x03A1E02E), - - /* NID 0x0C. */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x9017E110), - - /* NID 0x0D. */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x9017E11F), - - /* NID 0x0E. */ - AZALIA_PIN_CFG(0x0, 0x0E, 0x400000FE), - - /* NID 0x0F */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x0381E020), - - /* NID 0x10 */ - AZALIA_PIN_CFG(0x0, 0x10, 0x1345E230), - - /* NID 0x11 */ - AZALIA_PIN_CFG(0x0, 0x11, 0x13C5E240), - - /* NID 0x15 */ - AZALIA_PIN_CFG(0x0, 0x15, 0x400000FC), - - /* NID 0x1B. */ - AZALIA_PIN_CFG(0x0, 0x1B, 0x400000FB), + AZALIA_SUBVENDOR(0x0, 0x106b2200), + AZALIA_PIN_CFG(0x0, 0x0a, 0x0321e21f), + AZALIA_PIN_CFG(0x0, 0x0b, 0x03a1e02e), + AZALIA_PIN_CFG(0x0, 0x0c, 0x9017e110), + AZALIA_PIN_CFG(0x0, 0x0d, 0x9017e11f), + AZALIA_PIN_CFG(0x0, 0x0e, 0x400000fe), + AZALIA_PIN_CFG(0x0, 0x0f, 0x0381e020), + AZALIA_PIN_CFG(0x0, 0x10, 0x1345e230), + AZALIA_PIN_CFG(0x0, 0x11, 0x13c5e240), + AZALIA_PIN_CFG(0x0, 0x15, 0x400000fc), + AZALIA_PIN_CFG(0x0, 0x1b, 0x400000fb), #else /* CONFIG_BOARD_APPLE_IMAC52 */ 0x106b0f00, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ AZALIA_SUBVENDOR(0x0, 0x106b0f00), - - /* NID 0x0A. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x012be032), - - /* NID 0x0B. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x90afe111), - - /* NID 0x0C. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x9017e131), - - /* NID 0x0D. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x4080e10f), - - /* NID 0x0E. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f0e00f), - - /* NID 0x0F */ AZALIA_PIN_CFG(0x0, 0x0f, 0x018be021), - - /* NID 0x10 */ AZALIA_PIN_CFG(0x0, 0x10, 0x114bf033), - - /* NID 0x11 */ AZALIA_PIN_CFG(0x0, 0x11, 0x11cbc022), - - /* NID 0x15 */ AZALIA_PIN_CFG(0x0, 0x15, 0x4080e10f), - - /* NID 0x1B. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x4080e10f), #endif diff --git a/src/mainboard/apple/macbookair4_2/hda_verb.c b/src/mainboard/apple/macbookair4_2/hda_verb.c index 69a165c..d5b2dcf 100644 --- a/src/mainboard/apple/macbookair4_2/hda_verb.c +++ b/src/mainboard/apple/macbookair4_2/hda_verb.c @@ -14,56 +14,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10134206, /* Codec Vendor / Device ID: Cirrus */ - 0x106b5b00, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10134206, /* Codec Vendor / Device ID: Cirrus */ + 0x106b5b00, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x106b5b00), - - /* NID 0x09. */ AZALIA_PIN_CFG(0x0, 0x09, 0x012b4030), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x400000f0), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x90100120), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x400000f0), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90a00110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x400000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x400000f0), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x400000f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x400000f0), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x400000f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560010), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560010), }; diff --git a/src/mainboard/asrock/b75pro3-m/hda_verb.c b/src/mainboard/asrock/b75pro3-m/hda_verb.c index d7e41b7..56c36ea 100644 --- a/src/mainboard/asrock/b75pro3-m/hda_verb.c +++ b/src/mainboard/asrock/b75pro3-m/hda_verb.c @@ -18,68 +18,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ - 0x18498892, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ + 0x18498892, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x18498892), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x411111f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x01011012), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x01016011), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01a19840), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a19950), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x0181304f), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x02214120), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x4005e601), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x01452130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/asrock/h110m/hda_verb.c b/src/mainboard/asrock/h110m/hda_verb.c index 6e13784..dd182a9 100644 --- a/src/mainboard/asrock/h110m/hda_verb.c +++ b/src/mainboard/asrock/h110m/hda_verb.c @@ -18,10 +18,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header ALC887 */ - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x10438445, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */ + 0x10438445, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438445), AZALIA_PIN_CFG(0x0, 0x11, 0x40000000), AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), @@ -38,20 +37,12 @@ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - /* coreboot specific header */ - 0x80862809, /* Codec Vendor / Device ID: Intel Skylake HDMI */ - 0x80860101, - 4, - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + 0x80862809, /* Codec Vendor / Device ID: Intel Skylake HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x2, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x2, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x2, 0x07, 0x18560030) }; diff --git a/src/mainboard/asus/h61m-cs/hda_verb.c b/src/mainboard/asus/h61m-cs/hda_verb.c index 53b4ea4..4ee07a7 100644 --- a/src/mainboard/asus/h61m-cs/hda_verb.c +++ b/src/mainboard/asus/h61m-cs/hda_verb.c @@ -19,9 +19,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x10438445, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ + 0x10438445, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438445), AZALIA_PIN_CFG(0x0, 0x11, 0x40330000), AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), diff --git a/src/mainboard/asus/p8h61-m_pro/hda_verb.c b/src/mainboard/asus/p8h61-m_pro/hda_verb.c index 05a2b39..403ecb2 100644 --- a/src/mainboard/asus/p8h61-m_pro/hda_verb.c +++ b/src/mainboard/asus/p8h61-m_pro/hda_verb.c @@ -16,68 +16,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x10438444, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ + 0x10438444, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438444), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x99430140), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x01011012), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x01016011), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x01012014), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01a19850), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a19c60), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x0181305f), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x02214c20), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x4005e601), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x01456130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/asus/p8z77-m_pro/hda_verb.c b/src/mainboard/asus/p8z77-m_pro/hda_verb.c index 1f22a7c..4ab54f9 100644 --- a/src/mainboard/asus/p8z77-m_pro/hda_verb.c +++ b/src/mainboard/asus/p8z77-m_pro/hda_verb.c @@ -19,13 +19,10 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ - 0x10438436, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* Subsystem ID */ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ + 0x10438436, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438436), - AZALIA_PIN_CFG(0x0, 0x11, 0x99430140), AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), @@ -40,13 +37,11 @@ AZALIA_PIN_CFG(0x0, 0x1d, 0x4005e601), AZALIA_PIN_CFG(0x0, 0x1e, 0x01456130), AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* Subsystem ID */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), diff --git a/src/mainboard/compulab/intense_pc/hda_verb.c b/src/mainboard/compulab/intense_pc/hda_verb.c index c71d83b..82017b5 100644 --- a/src/mainboard/compulab/intense_pc/hda_verb.c +++ b/src/mainboard/compulab/intense_pc/hda_verb.c @@ -18,68 +18,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0888, /* Codec Vendor / Device ID: Realtek */ - 0x10ec0888, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0888, /* Codec Vendor / Device ID: Realtek */ + 0x10ec0888, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10ec0888), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x411110f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01214120), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x411111f0), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x411111f0), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01a19131), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x411111f0), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x014421f0), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x01c421f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c index a0e0614..a205ed3 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c @@ -17,9 +17,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Realtek ALC887 */ - 0x1458a002, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Realtek ALC887 */ + 0x1458a002, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x1458a002), AZALIA_PIN_CFG(0x2, 0x11, 0x411111f0), AZALIA_PIN_CFG(0x2, 0x12, 0x411111f0), diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c index 8860993..a28151d 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c @@ -17,9 +17,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Realtek ALC887 */ - 0x1458a002, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Realtek ALC887 */ + 0x1458a002, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x1458a002), AZALIA_PIN_CFG(0x2, 0x11, 0x411110f0), AZALIA_PIN_CFG(0x2, 0x12, 0x411111f0), diff --git a/src/mainboard/google/butterfly/hda_verb.c b/src/mainboard/google/butterfly/hda_verb.c index fc34e56..9a52b33 100644 --- a/src/mainboard/google/butterfly/hda_verb.c +++ b/src/mainboard/google/butterfly/hda_verb.c @@ -13,212 +13,172 @@ * GNU General Public License for more details. */ -/* Vendor Name : IDT - * Vendor ID : 0x111d76e5 - * Subsystem ID : 0x103c18f9 - * Revision ID : 0x100303 - */ - - #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x111D76E5, // Codec Vendor / Device ID: IDT 92HD99 - 0x103C18F9, // Subsystem ID + /* --- Codec #0 --- */ + 0x111d76e5, // Codec Vendor / Device ID: IDT 92HD99 + 0x103c18f9, // Subsystem ID 115, // Number of 4 dword sets + AZALIA_SUBVENDOR(0x0, 0x103c18F9), -/* Bits 31:28 - Codec Address */ -/* Bits 27:20 - NID */ -/* Bits 19:8 - Verb ID */ -/* Bits 7:0 - Payload */ + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x103C18F9), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000F0), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Internal Speakers: Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), - -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), - -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), /* * Hardware EQ Parameters * Sample Rate 88200 */ - 0x0227A63F, 0x0227A73E, 0x0227A8EB, 0x0227A93F, - 0x0227AA3E, 0x0227ABEB, 0x0227AC00, 0x0227AD80, - 0x0227A681, 0x0227A782, 0x0227A829, 0x0227A981, - 0x0227AA82, 0x0227AB29, 0x0227AC01, 0x0227AD80, - 0x0227A63F, 0x0227A73E, 0x0227A8EB, 0x0227A93F, - 0x0227AA3E, 0x0227ABEB, 0x0227AC02, 0x0227AD80, - 0x0227A67E, 0x0227A77B, 0x0227A846, 0x0227A97E, - 0x0227AA7B, 0x0227AB46, 0x0227AC03, 0x0227AD80, - 0x0227A6C1, 0x0227A77F, 0x0227A898, 0x0227A9C1, - 0x0227AA7F, 0x0227AB98, 0x0227AC04, 0x0227AD80, - 0x0227A63E, 0x0227A7D1, 0x0227A84F, 0x0227A93E, - 0x0227AAD1, 0x0227AB4F, 0x0227AC05, 0x0227AD80, - 0x0227A683, 0x0227A7BE, 0x0227A855, 0x0227A983, - 0x0227AABE, 0x0227AB55, 0x0227AC06, 0x0227AD80, - 0x0227A63D, 0x0227A7B9, 0x0227A856, 0x0227A93D, - 0x0227AAB9, 0x0227AB56, 0x0227AC07, 0x0227AD80, - 0x0227A67C, 0x0227A741, 0x0227A8AB, 0x0227A97C, - 0x0227AA41, 0x0227ABAB, 0x0227AC08, 0x0227AD80, - 0x0227A6C3, 0x0227A775, 0x0227A85A, 0x0227A9C3, - 0x0227AA75, 0x0227AB5A, 0x0227AC09, 0x0227AD80, - 0x0227A63F, 0x0227A79E, 0x0227A829, 0x0227A93F, - 0x0227AA9E, 0x0227AB29, 0x0227AC0A, 0x0227AD80, - 0x0227A682, 0x0227A7E3, 0x0227A867, 0x0227A982, - 0x0227AAE3, 0x0227AB67, 0x0227AC0B, 0x0227AD80, - 0x0227A63E, 0x0227A74F, 0x0227A89D, 0x0227A93E, - 0x0227AA4F, 0x0227AB9D, 0x0227AC0C, 0x0227AD80, - 0x0227A67D, 0x0227A71C, 0x0227A899, 0x0227A97D, - 0x0227AA1C, 0x0227AB99, 0x0227AC0D, 0x0227AD80, - 0x0227A6C2, 0x0227A712, 0x0227A839, 0x0227A9C2, - 0x0227AA12, 0x0227AB39, 0x0227AC0E, 0x0227AD80, - 0x0227A63F, 0x0227A708, 0x0227A856, 0x0227A93F, - 0x0227AA08, 0x0227AB56, 0x0227AC0F, 0x0227AD80, - 0x0227A68E, 0x0227A7ED, 0x0227A89D, 0x0227A98E, - 0x0227AAED, 0x0227AB9D, 0x0227AC10, 0x0227AD80, - 0x0227A637, 0x0227A78F, 0x0227A853, 0x0227A937, - 0x0227AA8F, 0x0227AB53, 0x0227AC11, 0x0227AD80, - 0x0227A671, 0x0227A712, 0x0227A863, 0x0227A971, - 0x0227AA12, 0x0227AB63, 0x0227AC12, 0x0227AD80, - 0x0227A6C9, 0x0227A768, 0x0227A856, 0x0227A9C9, - 0x0227AA68, 0x0227AB56, 0x0227AC13, 0x0227AD80, - 0x0227A642, 0x0227A709, 0x0227A838, 0x0227A942, - 0x0227AA09, 0x0227AB38, 0x0227AC14, 0x0227AD80, - 0x0227A69C, 0x0227A78A, 0x0227A867, 0x0227A99C, - 0x0227AA8A, 0x0227AB67, 0x0227AC15, 0x0227AD80, - 0x0227A634, 0x0227A717, 0x0227A8E3, 0x0227A934, - 0x0227AA17, 0x0227ABE3, 0x0227AC16, 0x0227AD80, - 0x0227A663, 0x0227A775, 0x0227A899, 0x0227A963, - 0x0227AA75, 0x0227AB99, 0x0227AC17, 0x0227AD80, - 0x0227A6C9, 0x0227A7DE, 0x0227A8E5, 0x0227A9C9, - 0x0227AADE, 0x0227ABE5, 0x0227AC18, 0x0227AD80, - 0x0227A640, 0x0227A700, 0x0227A800, 0x0227A940, - 0x0227AA00, 0x0227AB00, 0x0227AC19, 0x0227AD80, + 0x0227a63f, 0x0227a73e, 0x0227a8eb, 0x0227a93f, + 0x0227aa3e, 0x0227abeb, 0x0227ac00, 0x0227ad80, + 0x0227a681, 0x0227a782, 0x0227a829, 0x0227a981, + 0x0227aa82, 0x0227ab29, 0x0227ac01, 0x0227ad80, + 0x0227a63f, 0x0227a73e, 0x0227a8eb, 0x0227a93f, + 0x0227aa3e, 0x0227abeb, 0x0227ac02, 0x0227ad80, + 0x0227a67e, 0x0227a77b, 0x0227a846, 0x0227a97e, + 0x0227aa7b, 0x0227ab46, 0x0227ac03, 0x0227ad80, + 0x0227a6c1, 0x0227a77f, 0x0227a898, 0x0227a9c1, + 0x0227aa7f, 0x0227ab98, 0x0227ac04, 0x0227ad80, + 0x0227a63e, 0x0227a7d1, 0x0227a84f, 0x0227a93e, + 0x0227aad1, 0x0227ab4f, 0x0227ac05, 0x0227ad80, + 0x0227a683, 0x0227a7be, 0x0227a855, 0x0227a983, + 0x0227aabe, 0x0227ab55, 0x0227ac06, 0x0227ad80, + 0x0227a63d, 0x0227a7b9, 0x0227a856, 0x0227a93d, + 0x0227aab9, 0x0227ab56, 0x0227ac07, 0x0227ad80, + 0x0227a67c, 0x0227a741, 0x0227a8ab, 0x0227a97c, + 0x0227aa41, 0x0227abab, 0x0227ac08, 0x0227ad80, + 0x0227a6c3, 0x0227a775, 0x0227a85a, 0x0227a9c3, + 0x0227aa75, 0x0227ab5a, 0x0227ac09, 0x0227ad80, + 0x0227a63f, 0x0227a79e, 0x0227a829, 0x0227a93f, + 0x0227aa9e, 0x0227ab29, 0x0227ac0a, 0x0227ad80, + 0x0227a682, 0x0227a7e3, 0x0227a867, 0x0227a982, + 0x0227aae3, 0x0227ab67, 0x0227ac0b, 0x0227ad80, + 0x0227a63e, 0x0227a74f, 0x0227a89d, 0x0227a93e, + 0x0227aa4f, 0x0227ab9d, 0x0227ac0c, 0x0227ad80, + 0x0227a67d, 0x0227a71c, 0x0227a899, 0x0227a97d, + 0x0227aa1c, 0x0227ab99, 0x0227ac0d, 0x0227ad80, + 0x0227a6c2, 0x0227a712, 0x0227a839, 0x0227a9c2, + 0x0227aa12, 0x0227ab39, 0x0227ac0e, 0x0227ad80, + 0x0227a63f, 0x0227a708, 0x0227a856, 0x0227a93f, + 0x0227aa08, 0x0227ab56, 0x0227ac0f, 0x0227ad80, + 0x0227a68e, 0x0227a7ed, 0x0227a89d, 0x0227a98e, + 0x0227aaed, 0x0227ab9d, 0x0227ac10, 0x0227ad80, + 0x0227a637, 0x0227a78f, 0x0227a853, 0x0227a937, + 0x0227aa8f, 0x0227ab53, 0x0227ac11, 0x0227ad80, + 0x0227a671, 0x0227a712, 0x0227a863, 0x0227a971, + 0x0227aa12, 0x0227ab63, 0x0227ac12, 0x0227ad80, + 0x0227a6c9, 0x0227a768, 0x0227a856, 0x0227a9c9, + 0x0227aa68, 0x0227ab56, 0x0227ac13, 0x0227ad80, + 0x0227a642, 0x0227a709, 0x0227a838, 0x0227a942, + 0x0227aa09, 0x0227ab38, 0x0227ac14, 0x0227ad80, + 0x0227a69c, 0x0227a78a, 0x0227a867, 0x0227a99c, + 0x0227aa8a, 0x0227ab67, 0x0227ac15, 0x0227ad80, + 0x0227a634, 0x0227a717, 0x0227a8e3, 0x0227a934, + 0x0227aa17, 0x0227abe3, 0x0227ac16, 0x0227ad80, + 0x0227a663, 0x0227a775, 0x0227a899, 0x0227a963, + 0x0227aa75, 0x0227ab99, 0x0227ac17, 0x0227ad80, + 0x0227a6c9, 0x0227a7de, 0x0227a8e5, 0x0227a9c9, + 0x0227aade, 0x0227abe5, 0x0227ac18, 0x0227ad80, + 0x0227a640, 0x0227a700, 0x0227a800, 0x0227a940, + 0x0227aa00, 0x0227ab00, 0x0227ac19, 0x0227ad80, /* * Hardware EQ Parameters * Sample Rate 96000 */ - 0x0227A63F, 0x0227A74E, 0x0227A888, 0x0227A93F, - 0x0227AA4E, 0x0227AB88, 0x0227AC1A, 0x0227AD80, - 0x0227A681, 0x0227A762, 0x0227A8EE, 0x0227A981, - 0x0227AA62, 0x0227ABEE, 0x0227AC1B, 0x0227AD80, - 0x0227A63F, 0x0227A74E, 0x0227A888, 0x0227A93F, - 0x0227AA4E, 0x0227AB88, 0x0227AC1C, 0x0227AD80, - 0x0227A67E, 0x0227A79A, 0x0227A8E7, 0x0227A97E, - 0x0227AA9A, 0x0227ABE7, 0x0227AC1D, 0x0227AD80, - 0x0227A6C1, 0x0227A760, 0x0227A8C3, 0x0227A9C1, - 0x0227AA60, 0x0227ABC3, 0x0227AC1E, 0x0227AD80, - 0x0227A63E, 0x0227A7E9, 0x0227A84B, 0x0227A93E, - 0x0227AAE9, 0x0227AB4B, 0x0227AC1F, 0x0227AD80, - 0x0227A683, 0x0227A76C, 0x0227A8F2, 0x0227A983, - 0x0227AA6C, 0x0227ABF2, 0x0227AC20, 0x0227AD80, - 0x0227A63D, 0x0227A7E7, 0x0227A880, 0x0227A93D, - 0x0227AAE7, 0x0227AB80, 0x0227AC21, 0x0227AD80, - 0x0227A67C, 0x0227A793, 0x0227A80E, 0x0227A97C, - 0x0227AA93, 0x0227AB0E, 0x0227AC22, 0x0227AD80, - 0x0227A6C3, 0x0227A72F, 0x0227A835, 0x0227A9C3, - 0x0227AA2F, 0x0227AB35, 0x0227AC23, 0x0227AD80, - 0x0227A63F, 0x0227A7A5, 0x0227A8FE, 0x0227A93F, - 0x0227AAA5, 0x0227ABFE, 0x0227AC24, 0x0227AD80, - 0x0227A682, 0x0227A798, 0x0227A89D, 0x0227A982, - 0x0227AA98, 0x0227AB9D, 0x0227AC25, 0x0227AD80, - 0x0227A63E, 0x0227A772, 0x0227A839, 0x0227A93E, - 0x0227AA72, 0x0227AB39, 0x0227AC26, 0x0227AD80, - 0x0227A67D, 0x0227A767, 0x0227A863, 0x0227A97D, - 0x0227AA67, 0x0227AB63, 0x0227AC27, 0x0227AD80, - 0x0227A6C1, 0x0227A7E7, 0x0227A8C8, 0x0227A9C1, - 0x0227AAE7, 0x0227ABC8, 0x0227AC28, 0x0227AD80, - 0x0227A63F, 0x0227A71B, 0x0227A81A, 0x0227A93F, - 0x0227AA1B, 0x0227AB1A, 0x0227AC29, 0x0227AD80, - 0x0227A68D, 0x0227A763, 0x0227A872, 0x0227A98D, - 0x0227AA63, 0x0227AB72, 0x0227AC2A, 0x0227AD80, - 0x0227A638, 0x0227A733, 0x0227A809, 0x0227A938, - 0x0227AA33, 0x0227AB09, 0x0227AC2B, 0x0227AD80, - 0x0227A672, 0x0227A79C, 0x0227A88E, 0x0227A972, - 0x0227AA9C, 0x0227AB8E, 0x0227AC2C, 0x0227AD80, - 0x0227A6C8, 0x0227A7B1, 0x0227A8DD, 0x0227A9C8, - 0x0227AAB1, 0x0227ABDD, 0x0227AC2D, 0x0227AD80, - 0x0227A641, 0x0227A7E1, 0x0227A8D8, 0x0227A941, - 0x0227AAE1, 0x0227ABD8, 0x0227AC2E, 0x0227AD80, - 0x0227A699, 0x0227A70D, 0x0227A820, 0x0227A999, - 0x0227AA0D, 0x0227AB20, 0x0227AC2F, 0x0227AD80, - 0x0227A634, 0x0227A7FE, 0x0227A823, 0x0227A934, - 0x0227AAFE, 0x0227AB23, 0x0227AC30, 0x0227AD80, - 0x0227A666, 0x0227A7F2, 0x0227A8E0, 0x0227A966, - 0x0227AAF2, 0x0227ABE0, 0x0227AC31, 0x0227AD80, - 0x0227A6C9, 0x0227A720, 0x0227A804, 0x0227A9C9, - 0x0227AA20, 0x0227AB04, 0x0227AC32, 0x0227AD80, - 0x0227A640, 0x0227A700, 0x0227A800, 0x0227A940, - 0x0227AA00, 0x0227AB00, 0x0227AC33, 0x0227AD80, + 0x0227a63f, 0x0227a74e, 0x0227a888, 0x0227a93f, + 0x0227aa4e, 0x0227ab88, 0x0227ac1a, 0x0227ad80, + 0x0227a681, 0x0227a762, 0x0227a8ee, 0x0227a981, + 0x0227aa62, 0x0227abee, 0x0227ac1b, 0x0227ad80, + 0x0227a63f, 0x0227a74e, 0x0227a888, 0x0227a93f, + 0x0227aa4e, 0x0227ab88, 0x0227ac1c, 0x0227ad80, + 0x0227a67e, 0x0227a79a, 0x0227a8e7, 0x0227a97e, + 0x0227aa9a, 0x0227abe7, 0x0227ac1d, 0x0227ad80, + 0x0227a6c1, 0x0227a760, 0x0227a8c3, 0x0227a9c1, + 0x0227aa60, 0x0227abc3, 0x0227ac1e, 0x0227ad80, + 0x0227a63e, 0x0227a7e9, 0x0227a84b, 0x0227a93e, + 0x0227aae9, 0x0227ab4b, 0x0227ac1f, 0x0227ad80, + 0x0227a683, 0x0227a76c, 0x0227a8f2, 0x0227a983, + 0x0227aa6c, 0x0227abf2, 0x0227ac20, 0x0227ad80, + 0x0227a63d, 0x0227a7e7, 0x0227a880, 0x0227a93d, + 0x0227aae7, 0x0227ab80, 0x0227ac21, 0x0227ad80, + 0x0227a67c, 0x0227a793, 0x0227a80e, 0x0227a97c, + 0x0227aa93, 0x0227ab0e, 0x0227ac22, 0x0227ad80, + 0x0227a6c3, 0x0227a72f, 0x0227a835, 0x0227a9c3, + 0x0227aa2f, 0x0227ab35, 0x0227ac23, 0x0227ad80, + 0x0227a63f, 0x0227a7a5, 0x0227a8fe, 0x0227a93f, + 0x0227aaa5, 0x0227abfe, 0x0227ac24, 0x0227ad80, + 0x0227a682, 0x0227a798, 0x0227a89d, 0x0227a982, + 0x0227aa98, 0x0227ab9d, 0x0227ac25, 0x0227ad80, + 0x0227a63e, 0x0227a772, 0x0227a839, 0x0227a93e, + 0x0227aa72, 0x0227ab39, 0x0227ac26, 0x0227ad80, + 0x0227a67d, 0x0227a767, 0x0227a863, 0x0227a97d, + 0x0227aa67, 0x0227ab63, 0x0227ac27, 0x0227ad80, + 0x0227a6c1, 0x0227a7e7, 0x0227a8c8, 0x0227a9c1, + 0x0227aae7, 0x0227abc8, 0x0227ac28, 0x0227ad80, + 0x0227a63f, 0x0227a71b, 0x0227a81a, 0x0227a93f, + 0x0227aa1b, 0x0227ab1a, 0x0227ac29, 0x0227ad80, + 0x0227a68d, 0x0227a763, 0x0227a872, 0x0227a98d, + 0x0227aa63, 0x0227ab72, 0x0227ac2a, 0x0227ad80, + 0x0227a638, 0x0227a733, 0x0227a809, 0x0227a938, + 0x0227aa33, 0x0227ab09, 0x0227ac2b, 0x0227ad80, + 0x0227a672, 0x0227a79c, 0x0227a88e, 0x0227a972, + 0x0227aa9c, 0x0227ab8e, 0x0227ac2c, 0x0227ad80, + 0x0227a6c8, 0x0227a7b1, 0x0227a8dd, 0x0227a9c8, + 0x0227aab1, 0x0227abdd, 0x0227ac2d, 0x0227ad80, + 0x0227a641, 0x0227a7e1, 0x0227a8d8, 0x0227a941, + 0x0227aae1, 0x0227abd8, 0x0227ac2e, 0x0227ad80, + 0x0227a699, 0x0227a70d, 0x0227a820, 0x0227a999, + 0x0227aa0d, 0x0227ab20, 0x0227ac2f, 0x0227ad80, + 0x0227a634, 0x0227a7fe, 0x0227a823, 0x0227a934, + 0x0227aafe, 0x0227ab23, 0x0227ac30, 0x0227ad80, + 0x0227a666, 0x0227a7f2, 0x0227a8e0, 0x0227a966, + 0x0227aaf2, 0x0227abe0, 0x0227ac31, 0x0227ad80, + 0x0227a6c9, 0x0227a720, 0x0227a804, 0x0227a9c9, + 0x0227aa20, 0x0227ab04, 0x0227ac32, 0x0227ad80, + 0x0227a640, 0x0227a700, 0x0227a800, 0x0227a940, + 0x0227aa00, 0x0227ab00, 0x0227ac33, 0x0227ad80, /* SAFEDSP Parameters */ - 0x022782C1, 0x02277127, 0x02277227, 0x02278801, - 0x02278C58, 0x02278E90, 0x0227890A, 0x02278A14, - 0x02278B0F, 0x0017B008, + 0x022782c1, 0x02277127, 0x02277227, 0x02278801, + 0x02278c58, 0x02278e90, 0x0227890a, 0x02278a14, + 0x02278b0f, 0x0017b008, /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707c0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ + /* --- Codec #3 --- */ 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + // Revision ID: 0x100000 + 4, // Number of 4 dword sets AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/hp/2570p/hda_verb.c b/src/mainboard/hp/2570p/hda_verb.c index a8e0729..585d94a 100644 --- a/src/mainboard/hp/2570p/hda_verb.c +++ b/src/mainboard/hp/2570p/hda_verb.c @@ -18,62 +18,32 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c17df, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c17df, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c17df), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/hp/2760p/hda_verb.c b/src/mainboard/hp/2760p/hda_verb.c index 48b730a..35890f3 100644 --- a/src/mainboard/hp/2760p/hda_verb.c +++ b/src/mainboard/hp/2760p/hda_verb.c @@ -18,62 +18,32 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c162a, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c162a, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c162a), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x40f000f0), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421401f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x90a70130), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x40f000f0), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/hp/8460p/hda_verb.c b/src/mainboard/hp/8460p/hda_verb.c index 96430133..db95706 100644 --- a/src/mainboard/hp/8460p/hda_verb.c +++ b/src/mainboard/hp/8460p/hda_verb.c @@ -18,47 +18,24 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c3588, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c3588, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c3588), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x40f000f0), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421401f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x90a60130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), }; diff --git a/src/mainboard/hp/8770w/hda_verb.c b/src/mainboard/hp/8770w/hda_verb.c index cc66a31..958b5bd 100644 --- a/src/mainboard/hp/8770w/hda_verb.c +++ b/src/mainboard/hp/8770w/hda_verb.c @@ -19,41 +19,19 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c176c, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c176c, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c176c), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), }; diff --git a/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c b/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c index 907ad2f..b6daf8b 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c +++ b/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0662, /* Codec Vendor / Device ID: Realtek */ - 0x103c1495, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0662, /* Codec Vendor / Device ID: Realtek */ + 0x103c1495, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c1495), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x99130120), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01813c30), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a11c3f), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x0221101f), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40028101), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80861495, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80861495, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80861495), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/hp/folio_9470m/hda_verb.c b/src/mainboard/hp/folio_9470m/hda_verb.c index 14d181f..7852b30 100644 --- a/src/mainboard/hp/folio_9470m/hda_verb.c +++ b/src/mainboard/hp/folio_9470m/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d76e0, /* Codec Vendor / Device ID: IDT */ - 0x103c18df, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d76e0, /* Codec Vendor / Device ID: IDT */ + 0x103c18df, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c18df), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0321101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x03a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/hp/revolve_810_g1/hda_verb.c b/src/mainboard/hp/revolve_810_g1/hda_verb.c index 693ee40..86551a1 100644 --- a/src/mainboard/hp/revolve_810_g1/hda_verb.c +++ b/src/mainboard/hp/revolve_810_g1/hda_verb.c @@ -18,62 +18,32 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d76e0, /* Codec Vendor / Device ID: IDT */ - 0x103c18f8, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d76e0, /* Codec Vendor / Device ID: IDT */ + 0x103c18f8, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c18f8), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/hp/z220_sff_workstation/hda_verb.c b/src/mainboard/hp/z220_sff_workstation/hda_verb.c index 9ded3ec..9ceb2a1 100644 --- a/src/mainboard/hp/z220_sff_workstation/hda_verb.c +++ b/src/mainboard/hp/z220_sff_workstation/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0221, /* Codec Vendor / Device ID: Realtek */ - 0x103c1791, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0221, /* Codec Vendor / Device ID: Realtek */ + 0x103c1791, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c1791), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x403c0000), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x90170110), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x02a11030), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x0181303f), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40400001), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - - /* NID 0x21. */ AZALIA_PIN_CFG(0x0, 0x21, 0x0221102f), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x103c1791, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x103c1791, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x103c1791), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/intel/dcp847ske/hda_verb.c b/src/mainboard/intel/dcp847ske/hda_verb.c index 3b7190d..dfcaa3a 100644 --- a/src/mainboard/intel/dcp847ske/hda_verb.c +++ b/src/mainboard/intel/dcp847ske/hda_verb.c @@ -18,20 +18,12 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/l520/hda_verb.c b/src/mainboard/lenovo/l520/hda_verb.c index bca06f5..6ab0938 100644 --- a/src/mainboard/lenovo/l520/hda_verb.c +++ b/src/mainboard/lenovo/l520/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa21de, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa21de, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa21de), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x99a30920), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x99130110), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40079a2d), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - - /* NID 0x21. */ AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/s230u/hda_verb.c b/src/mainboard/lenovo/s230u/hda_verb.c index 2433e99..4ae753e 100644 --- a/src/mainboard/lenovo/s230u/hda_verb.c +++ b/src/mainboard/lenovo/s230u/hda_verb.c @@ -15,21 +15,18 @@ * GNU General Public License for more details. */ +/* Bits 31:28 - Codec Address */ +/* Bits 27:20 - NID */ +/* Bits 19:8 - Verb ID */ +/* Bits 7:0 - Payload */ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fa, // Subsystem ID - 13, // Number of 4 dword sets - - /* Bits 31:28 - Codec Address */ - /* Bits 27:20 - NID */ - /* Bits 19:8 - Verb ID */ - /* Bits 7:0 - Payload */ - - /* NID 0x01 - NodeInfo */ + /* --- Codec #0 --- */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fa, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17AA21FA), /* @@ -64,61 +61,49 @@ * 3:0 Sequence * For stream channel to in/out mapping */ - - /* - * NID 0x12 - Digital MIC - * Fixed function, mic in, digital - */ + /* Digital MIC: Fixed function, mic in, digital */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60940), - /* - * NID 0x14 - SPK out - * Fixed function, speaker, analog - */ + + /* SPK out: Fixed function, speaker, analog */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - /* - * NID 0x15 - HP out - * Location left, headphone out, 1/8" jack, black - */ + + /* HP out: Location left, headphone out, 1/8" jack, black */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - /* NID 0x17 - ? (Unconnected) */ + + /* Unknown: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - /* - * NID 0x18 - MIC1 in - * Location left, mic in, 1/8" jack, black - */ + + /* MIC1 in: Location left, mic in, 1/8" jack, black */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - /* NID 0x19 - MIC2 in (Unconnected) */ + + /* MIC2 in: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - /* NID 0x1a - Line1 in (Unconnected) */ + + /* Line1 in: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - /* NID 0x1b - Line2 in (Unconnected) */ + + /* Line2 in: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - /* NID 0x1d - PCBEEP */ + + /* PCBEEP */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40148605), - /* NID 0x1e - S/PDIF out (Unconnected) */ + + /* S/PDIF out: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x01470740, // Enable output for NID 0x14 (Speaker out) - 0x015707C0, // Enable output & HP amp for NID 0x15 (HP out) - 0x01870724, // Enable Vrefout NID 0x18 (MIC1 in) - 0x00170500, // Set power state to D0 + 0x01470740, /* Enable output for NID 0x14 (Speaker out) */ + 0x015707C0, /* Enable output & HP amp for NID 0x15 (HP out) */ + 0x01870724, /* Enable Vrefout NID 0x18 (MIC1 in) */ + 0x00170500, /* Set power state to D0 */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x58560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/t410/hda_verb.c b/src/mainboard/lenovo/t410/hda_verb.c index 2b871f6..7569b6b 100644 --- a/src/mainboard/lenovo/t410/hda_verb.c +++ b/src/mainboard/lenovo/t410/hda_verb.c @@ -17,28 +17,25 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14F15069, /* Codec Vendor / Device ID: Conexant CX20585 */ - 0x17AA214C, /* Subsystem ID */ + 0x14f15069, /* Codec Vendor / Device ID: Conexant CX20585 */ + 0x17aa214c, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - AZALIA_SUBVENDOR(0x0, 0x17AA214C), - AZALIA_PIN_CFG(0x0, 0x19, 0x042110F0), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A190F0), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A110F0), - AZALIA_PIN_CFG(0x0, 0x1C, 0x612140F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x901701F0), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A601F0), + AZALIA_SUBVENDOR(0x0, 0x17aa214c), + AZALIA_PIN_CFG(0x0, 0x19, 0x042110f0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a190f0), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a110f0), + AZALIA_PIN_CFG(0x0, 0x1c, 0x612140f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x901701f0), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a601f0), 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI. */ - 0x17AA21B5, /* Subsystem ID */ + 0x17aa21b5, /* Subsystem ID */ 4, /* Number of 4 dword sets */ - - AZALIA_SUBVENDOR(0x3, 0x17AA21B5), + AZALIA_SUBVENDOR(0x3, 0x17aa21b5), AZALIA_PIN_CFG(0x3, 0x04, 0x18560010), AZALIA_PIN_CFG(0x3, 0x05, 0x18560020), AZALIA_PIN_CFG(0x3, 0x06, 0x18560030), diff --git a/src/mainboard/lenovo/t420/hda_verb.c b/src/mainboard/lenovo/t420/hda_verb.c index 9287d4a..4c68c73 100644 --- a/src/mainboard/lenovo/t420/hda_verb.c +++ b/src/mainboard/lenovo/t420/hda_verb.c @@ -14,29 +14,18 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21d2 - * Revision ID : 0x100002 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - Schematic show CX20672 - 0x17aa21ce, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21D2), +#include <device/azalia_device.h> +const u32 cim_verb_data[] = { + 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - schematic shows CX20672 */ + 0x17aa21ce, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21d2), AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), @@ -49,14 +38,14 @@ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ diff --git a/src/mainboard/lenovo/t420s/hda_verb.c b/src/mainboard/lenovo/t420s/hda_verb.c index 8a9c3e5..9d315d7 100644 --- a/src/mainboard/lenovo/t420s/hda_verb.c +++ b/src/mainboard/lenovo/t420s/hda_verb.c @@ -14,49 +14,38 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21d2 - * Revision ID : 0x100002 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - Schematic show CX20672 - 0x17aa21d2, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21D2), +#include <device/azalia_device.h> +const u32 cim_verb_data[] = { + 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - schematic shows CX20672 */ + 0x17aa21d2, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21d2), AZALIA_PIN_CFG(0x0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060), - AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a19050), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a11060), + AZALIA_PIN_CFG(0x0, 0x1c, 0x6121401f), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x90170110), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a60170), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ diff --git a/src/mainboard/lenovo/t430/hda_verb.c b/src/mainboard/lenovo/t430/hda_verb.c index 255198f..a8f6727 100644 --- a/src/mainboard/lenovo/t430/hda_verb.c +++ b/src/mainboard/lenovo/t430/hda_verb.c @@ -16,56 +16,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa21f3, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa21f3, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa21f3), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c b/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c index c5c17b8..b8f6bfe 100644 --- a/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c +++ b/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c @@ -14,110 +14,72 @@ * GNU General Public License for more details. */ -/* Vendor Name : Realtek - * Vendor ID : 0x10ec0269 - * Subsystem ID : 0x17aa21fb - * Revision ID : 0x100203 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fb, // Subsystem ID - 19, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FB), +#include <device/azalia_device.h> -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), +const u32 cim_verb_data[] = { + /* --- Codec #0 --- */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fb, /* Subsystem ID */ + 19, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fb), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - AZALIA_PIN_CFG(0x0, 0x17, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), 0x01970804, 0x01870803, 0x01470740, 0x00970600, - AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1B, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205), - AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ 0x00370600, 0x00270600, - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c b/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c index 1c5d376..5d47099 100644 --- a/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c +++ b/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa2208, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa2208, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa2208), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x40008000), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11030), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40f38205), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/t440p/hda_verb.c b/src/mainboard/lenovo/t440p/hda_verb.c index 9527312..791638d 100644 --- a/src/mainboard/lenovo/t440p/hda_verb.c +++ b/src/mainboard/lenovo/t440p/hda_verb.c @@ -18,9 +18,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0292, /* Codec Vendor / Device ID: Realtek */ - 0x17aa220e, /* Subsystem ID */ - 12, /* Number of 4 dword sets */ + 0x10ec0292, /* Codec Vendor / Device ID: Realtek */ + 0x17aa220e, /* Subsystem ID */ + 12, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa220e), AZALIA_PIN_CFG(0x0, 0x12, 0x90a60130), AZALIA_PIN_CFG(0x0, 0x13, 0x40000000), diff --git a/src/mainboard/lenovo/t520/hda_verb.c b/src/mainboard/lenovo/t520/hda_verb.c index 2d10e35..46d7d94 100644 --- a/src/mainboard/lenovo/t520/hda_verb.c +++ b/src/mainboard/lenovo/t520/hda_verb.c @@ -14,49 +14,38 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21cf - * Revision ID : 0x100000 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - Schematic shows CX20672 - 0x17aa21cf, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21CF), +#include <device/azalia_device.h> +const u32 cim_verb_data[] = { + 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - Schematic shows CX20672 */ + 0x17aa21cf, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21cf), AZALIA_PIN_CFG(0x0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060), - AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a19050), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a11060), + AZALIA_PIN_CFG(0x0, 0x1c, 0x6121401f), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x90170110), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a60170), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707c0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ diff --git a/src/mainboard/lenovo/t530/hda_verb.c b/src/mainboard/lenovo/t530/hda_verb.c index f8876aa..5ed12b4 100644 --- a/src/mainboard/lenovo/t530/hda_verb.c +++ b/src/mainboard/lenovo/t530/hda_verb.c @@ -14,108 +14,71 @@ * GNU General Public License for more details. */ -/* Vendor Name : IDT - * Vendor ID : 0x10ec0269 - * Subsystem ID : 0x17aa21fa - * Revision ID : 0x100303 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fa, // Subsystem ID - 18, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FA), +#include <device/azalia_device.h> -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), +const u32 cim_verb_data[] = { + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fa, /* Subsystem ID */ + 18, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fa), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), - AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), + + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), 0x01970804, 0x01870803, 0x01470740, 0x00970600, - AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205), - AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ 0x00370600, 0x00270600, - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) }; diff --git a/src/mainboard/lenovo/t60/hda_verb.c b/src/mainboard/lenovo/t60/hda_verb.c index 216696b..22eec0a 100644 --- a/src/mainboard/lenovo/t60/hda_verb.c +++ b/src/mainboard/lenovo/t60/hda_verb.c @@ -14,12 +14,10 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ - 0x17aa2025, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - + 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ + 0x17aa2025, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa2025), - AZALIA_PIN_CFG(0, 0x05, 0xc3014110), AZALIA_PIN_CFG(0, 0x06, 0x4221401f), AZALIA_PIN_CFG(0, 0x07, 0x591311f0), diff --git a/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c b/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c index 1946286..8ea3258 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c +++ b/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c @@ -17,56 +17,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa21f9, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa21f9, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa21f9), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/lenovo/x201/hda_verb.c b/src/mainboard/lenovo/x201/hda_verb.c index 25a87f5..95169a8 100644 --- a/src/mainboard/lenovo/x201/hda_verb.c +++ b/src/mainboard/lenovo/x201/hda_verb.c @@ -17,58 +17,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14F15069, /* Codec Vendor / Device ID: Conexant CX20585 */ - 0x17AA2155, /* Subsystem ID */ + 0x14f15069, /* Codec Vendor / Device ID: Conexant CX20585 */ + 0x17aa2155, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ - AZALIA_SUBVENDOR(0x0, 0x17AA2155), - - /* NID 0x19: Headphone jack. */ - AZALIA_PIN_CFG(0x0, 0x19, 0x042140F0), - - /* NID 0x1A: Dock mic jack. */ - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A190F0), - - /* NID 0x1B: Mic jack. */ - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A190F0), - - /* NID 0x1C: Dock headphone jack. */ - AZALIA_PIN_CFG(0x0, 0x1C, 0x612140F0), - - /* NID 0x1D: EAPD detect. */ - AZALIA_PIN_CFG(0x0, 0x1D, 0x601700F0), - - /* NID 0x1E */ - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - - /* NID 0x1F */ - AZALIA_PIN_CFG(0x0, 0x1F, 0x901701F0), - - /* NID 0x20 */ - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - - /* NID 0x22 */ - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - - /* NID 0x23: Internal mic boost volume. */ - AZALIA_PIN_CFG(0x0, 0x23, 0x90A601F0), + AZALIA_SUBVENDOR(0x0, 0x17aa2155), + AZALIA_PIN_CFG(0x0, 0x19, 0x042140f0), /* Headphone jack */ + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a190f0), /* Dock mic jack */ + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a190f0), /* Mic jack */ + AZALIA_PIN_CFG(0x0, 0x1c, 0x612140f0), /* Dock headphone jack */ + AZALIA_PIN_CFG(0x0, 0x1d, 0x601700f0), /* EAPD detect */ + AZALIA_PIN_CFG(0x0, 0x1e, 0x40F001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x901701f0), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a601f0), /* Internal mic boost volume */ 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI. */ 0x17aa21b5, /* Subsystem ID */ 4, /* Number of 4 dword sets */ - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21b5 */ - AZALIA_SUBVENDOR(0x3, 0x17AA21B5), - - /* NID 0x04. */ + AZALIA_SUBVENDOR(0x3, 0x17aa21b5), AZALIA_PIN_CFG(0x3, 0x04, 0x58560010), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560020), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560030), }; diff --git a/src/mainboard/lenovo/x220/hda_verb.c b/src/mainboard/lenovo/x220/hda_verb.c index b7b670d..00751c4 100644 --- a/src/mainboard/lenovo/x220/hda_verb.c +++ b/src/mainboard/lenovo/x220/hda_verb.c @@ -14,76 +14,52 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21db - * Revision ID : 0x100002 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - 0x17aa21db, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21DB), +#include <device/azalia_device.h> + +const u32 cim_verb_data[] = { + /* --- Codec #0 --- */ + 0x14f1506e, /* Codec Vendor / Device ID: Conexant CX20590 */ + 0x17aa21db, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21db), AZALIA_PIN_CFG(0x0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060), - AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a19050), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a11060), + AZALIA_PIN_CFG(0x0, 0x1c, 0x6121401f), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x90170110), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a60170), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862805, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/x230/hda_verb.c b/src/mainboard/lenovo/x230/hda_verb.c index 0393ff5..ff1a2dd 100644 --- a/src/mainboard/lenovo/x230/hda_verb.c +++ b/src/mainboard/lenovo/x230/hda_verb.c @@ -14,67 +14,45 @@ * GNU General Public License for more details. */ -/* Vendor Name : IDT - * Vendor ID : 0x10ec0269 - * Subsystem ID : 0x17aa21fa - * Revision ID : 0x100303 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fa, // Subsystem ID - 19, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FA), +#include <device/azalia_device.h> -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), +const u32 cim_verb_data[] = { + /* --- Codec #0 --- */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fa, /* Subsystem ID */ + 19, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fa), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), - AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), + + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0), - - AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205), - AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ 0x01970804, @@ -84,11 +62,10 @@ 0x00370680, 0x00270680, - 0x01470C02, - 0x01570C02, + 0x01470c02, + 0x01570c02, - /* ALC coefficients. */ - + /* ALC coefficients. */ /* 08 */ 0x02050008, 0x02040700, @@ -102,29 +79,14 @@ 0x01870724, /* Enable Vrefout for mic */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/x60/hda_verb.c b/src/mainboard/lenovo/x60/hda_verb.c index 216696b..0712498 100644 --- a/src/mainboard/lenovo/x60/hda_verb.c +++ b/src/mainboard/lenovo/x60/hda_verb.c @@ -14,9 +14,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ - 0x17aa2025, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ + 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ + 0x17aa2025, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa2025), diff --git a/src/mainboard/msi/ms7707/hda_verb.c b/src/mainboard/msi/ms7707/hda_verb.c index 7ff2bee..0895e29 100644 --- a/src/mainboard/msi/ms7707/hda_verb.c +++ b/src/mainboard/msi/ms7707/hda_verb.c @@ -18,53 +18,23 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x14627707, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ + 0x14627707, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x14627707), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x411111f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014410), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x01011412), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x01016411), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x01012414), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01813c40), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a19c50), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x02214c20), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x411111f0), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x01454130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), }; diff --git a/src/mainboard/packardbell/ms2290/hda_verb.c b/src/mainboard/packardbell/ms2290/hda_verb.c index d458cd6..4f78b89 100644 --- a/src/mainboard/packardbell/ms2290/hda_verb.c +++ b/src/mainboard/packardbell/ms2290/hda_verb.c @@ -17,43 +17,22 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ 0x10ec0272, /* Codec Vendor / Device ID: Realtek ALC272X */ 0x10250379, /* Subsystem ID */ 6, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ AZALIA_SUBVENDOR(0x0, 0x10250379), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x99130110), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x99a30920), + AZALIA_PIN_CFG(0x0, 0x1d, 0x4017992d), + AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), - /* NID 0x18. */ - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - - /* NID 0x19. */ - AZALIA_PIN_CFG(0x0, 0x19, 0x99A30920), - - /* NID 0x1D. */ - AZALIA_PIN_CFG(0x0, 0x1D, 0x4017992D), - - /* NID 0x21. */ - AZALIA_PIN_CFG(0x0, 0x21, 0x0321101F), - - 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI. */ + 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI */ 0x80860101, /* Subsystem ID */ 4, /* Number of 4 dword sets */ - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21b5 */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x04. */ AZALIA_PIN_CFG(0x3, 0x04, 0x18560010), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560020), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560030), }; diff --git a/src/mainboard/sapphire/pureplatinumh61/hda_verb.c b/src/mainboard/sapphire/pureplatinumh61/hda_verb.c index 9be242e..2371004 100644 --- a/src/mainboard/sapphire/pureplatinumh61/hda_verb.c +++ b/src/mainboard/sapphire/pureplatinumh61/hda_verb.c @@ -17,68 +17,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ - 0x10ec0000, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ + 0x10ec0000, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x10ec0000), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x2, 0x11, 0x411111f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x2, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x2, 0x14, 0x01014c10), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x2, 0x15, 0x01011c12), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x2, 0x16, 0x01016c11), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x2, 0x17, 0x01012c14), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x2, 0x18, 0x01a19c40), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x2, 0x19, 0x02a19c50), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x2, 0x1a, 0x01813c4f), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x2, 0x1b, 0x0321403f), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x2, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x2, 0x1d, 0x4005e601), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x2, 0x1e, 0x0145e130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x2, 0x1f, 0x411111f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; -- To view, visit https://review.coreboot.org/c/coreboot/+/37541 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ibe2d92990d0074266aa05ada749e9dad55e609a2 Gerrit-Change-Number: 37541 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

3 8

Change in coreboot[master]: Documentation: Fix EC type for facebook and portwell boards
by Wim Vervoorn (Code Review) 12 Dec '19

12 Dec '19

Wim Vervoorn has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37657 ) Change subject: Documentation: Fix EC type for facebook and portwell boards ...................................................................... Documentation: Fix EC type for facebook and portwell boards Board description contained incorrect EC type. Change EC type to ITE8528 BUG=N/A TEST=build Change-Id: Ib5af79fb00bfdfc5dbe001b60010a74bddc696e2 Signed-off-by: Wim Vervoorn <wvervoorn(a)eltan.com> --- M Documentation/mainboard/facebook/fbg1701.md M Documentation/mainboard/facebook/monolith.md M Documentation/mainboard/portwell/pq7-m107.md 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/37657/1 diff --git a/Documentation/mainboard/facebook/fbg1701.md b/Documentation/mainboard/facebook/fbg1701.md index 06bf42f..e711ef3 100644 --- a/Documentation/mainboard/facebook/fbg1701.md +++ b/Documentation/mainboard/facebook/fbg1701.md @@ -72,7 +72,7 @@ +------------------+--------------------------------------------------+ | CPU | Intel Braswell (N3710) | +------------------+--------------------------------------------------+ -| Super I/O, EC | ITE8256 | +| Super I/O, EC | ITE8528 | +------------------+--------------------------------------------------+ | Coprocessor | Intel Management Engine | +------------------+--------------------------------------------------+ diff --git a/Documentation/mainboard/facebook/monolith.md b/Documentation/mainboard/facebook/monolith.md index 9b9f33b..be7f9617 100644 --- a/Documentation/mainboard/facebook/monolith.md +++ b/Documentation/mainboard/facebook/monolith.md @@ -67,7 +67,7 @@ +------------------+--------------------------------------------------+ | CPU | Intel i3-7100U | +------------------+--------------------------------------------------+ -| Super I/O, EC | ITE8256 | +| Super I/O, EC | ITE8528 | +------------------+--------------------------------------------------+ | Coprocessor | Intel Management Engine | +------------------+--------------------------------------------------+ diff --git a/Documentation/mainboard/portwell/pq7-m107.md b/Documentation/mainboard/portwell/pq7-m107.md index f7e5142..0350ac3 100644 --- a/Documentation/mainboard/portwell/pq7-m107.md +++ b/Documentation/mainboard/portwell/pq7-m107.md @@ -67,7 +67,7 @@ +------------------+--------------------------------------------------+ | CPU | Intel Braswell (N3710) | +------------------+--------------------------------------------------+ -| Super I/O, EC | ITE8256 | +| Super I/O, EC | ITE8528 | +------------------+--------------------------------------------------+ | Coprocessor | Intel Management Engine | +------------------+--------------------------------------------------+ -- To view, visit https://review.coreboot.org/c/coreboot/+/37657 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib5af79fb00bfdfc5dbe001b60010a74bddc696e2 Gerrit-Change-Number: 37657 Gerrit-PatchSet: 1 Gerrit-Owner: Wim Vervoorn <wvervoorn(a)eltan.com> Gerrit-MessageType: newchange

4 3

Change in coreboot[master]: soc/intel/{cnl,icl,skl,tgl}: Remove unused gpe0_en_* from chip.h
by Furquan Shaikh (Code Review) 12 Dec '19

12 Dec '19

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37659 ) Change subject: soc/intel/{cnl,icl,skl,tgl}: Remove unused gpe0_en_* from chip.h ...................................................................... soc/intel/{cnl,icl,skl,tgl}: Remove unused gpe0_en_* from chip.h gpe0_en_* seem to have been copied over from previous generations but recent SoCs don't use it. This change gets rid of these unused members. Change-Id: I165e66aeefde4efea4484f588c774795987ca461 Signed-off-by: Furquan Shaikh <furquan(a)google.com> --- M src/soc/intel/cannonlake/chip.h M src/soc/intel/icelake/chip.h M src/soc/intel/skylake/chip.h M src/soc/intel/tigerlake/chip.h 4 files changed, 0 insertions(+), 23 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/37659/1 diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index f08fd0a..85c33db 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -45,12 +45,6 @@ /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; - /* GPE configuration */ - uint32_t gpe0_en_1; /* GPE0_EN_31_0 */ - uint32_t gpe0_en_2; /* GPE0_EN_63_32 */ - uint32_t gpe0_en_3; /* GPE0_EN_95_64 */ - uint32_t gpe0_en_4; /* GPE0_EN_127_96 / GPE_STD */ - /* Gpio group routed to each dword of the GPE0 block. Values are * of the form GPP_[A:G] or GPD. */ uint8_t gpe0_dw0; /* GPE0_31_0 STS/EN */ diff --git a/src/soc/intel/icelake/chip.h b/src/soc/intel/icelake/chip.h index ec625a0..0687513 100644 --- a/src/soc/intel/icelake/chip.h +++ b/src/soc/intel/icelake/chip.h @@ -35,12 +35,6 @@ /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; - /* GPE configuration */ - uint32_t gpe0_en_1; /* GPE0_EN_31_0 */ - uint32_t gpe0_en_2; /* GPE0_EN_63_32 */ - uint32_t gpe0_en_3; /* GPE0_EN_95_64 */ - uint32_t gpe0_en_4; /* GPE0_EN_127_96 / GPE_STD */ - /* Gpio group routed to each dword of the GPE0 block. Values are * of the form GPP_[A:G] or GPD. */ uint8_t gpe0_dw0; /* GPE0_31_0 STS/EN */ diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 63626663..b189a16 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -73,11 +73,6 @@ uint8_t pirqg_routing; uint8_t pirqh_routing; - /* GPE configuration */ - uint32_t gpe0_en_1; /* GPE0_EN_31_0 */ - uint32_t gpe0_en_2; /* GPE0_EN_63_32 */ - uint32_t gpe0_en_3; /* GPE0_EN_95_64 */ - uint32_t gpe0_en_4; /* GPE0_EN_127_96 / GPE_STD */ /* Gpio group routed to each dword of the GPE0 block. Values are * of the form GPP_[A:G] or GPD. */ uint8_t gpe0_dw0; /* GPE0_31_0 STS/EN */ diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h index 32dc02c..5e0fcd1 100644 --- a/src/soc/intel/tigerlake/chip.h +++ b/src/soc/intel/tigerlake/chip.h @@ -35,12 +35,6 @@ /* Common struct containing soc config data required by common code */ struct soc_intel_common_config common_soc_config; - /* GPE configuration */ - uint32_t gpe0_en_1; /* GPE0_EN_31_0 */ - uint32_t gpe0_en_2; /* GPE0_EN_63_32 */ - uint32_t gpe0_en_3; /* GPE0_EN_95_64 */ - uint32_t gpe0_en_4; /* GPE0_EN_127_96 / GPE_STD */ - /* Gpio group routed to each dword of the GPE0 block. Values are * of the form GPP_[A:G] or GPD. */ uint8_t gpe0_dw0; /* GPE0_31_0 STS/EN */ -- To view, visit https://review.coreboot.org/c/coreboot/+/37659 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I165e66aeefde4efea4484f588c774795987ca461 Gerrit-Change-Number: 37659 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh <furquan(a)google.com> Gerrit-MessageType: newchange

4 3

Change in coreboot[master]: hatch/create_coreboot_variant: clean up user-visible output
by Paul Fagerburg (Code Review) 12 Dec '19

12 Dec '19

Paul Fagerburg has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37647 ) Change subject: hatch/create_coreboot_variant: clean up user-visible output ...................................................................... hatch/create_coreboot_variant: clean up user-visible output * Add more information in the usage message when the cmdline params are incorrect. * Remove messages that tell the user what to do, because the top-level program that invokes this script will handle those commands, and so this script telling the user what to do is noise (and possibly harmful) * Add more information to the commit message that the script prepares for the user. * Bump script version number. BRANCH=None BUG=b:140261109 TEST=Create the "sushi" variant of the "hatch" baseboard: `util/mainboard/google/hatch/create_coreboot_variant.sh sushi` Inspect the files in src/mainboard/google/hatch/variants/sushi Change-Id: I04e949aedce61ed7fc7df681b72c3cfef31b5513 Signed-off-by: Paul Fagerburg <pfagerburg(a)chromium.org> --- M util/mainboard/google/hatch/create_coreboot_variant.sh 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/37647/1 diff --git a/util/mainboard/google/hatch/create_coreboot_variant.sh b/util/mainboard/google/hatch/create_coreboot_variant.sh index 184e54c..7b16d74 100755 --- a/util/mainboard/google/hatch/create_coreboot_variant.sh +++ b/util/mainboard/google/hatch/create_coreboot_variant.sh @@ -13,7 +13,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -VERSION="1.0.0" +VERSION="1.0.1" SCRIPT=$(basename -- "${0}") export LC_ALL=C @@ -21,9 +21,8 @@ if [[ "$#" -lt 1 ]]; then echo "Usage: ${SCRIPT} variant_name [b:bug_number]" echo "e.g. ${SCRIPT} kohaku b:140261109" - echo "Adds a new variant of Hatch to Kconfig and Kconfig.name, creates the" - echo "skeleton files for acpi, ec, and gpio, copies the makefile for" - echo "SPD sources, and sets up a basic overridetree" + echo "* Adds a new variant of the baseboard to Kconfig and Kconfig.name" + echo "* Copies the template files for the baseboard to the new variant" exit 1 fi @@ -78,11 +77,12 @@ # Now commit the files. git commit -sm "${BASE}: Create ${VARIANT} variant +Create the ${VARIANT} of the ${BASE} baseboard by copying +the baseboard template files to a new directory named for +the variant. + (Auto-Generated by ${SCRIPT} version ${VERSION}). BUG=${BUG} TEST=util/abuild/abuild -p none -t google/${BASE} -x -a make sure the build includes GOOGLE_${VARIANT_UPPER}" - -echo "Please check all the files (git show), make any changes you want," -echo "and then push to coreboot HEAD:refs/for/master" -- To view, visit https://review.coreboot.org/c/coreboot/+/37647 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I04e949aedce61ed7fc7df681b72c3cfef31b5513 Gerrit-Change-Number: 37647 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Fagerburg <pfagerburg(a)chromium.org> Gerrit-MessageType: newchange

3 7

Change in coreboot[master]: drivers/intel/fsp2_0: Add logo support
by Wim Vervoorn (Code Review) 12 Dec '19

12 Dec '19

Wim Vervoorn has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37515 ) Change subject: drivers/intel/fsp2_0: Add logo support ...................................................................... drivers/intel/fsp2_0: Add logo support Add support for the FSP feature to display the logo. BUG=N/A TEST=tested on facebook monolith Change-Id: Iaaffd2be567861371bbe908c1ef9d7dde483a945 Signed-off-by: Wim Vervoorn <wvervoorn(a)eltan.com> --- M src/drivers/intel/fsp2_0/Kconfig M src/drivers/intel/fsp2_0/Makefile.inc M src/drivers/intel/fsp2_0/include/fsp/api.h A src/drivers/intel/fsp2_0/logo.c M src/drivers/intel/fsp2_0/silicon_init.c 5 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/37515/1 diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig index 77382d3..1d692a8 100644 --- a/src/drivers/intel/fsp2_0/Kconfig +++ b/src/drivers/intel/fsp2_0/Kconfig @@ -156,6 +156,18 @@ is limited till EFI_PEI_MP_SERVICE_PPI and this option might be useful to add further PPI if required. +config FSP2_0_DISPLAY_LOGO + bool "Enable logo" + default n + help + Uses the FSP to display the boot logo. This method supports a + BMP file only. The uncompressed size can be up to 1 MB. + +config FSP2_0_LOGO_FILE_NAME + string "Logo file" + depends on FSP2_0_DISPLAY_LOGO + default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/logo.bmp" + if FSP_PEIM_TO_PEIM_INTERFACE source "src/drivers/intel/fsp2_0/ppi/Kconfig" endif diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc index bc00cd4..8658062 100644 --- a/src/drivers/intel/fsp2_0/Makefile.inc +++ b/src/drivers/intel/fsp2_0/Makefile.inc @@ -30,6 +30,7 @@ ramstage-$(CONFIG_DISPLAY_FSP_HEADER) += header_display.c ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c ramstage-$(CONFIG_VERIFY_HOBS) += hob_verify.c +ramstage-$(CONFIG_FSP2_0_DISPLAY_LOGO) += logo.c ramstage-y += notify.c ramstage-y += silicon_init.c ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c @@ -78,6 +79,12 @@ true endif +# Add logo to the cbfs image +cbfs-files-$(CONFIG_FSP2_0_DISPLAY_LOGO) += logo.bmp +logo.bmp-file := $(call strip_quotes,$(CONFIG_FSP2_0_LOGO_FILE_NAME)) +logo.bmp-type := raw +logo.bmp-compression := LZMA + ifneq ($(call strip_quotes,$(CONFIG_FSP_HEADER_PATH)),) CPPFLAGS_common+=-I$(CONFIG_FSP_HEADER_PATH) endif diff --git a/src/drivers/intel/fsp2_0/include/fsp/api.h b/src/drivers/intel/fsp2_0/include/fsp/api.h index b63cd04..fb42c76 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/api.h +++ b/src/drivers/intel/fsp2_0/include/fsp/api.h @@ -69,6 +69,9 @@ uint8_t fsp_memory_mainboard_version(void); uint8_t fsp_memory_soc_version(void); +/* Load logo to be displayed by FSP */ +void load_logo(FSPS_UPD *supd); + /* Callback after processing FSP notify */ void platform_fsp_notify_status(enum fsp_notify_phase phase); diff --git a/src/drivers/intel/fsp2_0/logo.c b/src/drivers/intel/fsp2_0/logo.c new file mode 100644 index 0000000..feeec3b --- /dev/null +++ b/src/drivers/intel/fsp2_0/logo.c @@ -0,0 +1,27 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <soc/ramstage.h> +#include <console/console.h> +#include <fsp/api.h> +#include <include/cbfs.h> + +void load_logo(FSPS_UPD *supd) +{ + FSP_S_CONFIG *params = &supd->FspsConfig; + + params->LogoSize = cbfs_boot_load_file("logo.bmp", (void *)params->LogoPtr, + params->LogoSize, CBFS_TYPE_RAW); + if (!params->LogoSize) + params->LogoPtr = 0; +} diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index f58851d..4131142 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -34,6 +34,7 @@ fsp_silicon_init_fn silicon_init; uint32_t status; uint8_t postcode; + const struct cbmem_entry *logo_entry; supd = (FSPS_UPD *) (hdr->cfg_region_offset + hdr->image_base); @@ -56,6 +57,13 @@ /* Give SoC/mainboard a chance to populate entries */ platform_fsp_silicon_init_params_cb(upd); + if (CONFIG(FSP2_0_DISPLAY_LOGO)) { + upd->FspsConfig.LogoSize = 1 * MiB; + logo_entry = cbmem_entry_add(CBMEM_ID_FSP_LOGO, upd->FspsConfig.LogoSize); + upd->FspsConfig.LogoPtr = (UINT32)cbmem_entry_start(logo_entry); + load_logo(upd); + } + /* Call SiliconInit */ silicon_init = (void *) (hdr->image_base + hdr->silicon_init_entry_offset); @@ -67,6 +75,9 @@ timestamp_add_now(TS_FSP_SILICON_INIT_END); post_code(POST_FSP_SILICON_EXIT); + if (CONFIG(FSP2_0_DISPLAY_LOGO)) + cbmem_entry_remove(logo_entry); + fsp_debug_after_silicon_init(status); /* Handle any errors returned by FspSiliconInit */ -- To view, visit https://review.coreboot.org/c/coreboot/+/37515 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iaaffd2be567861371bbe908c1ef9d7dde483a945 Gerrit-Change-Number: 37515 Gerrit-PatchSet: 1 Gerrit-Owner: Wim Vervoorn <wvervoorn(a)eltan.com> Gerrit-MessageType: newchange

6 13

Change in coreboot[master]: acpigen: Add methods for mutex operations
by Patrick Rudolph (Code Review) 12 Dec '19

12 Dec '19

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37637 ) Change subject: acpigen: Add methods for mutex operations ...................................................................... acpigen: Add methods for mutex operations Change-Id: I79310b0f9e2297cf8428d11598935164caf95968 Signed-off-by: Patrick Rudolph <patrick.rudolph(a)9elements.com> --- M src/arch/x86/acpigen.c M src/arch/x86/include/arch/acpigen.h 2 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/37637/1 diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c index 1d75889..8272757 100644 --- a/src/arch/x86/acpigen.c +++ b/src/arch/x86/acpigen.c @@ -403,6 +403,37 @@ acpigen_write_integer(opreg->regionlen); } +/* + * Generate ACPI AML code for Mutex + * Arg0: Pointer to name of mutex + * Arg1: Initial value of mutex + */ +void acpigen_write_mutex(const char *name, const int val) +{ + /* MutexOp */ + acpigen_emit_ext_op(MUTEX_OP); + /* NameString 4 chars only */ + acpigen_emit_simple_namestring(name); + acpigen_write_integer(val); +} + +void acpigen_write_acquire(const char *name, const int val) +{ + /* AcquireOp */ + acpigen_emit_ext_op(ACQUIRE_OP); + /* NameString 4 chars only */ + acpigen_emit_simple_namestring(name); + acpigen_write_word(val); +} + +void acpigen_write_release(const char *name) +{ + /* ReleaseOp */ + acpigen_emit_ext_op(RELEASE_OP); + /* NameString 4 chars only */ + acpigen_emit_simple_namestring(name); +} + static void acpigen_write_field_length(uint32_t len) { uint8_t i, j; diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h index 6fd9f73..a97cf1d 100644 --- a/src/arch/x86/include/arch/acpigen.h +++ b/src/arch/x86/include/arch/acpigen.h @@ -411,6 +411,21 @@ */ void acpigen_write_opregion(struct opregion *opreg); /* + * Generate ACPI AML code for Mutex + * This function takes mutex name and initial value. + */ +void acpigen_write_mutex(const char *name, const int val); +/* + * Generate ACPI AML code for Acquire + * This function takes mutex name and privilege value. + */ +void acpigen_write_acquire(const char *name, const int val); +/* + * Generate ACPI AML code for Release + * This function takes mutex name. + */ +void acpigen_write_release(const char *name); +/* * Generate ACPI AML code for Field * This function takes input region name, fieldlist, count & flags. */ -- To view, visit https://review.coreboot.org/c/coreboot/+/37637 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I79310b0f9e2297cf8428d11598935164caf95968 Gerrit-Change-Number: 37637 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-MessageType: newchange

3 7

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2019