Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/73422 )
Change subject: soc/amd/picasso/include/southbridge: drop PM_CPU_CTRL define
......................................................................
soc/amd/picasso/include/southbridge: drop PM_CPU_CTRL define
Picasso and newer don't implement the P_CNT register to control the CPU
duty cycle and also trap the C state control IO addresses directly in
the CPU, so those won't reach the FCH. This register is unused in the
Picasso code and not even defined any more in the Cezanne PPR. The
Picasso PPR does define this register, but since it's useless and might
even just be a leftover form a pre-Zen CPU generation, drop the define.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: I3820db542c4714a100c7d36de673daa1a06e4a67
---
M src/soc/amd/picasso/include/soc/southbridge.h
1 file changed, 17 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/73422/1
diff --git a/src/soc/amd/picasso/include/soc/southbridge.h b/src/soc/amd/picasso/include/soc/southbridge.h
index a3fb1a2..31f3ed6 100644
--- a/src/soc/amd/picasso/include/soc/southbridge.h
+++ b/src/soc/amd/picasso/include/soc/southbridge.h
@@ -47,7 +47,6 @@
#define TIMER_STS BIT(0)
#define PM1_CNT_BLK 0x62
#define PM_TMR_BLK 0x64
-#define PM_CPU_CTRL 0x66
#define PM_GPE0_BLK 0x68
#define PM_ACPI_SMI_CMD 0x6a
#define PM_ACPI_CONF 0x74
--
To view, visit https://review.coreboot.org/c/coreboot/+/73422
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3820db542c4714a100c7d36de673daa1a06e4a67
Gerrit-Change-Number: 73422
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-MessageType: newchange
Attention is currently required from: Raul Rangel, Jason Nien, Martin Roth, Tim Van Patten, Karthik Ramasubramanian.
Martin L Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/73299 )
Change subject: skyrim/overridetree.cb: Remove gpio_keys ACPI node
......................................................................
Patch Set 6: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/73299
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9ffe215741b72b678d74405769f35167d8ded4b5
Gerrit-Change-Number: 73299
Gerrit-PatchSet: 6
Gerrit-Owner: Tim Van Patten <timvp(a)google.com>
Gerrit-Reviewer: Jason Nien <jason.nien(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Martin Roth <martin.roth(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org>
Gerrit-Attention: Jason Nien <jason.nien(a)amd.corp-partner.google.com>
Gerrit-Attention: Martin Roth <martin.roth(a)amd.corp-partner.google.com>
Gerrit-Attention: Tim Van Patten <timvp(a)google.com>
Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Comment-Date: Fri, 03 Mar 2023 17:21:41 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Jason Glenesk, Matt DeVillier, Fred Reitberger.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/73420 )
Change subject: soc/amd/picasso/acpi: don't announce unimplemented duty cycle control
......................................................................
soc/amd/picasso/acpi: don't announce unimplemented duty cycle control
Picasso neither has the corresponding P_CNT register implemented nor
writes a _PTC ACPI object that would specify the P_CNT register. The
Picasso UEFI reference code also sets the duty_width FADT entry to 0.
This also aligns the Picasso code with the Cezanne code in this regard.
Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de>
Change-Id: I74645e5c4e54a2ad6bc7f9e72f5f656027a79860
---
M src/soc/amd/picasso/acpi.c
1 file changed, 17 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/73420/1
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index 89ca502..7244a11 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -86,8 +86,8 @@
overridden by the _CST packages in the processor devices. */
fadt->p_lvl2_lat = ACPI_FADT_C2_NOT_SUPPORTED;
fadt->p_lvl3_lat = ACPI_FADT_C3_NOT_SUPPORTED;
- fadt->duty_offset = 1; /* CLK_VAL bits 3:1 */
- fadt->duty_width = 3; /* CLK_VAL bits 3:1 */
+ fadt->duty_offset = 0; /* Not supported */
+ fadt->duty_width = 0; /* Not supported */
fadt->day_alrm = RTC_DATE_ALARM;
fadt->iapc_boot_arch = cfg->fadt_boot_arch; /* legacy free default */
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
--
To view, visit https://review.coreboot.org/c/coreboot/+/73420
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I74645e5c4e54a2ad6bc7f9e72f5f656027a79860
Gerrit-Change-Number: 73420
Gerrit-PatchSet: 1
Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)amd.corp-partner.google.com>
Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-MessageType: newchange
Attention is currently required from: Felix Singer, Nico Huber, Angel Pons, Elyes Haouas.
Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/61540 )
Change subject: mb/asus/p8x7x-series: Refactor mainboard_get_spd()
......................................................................
Patch Set 7:
(2 comments)
Patchset:
PS4:
> > As far as precedents go, it has already been set. […]
I just uploaded a new patch set that executes option 3. However the way Angel describes things, it may pan out more like option 4 (which isn't all that different).
Elyes, I have to leave the #include in for p8z77-m(_pro) because it indirectly declares another hook for MRC raminit, that we found out the hard way earlier, as these two still supports MRC raminit. That part is being addressed by CB:72496. After we get this in, Please get that in as well, and then I'll put out a patch to completely clean those two up. Thanks.
Patchset:
PS7:
Nico, I'm not sure if devicetree covers romstage. Even if it does, it is better done by someone better versed in devicetree.
--
To view, visit https://review.coreboot.org/c/coreboot/+/61540
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I3b9c616a6c722e1f0fc124ced225efdcadb46b25
Gerrit-Change-Number: 61540
Gerrit-PatchSet: 7
Gerrit-Owner: Keith Hui <buurin(a)gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-CC: Nico Huber <nico.h(a)gmx.de>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Attention: Nico Huber <nico.h(a)gmx.de>
Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Attention: Elyes Haouas <ehaouas(a)noos.fr>
Gerrit-Comment-Date: Fri, 03 Mar 2023 17:14:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de>
Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com>
Comment-In-Reply-To: Keith Hui <buurin(a)gmail.com>
Gerrit-MessageType: comment
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/72629 )
Change subject: drv/i2c/ptn3460: Add 'mainboard' prefix to mainboard-level callbacks
......................................................................
drv/i2c/ptn3460: Add 'mainboard' prefix to mainboard-level callbacks
As discused earlier, the callback name 'mb_adjust_cfg' was considered
too generic. The new naming is chosen to be consistent with other
drivers' callback names designed to be used at mainboard level.
Also other functions, namely 'mb_get_edid' and 'mb_select_edid_table'
are renamed accordingly.
BUG=none
TEST=Builds for siemens/mc_apl{1,4,5,7} and siemens/mc_ehl boards
complete successfully.
Change-Id: I4cbec0e72e5f03e94df0faa36765d1a6cd873a7a
Signed-off-by: Jan Samek <jan.samek(a)siemens.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72629
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Reviewed-by: Werner Zeh <werner.zeh(a)siemens.com>
---
M src/drivers/i2c/ptn3460/ptn3460.c
M src/drivers/i2c/ptn3460/ptn3460.h
M src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
M src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
M src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
M src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
M src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
7 files changed, 49 insertions(+), 24 deletions(-)
Approvals:
build bot (Jenkins): Verified
Werner Zeh: Looks good to me, approved
Mario Scheithauer: Looks good to me, but someone else must approve
diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c
index d2df04d..7dee222 100644
--- a/src/drivers/i2c/ptn3460/ptn3460.c
+++ b/src/drivers/i2c/ptn3460/ptn3460.c
@@ -76,13 +76,13 @@
}
/* Mainboard provides EDID data. */
- if (mb_get_edid(edid_data) != CB_SUCCESS) {
+ if (mainboard_ptn3460_get_edid(edid_data) != CB_SUCCESS) {
printk(BIOS_ERR, "PTN3460 error: Unable to get EDID data from mainboard.\n");
return;
}
/* Mainboard decides which EDID table has to be used. */
- edid_tab = mb_select_edid_table();
+ edid_tab = mainboard_ptn3460_select_edid_table();
if (edid_tab > PTN_MAX_EDID_NUM) {
printk(BIOS_ERR, "PTN3460 error: invalid EDID table (%d) selected.\n",
edid_tab);
@@ -108,7 +108,7 @@
}
/* Mainboard can modify the configuration data.
Write back configuration data to PTN3460 if modified by mainboard */
- if (mb_adjust_cfg(&cfg) == CB_SUCCESS) {
+ if (mainboard_ptn3460_config(&cfg) == CB_SUCCESS) {
ptr = (uint8_t *)&cfg;
for (i = 0; i < sizeof(struct ptn_3460_config); i++) {
val = i2c_dev_writeb_at(dev, PTN_CONFIG_OFF + i, *ptr++);
@@ -123,15 +123,15 @@
init_done = true;
}
-__weak enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+__weak enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
return CB_ERR;
}
-__weak uint8_t mb_select_edid_table(void)
+__weak uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 0;
}
-__weak enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg_ptr)
+__weak enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg_ptr)
{
return CB_ERR;
}
diff --git a/src/drivers/i2c/ptn3460/ptn3460.h b/src/drivers/i2c/ptn3460/ptn3460.h
index ecd2191..a3fa60b 100644
--- a/src/drivers/i2c/ptn3460/ptn3460.h
+++ b/src/drivers/i2c/ptn3460/ptn3460.h
@@ -52,8 +52,8 @@
/* We need functions which we can call to get mainboard specific data */
/* These functions can be implemented somewhere else but must exist. */
-extern enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN]);
-extern uint8_t mb_select_edid_table(void);
-extern enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg_ptr);
+extern enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN]);
+extern uint8_t mainboard_ptn3460_select_edid_table(void);
+extern enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg_ptr);
#endif /* _I2C_PTN3460_H_ */
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
index 8a20f36..bad4da7 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl1/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
index 39cc274..7f4334e 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
index c74e90a..320fcc7 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/lcd_panel.c
@@ -33,7 +33,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -56,7 +56,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -66,7 +66,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
index 39cc274..7f4334e 100644
--- a/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
+++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl7/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
index 965f62d..a4985c1 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl3/lcd_panel.c
@@ -10,7 +10,7 @@
* @param edid_data pointer to EDID data in driver
* @return CB_SUCCESS on successful EDID data retrieval, CB_ERR otherwise
*/
-enum cb_err mb_get_edid(uint8_t edid_data[PTN_EDID_LEN])
+enum cb_err mainboard_ptn3460_get_edid(uint8_t edid_data[PTN_EDID_LEN])
{
const char *hwi_block = "hwinfo.hex";
@@ -31,7 +31,7 @@
* which has to be used.
* @return Index of the EDID slot selected for EDID emulation
*/
-uint8_t mb_select_edid_table(void)
+uint8_t mainboard_ptn3460_select_edid_table(void)
{
return 6; /* With this mainboard we use EDID block 6 for emulation in PTN3460. */
}
@@ -41,7 +41,7 @@
* @param *cfg_ptr Pointer to the PTN config structure to modify
* @return CB_SUCCESS if data was modified and needs to be updated; CB_ERR on error
*/
-enum cb_err mb_adjust_cfg(struct ptn_3460_config *cfg)
+enum cb_err mainboard_ptn3460_config(struct ptn_3460_config *cfg)
{
const char *hwi_block = "hwinfo.hex";
uint8_t disp_con = 0, color_depth = 0;
--
To view, visit https://review.coreboot.org/c/coreboot/+/72629
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4cbec0e72e5f03e94df0faa36765d1a6cd873a7a
Gerrit-Change-Number: 72629
Gerrit-PatchSet: 7
Gerrit-Owner: Jan Samek <jan.samek(a)siemens.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Mario Scheithauer <mario.scheithauer(a)siemens.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Uwe Poeche <uwe.poeche(a)siemens.com>
Gerrit-MessageType: merged