Skip to content

Commit

Permalink
Merge pull request #188 from coreboot/main
Browse files Browse the repository at this point in the history 
[pull] main from coreboot:main
  • Loading branch information
@pull
pull[bot] authored Oct 11, 2024
2 parents 19835ed + 177bb5e commit 5ab0780
Show file tree
Hide file tree
Showing 29 changed files with 714 additions and 170 deletions.
31 changes: 21 additions & 10 deletions src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,33 @@ chip soc/intel/alderlake
chip drivers/usb/acpi
device ref tcss_root_hub on
chip drivers/usb/acpi
register "desc" = ""USB Type-C""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "desc" = ""USB Type-C""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device ref tcss_usb3_port1 on end
end
end
end
end
device ref gna on end
device ref xhci on
# Front panel USB Type C
# Front USB 3.0 Type-C
register "usb2_ports[0]" = "USB2_PORT_MID(OC_SKIP)"
register "tcss_ports[0]" = "TCSS_PORT_DEFAULT(OC_SKIP)"

# Back Top USB Type A [5]
# Back Top USB 3.0 Type-A
register "usb2_ports[1]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC_SKIP)"

# Back Bottom USB Type A [6]
# Back Bottom USB 3.0 Type-A
register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[3]" = "USB3_PORT_DEFAULT(OC_SKIP)"

# Front Left USB Type A [3]
# Front Left USB 3.0 Type-A
register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)"

# Front Right USB Type A [2]
# Front Right USB 3.0 Type-A
register "usb2_ports[6]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC_SKIP)"

Expand All @@ -66,51 +67,61 @@ chip soc/intel/alderlake
chip drivers/usb/acpi
register "desc" = ""USB Type-C""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device ref usb2_port1 on end
end
chip drivers/usb/acpi
register "desc" = ""Back Top USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device ref usb2_port2 on end
end
chip drivers/usb/acpi
register "desc" = ""Back Top USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device ref usb3_port3 on end
end
chip drivers/usb/acpi
register "desc" = ""Back Bottom USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 2)"
device ref usb2_port3 on end
end
chip drivers/usb/acpi
register "desc" = ""Back Bottom USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 2)"
device ref usb3_port4 on end
end
chip drivers/usb/acpi
register "desc" = ""Front Left USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 3)"
device ref usb2_port6 on end
end
chip drivers/usb/acpi
register "desc" = ""Front Left USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 3)"
device ref usb3_port2 on end
end
chip drivers/usb/acpi
register "desc" = ""Front Right USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 4)"
device ref usb2_port7 on end
end
chip drivers/usb/acpi
register "desc" = ""Front Right USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 4)"
device ref usb3_port1 on end
end
chip drivers/usb/acpi
register "desc" = ""Internal Bluetooth""
register "type" = "UPC_TYPE_INTERNAL"
register "group" = "ACPI_PLD_GROUP(0, 5)"
device ref usb2_port10 on end
end
end
Expand Down Expand Up @@ -211,8 +222,8 @@ chip soc/intel/alderlake
register "pch_hda_idisp_link_tmode" = "HDA_TMODE_8T"
end
device ref smbus on end
end
chip drivers/crb
device mmio 0xfed40000 on end
chip drivers/crb
device mmio 0xfed40000 on end
end
end
end
17 changes: 11 additions & 6 deletions src/mainboard/starlabs/byte_adl/variants/mk_ii/devtree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,30 @@ void devtree_update(void)

struct device *nic_dev = pcidev_on_root(0x14, 3);

uint8_t performance_scale = 100;

/* Update PL1 & PL2 based on CMOS settings */
switch (get_power_profile(PP_POWER_SAVER)) {
case PP_POWER_SAVER:
soc_conf_4core->tdp_pl1_override = 6;
soc_conf_4core->tdp_pl2_override = 10;
performance_scale -= 25;
common_config->pch_thermal_trip = 30;
break;
case PP_BALANCED:
soc_conf_4core->tdp_pl1_override = 10;
soc_conf_4core->tdp_pl2_override = 25;
/* Use the Intel defaults */
common_config->pch_thermal_trip = 25;
break;
case PP_PERFORMANCE:
soc_conf_4core->tdp_pl1_override = 20;
soc_conf_4core->tdp_pl2_override = 35;
performance_scale += 25;
common_config->pch_thermal_trip = 20;
break;
}

soc_conf_4core->tdp_pl1_override = (soc_conf_4core->tdp_pl1_override * performance_scale) / 100;
soc_conf_4core->tdp_pl2_override = (soc_conf_4core->tdp_pl2_override * performance_scale) / 100;

/* Set PL4 to 1.0C */
soc_conf_4core->tdp_pl4 = 36;

/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0) {
cfg->usb2_ports[9].enable = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ const struct pad_config gpio_table[] = {
/* E13: PWD Amplifier Input */
PAD_CFG_GPO(GPP_E13, 0, PLTRST),
/* E14: EDP HPD */
PAD_NC(GPP_E14, NONE),
PAD_CFG_NF(GPP_E14, NONE, DEEP, NF1),
/* E15: Not Connected LAN RESET */
PAD_NC(GPP_E15, NONE),
/* E16: Not Connected */
Expand Down
17 changes: 11 additions & 6 deletions src/mainboard/starlabs/lite/devtree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,30 @@ void devtree_update(void)

struct device *nic_dev = pcidev_on_root(0x0c, 0);

uint8_t performance_scale = 100;

/* Update PL1 & PL2 based on CMOS settings */
switch (get_power_profile(PP_POWER_SAVER)) {
case PP_POWER_SAVER:
soc_conf->tdp_pl1_override = 6;
soc_conf->tdp_pl2_override = 10;
performance_scale -= 25;
cfg->tcc_offset = 15;
break;
case PP_BALANCED:
soc_conf->tdp_pl1_override = 10;
soc_conf->tdp_pl2_override = 15;
/* Use the Intel defaults */
cfg->tcc_offset = 10;
break;
case PP_PERFORMANCE:
soc_conf->tdp_pl1_override = 10;
soc_conf->tdp_pl2_override = 20;
performance_scale += 25;
cfg->tcc_offset = 5;
break;
}

soc_conf->tdp_pl1_override = (soc_conf->tdp_pl1_override * performance_scale) / 100;
soc_conf->tdp_pl2_override = (soc_conf->tdp_pl2_override * performance_scale) / 100;

/* Set PL4 to 1.0C */
soc_conf->tdp_pl4 = 31;

/* Enable/Disable Wireless based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
nic_dev->enabled = 0;
Expand Down
12 changes: 6 additions & 6 deletions src/mainboard/starlabs/lite/variants/glk/devicetree.cb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ chip soc/intel/apollolake
register "sata_ports_enable[0]" = "1"
end
device ref xhci on
# Motherboard USB Type C
# Motherboard USB 3.0 Type-C
register "usb2_port[0]" = "PORT_EN(OC_SKIP)"
register "usb3_port[1]" = "PORT_EN(OC_SKIP)"

# Motherboard USB 3.0
# Motherboard USB 3.0 Type-A
register "usb2_port[3]" = "PORT_EN(OC1)"
register "usb3_port[0]" = "PORT_EN(OC1)"

# Daughterboard USB 3.0
# Daughterboard USB 3.0 Type-A
register "usb2_port[5]" = "PORT_EN(OC_SKIP)"
register "usb3_port[4]" = "PORT_EN(OC_SKIP)"

Expand Down Expand Up @@ -126,8 +126,8 @@ chip soc/intel/apollolake
device pnp 4e.19 off end # Power Management Channel 5
end
end
end
chip drivers/crb
device mmio 0xfed40000 on end
chip drivers/crb
device mmio 0xfed40000 on end
end
end
end
12 changes: 6 additions & 6 deletions src/mainboard/starlabs/lite/variants/glkr/devicetree.cb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ chip soc/intel/apollolake
register "sata_ports_enable[0]" = "1"
end
device ref xhci on
# Motherboard USB Type C
# Motherboard USB 3.0 Type-C
register "usb2_port[0]" = "PORT_EN(OC1)"
register "usb3_port[0]" = "PORT_EN(OC1)"

# Motherboard USB 3.0
# Motherboard USB 3.0 Type-A
register "usb2_port[1]" = "PORT_EN(OC0)"
register "usb3_port[1]" = "PORT_EN(OC0)"

# Daughterboard USB 3.0
# Daughterboard USB 3.0 Type-A
register "usb2_port[3]" = "PORT_EN(OC1)"
register "usb3_port[4]" = "PORT_EN(OC1)"

Expand Down Expand Up @@ -120,8 +120,8 @@ chip soc/intel/apollolake
device pnp 4e.1e off end # Power Management Channel 4
end
end
end
chip drivers/crb
device mmio 0xfed40000 on end
chip drivers/crb
device mmio 0xfed40000 on end
end
end
end
22 changes: 16 additions & 6 deletions src/mainboard/starlabs/starbook/variants/adl/devicetree.cb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ chip soc/intel/alderlake
end
device ref gna on end
device ref xhci on
# Motherboard USB Type C
# Motherboard USB 3.0 Type-C
register "usb2_ports[0]" = "USB2_PORT_MID(OC5)"
register "usb3_ports[2]" = "USB3_PORT_DEFAULT(OC3)"

# Motherboard USB 3.0
# Motherboard USB 3.0 Type-A
register "usb2_ports[2]" = "USB2_PORT_MID(OC_SKIP)"
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC5)"

# Daughterboard USB 3.0
# Daughterboard USB 3.0 Type-A
register "usb2_ports[6]" = "USB2_PORT_MID(OC0)"
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC_SKIP)"

Expand All @@ -47,7 +47,7 @@ chip soc/intel/alderlake
# Fingerprint Reader
register "usb2_ports[5]" = "USB2_PORT_MID(OC0)"

# Daughterboard SD Card
# Daughterboard USB 2.0 Type-A + SD Card Reader
register "usb2_ports[3]" = "USB2_PORT_MID(OC_SKIP)"

# Internal Bluetooth
Expand All @@ -58,51 +58,61 @@ chip soc/intel/alderlake
chip drivers/usb/acpi
register "desc" = ""USB Type-C""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device ref usb2_port1 on end
end
chip drivers/usb/acpi
register "desc" = ""USB Type-C""
register "type" = "UPC_TYPE_C_USB2_SS_SWITCH"
register "group" = "ACPI_PLD_GROUP(0, 0)"
device ref usb3_port3 on end
end
chip drivers/usb/acpi
register "desc" = ""Left USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device ref usb2_port3 on end
end
chip drivers/usb/acpi
register "desc" = ""Left USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 1)"
device ref usb3_port1 on end
end
chip drivers/usb/acpi
register "desc" = ""Right USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 2)"
device ref usb2_port7 on end
end
chip drivers/usb/acpi
register "desc" = ""Right USB Type-A""
register "type" = "UPC_TYPE_USB3_A"
register "group" = "ACPI_PLD_GROUP(0, 2)"
device ref usb3_port2 on end
end
chip drivers/usb/acpi
register "desc" = ""Internal Webcam""
register "type" = "UPC_TYPE_INTERNAL"
register "group" = "ACPI_PLD_GROUP(0, 3)"
device ref usb2_port5 on end
end
chip drivers/usb/acpi
register "desc" = ""Fingerprint Reader""
register "type" = "UPC_TYPE_INTERNAL"
register "group" = "ACPI_PLD_GROUP(0, 4)"
device ref usb2_port6 on end
end
chip drivers/usb/acpi
register "desc" = ""MicroSD Card Reader""
register "type" = "UPC_TYPE_INTERNAL"
register "desc" = ""USB 2.0 Hub""
register "type" = "UPC_TYPE_HUB"
register "group" = "ACPI_PLD_GROUP(0, 5)"
device ref usb2_port4 on end
end
chip drivers/usb/acpi
register "desc" = ""Internal Bluetooth""
register "type" = "UPC_TYPE_INTERNAL"
register "group" = "ACPI_PLD_GROUP(0, 6)"
device ref usb2_port10 on end
end
end
Expand Down
27 changes: 15 additions & 12 deletions src/mainboard/starlabs/starbook/variants/adl/devtree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,34 @@ void devtree_update(void)
struct soc_power_limits_config *soc_conf_12core =
&cfg->power_limits_config[ADL_P_682_28W_CORE];

uint8_t performance_scale = 100;

/* Update PL1 & PL2 based on CMOS settings */
switch (get_power_profile(PP_POWER_SAVER)) {
case PP_POWER_SAVER:
soc_conf_10core->tdp_pl1_override = 15;
soc_conf_12core->tdp_pl1_override = 15;
soc_conf_10core->tdp_pl2_override = 15;
soc_conf_12core->tdp_pl2_override = 15;
performance_scale -= 25;
common_config->pch_thermal_trip = 20;
break;
case PP_BALANCED:
soc_conf_10core->tdp_pl1_override = 15;
soc_conf_12core->tdp_pl1_override = 15;
soc_conf_10core->tdp_pl2_override = 25;
soc_conf_12core->tdp_pl2_override = 25;
/* Use the Intel defaults */
common_config->pch_thermal_trip = 15;
break;
case PP_PERFORMANCE:
soc_conf_10core->tdp_pl1_override = 28;
soc_conf_12core->tdp_pl1_override = 28;
soc_conf_10core->tdp_pl2_override = 40;
soc_conf_12core->tdp_pl2_override = 40;
performance_scale += 25;
common_config->pch_thermal_trip = 10;
break;
}

soc_conf_10core->tdp_pl1_override = (soc_conf_10core->tdp_pl1_override * performance_scale) / 100;
soc_conf_12core->tdp_pl1_override = (soc_conf_12core->tdp_pl2_override * performance_scale) / 100;

soc_conf_10core->tdp_pl2_override = (soc_conf_10core->tdp_pl1_override * performance_scale) / 100;
soc_conf_12core->tdp_pl2_override = (soc_conf_12core->tdp_pl2_override * performance_scale) / 100;

/* Set PL4 to 1.0C */
soc_conf_10core->tdp_pl4 = 65;
soc_conf_12core->tdp_pl4 = 65;

/* Enable/Disable Bluetooth based on CMOS settings */
if (get_uint_option("wireless", 1) == 0)
cfg->usb2_ports[9].enable = 0;
Expand Down
Loading

0 comments on commit 5ab0780

Please sign in to comment.