coreboot-gerrit December 2020

coreboot-gerrit@coreboot.org

1 participants
3167 discussions

Change in coreboot[master]: mb/clevo/l140cu: Use proper indents
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48372 ) Change subject: mb/clevo/l140cu: Use proper indents ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/48372 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id6e6f4ad648a9bed35305b7a446744c6ed06a150 Gerrit-Change-Number: 48372 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 06 Dec 2020 11:25:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/clevo/l140cu: Make PCI devices P2SB and PMC hidden
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48371 ) Change subject: mb/clevo/l140cu: Make PCI devices P2SB and PMC hidden ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://review.coreboot.org/c/coreboot/+/48371 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie6e12f99b0a7ffb1c4831b3aa8705e911b677e88 Gerrit-Change-Number: 48371 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 06 Dec 2020 11:24:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/*: Remove unnecessary selects
by Felix Singer (Code Review) 06 Dec '20

06 Dec '20

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48289 ) Change subject: mb/*: Remove unnecessary selects ...................................................................... mb/*: Remove unnecessary selects Remove SOC_INTEL_COMMON_BLOCK_HDA from mainboards Kconfig since it is selected by their SoC soc/intel/cannonlake. Change-Id: I9597746a217575b42f6325998b948e16b452231a Signed-off-by: Felix Singer <felixsinger(a)posteo.net> --- M src/mainboard/clevo/cml-u/Kconfig M src/mainboard/intel/coffeelake_rvp/Kconfig M src/mainboard/purism/librem_cnl/Kconfig M src/mainboard/system76/lemp9/Kconfig 4 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/48289/1 diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig index 57c9f58..3f6f675 100644 --- a/src/mainboard/clevo/cml-u/Kconfig +++ b/src/mainboard/clevo/cml-u/Kconfig @@ -17,7 +17,6 @@ select MAINBOARD_HAS_TPM2 select NO_UART_ON_SUPERIO select SOC_INTEL_COMETLAKE_1 - select SOC_INTEL_COMMON_BLOCK_HDA select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SPD_READ_BY_WORD select SYSTEM_TYPE_LAPTOP diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index b1d8eba..0f8075b 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -15,7 +15,6 @@ select DRIVERS_GENERIC_MAX98357A select SOC_INTEL_CANNONLAKE_PCH_H if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8 select SOC_INTEL_COMMON_BLOCK_HDA_VERB if !BOARD_INTEL_COFFEELAKE_RVPU - select SOC_INTEL_COMMON_BLOCK_HDA if BOARD_INTEL_WHISKEYLAKE_RVP || BOARD_INTEL_COMETLAKE_RVPU select MAINBOARD_USES_IFD_EC_REGION select MAINBOARD_USES_IFD_GBE_REGION if BOARD_INTEL_COFFEELAKE_RVP11 || BOARD_INTEL_COFFEELAKE_RVP8 select MAINBOARD_HAS_LPC_TPM diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig index 39d57e6..1d31ec6 100644 --- a/src/mainboard/purism/librem_cnl/Kconfig +++ b/src/mainboard/purism/librem_cnl/Kconfig @@ -7,7 +7,6 @@ select HAVE_ACPI_TABLES select INTEL_GMA_HAVE_VBT select NO_UART_ON_SUPERIO - select SOC_INTEL_COMMON_BLOCK_HDA select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SPD_READ_BY_WORD select USE_LEGACY_8254_TIMER diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig index d514d3e..bf2af91 100644 --- a/src/mainboard/system76/lemp9/Kconfig +++ b/src/mainboard/system76/lemp9/Kconfig @@ -16,7 +16,6 @@ select MAINBOARD_HAS_TPM2 select NO_UART_ON_SUPERIO select SOC_INTEL_COMETLAKE_1 - select SOC_INTEL_COMMON_BLOCK_HDA select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SPD_READ_BY_WORD select SYSTEM_TYPE_LAPTOP -- To view, visit https://review.coreboot.org/c/coreboot/+/48289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I9597746a217575b42f6325998b948e16b452231a Gerrit-Change-Number: 48289 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: mb/siemens/chili: Move mainboard/gpio.h to variant/gpio.h
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48299 ) Change subject: mb/siemens/chili: Move mainboard/gpio.h to variant/gpio.h ...................................................................... mb/siemens/chili: Move mainboard/gpio.h to variant/gpio.h Move mainboard/gpio.h to variant/gpio.h and rename its methods to make clear that these methods are implemented on variant level. Change-Id: Ib4e7ec948ca4d019ad82ebc5abe39fc408281cf4 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48299 Reviewed-by: Michael Niewöhner <foss(a)mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- D src/mainboard/siemens/chili/include/mainboard/gpio.h A src/mainboard/siemens/chili/include/variant/gpio.h M src/mainboard/siemens/chili/romstage.c M src/mainboard/siemens/chili/variants/base/gpio.c M src/mainboard/siemens/chili/variants/chili/gpio.c 5 files changed, 14 insertions(+), 14 deletions(-) Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved diff --git a/src/mainboard/siemens/chili/include/mainboard/gpio.h b/src/mainboard/siemens/chili/include/mainboard/gpio.h deleted file mode 100644 index ef2a21c..0000000 --- a/src/mainboard/siemens/chili/include/mainboard/gpio.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef MAINBOARD_GPIO_H -#define MAINBOARD_GPIO_H - -void mainboard_configure_gpios(void); - -#endif diff --git a/src/mainboard/siemens/chili/include/variant/gpio.h b/src/mainboard/siemens/chili/include/variant/gpio.h new file mode 100644 index 0000000..4258325 --- /dev/null +++ b/src/mainboard/siemens/chili/include/variant/gpio.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef VARIANT_GPIO_H +#define VARIANT_GPIO_H + +void variant_configure_gpios(void); + +#endif diff --git a/src/mainboard/siemens/chili/romstage.c b/src/mainboard/siemens/chili/romstage.c index 7453fa5..06927b0 100644 --- a/src/mainboard/siemens/chili/romstage.c +++ b/src/mainboard/siemens/chili/romstage.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <mainboard/gpio.h> #include <option.h> #include <soc/cnl_memcfg_init.h> #include <soc/gpio.h> #include <soc/romstage.h> #include <variant.h> +#include <variant/gpio.h> void mainboard_memory_init_params(FSPM_UPD *memupd) { @@ -31,7 +31,7 @@ variant_romstage_params(memupd); - mainboard_configure_gpios(); + variant_configure_gpios(); } __weak void variant_romstage_params(FSPM_UPD *const mupd) diff --git a/src/mainboard/siemens/chili/variants/base/gpio.c b/src/mainboard/siemens/chili/variants/base/gpio.c index 9d459cc..8264917 100644 --- a/src/mainboard/siemens/chili/variants/base/gpio.c +++ b/src/mainboard/siemens/chili/variants/base/gpio.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <soc/gpio.h> -#include <mainboard/gpio.h> +#include <variant/gpio.h> static const struct pad_config gpio_table[] = { /* GPP_A14 GPIO */ PAD_NC(GPP_A14, NONE), @@ -122,7 +122,7 @@ /* GPP_J11 A4WP_PRESENT */ PAD_CFG_NF(GPP_J11, NONE, DEEP, NF1), }; -void mainboard_configure_gpios(void) +void variant_configure_gpios(void) { gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); } diff --git a/src/mainboard/siemens/chili/variants/chili/gpio.c b/src/mainboard/siemens/chili/variants/chili/gpio.c index a259547..285103b 100644 --- a/src/mainboard/siemens/chili/variants/chili/gpio.c +++ b/src/mainboard/siemens/chili/variants/chili/gpio.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <soc/gpio.h> -#include <mainboard/gpio.h> +#include <variant/gpio.h> static const struct pad_config gpio_table[] = { /* GPP_A14 GPIO 0x0000002644000300 */ PAD_NC(GPP_A14, NONE), @@ -121,7 +121,7 @@ /* GPP_J11 A4WP_PRESENT 0x0000003944000700 */ PAD_CFG_NF(GPP_J11, NONE, DEEP, NF1), }; -void mainboard_configure_gpios(void) +void variant_configure_gpios(void) { gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); } -- To view, visit https://review.coreboot.org/c/coreboot/+/48299 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib4e7ec948ca4d019ad82ebc5abe39fc408281cf4 Gerrit-Change-Number: 48299 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/clevo/kbl-u: Add a seperate method for early GPIOs
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48298 ) Change subject: mb/clevo/kbl-u: Add a seperate method for early GPIOs ...................................................................... mb/clevo/kbl-u: Add a seperate method for early GPIOs Add variant_configure_early_gpios() configuring early GPIOs to make the difference clear. Change-Id: I6e7c8c32963c9eeab4399947dac511442987cb45 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48298 Reviewed-by: Michael Niewöhner <foss(a)mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/mainboard/clevo/kbl-u/bootblock.c M src/mainboard/clevo/kbl-u/include/variant/gpio.h M src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c 3 files changed, 3 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved diff --git a/src/mainboard/clevo/kbl-u/bootblock.c b/src/mainboard/clevo/kbl-u/bootblock.c index 8f085be..b351fbd 100644 --- a/src/mainboard/clevo/kbl-u/bootblock.c +++ b/src/mainboard/clevo/kbl-u/bootblock.c @@ -5,5 +5,5 @@ void bootblock_mainboard_early_init(void) { - variant_configure_gpios(); + variant_configure_early_gpios(); } diff --git a/src/mainboard/clevo/kbl-u/include/variant/gpio.h b/src/mainboard/clevo/kbl-u/include/variant/gpio.h index 4258325..95d5762 100644 --- a/src/mainboard/clevo/kbl-u/include/variant/gpio.h +++ b/src/mainboard/clevo/kbl-u/include/variant/gpio.h @@ -3,6 +3,7 @@ #ifndef VARIANT_GPIO_H #define VARIANT_GPIO_H +void variant_configure_early_gpios(void); void variant_configure_gpios(void); #endif diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c b/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c index 46b9ff0..dc55aae 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c @@ -11,7 +11,7 @@ _PAD_CFG_STRUCT(GPP_C21, 0x44000700, 0x0) }; -void variant_configure_gpios(void) +void variant_configure_early_gpios(void) { gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table)); } -- To view, visit https://review.coreboot.org/c/coreboot/+/48298 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6e7c8c32963c9eeab4399947dac511442987cb45 Gerrit-Change-Number: 48298 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/clevo/kbl-u: Move mainboard/gpio.h to variant/gpio.h
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48297 ) Change subject: mb/clevo/kbl-u: Move mainboard/gpio.h to variant/gpio.h ...................................................................... mb/clevo/kbl-u: Move mainboard/gpio.h to variant/gpio.h Move mainboard/gpio.h to variant/gpio.h and rename its methods to make clear that these methods are implemented on variant level. Change-Id: Ibcb6322067285984bad70761fce34cfcb6ed8e0f Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48297 Reviewed-by: Michael Niewöhner <foss(a)mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/mainboard/clevo/kbl-u/bootblock.c D src/mainboard/clevo/kbl-u/include/mainboard/gpio.h A src/mainboard/clevo/kbl-u/include/variant/gpio.h M src/mainboard/clevo/kbl-u/ramstage.c M src/mainboard/clevo/kbl-u/variants/n13xwu/gpio.c M src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c 6 files changed, 16 insertions(+), 16 deletions(-) Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved diff --git a/src/mainboard/clevo/kbl-u/bootblock.c b/src/mainboard/clevo/kbl-u/bootblock.c index 067c9ec..8f085be 100644 --- a/src/mainboard/clevo/kbl-u/bootblock.c +++ b/src/mainboard/clevo/kbl-u/bootblock.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <bootblock_common.h> -#include <mainboard/gpio.h> +#include <variant/gpio.h> void bootblock_mainboard_early_init(void) { - mainboard_configure_gpios(); + variant_configure_gpios(); } diff --git a/src/mainboard/clevo/kbl-u/include/mainboard/gpio.h b/src/mainboard/clevo/kbl-u/include/mainboard/gpio.h deleted file mode 100644 index ef2a21c..0000000 --- a/src/mainboard/clevo/kbl-u/include/mainboard/gpio.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef MAINBOARD_GPIO_H -#define MAINBOARD_GPIO_H - -void mainboard_configure_gpios(void); - -#endif diff --git a/src/mainboard/clevo/kbl-u/include/variant/gpio.h b/src/mainboard/clevo/kbl-u/include/variant/gpio.h new file mode 100644 index 0000000..4258325 --- /dev/null +++ b/src/mainboard/clevo/kbl-u/include/variant/gpio.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef VARIANT_GPIO_H +#define VARIANT_GPIO_H + +void variant_configure_gpios(void); + +#endif diff --git a/src/mainboard/clevo/kbl-u/ramstage.c b/src/mainboard/clevo/kbl-u/ramstage.c index 9368021e..e34d500 100644 --- a/src/mainboard/clevo/kbl-u/ramstage.c +++ b/src/mainboard/clevo/kbl-u/ramstage.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <device/device.h> -#include <mainboard/gpio.h> +#include <variant/gpio.h> /* * TODO: @@ -14,7 +14,7 @@ static void init_mainboard(void *chip_info) { - mainboard_configure_gpios(); + variant_configure_gpios(); } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio.c b/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio.c index e7aadcc..4b25993 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio.c +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <mainboard/gpio.h> #include <soc/gpio.h> +#include <variant/gpio.h> static const struct pad_config gpio_table[] = { // RCIN# @@ -497,7 +497,7 @@ _PAD_CFG_STRUCT(GPP_G7, 0x44000702, 0x0) }; -void mainboard_configure_gpios(void) +void variant_configure_gpios(void) { gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); } diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c b/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c index 00246a4..46b9ff0 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/gpio_early.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <mainboard/gpio.h> #include <soc/gpio.h> +#include <variant/gpio.h> static const struct pad_config early_gpio_table[] = { // UART2_RXD @@ -11,7 +11,7 @@ _PAD_CFG_STRUCT(GPP_C21, 0x44000700, 0x0) }; -void mainboard_configure_gpios(void) +void variant_configure_gpios(void) { gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table)); } -- To view, visit https://review.coreboot.org/c/coreboot/+/48297 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ibcb6322067285984bad70761fce34cfcb6ed8e0f Gerrit-Change-Number: 48297 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/clevo/cml-u: Move mainboard/gpio.h to variant/gpio.h
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48296 ) Change subject: mb/clevo/cml-u: Move mainboard/gpio.h to variant/gpio.h ...................................................................... mb/clevo/cml-u: Move mainboard/gpio.h to variant/gpio.h Move mainboard/gpio.h to variant/gpio.h and rename its methods to make clear that these methods are implemented on variant level. Change-Id: I1ae9b54ed683000f65323b11747ce3280a1c7f2a Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48296 Reviewed-by: Michael Niewöhner <foss(a)mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/mainboard/clevo/cml-u/bootblock.c D src/mainboard/clevo/cml-u/include/mainboard/gpio.h A src/mainboard/clevo/cml-u/include/variant/gpio.h M src/mainboard/clevo/cml-u/ramstage.c M src/mainboard/clevo/cml-u/variants/l140cu/gpio.c M src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c 6 files changed, 17 insertions(+), 17 deletions(-) Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved diff --git a/src/mainboard/clevo/cml-u/bootblock.c b/src/mainboard/clevo/cml-u/bootblock.c index d75158c..389a7a9 100644 --- a/src/mainboard/clevo/cml-u/bootblock.c +++ b/src/mainboard/clevo/cml-u/bootblock.c @@ -2,9 +2,9 @@ #include <bootblock_common.h> #include <gpio.h> -#include <mainboard/gpio.h> +#include <variant/gpio.h> void bootblock_mainboard_init(void) { - mainboard_configure_early_gpios(); + variant_configure_early_gpios(); } diff --git a/src/mainboard/clevo/cml-u/include/mainboard/gpio.h b/src/mainboard/clevo/cml-u/include/mainboard/gpio.h deleted file mode 100644 index c6393be..0000000 --- a/src/mainboard/clevo/cml-u/include/mainboard/gpio.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef MAINBOARD_GPIO_H -#define MAINBOARD_GPIO_H - -void mainboard_configure_early_gpios(void); -void mainboard_configure_gpios(void); - -#endif diff --git a/src/mainboard/clevo/cml-u/include/variant/gpio.h b/src/mainboard/clevo/cml-u/include/variant/gpio.h new file mode 100644 index 0000000..95d5762 --- /dev/null +++ b/src/mainboard/clevo/cml-u/include/variant/gpio.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef VARIANT_GPIO_H +#define VARIANT_GPIO_H + +void variant_configure_early_gpios(void); +void variant_configure_gpios(void); + +#endif diff --git a/src/mainboard/clevo/cml-u/ramstage.c b/src/mainboard/clevo/cml-u/ramstage.c index 771c6aa..8196970 100644 --- a/src/mainboard/clevo/cml-u/ramstage.c +++ b/src/mainboard/clevo/cml-u/ramstage.c @@ -1,11 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <device/device.h> -#include <mainboard/gpio.h> +#include <variant/gpio.h> static void init_mainboard(void *chip_info) { - mainboard_configure_gpios(); + variant_configure_gpios(); } struct chip_operations mainboard_ops = { diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/gpio.c b/src/mainboard/clevo/cml-u/variants/l140cu/gpio.c index 475c2d5..d5744ef 100644 --- a/src/mainboard/clevo/cml-u/variants/l140cu/gpio.c +++ b/src/mainboard/clevo/cml-u/variants/l140cu/gpio.c @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <mainboard/gpio.h> #include <soc/gpe.h> #include <soc/gpio.h> +#include <variant/gpio.h> /* Name format: <pad name> / <net/pin name in schematics> */ static const struct pad_config gpio_table[] = { @@ -237,7 +237,7 @@ PAD_NC(GPP_H23, UP_20K), }; -void mainboard_configure_gpios(void) +void variant_configure_gpios(void) { gpio_configure_pads(gpio_table, ARRAY_SIZE(gpio_table)); } diff --git a/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c b/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c index 274efaf..3ea1c81 100644 --- a/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c +++ b/src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <mainboard/gpio.h> #include <soc/gpio.h> +#include <variant/gpio.h> /* Name format: <pad name> / <net/pin name in schematics> */ static const struct pad_config early_gpio_table[] = { @@ -11,7 +11,7 @@ PAD_NC(GPP_C23, UP_20K), }; -void mainboard_configure_early_gpios(void) +void variant_configure_early_gpios(void) { gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table)); } -- To view, visit https://review.coreboot.org/c/coreboot/+/48296 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1ae9b54ed683000f65323b11747ce3280a1c7f2a Gerrit-Change-Number: 48296 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in coreboot[master]: mb/prodrive/hermes: Wrap UART driver by PCI device
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48293 ) Change subject: mb/prodrive/hermes: Wrap UART driver by PCI device ...................................................................... Patch Set 4: > Patch Set 4: Code-Review-1 > > (1 comment) > > > Patch Set 4: > > > > > I don't understand why this is necessary at all. Looks like you found a bug in sconfig you are trying to work around. > > > > I don't know if it is a bug actually or if this is just not meant to be. When we started adding the chipset devicetrees for soc/skylake and soc/cannonlake, we encountered that problem on cannonlake. > > > > If the PCI device on mb/hermes is wrapped by the UART driver and if also the patch for the chipset devicetree is applied, then the PCI device has two declarations in static.c. > > > > DEVTREE_CONST struct device *DEVTREE_CONST __pci_0_19_2 = &_dev32; > > ... > > DEVTREE_CONST struct device *DEVTREE_CONST __pci_0_19_2 = &_dev70; > > > > There was a similar problem with drivers/wifi/generic (CB:46865) as Michael mentioned. Furquan solved that by turning it around. So he moved the driver into the device. Here in this case, only the declaration for &_dev32 (from the example above) is left then, while &_dev72 is declared as a sub device. > > This is a bug in sconfig as it's clearly the same PCI device (same dev function number, same parent). It's not a bug in sconfig but a driver problem; see discussion in CB:46531 -- To view, visit https://review.coreboot.org/c/coreboot/+/48293 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I298247276ec95b2f599f1fcd399550a51b63aff1 Gerrit-Change-Number: 48293 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 06 Dec 2020 09:27:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/prodrive/hermes: Wrap UART driver by PCI device
by Michael Niewöhner (Code Review) 06 Dec '20

06 Dec '20

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48293 ) Change subject: mb/prodrive/hermes: Wrap UART driver by PCI device ...................................................................... Patch Set 4: (1 comment) https://review.coreboot.org/c/coreboot/+/48293/4/src/mainboard/prodrive/her… File src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb: https://review.coreboot.org/c/coreboot/+/48293/4/src/mainboard/prodrive/her… PS4, Line 177: device pci 19.2 on end > > Maybe the driver needs to be edited to make that work > and as it's not the 19.2 pci device the driver will not work. ... -- To view, visit https://review.coreboot.org/c/coreboot/+/48293 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I298247276ec95b2f599f1fcd399550a51b63aff1 Gerrit-Change-Number: 48293 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 06 Dec 2020 09:25:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Michael Niewöhner <foss(a)mniewoehner.de> Comment-In-Reply-To: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/prodrive/hermes: Wrap UART driver by PCI device
by Patrick Rudolph (Code Review) 06 Dec '20

06 Dec '20

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48293 ) Change subject: mb/prodrive/hermes: Wrap UART driver by PCI device ...................................................................... Patch Set 4: Code-Review-1 (1 comment) > Patch Set 4: > > > I don't understand why this is necessary at all. Looks like you found a bug in sconfig you are trying to work around. > > I don't know if it is a bug actually or if this is just not meant to be. When we started adding the chipset devicetrees for soc/skylake and soc/cannonlake, we encountered that problem on cannonlake. > > If the PCI device on mb/hermes is wrapped by the UART driver and if also the patch for the chipset devicetree is applied, then the PCI device has two declarations in static.c. > > DEVTREE_CONST struct device *DEVTREE_CONST __pci_0_19_2 = &_dev32; > ... > DEVTREE_CONST struct device *DEVTREE_CONST __pci_0_19_2 = &_dev70; > > There was a similar problem with drivers/wifi/generic (CB:46865) as Michael mentioned. Furquan solved that by turning it around. So he moved the driver into the device. Here in this case, only the declaration for &_dev32 (from the example above) is left then, while &_dev72 is declared as a sub device. This is a bug in sconfig as it's clearly the same PCI device (same dev function number, same parent). https://review.coreboot.org/c/coreboot/+/48293/4/src/mainboard/prodrive/her… File src/mainboard/prodrive/hermes/variants/baseboard/overridetree.cb: https://review.coreboot.org/c/coreboot/+/48293/4/src/mainboard/prodrive/her… PS4, Line 177: device pci 19.2 on end > 19.2->19.2 won't work; `device generic 0 on end` would be correct, see CB:46865 for example. […] The device must be hidden and as it's not the 19.2 pci device the driver will not work. -- To view, visit https://review.coreboot.org/c/coreboot/+/48293 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I298247276ec95b2f599f1fcd399550a51b63aff1 Gerrit-Change-Number: 48293 Gerrit-PatchSet: 4 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com> Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 06 Dec 2020 09:01:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Michael Niewöhner <foss(a)mniewoehner.de> Gerrit-MessageType: comment

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2020