coreboot-gerrit July 2018

coreboot-gerrit@coreboot.org

1 participants
877 discussions

Change in coreboot[master]: Documenation/conf.py: Make sure release is a string
by Patrick Rudolph (Code Review) 26 Jul '18

26 Jul '18

Patrick Rudolph has submitted this change and it was merged. ( https://review.coreboot.org/27630 ) Change subject: Documenation/conf.py: Make sure release is a string ...................................................................... Documenation/conf.py: Make sure release is a string With python3 the split method can operate on strings while check_output generates bytestrings. Change-Id: I7b455c56e8195f0ecfbe5e360ac161c176f00115 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Reviewed-on: https://review.coreboot.org/27630 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> --- M Documentation/conf.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved diff --git a/Documentation/conf.py b/Documentation/conf.py index b8415c6..ff1ad9d 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -20,7 +20,7 @@ # built documents. # # The full version, including alpha/beta/rc tags. -release = subprocess.check_output(('git', 'describe')) +release = subprocess.check_output(('git', 'describe')).decode("utf-8") # The short X.Y version. version = release.split("-")[0] -- To view, visit https://review.coreboot.org/27630 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7b455c56e8195f0ecfbe5e360ac161c176f00115 Gerrit-Change-Number: 27630 Gerrit-PatchSet: 2 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: Documentation/writing_docs: Document the need for recommonmark
by Patrick Rudolph (Code Review) 26 Jul '18

26 Jul '18

Patrick Rudolph has submitted this change and it was merged. ( https://review.coreboot.org/27631 ) Change subject: Documentation/writing_docs: Document the need for recommonmark ...................................................................... Documentation/writing_docs: Document the need for recommonmark python-recommonmark is need for sphinx to be able to hande the markdown documentation. Change-Id: I9513ab4bdc753e0350754d9869239ea833893af9 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> Reviewed-on: https://review.coreboot.org/27631 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> --- M Documentation/getting_started/writing_documentation.md 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved diff --git a/Documentation/getting_started/writing_documentation.md b/Documentation/getting_started/writing_documentation.md index 9a9bbf0..027def9 100644 --- a/Documentation/getting_started/writing_documentation.md +++ b/Documentation/getting_started/writing_documentation.md @@ -16,7 +16,9 @@ ### Install Sphinx -Please follow this official [guide]. +Please follow this official [guide] to install sphinx. +You will also need python-recommonmark for sphinx to be able to handle +markdown documenation. ### Optional -- To view, visit https://review.coreboot.org/27631 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9513ab4bdc753e0350754d9869239ea833893af9 Gerrit-Change-Number: 27631 Gerrit-PatchSet: 3 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: util: Add util_readme script
by Philipp Deppenwiese (Code Review) 26 Jul '18

26 Jul '18

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/27564 ) Change subject: util: Add util_readme script ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://review.coreboot.org/27564 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I015ae6816ea74cacb7f0332fda2c3ebef205c1e2 Gerrit-Change-Number: 27564 Gerrit-PatchSet: 6 Gerrit-Owner: Tom Hiller <thrilleratplay(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Comment-Date: Thu, 26 Jul 2018 10:39:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/google/poppy/variant/nami: variant devicetree updating for AC-/DCL...
by TH Lin (Code Review) 26 Jul '18

26 Jul '18

TH Lin has uploaded this change for review. ( https://review.coreboot.org/27646 Change subject: mb/google/poppy/variant/nami: variant devicetree updating for AC-/DCLoadLine ...................................................................... mb/google/poppy/variant/nami: variant devicetree updating for AC-/DCLoadLine BUG=b:111761175 BRANCH=nami TEST=emerge-nami coreboot chromeos-bootimage Change-Id: I1a022a66a6fe478d20f902e9c2c4d5b26bae6c72 Signed-off-by: T.H. Lin <t.h_lin(a)quanta.corp-partner.google.com> --- M src/mainboard/google/poppy/variants/nami/mainboard.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/27646/1 diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 8080c94..d966562 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -83,6 +83,16 @@ /* Disable unused port USB port */ cfg->usb2_ports[5].enable = 0; break; + case SKU_0_AKALI: + case SKU_1_AKALI: + case SKU_0_AKALI360: + case SKU_1_AKALI360: + cfg->domain_vr_config[VR_SYSTEM_AGENT].ac_loadline = 1100; + cfg->domain_vr_config[VR_IA_CORE].ac_loadline = 245; + cfg->domain_vr_config[VR_GT_SLICED].ac_loadline = 314; + cfg->domain_vr_config[VR_SYSTEM_AGENT].dc_loadline = 1033; + cfg->domain_vr_config[VR_IA_CORE].dc_loadline = 247; + cfg->domain_vr_config[VR_GT_SLICED].dc_loadline = 319; default: break; } -- To view, visit https://review.coreboot.org/27646 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a022a66a6fe478d20f902e9c2c4d5b26bae6c72 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 1 Gerrit-Owner: TH Lin <t.h_lin(a)quanta.corp-partner.google.com>

1 0

Change in coreboot[master]: riscv: add support move bootblock to CAR/SRAM before exection
by Xiang Wang (Code Review) 26 Jul '18

26 Jul '18

Xiang Wang has uploaded this change for review. ( https://review.coreboot.org/27645 Change subject: riscv: add support move bootblock to CAR/SRAM before exection ...................................................................... riscv: add support move bootblock to CAR/SRAM before exection It cannot access the data segment, if program located in masked rom. So we can move it to CAR/SRAM before execution. Change-Id: If1f53a7dbd7db9643bd9aeea6567cd4fae0f310e Signed-off-by: Xiang Wang <wxjstz(a)126.com> --- M src/arch/riscv/Kconfig M src/arch/riscv/bootblock.S 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/27645/1 diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 916e269..e36bbd6 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -28,3 +28,7 @@ config ARCH_RAMSTAGE_RISCV bool default n + +config MOVE_BOOTBLOCK_TO_CAR + bool + default n diff --git a/src/arch/riscv/bootblock.S b/src/arch/riscv/bootblock.S index f92ed4b..378214c 100644 --- a/src/arch/riscv/bootblock.S +++ b/src/arch/riscv/bootblock.S @@ -37,6 +37,31 @@ # initialize cache as ram call cache_as_ram + # It cannot access the data segment, if program located in masked rom. + # so we can move it to CAR/SRAM before execution. +#if IS_ENABLED(CONFIG_MOVE_BOOTBLOCK_TO_CAR) +_m2car: + la a0, _program + la a1, _eprogram + ld a2, _program_execution_address + beq a0, a2, _em2car +1: + lb t0, 0(a0) + sb t0, 0(a2) + addi a0, a0, 1 + addi a2, a2, 1 + blt a0, a1, 1b + + ld a0, _em2car_execution_address + jr a0 +_program_execution_address: + .dword _program +_em2car_execution_address: + .dword _em2car +_em2car: + +#endif + # Save the FDT pointer to memory. # Make mscratch vacate for exception context switching. csrrw a1, mscratch, zero -- To view, visit https://review.coreboot.org/27645 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If1f53a7dbd7db9643bd9aeea6567cd4fae0f310e Gerrit-Change-Number: 27645 Gerrit-PatchSet: 1 Gerrit-Owner: Xiang Wang <wxjstz(a)126.com>

1 0

Change in coreboot[master]: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines
by Kane Chen (Code Review) 26 Jul '18

26 Jul '18

Kane Chen has posted comments on this change. ( https://review.coreboot.org/27644 ) Change subject: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines ...................................................................... Patch Set 3: (1 comment) https://review.coreboot.org/#/c/27644/3/src/mainboard/google/poppy/variants… File src/mainboard/google/poppy/variants/nami/mainboard.c: https://review.coreboot.org/#/c/27644/3/src/mainboard/google/poppy/variants… PS3, Line 168: ant_devtree_update(void) Do we need to move this entire function here? thanks. -- To view, visit https://review.coreboot.org/27644 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 3 Gerrit-Owner: Gaggery Tsai <gaggery.tsai(a)intel.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Kane Chen <kane.chen(a)intel.com> Gerrit-Reviewer: Shelley Chen <shchen(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 26 Jul 2018 08:15:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines
by Gaggery Tsai (Code Review) 26 Jul '18

26 Jul '18

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/27644 to look at the new patch set (#3). Change subject: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines ...................................................................... mb/google/poppy/variant/nami: Overwrite AC/DC loadlines This patch adds a function to overwrite AC/DC loadlines for differnt projects. BUG=b:111761175 BRANCH=None TEST=emerge-nami coreboot chromeos-bootimage and use DCI to dump AC/DC loadline settings. Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Signed-off-by: Gaggery Tsai <gaggery.tsai(a)intel.com> --- A src/mainboard/google/poppy/variants/nami/include/variant/variant.h M src/mainboard/google/poppy/variants/nami/mainboard.c 2 files changed, 175 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/27644/3 -- To view, visit https://review.coreboot.org/27644 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 3 Gerrit-Owner: Gaggery Tsai <gaggery.tsai(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines
by Gaggery Tsai (Code Review) 26 Jul '18

26 Jul '18

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/27644 to look at the new patch set (#2). Change subject: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines ...................................................................... mb/google/poppy/variant/nami: Overwrite AC/DC loadlines This patch adds a fucntion to overwrite AC/DC loadlines for differnt projects. BUG=b:111761175 BRANCH=None TEST=emerge-nami coreboot chromeos-bootimage and use DCI to dump AC/DC loadline settings. Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Signed-off-by: Gaggery Tsai <gaggery.tsai(a)intel.com> --- A src/mainboard/google/poppy/variants/nami/include/variant/variant.h M src/mainboard/google/poppy/variants/nami/mainboard.c 2 files changed, 175 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/27644/2 -- To view, visit https://review.coreboot.org/27644 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 2 Gerrit-Owner: Gaggery Tsai <gaggery.tsai(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines
by build bot (Jenkins) (Code Review) 26 Jul '18

26 Jul '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/27644 ) Change subject: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines ...................................................................... Patch Set 1: (2 comments) https://review.coreboot.org/#/c/27644/1/src/mainboard/google/poppy/variants… File src/mainboard/google/poppy/variants/nami/mainboard.c: https://review.coreboot.org/#/c/27644/1/src/mainboard/google/poppy/variants… PS1, Line 200: cfg->domain_vr_config[i].ac_loadline = sku_ll_mapping[sku_id].ac_loadline[i]; line over 80 characters https://review.coreboot.org/#/c/27644/1/src/mainboard/google/poppy/variants… PS1, Line 201: cfg->domain_vr_config[i].dc_loadline = sku_ll_mapping[sku_id].dc_loadline[i]; line over 80 characters -- To view, visit https://review.coreboot.org/27644 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 1 Gerrit-Owner: Gaggery Tsai <gaggery.tsai(a)intel.com> Gerrit-CC: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 26 Jul 2018 07:32:43 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in coreboot[master]: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines
by Gaggery Tsai (Code Review) 26 Jul '18

26 Jul '18

Gaggery Tsai has uploaded this change for review. ( https://review.coreboot.org/27644 Change subject: mb/google/poppy/variant/nami: Overwrite AC/DC loadlines ...................................................................... mb/google/poppy/variant/nami: Overwrite AC/DC loadlines This patch adds a fucntion to overwrite AC/DC loadlines for differnt projects. BUG=b:111761175 BRANCH=None TEST=emerge-nami coreboot chromeos-bootimage and use DCI to dump AC/DC loadline settings. Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Signed-off-by: Gaggery Tsai <gaggery.tsai(a)intel.com> --- A src/mainboard/google/poppy/variants/nami/include/variant/variant.h M src/mainboard/google/poppy/variants/nami/mainboard.c 2 files changed, 173 insertions(+), 27 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/27644/1 diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/variant.h b/src/mainboard/google/poppy/variants/nami/include/variant/variant.h new file mode 100644 index 0000000..4a3d37a --- /dev/null +++ b/src/mainboard/google/poppy/variants/nami/include/variant/variant.h @@ -0,0 +1,132 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2018 Google Inc. + * + * 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. + */ + +#ifndef __SKU_VARIANT_H__ +#define __SKU_VARIANT_H__ + +enum project_sku { + PRJ_LIST_MIN = 0x1, + PRJ_AKALI = PRJ_LIST_MIN, + PRJ_TBD = PRJ_AKALI + 1, + PRJ_VAYNE = PRJ_TBD + 1, + PRJ_SONA = PRJ_VAYNE + 1, + PRJ_PANTHEON = PRJ_SONA + 1, + PRJ_LIST_MAX = PRJ_PANTHEON +}; + +#define PRJ_DEFAULT PRJ_VAYNE + +/* Variant for AKALI */ +#define AKALI_SA_AC_LOADLINE 1100 +#define AKALI_SA_DC_LOADLINE 1028 +#define AKALI_IA_AC_LOADLINE 272 +#define AKALI_IA_DC_LOADLINE 247 +#define AKALI_GT_AC_LOADLINE 314 +#define AKALI_GT_DC_LOADLINE 321 + +/* Variant for Nami */ +#define NAMI_SA_AC_LOADLINE 1490 +#define NAMI_SA_DC_LOADLINE 1420 +#define NAMI_IA_AC_LOADLINE 400 +#define NAMI_IA_DC_LOADLINE 400 +#define NAMI_GT_AC_LOADLINE 310 +#define NAMI_GT_DC_LOADLINE 310 +#define NAMI_GTS_AC_LOADLINE 310 +#define NAMI_GTS_DC_LOADLINE 310 + +const struct { + enum project_sku sku; + int ac_loadline[NUM_VR_DOMAINS]; + int dc_loadline[NUM_VR_DOMAINS]; +} sku_ll_mapping[] = { + [PRJ_AKALI] = { + .sku = PRJ_AKALI, + .ac_loadline = { + AKALI_SA_AC_LOADLINE, + AKALI_IA_AC_LOADLINE, + AKALI_GT_AC_LOADLINE, + AKALI_GT_AC_LOADLINE + }, + .dc_loadline = { + AKALI_SA_DC_LOADLINE, + AKALI_IA_DC_LOADLINE, + AKALI_GT_DC_LOADLINE, + AKALI_GT_DC_LOADLINE + } + }, + [PRJ_SONA] = { + .sku = PRJ_SONA, + .ac_loadline = { + NAMI_SA_AC_LOADLINE, + NAMI_IA_AC_LOADLINE, + NAMI_GT_AC_LOADLINE, + NAMI_GTS_AC_LOADLINE + }, + .dc_loadline = { + NAMI_SA_DC_LOADLINE, + NAMI_IA_DC_LOADLINE, + NAMI_GT_DC_LOADLINE, + NAMI_GTS_DC_LOADLINE + } + }, + [PRJ_TBD] = { + .sku = PRJ_TBD, + .ac_loadline = { + NAMI_SA_AC_LOADLINE, + NAMI_IA_AC_LOADLINE, + NAMI_GT_AC_LOADLINE, + NAMI_GTS_AC_LOADLINE + }, + .dc_loadline = { + NAMI_SA_DC_LOADLINE, + NAMI_IA_DC_LOADLINE, + NAMI_GT_DC_LOADLINE, + NAMI_GTS_DC_LOADLINE + } + }, + [PRJ_VAYNE] = { + .sku = PRJ_VAYNE, + .ac_loadline = { + NAMI_SA_AC_LOADLINE, + NAMI_IA_AC_LOADLINE, + NAMI_GT_AC_LOADLINE, + NAMI_GTS_AC_LOADLINE + }, + .dc_loadline = { + NAMI_SA_DC_LOADLINE, + NAMI_IA_DC_LOADLINE, + NAMI_GT_DC_LOADLINE, + NAMI_GTS_DC_LOADLINE + } + }, + [PRJ_PANTHEON] = { + .sku = PRJ_PANTHEON, + .ac_loadline = { + NAMI_SA_AC_LOADLINE, + NAMI_IA_AC_LOADLINE, + NAMI_GT_AC_LOADLINE, + NAMI_GTS_AC_LOADLINE + }, + .dc_loadline = { + NAMI_SA_DC_LOADLINE, + NAMI_IA_DC_LOADLINE, + NAMI_GT_DC_LOADLINE, + NAMI_GTS_DC_LOADLINE + } + }, +}; + + +#endif /* __OEM_SKU_VARIANT_H__ */ diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 8080c94..3c2c75f 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -28,6 +28,7 @@ #include <soc/ramstage.h> #include <string.h> #include <variant/sku.h> +#include <variant/variant.h> #define PL2_I7_SKU 44 #define PL2_DEFAULT 29 @@ -61,33 +62,6 @@ return sku_id; } -/* Override dev tree settings per board */ -void variant_devtree_update(void) -{ - uint32_t sku_id = variant_board_sku(); - struct device *root = SA_DEV_ROOT; - config_t *cfg = root->chip_info; - - /* Update PL2 based on SKU. */ - cfg->tdp_pl2_override = get_pl2(sku_id); - - switch (sku_id) { - case SKU_0_VAYNE: - case SKU_1_VAYNE: - case SKU_2_VAYNE: - case SKU_0_PANTHEON: - case SKU_1_PANTHEON: - case SKU_2_PANTHEON: - case SKU_0_SONA: - case SKU_1_SONA: - /* Disable unused port USB port */ - cfg->usb2_ports[5].enable = 0; - break; - default: - break; - } -} - const char *smbios_mainboard_sku(void) { static char sku_str[14]; /* sku{0..4294967295} */ @@ -189,3 +163,43 @@ break; } } + +/* Override dev tree settings per board */ +void variant_devtree_update(void) +{ + uint32_t sku_id = variant_board_sku(); + uint32_t i; + struct device *root = SA_DEV_ROOT; + config_t *cfg = root->chip_info; + + /* Update PL2 based on SKU. */ + cfg->tdp_pl2_override = get_pl2(sku_id); + + switch (sku_id) { + case SKU_0_VAYNE: + case SKU_1_VAYNE: + case SKU_2_VAYNE: + case SKU_0_PANTHEON: + case SKU_1_PANTHEON: + case SKU_2_PANTHEON: + case SKU_0_SONA: + case SKU_1_SONA: + /* Disable unused port USB port */ + cfg->usb2_ports[5].enable = 0; + break; + default: + break; + } + + /* Update AC/DC loadlines based on OEM ID */ + sku_id = read_oem_id(); + if (sku_id < PRJ_LIST_MIN || sku_id > PRJ_LIST_MAX) + sku_id = PRJ_DEFAULT; + + for (i = 0; i < ARRAY_SIZE(cfg->domain_vr_config); i++) { + cfg->domain_vr_config[i].ac_loadline = sku_ll_mapping[sku_id].ac_loadline[i]; + cfg->domain_vr_config[i].dc_loadline = sku_ll_mapping[sku_id].dc_loadline[i]; + } +} + + -- To view, visit https://review.coreboot.org/27644 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id0068c5334c257b9f4c32b6088becbfe8391a864 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 1 Gerrit-Owner: Gaggery Tsai <gaggery.tsai(a)intel.com>

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2018