coreboot-gerrit January 2021

coreboot-gerrit@coreboot.org

1 participants
6507 discussions

Change in coreboot[master]: soc/amd/common/block/gpio_banks: clear output enable in gpio_input_*
by Felix Held (Code Review) 06 Jan '21

06 Jan '21

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49118 ) Change subject: soc/amd/common/block/gpio_banks: clear output enable in gpio_input_* ...................................................................... soc/amd/common/block/gpio_banks: clear output enable in gpio_input_* The functions to configure a GPIO as input with pull-up/down need to clear the output enable bit, so that the direction will be input. If the pin was configured as output before, the pin direction was still output after this call which is at least unexpected. Change-Id: Id1fa1669195080b34fd62324616825415728b0b4 Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> --- M src/soc/amd/common/block/gpio_banks/gpio.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/49118/1 diff --git a/src/soc/amd/common/block/gpio_banks/gpio.c b/src/soc/amd/common/block/gpio_banks/gpio.c index f8062e7..03804d5 100644 --- a/src/soc/amd/common/block/gpio_banks/gpio.c +++ b/src/soc/amd/common/block/gpio_banks/gpio.c @@ -147,12 +147,12 @@ void gpio_input_pulldown(gpio_t gpio_num) { - gpio_setbits32(gpio_num, GPIO_PULL_MASK, GPIO_PULLDOWN_ENABLE); + gpio_setbits32(gpio_num, GPIO_PULL_MASK | GPIO_OUTPUT_ENABLE, GPIO_PULLDOWN_ENABLE); } void gpio_input_pullup(gpio_t gpio_num) { - gpio_setbits32(gpio_num, GPIO_PULL_MASK, GPIO_PULLUP_ENABLE); + gpio_setbits32(gpio_num, GPIO_PULL_MASK | GPIO_OUTPUT_ENABLE, GPIO_PULLUP_ENABLE); } void gpio_input(gpio_t gpio_num) -- To view, visit https://review.coreboot.org/c/coreboot/+/49118 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id1fa1669195080b34fd62324616825415728b0b4 Gerrit-Change-Number: 49118 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: soc/amd/common/block/gpio_banks: clear pull-up/down bits in gpio_input
by Felix Held (Code Review) 06 Jan '21

06 Jan '21

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49117 ) Change subject: soc/amd/common/block/gpio_banks: clear pull-up/down bits in gpio_input ...................................................................... soc/amd/common/block/gpio_banks: clear pull-up/down bits in gpio_input If the pin was configured as pull-up/down before this wouldn't get cleared when calling gpio_input before. Change-Id: I17d5eccb7492138e64abaecbd7cb853adb8c4d2d Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> --- M src/soc/amd/common/block/gpio_banks/gpio.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/49117/1 diff --git a/src/soc/amd/common/block/gpio_banks/gpio.c b/src/soc/amd/common/block/gpio_banks/gpio.c index 8e340a3..f8062e7 100644 --- a/src/soc/amd/common/block/gpio_banks/gpio.c +++ b/src/soc/amd/common/block/gpio_banks/gpio.c @@ -157,7 +157,7 @@ void gpio_input(gpio_t gpio_num) { - gpio_and32(gpio_num, ~GPIO_OUTPUT_ENABLE); + gpio_and32(gpio_num, ~(GPIO_PULL_MASK | GPIO_OUTPUT_ENABLE)); } void gpio_output(gpio_t gpio_num, int value) -- To view, visit https://review.coreboot.org/c/coreboot/+/49117 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I17d5eccb7492138e64abaecbd7cb853adb8c4d2d Gerrit-Change-Number: 49117 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: mb/google/dedede: Enable "FastPkgCRampDisable" upd for noise mitigation
by Maulik V Vaghela (Code Review) 06 Jan '21

06 Jan '21

Hello build bot (Jenkins), Ronak Kanabar, Divagar Mohandass, Karthik Ramasubramanian, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/49134 to look at the new patch set (#5). Change subject: mb/google/dedede: Enable "FastPkgCRampDisable" upd for noise mitigation ...................................................................... mb/google/dedede: Enable "FastPkgCRampDisable" upd for noise mitigation As part of acoustic noise mitigation calibration, we need to enable FastPkgCRampDisable upd along with slew rate = 1. This values has been derived based on noise calibration done. Please refer document 575216 for procedure. BUG=None BRANCH=dedede TEST=correct value has been programmed and slew rate measurement is correct on scope. Change-Id: Ie42c8ab647ff42fa043b6f717a9834f9b9c551f6 Signed-off-by: Maulik V Vaghela <maulik.v.vaghela(a)intel.com> --- M src/mainboard/google/dedede/variants/drawcia/overridetree.cb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/49134/5 -- To view, visit https://review.coreboot.org/c/coreboot/+/49134 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ie42c8ab647ff42fa043b6f717a9834f9b9c551f6 Gerrit-Change-Number: 49134 Gerrit-PatchSet: 5 Gerrit-Owner: Maulik V Vaghela <maulik.v.vaghela(a)intel.com> Gerrit-Reviewer: Divagar Mohandass <divagar.mohandass(a)intel.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Ronak Kanabar <ronak.kanabar(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: cpu/intel/model_206ax: Simplify C-state acpigen
by Angel Pons (Code Review) 06 Jan '21

06 Jan '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49090 ) Change subject: cpu/intel/model_206ax: Simplify C-state acpigen ...................................................................... cpu/intel/model_206ax: Simplify C-state acpigen Since there's only one set of values, the if-clause is unnecessary. Change-Id: I2fb4582377fe2f204d2cee0dc513a4d5d24feabe Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/cpu/intel/model_206ax/acpi.c 1 file changed, 2 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/49090/1 diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index b38eb15..b53e505 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -78,20 +78,8 @@ return; acpigen_write_method("_CST", 0); - - /* If running on AC power */ - acpigen_emit_byte(0xa0); /* IfOp */ - acpigen_write_len_f(); /* PkgLength */ - acpigen_emit_namestring("PWRS"); - acpigen_emit_byte(0xa4); /* ReturnOp */ - generate_cstate_entries(cpu->cstates, conf->acpi_c1, - conf->acpi_c2, conf->acpi_c3); - acpigen_pop_len(); - - /* Else on battery power */ - acpigen_emit_byte(0xa4); /* ReturnOp */ - generate_cstate_entries(cpu->cstates, conf->acpi_c1, - conf->acpi_c2, conf->acpi_c3); + acpigen_emit_byte(RETURN_OP); + generate_cstate_entries(cpu->cstates, conf->acpi_c1, conf->acpi_c2, conf->acpi_c3); acpigen_pop_len(); } -- To view, visit https://review.coreboot.org/c/coreboot/+/49090 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I2fb4582377fe2f204d2cee0dc513a4d5d24feabe Gerrit-Change-Number: 49090 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: cpu/intel/model_206ax: Rename `cX_acpower` options
by Angel Pons (Code Review) 06 Jan '21

06 Jan '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49089 ) Change subject: cpu/intel/model_206ax: Rename `cX_acpower` options ...................................................................... cpu/intel/model_206ax: Rename `cX_acpower` options They aren't specific to AC power operation anymore. Also adapt autoport. Change-Id: Ib04d0a08674b7d2773d440d39bd6dfbd4359e0fb Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/cpu/intel/model_206ax/acpi.c M src/cpu/intel/model_206ax/chip.h M src/mainboard/apple/macbookair4_2/devicetree.cb M src/mainboard/asrock/b75pro3-m/devicetree.cb M src/mainboard/asus/h61m-cs/devicetree.cb M src/mainboard/asus/maximus_iv_gene-z/devicetree.cb M src/mainboard/asus/p8h61-m_lx/devicetree.cb M src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb M src/mainboard/asus/p8h61-m_pro/devicetree.cb M src/mainboard/asus/p8z77-m_pro/devicetree.cb M src/mainboard/asus/p8z77-v_lx2/devicetree.cb M src/mainboard/biostar/th61-itx/devicetree.cb M src/mainboard/compulab/intense_pc/devicetree.cb M src/mainboard/dell/optiplex_9010/devicetree.cb M src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb M src/mainboard/gigabyte/ga-h61m-series/devicetree.cb M src/mainboard/google/butterfly/devicetree.cb M src/mainboard/google/link/devicetree.cb M src/mainboard/google/parrot/devicetree.cb M src/mainboard/google/stout/devicetree.cb M src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb M src/mainboard/hp/snb_ivb_laptops/devicetree.cb M src/mainboard/hp/z220_sff_workstation/devicetree.cb M src/mainboard/intel/dcp847ske/devicetree.cb M src/mainboard/intel/emeraldlake2/devicetree.cb M src/mainboard/kontron/ktqm77/devicetree.cb M src/mainboard/lenovo/l520/devicetree.cb M src/mainboard/lenovo/s230u/devicetree.cb M src/mainboard/lenovo/t420/devicetree.cb M src/mainboard/lenovo/t420s/devicetree.cb M src/mainboard/lenovo/t430/devicetree.cb M src/mainboard/lenovo/t430s/devicetree.cb M src/mainboard/lenovo/t520/devicetree.cb M src/mainboard/lenovo/t530/devicetree.cb M src/mainboard/lenovo/x131e/devicetree.cb M src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb M src/mainboard/lenovo/x220/devicetree.cb M src/mainboard/lenovo/x230/devicetree.cb M src/mainboard/msi/ms7707/devicetree.cb M src/mainboard/roda/rv11/variants/rv11/devicetree.cb M src/mainboard/roda/rv11/variants/rw11/devicetree.cb M src/mainboard/samsung/lumpy/devicetree.cb M src/mainboard/samsung/stumpy/devicetree.cb M src/mainboard/sapphire/pureplatinumh61/devicetree.cb M src/mainboard/supermicro/x9scl/devicetree.cb M util/autoport/sandybridge.go 46 files changed, 139 insertions(+), 139 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/49089/1 diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index 514b1bb..b38eb15 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -84,14 +84,14 @@ acpigen_write_len_f(); /* PkgLength */ acpigen_emit_namestring("PWRS"); acpigen_emit_byte(0xa4); /* ReturnOp */ - generate_cstate_entries(cpu->cstates, conf->c1_acpower, - conf->c2_acpower, conf->c3_acpower); + generate_cstate_entries(cpu->cstates, conf->acpi_c1, + conf->acpi_c2, conf->acpi_c3); acpigen_pop_len(); /* Else on battery power */ acpigen_emit_byte(0xa4); /* ReturnOp */ - generate_cstate_entries(cpu->cstates, conf->c1_acpower, - conf->c2_acpower, conf->c3_acpower); + generate_cstate_entries(cpu->cstates, conf->acpi_c1, + conf->acpi_c2, conf->acpi_c3); acpigen_pop_len(); } diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h index aca1804..1c98bcb 100644 --- a/src/cpu/intel/model_206ax/chip.h +++ b/src/cpu/intel/model_206ax/chip.h @@ -4,9 +4,9 @@ #define SPEEDSTEP_APIC_MAGIC 0xACAC struct cpu_intel_model_206ax_config { - int c1_acpower; /* ACPI C1 on AC Power */ - int c2_acpower; /* ACPI C2 on AC Power */ - int c3_acpower; /* ACPI C3 on AC Power */ + int acpi_c1; /* ACPI C1 on AC Power */ + int acpi_c2; /* ACPI C2 on AC Power */ + int acpi_c3; /* ACPI C3 on AC Power */ int tcc_offset; /* TCC Activation Offset */ }; diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb index 7bf6be2..5050758 100644 --- a/src/mainboard/apple/macbookair4_2/devicetree.cb +++ b/src/mainboard/apple/macbookair4_2/devicetree.cb @@ -15,9 +15,9 @@ register "gpu_pch_backlight" = "0x13121312" device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb index 3838aec..af69d58 100644 --- a/src/mainboard/asrock/b75pro3-m/devicetree.cb +++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb @@ -15,9 +15,9 @@ register "gpu_pch_backlight" = "0x00000000" device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/h61m-cs/devicetree.cb b/src/mainboard/asus/h61m-cs/devicetree.cb index 9ecff52..60f8191 100644 --- a/src/mainboard/asus/h61m-cs/devicetree.cb +++ b/src/mainboard/asus/h61m-cs/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb index 6bfd26f..7b90149 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb +++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/p8h61-m_lx/devicetree.cb index 30abc61..eddca81 100644 --- a/src/mainboard/asus/p8h61-m_lx/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_lx/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb b/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb index b4c70e1..317f9cc 100644 --- a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb index 18e1831..969169c 100644 --- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8z77-m_pro/devicetree.cb b/src/mainboard/asus/p8z77-m_pro/devicetree.cb index 30d12aa..1d1a244 100644 --- a/src/mainboard/asus/p8z77-m_pro/devicetree.cb +++ b/src/mainboard/asus/p8z77-m_pro/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb index fa70be7..0fc6dc1 100644 --- a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb +++ b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/biostar/th61-itx/devicetree.cb b/src/mainboard/biostar/th61-itx/devicetree.cb index b18f593..118a58e 100644 --- a/src/mainboard/biostar/th61-itx/devicetree.cb +++ b/src/mainboard/biostar/th61-itx/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb index 14b6840..b48dae3 100644 --- a/src/mainboard/compulab/intense_pc/devicetree.cb +++ b/src/mainboard/compulab/intense_pc/devicetree.cb @@ -8,9 +8,9 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax # FIXME: check all registers - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/dell/optiplex_9010/devicetree.cb b/src/mainboard/dell/optiplex_9010/devicetree.cb index 0b010d3..c805b1f 100644 --- a/src/mainboard/dell/optiplex_9010/devicetree.cb +++ b/src/mainboard/dell/optiplex_9010/devicetree.cb @@ -1,9 +1,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" register "tcc_offset" = "5" # TCC of 95C device lapic 0 on end device lapic 0xacac off end diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb index 4cb5bff..0c24a9d 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb +++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb @@ -2,9 +2,9 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" # Magic APIC ID to locate this chip device lapic 0x0 on end device lapic 0xacac off end diff --git a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb index 4a8f9bb..d0ec09c 100644 --- a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb +++ b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb index 095656b..2b9753a 100644 --- a/src/mainboard/google/butterfly/devicetree.cb +++ b/src/mainboard/google/butterfly/devicetree.cb @@ -26,9 +26,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb index 5241dd6..a99d618 100644 --- a/src/mainboard/google/link/devicetree.cb +++ b/src/mainboard/google/link/devicetree.cb @@ -25,9 +25,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb index 2dc35e8..a384d87 100644 --- a/src/mainboard/google/parrot/devicetree.cb +++ b/src/mainboard/google/parrot/devicetree.cb @@ -25,9 +25,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb index 66dd06d..5461b15 100644 --- a/src/mainboard/google/stout/devicetree.cb +++ b/src/mainboard/google/stout/devicetree.cb @@ -27,9 +27,9 @@ register "tcc_offset" = "5" # TCC of 95C - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb index 0ec9a53..fbff203 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb +++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb @@ -8,9 +8,9 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb index eb73eef..c1e80c8 100644 --- a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb +++ b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb @@ -17,9 +17,9 @@ register "gpu_pch_backlight" = "0x02880288" device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb index 0fdbe90..61535df 100644 --- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb +++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb @@ -8,9 +8,9 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb index 8f83589..7a56844 100644 --- a/src/mainboard/intel/dcp847ske/devicetree.cb +++ b/src/mainboard/intel/dcp847ske/devicetree.cb @@ -17,9 +17,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" end end device domain 0x0 on diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb index 1fb02e3..b2f4e6b 100644 --- a/src/mainboard/intel/emeraldlake2/devicetree.cb +++ b/src/mainboard/intel/emeraldlake2/devicetree.cb @@ -17,9 +17,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "3" # ACPI(C1) = MWAIT(C3) - register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "3" # ACPI(C1) = MWAIT(C3) + register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb index 7abdbb3..71c9611 100644 --- a/src/mainboard/kontron/ktqm77/devicetree.cb +++ b/src/mainboard/kontron/ktqm77/devicetree.cb @@ -8,9 +8,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "0" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "0" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb index 23af5b9..6505d13 100644 --- a/src/mainboard/lenovo/l520/devicetree.cb +++ b/src/mainboard/lenovo/l520/devicetree.cb @@ -14,9 +14,9 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb index 06ec045..eb92d78 100644 --- a/src/mainboard/lenovo/s230u/devicetree.cb +++ b/src/mainboard/lenovo/s230u/devicetree.cb @@ -13,9 +13,9 @@ register "gpu_pch_backlight" = "0x041e041e" device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb index 6b0ed3b..ffd1d24 100644 --- a/src/mainboard/lenovo/t420/devicetree.cb +++ b/src/mainboard/lenovo/t420/devicetree.cb @@ -21,9 +21,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb index 7110b98..4b95675 100644 --- a/src/mainboard/lenovo/t420s/devicetree.cb +++ b/src/mainboard/lenovo/t420s/devicetree.cb @@ -21,9 +21,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb index f03a225..cafc2df 100644 --- a/src/mainboard/lenovo/t430/devicetree.cb +++ b/src/mainboard/lenovo/t430/devicetree.cb @@ -16,9 +16,9 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax # FIXME: check all registers - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb index a6fb1bf..d9ececa 100644 --- a/src/mainboard/lenovo/t430s/devicetree.cb +++ b/src/mainboard/lenovo/t430s/devicetree.cb @@ -20,9 +20,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb index de4d8d7..296be73 100644 --- a/src/mainboard/lenovo/t520/devicetree.cb +++ b/src/mainboard/lenovo/t520/devicetree.cb @@ -21,9 +21,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb index 0b0c7fb..7adc0f5 100644 --- a/src/mainboard/lenovo/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/devicetree.cb @@ -21,9 +21,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb index 38f833b..18ed380 100644 --- a/src/mainboard/lenovo/x131e/devicetree.cb +++ b/src/mainboard/lenovo/x131e/devicetree.cb @@ -20,9 +20,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" end end diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb index da44a44..b4d3800 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb +++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb @@ -18,9 +18,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb index 3559a16..667b280 100644 --- a/src/mainboard/lenovo/x220/devicetree.cb +++ b/src/mainboard/lenovo/x220/devicetree.cb @@ -21,9 +21,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb index e304794..de91bba 100644 --- a/src/mainboard/lenovo/x230/devicetree.cb +++ b/src/mainboard/lenovo/x230/devicetree.cb @@ -21,9 +21,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/msi/ms7707/devicetree.cb b/src/mainboard/msi/ms7707/devicetree.cb index a7cbb1c..2ccf7c6 100644 --- a/src/mainboard/msi/ms7707/devicetree.cb +++ b/src/mainboard/msi/ms7707/devicetree.cb @@ -1,9 +1,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb index 86f07b5..dc30775 100644 --- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb +++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb @@ -23,9 +23,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_acpower" = "0" + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6) + register "acpi_c3" = "0" end end diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb index ca62c13..fdba671 100644 --- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb +++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb @@ -23,9 +23,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_acpower" = "0" + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6) + register "acpi_c3" = "0" end end diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb index 9d7d456..0f3ee5c 100644 --- a/src/mainboard/samsung/lumpy/devicetree.cb +++ b/src/mainboard/samsung/lumpy/devicetree.cb @@ -25,9 +25,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1) + register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb index 1cce1f1..20c994e 100644 --- a/src/mainboard/samsung/stumpy/devicetree.cb +++ b/src/mainboard/samsung/stumpy/devicetree.cb @@ -17,9 +17,9 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_acpower" = "3" # ACPI(C1) = MWAIT(C3) - register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) + register "acpi_c1" = "3" # ACPI(C1) = MWAIT(C3) + register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6) + register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb index a590450..82117fb 100644 --- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb +++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb @@ -3,9 +3,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0x0 on chip cpu/intel/model_206ax - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/supermicro/x9scl/devicetree.cb b/src/mainboard/supermicro/x9scl/devicetree.cb index 17b6c40..e1924c1 100644 --- a/src/mainboard/supermicro/x9scl/devicetree.cb +++ b/src/mainboard/supermicro/x9scl/devicetree.cb @@ -1,9 +1,9 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on chip cpu/intel/model_206ax # FIXME: check all registers - register "c1_acpower" = "1" - register "c2_acpower" = "3" - register "c3_acpower" = "5" + register "acpi_c1" = "1" + register "acpi_c2" = "3" + register "acpi_c3" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go index 645bd93..950286c 100644 --- a/util/autoport/sandybridge.go +++ b/util/autoport/sandybridge.go @@ -44,9 +44,9 @@ Comment: "FIXME: check all registers", Registers: map[string]string{ /* FIXME:XX hardcoded. */ - "c1_acpower": "1", - "c2_acpower": "3", - "c3_acpower": "5", + "acpi_c1": "1", + "acpi_c2": "3", + "acpi_c3": "5", }, Children: []DevTreeNode{ { -- To view, visit https://review.coreboot.org/c/coreboot/+/49089 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ib04d0a08674b7d2773d440d39bd6dfbd4359e0fb Gerrit-Change-Number: 49089 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.io> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-MessageType: newchange

2 4

Change in coreboot[master]: cpu/intel/model_206ax: Unify ACPI C-state options
by Angel Pons (Code Review) 06 Jan '21

06 Jan '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49088 ) Change subject: cpu/intel/model_206ax: Unify ACPI C-state options ...................................................................... cpu/intel/model_206ax: Unify ACPI C-state options All mainboards use the same values for AC and battery, even desktop boards without a battery. Use the AC values everywhere and drop the battery values. Subsequent commits will rename the AC power options accordingly, and will also clean up the corresponding acpigen code. This is intentional so as to ease reviewing the devicetree changes. Also update util/autoport accordingly. Change-Id: I581dc9b733d1f3006a4dc81d8a2fec255d2a0a0f Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/cpu/intel/model_206ax/acpi.c M src/cpu/intel/model_206ax/chip.h M src/mainboard/apple/macbookair4_2/devicetree.cb M src/mainboard/asrock/b75pro3-m/devicetree.cb M src/mainboard/asus/h61m-cs/devicetree.cb M src/mainboard/asus/maximus_iv_gene-z/devicetree.cb M src/mainboard/asus/p8h61-m_lx/devicetree.cb M src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb M src/mainboard/asus/p8h61-m_pro/devicetree.cb M src/mainboard/asus/p8z77-m_pro/devicetree.cb M src/mainboard/asus/p8z77-v_lx2/devicetree.cb M src/mainboard/biostar/th61-itx/devicetree.cb M src/mainboard/compulab/intense_pc/devicetree.cb M src/mainboard/dell/optiplex_9010/devicetree.cb M src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb M src/mainboard/gigabyte/ga-h61m-series/devicetree.cb M src/mainboard/google/butterfly/devicetree.cb M src/mainboard/google/link/devicetree.cb M src/mainboard/google/parrot/devicetree.cb M src/mainboard/google/stout/devicetree.cb M src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb M src/mainboard/hp/snb_ivb_laptops/devicetree.cb M src/mainboard/hp/z220_sff_workstation/devicetree.cb M src/mainboard/intel/dcp847ske/devicetree.cb M src/mainboard/intel/emeraldlake2/devicetree.cb M src/mainboard/kontron/ktqm77/devicetree.cb M src/mainboard/lenovo/l520/devicetree.cb M src/mainboard/lenovo/s230u/devicetree.cb M src/mainboard/lenovo/t420/devicetree.cb M src/mainboard/lenovo/t420s/devicetree.cb M src/mainboard/lenovo/t430/devicetree.cb M src/mainboard/lenovo/t430s/devicetree.cb M src/mainboard/lenovo/t520/devicetree.cb M src/mainboard/lenovo/t530/devicetree.cb M src/mainboard/lenovo/x131e/devicetree.cb M src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb M src/mainboard/lenovo/x220/devicetree.cb M src/mainboard/lenovo/x230/devicetree.cb M src/mainboard/msi/ms7707/devicetree.cb M src/mainboard/roda/rv11/variants/rv11/devicetree.cb M src/mainboard/roda/rv11/variants/rw11/devicetree.cb M src/mainboard/samsung/lumpy/devicetree.cb M src/mainboard/samsung/stumpy/devicetree.cb M src/mainboard/sapphire/pureplatinumh61/devicetree.cb M src/mainboard/supermicro/x9scl/devicetree.cb M util/autoport/sandybridge.go 46 files changed, 2 insertions(+), 158 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/49088/1 diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c index b24f411..514b1bb 100644 --- a/src/cpu/intel/model_206ax/acpi.c +++ b/src/cpu/intel/model_206ax/acpi.c @@ -90,8 +90,8 @@ /* Else on battery power */ acpigen_emit_byte(0xa4); /* ReturnOp */ - generate_cstate_entries(cpu->cstates, conf->c1_battery, - conf->c2_battery, conf->c3_battery); + generate_cstate_entries(cpu->cstates, conf->c1_acpower, + conf->c2_acpower, conf->c3_acpower); acpigen_pop_len(); } diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h index a5a4312..aca1804 100644 --- a/src/cpu/intel/model_206ax/chip.h +++ b/src/cpu/intel/model_206ax/chip.h @@ -4,10 +4,6 @@ #define SPEEDSTEP_APIC_MAGIC 0xACAC struct cpu_intel_model_206ax_config { - int c1_battery; /* ACPI C1 on Battery Power */ - int c2_battery; /* ACPI C2 on Battery Power */ - int c3_battery; /* ACPI C3 on Battery Power */ - int c1_acpower; /* ACPI C1 on AC Power */ int c2_acpower; /* ACPI C2 on AC Power */ int c3_acpower; /* ACPI C3 on AC Power */ diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb index f6b0176..7bf6be2 100644 --- a/src/mainboard/apple/macbookair4_2/devicetree.cb +++ b/src/mainboard/apple/macbookair4_2/devicetree.cb @@ -16,11 +16,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb index 2fc7c88..3838aec 100644 --- a/src/mainboard/asrock/b75pro3-m/devicetree.cb +++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb @@ -16,11 +16,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/h61m-cs/devicetree.cb b/src/mainboard/asus/h61m-cs/devicetree.cb index ea2a5d8..9ecff52 100644 --- a/src/mainboard/asus/h61m-cs/devicetree.cb +++ b/src/mainboard/asus/h61m-cs/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb index a0b6312..6bfd26f 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb +++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/p8h61-m_lx/devicetree.cb index 4a29baa..30abc61 100644 --- a/src/mainboard/asus/p8h61-m_lx/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_lx/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb b/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb index 757c5cc..b4c70e1 100644 --- a/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_lx3_r2_0/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb index b318573..18e1831 100644 --- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8z77-m_pro/devicetree.cb b/src/mainboard/asus/p8z77-m_pro/devicetree.cb index 90feb7a..30d12aa 100644 --- a/src/mainboard/asus/p8z77-m_pro/devicetree.cb +++ b/src/mainboard/asus/p8z77-m_pro/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb index 33ff961..fa70be7 100644 --- a/src/mainboard/asus/p8z77-v_lx2/devicetree.cb +++ b/src/mainboard/asus/p8z77-v_lx2/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/biostar/th61-itx/devicetree.cb b/src/mainboard/biostar/th61-itx/devicetree.cb index 2329bb2..b18f593 100644 --- a/src/mainboard/biostar/th61-itx/devicetree.cb +++ b/src/mainboard/biostar/th61-itx/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb index 414c410..14b6840 100644 --- a/src/mainboard/compulab/intense_pc/devicetree.cb +++ b/src/mainboard/compulab/intense_pc/devicetree.cb @@ -9,11 +9,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/dell/optiplex_9010/devicetree.cb b/src/mainboard/dell/optiplex_9010/devicetree.cb index 6a21d20..0b010d3 100644 --- a/src/mainboard/dell/optiplex_9010/devicetree.cb +++ b/src/mainboard/dell/optiplex_9010/devicetree.cb @@ -2,11 +2,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" register "tcc_offset" = "5" # TCC of 95C device lapic 0 on end device lapic 0xacac off end diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb index fbc31b7..4cb5bff 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb +++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb @@ -5,9 +5,6 @@ register "c1_acpower" = "1" register "c2_acpower" = "3" register "c3_acpower" = "5" - register "c1_battery" = "1" - register "c2_battery" = "3" - register "c3_battery" = "5" # Magic APIC ID to locate this chip device lapic 0x0 on end device lapic 0xacac off end diff --git a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb index cb7b918..4a8f9bb 100644 --- a/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb +++ b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0 on end device lapic 0xacac off end end diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb index 94e5a21..095656b 100644 --- a/src/mainboard/google/butterfly/devicetree.cb +++ b/src/mainboard/google/butterfly/devicetree.cb @@ -29,10 +29,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb index 6ce51a3..5241dd6 100644 --- a/src/mainboard/google/link/devicetree.cb +++ b/src/mainboard/google/link/devicetree.cb @@ -28,10 +28,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb index 61e51d0..2dc35e8 100644 --- a/src/mainboard/google/parrot/devicetree.cb +++ b/src/mainboard/google/parrot/devicetree.cb @@ -28,10 +28,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb index bd91506..66dd06d 100644 --- a/src/mainboard/google/stout/devicetree.cb +++ b/src/mainboard/google/stout/devicetree.cb @@ -30,10 +30,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb index 7bd3128..0ec9a53 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb +++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb @@ -9,11 +9,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb index acdd4b3..eb73eef 100644 --- a/src/mainboard/hp/snb_ivb_laptops/devicetree.cb +++ b/src/mainboard/hp/snb_ivb_laptops/devicetree.cb @@ -18,11 +18,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/hp/z220_sff_workstation/devicetree.cb b/src/mainboard/hp/z220_sff_workstation/devicetree.cb index bfabacc..0fdbe90 100644 --- a/src/mainboard/hp/z220_sff_workstation/devicetree.cb +++ b/src/mainboard/hp/z220_sff_workstation/devicetree.cb @@ -9,11 +9,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb index b865d1a..8f83589 100644 --- a/src/mainboard/intel/dcp847ske/devicetree.cb +++ b/src/mainboard/intel/dcp847ske/devicetree.cb @@ -17,10 +17,6 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_battery" = "1" - register "c2_battery" = "3" - register "c3_battery" = "5" - register "c1_acpower" = "1" register "c2_acpower" = "3" register "c3_acpower" = "5" diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb index 3b4ee65..1fb02e3 100644 --- a/src/mainboard/intel/emeraldlake2/devicetree.cb +++ b/src/mainboard/intel/emeraldlake2/devicetree.cb @@ -17,10 +17,6 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_battery" = "3" # ACPI(C1) = MWAIT(C3) - register "c2_battery" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) - register "c1_acpower" = "3" # ACPI(C1) = MWAIT(C3) register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb index db0c9e2..7abdbb3 100644 --- a/src/mainboard/kontron/ktqm77/devicetree.cb +++ b/src/mainboard/kontron/ktqm77/devicetree.cb @@ -11,10 +11,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "0" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "4" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "0" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb index bab1d54..23af5b9 100644 --- a/src/mainboard/lenovo/l520/devicetree.cb +++ b/src/mainboard/lenovo/l520/devicetree.cb @@ -15,11 +15,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb index f3b8c27..06ec045 100644 --- a/src/mainboard/lenovo/s230u/devicetree.cb +++ b/src/mainboard/lenovo/s230u/devicetree.cb @@ -14,11 +14,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb index ef40fc4..6b0ed3b 100644 --- a/src/mainboard/lenovo/t420/devicetree.cb +++ b/src/mainboard/lenovo/t420/devicetree.cb @@ -24,10 +24,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb index 71068d0..7110b98 100644 --- a/src/mainboard/lenovo/t420s/devicetree.cb +++ b/src/mainboard/lenovo/t420s/devicetree.cb @@ -24,10 +24,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb index f3524cd..f03a225 100644 --- a/src/mainboard/lenovo/t430/devicetree.cb +++ b/src/mainboard/lenovo/t430/devicetree.cb @@ -17,11 +17,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb index 4bdb923..a6fb1bf 100644 --- a/src/mainboard/lenovo/t430s/devicetree.cb +++ b/src/mainboard/lenovo/t430s/devicetree.cb @@ -23,10 +23,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t520/devicetree.cb b/src/mainboard/lenovo/t520/devicetree.cb index cc1e7f2..de4d8d7 100644 --- a/src/mainboard/lenovo/t520/devicetree.cb +++ b/src/mainboard/lenovo/t520/devicetree.cb @@ -24,10 +24,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb index e4655b2..0b0c7fb 100644 --- a/src/mainboard/lenovo/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/devicetree.cb @@ -24,10 +24,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb index ddbfd98..38f833b 100644 --- a/src/mainboard/lenovo/x131e/devicetree.cb +++ b/src/mainboard/lenovo/x131e/devicetree.cb @@ -23,10 +23,6 @@ register "c1_acpower" = "1" register "c2_acpower" = "3" register "c3_acpower" = "5" - - register "c1_battery" = "1" - register "c2_battery" = "3" - register "c3_battery" = "5" end end diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb index 34eaa75..da44a44 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb +++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb @@ -21,10 +21,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb index 609036d..3559a16 100644 --- a/src/mainboard/lenovo/x220/devicetree.cb +++ b/src/mainboard/lenovo/x220/devicetree.cb @@ -24,10 +24,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb index 27d42b6..e304794 100644 --- a/src/mainboard/lenovo/x230/devicetree.cb +++ b/src/mainboard/lenovo/x230/devicetree.cb @@ -24,10 +24,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/msi/ms7707/devicetree.cb b/src/mainboard/msi/ms7707/devicetree.cb index db48656..a7cbb1c 100644 --- a/src/mainboard/msi/ms7707/devicetree.cb +++ b/src/mainboard/msi/ms7707/devicetree.cb @@ -2,11 +2,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb index f3108db..86f07b5 100644 --- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb +++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb @@ -26,10 +26,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) register "c3_acpower" = "0" - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_battery" = "0" end end diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb index a1edcaa3..ca62c13 100644 --- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb +++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb @@ -26,10 +26,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) register "c3_acpower" = "0" - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_battery" = "0" end end diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb index 06efaf8..9d7d456 100644 --- a/src/mainboard/samsung/lumpy/devicetree.cb +++ b/src/mainboard/samsung/lumpy/devicetree.cb @@ -28,10 +28,6 @@ register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) end end diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb index df640b5..1cce1f1 100644 --- a/src/mainboard/samsung/stumpy/devicetree.cb +++ b/src/mainboard/samsung/stumpy/devicetree.cb @@ -17,10 +17,6 @@ device lapic 0x0 on end device lapic 0xacac off end - register "c1_battery" = "3" # ACPI(C1) = MWAIT(C3) - register "c2_battery" = "4" # ACPI(C2) = MWAIT(C6) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) - register "c1_acpower" = "3" # ACPI(C1) = MWAIT(C3) register "c2_acpower" = "4" # ACPI(C2) = MWAIT(C6) register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb index 2bef030..a590450 100644 --- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb +++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb @@ -4,11 +4,8 @@ device cpu_cluster 0x0 on chip cpu/intel/model_206ax register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/src/mainboard/supermicro/x9scl/devicetree.cb b/src/mainboard/supermicro/x9scl/devicetree.cb index 9236f6f..17b6c40 100644 --- a/src/mainboard/supermicro/x9scl/devicetree.cb +++ b/src/mainboard/supermicro/x9scl/devicetree.cb @@ -2,11 +2,8 @@ device cpu_cluster 0 on chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" - register "c1_battery" = "1" register "c2_acpower" = "3" - register "c2_battery" = "3" register "c3_acpower" = "5" - register "c3_battery" = "5" device lapic 0x0 on end device lapic 0xacac off end end diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go index 68cbe68..645bd93 100644 --- a/util/autoport/sandybridge.go +++ b/util/autoport/sandybridge.go @@ -47,9 +47,6 @@ "c1_acpower": "1", "c2_acpower": "3", "c3_acpower": "5", - "c1_battery": "1", - "c2_battery": "3", - "c3_battery": "5", }, Children: []DevTreeNode{ { -- To view, visit https://review.coreboot.org/c/coreboot/+/49088 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I581dc9b733d1f3006a4dc81d8a2fec255d2a0a0f Gerrit-Change-Number: 49088 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Evgeny Zinoviev <me(a)ch1p.io> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: cpu/intel/x/chip.h: Drop unused `disable_acpi` setting
by Angel Pons (Code Review) 06 Jan '21

06 Jan '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49087 ) Change subject: cpu/intel/x/chip.h: Drop unused `disable_acpi` setting ...................................................................... cpu/intel/x/chip.h: Drop unused `disable_acpi` setting It is not used anywhere. Drop it. Change-Id: I92a72a46db237cf855491a664cdfadca34306f6c Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/cpu/intel/haswell/chip.h M src/cpu/intel/model_2065x/chip.h M src/cpu/intel/model_206ax/chip.h 3 files changed, 0 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/49087/1 diff --git a/src/cpu/intel/haswell/chip.h b/src/cpu/intel/haswell/chip.h index 7d41461..6afed37 100644 --- a/src/cpu/intel/haswell/chip.h +++ b/src/cpu/intel/haswell/chip.h @@ -4,8 +4,6 @@ #define SPEEDSTEP_APIC_MAGIC 0xACAC struct cpu_intel_haswell_config { - u8 disable_acpi; /* Do not generate CPU ACPI tables */ - int c1_battery; /* ACPI C1 on Battery Power */ int c2_battery; /* ACPI C2 on Battery Power */ int c3_battery; /* ACPI C3 on Battery Power */ diff --git a/src/cpu/intel/model_2065x/chip.h b/src/cpu/intel/model_2065x/chip.h index 21f75a3..d9b1057 100644 --- a/src/cpu/intel/model_2065x/chip.h +++ b/src/cpu/intel/model_2065x/chip.h @@ -4,8 +4,6 @@ #define SPEEDSTEP_APIC_MAGIC 0xACAC struct cpu_intel_model_2065x_config { - u8 disable_acpi; /* Do not generate CPU ACPI tables */ - int c1_battery; /* ACPI C1 on Battery Power */ int c2_battery; /* ACPI C2 on Battery Power */ int c3_battery; /* ACPI C3 on Battery Power */ diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h index 4e40830..a5a4312 100644 --- a/src/cpu/intel/model_206ax/chip.h +++ b/src/cpu/intel/model_206ax/chip.h @@ -4,8 +4,6 @@ #define SPEEDSTEP_APIC_MAGIC 0xACAC struct cpu_intel_model_206ax_config { - u8 disable_acpi; /* Do not generate CPU ACPI tables */ - int c1_battery; /* ACPI C1 on Battery Power */ int c2_battery; /* ACPI C2 on Battery Power */ int c3_battery; /* ACPI C3 on Battery Power */ -- To view, visit https://review.coreboot.org/c/coreboot/+/49087 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I92a72a46db237cf855491a664cdfadca34306f6c Gerrit-Change-Number: 49087 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: nb/intel/sandybridge: Use consistent comment style
by Angel Pons (Code Review) 06 Jan '21

06 Jan '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49066 ) Change subject: nb/intel/sandybridge: Use consistent comment style ...................................................................... nb/intel/sandybridge: Use consistent comment style Change-Id: Iacb1fb0a1309c3c23e670fee540514b6f546314a Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/northbridge/intel/sandybridge/raminit_common.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/66/49066/1 diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c index cef104c..eac0b50 100644 --- a/src/northbridge/intel/sandybridge/raminit_common.c +++ b/src/northbridge/intel/sandybridge/raminit_common.c @@ -430,7 +430,7 @@ remaplimit = remapbase + MIN(4096, tom - me_uma_size) - toludbase - 1; touudbase = remaplimit + 1; } else { - // Reclaim not possible + /* Reclaim not possible */ reclaim = 0; touudbase = tom - me_uma_size; } @@ -752,11 +752,11 @@ { switch (odt) { case 30: - return (1 << 9) | (1 << 2); // RZQ/8, RZQ/4 + return (1 << 9) | (1 << 2); /* RZQ/8, RZQ/4 */ case 60: - return (1 << 2); // RZQ/4 + return (1 << 2); /* RZQ/4 */ case 120: - return (1 << 6); // RZQ/2 + return (1 << 6); /* RZQ/2 */ default: case 0: return 0; @@ -2827,8 +2827,8 @@ FOR_ALL_CHANNELS MCHBAR32(PM_TRML_M_CONFIG_ch(channel)) = 0x00000aaa; - MCHBAR32(PM_BW_LIMIT_CONFIG) = 0x5f7003ff; // OK - MCHBAR32(PM_DLL_CONFIG) = 0x00073000 | ctrl->mdll_wake_delay; // OK + MCHBAR32(PM_BW_LIMIT_CONFIG) = 0x5f7003ff; + MCHBAR32(PM_DLL_CONFIG) = 0x00073000 | ctrl->mdll_wake_delay; FOR_ALL_CHANNELS { switch (ctrl->rankmap[channel]) { -- To view, visit https://review.coreboot.org/c/coreboot/+/49066 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Iacb1fb0a1309c3c23e670fee540514b6f546314a Gerrit-Change-Number: 49066 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

2 2

Change in coreboot[master]: nb/intel/sandybridge: Define and use `QCLK_PI` constant
by Angel Pons (Code Review) 06 Jan '21

06 Jan '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49065 ) Change subject: nb/intel/sandybridge: Define and use `QCLK_PI` constant ...................................................................... nb/intel/sandybridge: Define and use `QCLK_PI` constant To allow adjusting the phase shift of the various I/O signals, the memory controller contains several PIs (Phase Interpolators). These devices subdivide a QCLK (quarter of a clock cycle) in 64 `ticks`, and the desired phase shift is specified in a register. For shifts larger than one QCLK, there are `logic delay` registers, which allow shifting a whole number of QCLKs in addition to the PI phase shift. The number of PI ticks in a QCLK is often used in raminit calculations. Define the `QCLK_PI` macro and use it in place of magic numbers. In addition, add macros for other commonly-used values that use `QCLK_PI` to avoid unnecessarily repeating `2 * QCLK_PI`, such as `CCC_MAX_PI`. Tested with BUILD_TIMELESS=1, Asus P8Z77-V LX2 does not change. Change-Id: Id6ba32eb1278ef71cecb7e63bd8a95d17430ae54 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/northbridge/intel/sandybridge/raminit_common.c M src/northbridge/intel/sandybridge/raminit_common.h 2 files changed, 49 insertions(+), 36 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/49065/1 diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c index 61663b8..cef104c 100644 --- a/src/northbridge/intel/sandybridge/raminit_common.c +++ b/src/northbridge/intel/sandybridge/raminit_common.c @@ -921,6 +921,9 @@ LANEBASE_ECC }; +/* Maximum delay for command, control, clock */ +#define CCC_MAX_PI (2 * QCLK_PI - 1) + void program_timings(ramctr_timing *ctrl, int channel) { u32 reg_roundtrip_latency, reg_io_latency; @@ -946,9 +949,9 @@ printk(BIOS_ERR, "C%d command delay underflow: %d\n", channel, cmd_delay); cmd_delay = 0; } - if (cmd_delay >= 128) { + if (cmd_delay > CCC_MAX_PI) { printk(BIOS_ERR, "C%d command delay overflow: %d\n", channel, cmd_delay); - cmd_delay = 127; + cmd_delay = CCC_MAX_PI; } /* Apply control and clock delay if desired setting is positive */ @@ -969,23 +972,23 @@ if (slot_map == 3) ctl_delay[slot] /= 2; - if (ctl_delay[slot] >= 128) { + if (ctl_delay[slot] > CCC_MAX_PI) { printk(BIOS_ERR, "C%dS%d control delay overflow: %d\n", channel, slot, ctl_delay[slot]); - ctl_delay[slot] = 127; + ctl_delay[slot] = CCC_MAX_PI; } } FOR_ALL_POPULATED_RANKS { u32 clk_delay = ctrl->timings[channel][slotrank].pi_coding + cmd_delay; - if (clk_delay >= 128) { + if (clk_delay > CCC_MAX_PI) { printk(BIOS_ERR, "C%dR%d clock delay overflow: %d\n", channel, slotrank, clk_delay); - clk_delay = 127; + clk_delay = CCC_MAX_PI; } - clk_pi_coding |= (clk_delay % 64) << (6 * slotrank); - clk_logic_dly |= (clk_delay / 64) << slotrank; + clk_pi_coding |= (clk_delay % QCLK_PI) << (6 * slotrank); + clk_logic_dly |= (clk_delay / QCLK_PI) << slotrank; } } @@ -993,13 +996,13 @@ union gdcr_cmd_pi_coding_reg cmd_pi_coding = { .raw = get_XOVER_CMD(ctrl->rankmap[channel]), }; - cmd_pi_coding.cmd_pi_code = cmd_delay % 64; - cmd_pi_coding.cmd_logic_delay = cmd_delay / 64; + cmd_pi_coding.cmd_pi_code = cmd_delay % QCLK_PI; + cmd_pi_coding.cmd_logic_delay = cmd_delay / QCLK_PI; - cmd_pi_coding.ctl_pi_code_d0 = ctl_delay[0] % 64; - cmd_pi_coding.ctl_pi_code_d1 = ctl_delay[1] % 64; - cmd_pi_coding.ctl_logic_delay_d0 = ctl_delay[0] / 64; - cmd_pi_coding.ctl_logic_delay_d1 = ctl_delay[1] / 64; + cmd_pi_coding.ctl_pi_code_d0 = ctl_delay[0] % QCLK_PI; + cmd_pi_coding.ctl_pi_code_d1 = ctl_delay[1] % QCLK_PI; + cmd_pi_coding.ctl_logic_delay_d0 = ctl_delay[0] / QCLK_PI; + cmd_pi_coding.ctl_logic_delay_d1 = ctl_delay[1] / QCLK_PI; MCHBAR32(GDCRCMDPICODING_ch(channel)) = cmd_pi_coding.raw; @@ -1022,9 +1025,9 @@ const u8 dqs_p = ctrl->timings[channel][slotrank].lanes[lane].rx_dqs_p; const u8 dqs_n = ctrl->timings[channel][slotrank].lanes[lane].rx_dqs_n; const union gdcr_rx_reg gdcr_rx = { - .rcven_pi_code = rcven % 64, + .rcven_pi_code = rcven % QCLK_PI, .rx_dqs_p_pi_code = dqs_p, - .rcven_logic_delay = rcven / 64, + .rcven_logic_delay = rcven / QCLK_PI, .rx_dqs_n_pi_code = dqs_n, }; MCHBAR32(lane_base[lane] + GDCRRX(channel, slotrank)) = gdcr_rx.raw; @@ -1032,10 +1035,10 @@ const u16 tx_dqs = ctrl->timings[channel][slotrank].lanes[lane].tx_dqs; const int tx_dq = ctrl->timings[channel][slotrank].lanes[lane].tx_dq; const union gdcr_tx_reg gdcr_tx = { - .tx_dq_pi_code = tx_dq % 64, - .tx_dqs_pi_code = tx_dqs % 64, - .tx_dqs_logic_delay = tx_dqs / 64, - .tx_dq_logic_delay = tx_dq / 64, + .tx_dq_pi_code = tx_dq % QCLK_PI, + .tx_dqs_pi_code = tx_dqs % QCLK_PI, + .tx_dqs_logic_delay = tx_dqs / QCLK_PI, + .tx_dq_logic_delay = tx_dq / QCLK_PI, }; MCHBAR32(lane_base[lane] + GDCRTX(channel, slotrank)) = gdcr_tx.raw; } @@ -1103,13 +1106,15 @@ return ret; } +#define RCVEN_COARSE_PI_LENGTH (2 * QCLK_PI) + static void find_rcven_pi_coarse(ramctr_timing *ctrl, int channel, int slotrank, int *upperA) { int rcven; - int statistics[NUM_LANES][128]; + int statistics[NUM_LANES][RCVEN_COARSE_PI_LENGTH]; int lane; - for (rcven = 0; rcven < 128; rcven++) { + for (rcven = 0; rcven < RCVEN_COARSE_PI_LENGTH; rcven++) { FOR_ALL_LANES { ctrl->timings[channel][slotrank].lanes[lane].rcven = rcven; } @@ -1123,11 +1128,11 @@ } } FOR_ALL_LANES { - struct run rn = get_longest_zero_run(statistics[lane], 128); + struct run rn = get_longest_zero_run(statistics[lane], RCVEN_COARSE_PI_LENGTH); ctrl->timings[channel][slotrank].lanes[lane].rcven = rn.middle; upperA[lane] = rn.end; if (upperA[lane] < rn.middle) - upperA[lane] += 128; + upperA[lane] += 2 * QCLK_PI; printram("rcven: %d, %d, %d: % 4d-% 4d-% 4d\n", channel, slotrank, lane, rn.start, rn.middle, rn.end); @@ -1144,7 +1149,7 @@ FOR_ALL_LANES { ctrl->timings[channel][slotrank].lanes[lane].rcven - = upperA[lane] + rcven_delta + 64; + = upperA[lane] + rcven_delta + QCLK_PI; } program_timings(ctrl, channel); @@ -1239,8 +1244,8 @@ return MAKE_ERR; } FOR_ALL_LANES if (works[lane]) { - ctrl->timings[channel][slotrank].lanes[lane].rcven += 128; - upperA[lane] += 128; + ctrl->timings[channel][slotrank].lanes[lane].rcven += 2 * QCLK_PI; + upperA[lane] += 2 * QCLK_PI; printram("increment %d, %d, %d\n", channel, slotrank, lane); } } @@ -1349,7 +1354,7 @@ all_high = 1; some_high = 0; FOR_ALL_LANES { - if (ctrl->timings[channel][slotrank].lanes[lane].rcven >= 64) + if (ctrl->timings[channel][slotrank].lanes[lane].rcven >= QCLK_PI) some_high = 1; else all_high = 0; @@ -1359,8 +1364,8 @@ ctrl->timings[channel][slotrank].io_latency--; printram("4028--;\n"); FOR_ALL_LANES { - ctrl->timings[channel][slotrank].lanes[lane].rcven -= 64; - upperA[lane] -= 64; + ctrl->timings[channel][slotrank].lanes[lane].rcven -= QCLK_PI; + upperA[lane] -= QCLK_PI; } } else if (some_high) { @@ -1550,10 +1555,12 @@ program_wdb_pattern_length(channel, 16); } +#define TX_DQS_PI_LENGTH (2 * QCLK_PI) + static int write_level_rank(ramctr_timing *ctrl, int channel, int slotrank) { int tx_dqs; - int statistics[NUM_LANES][128]; + int statistics[NUM_LANES][TX_DQS_PI_LENGTH]; int lane; const union gdcr_training_mod_reg training_mod = { @@ -1575,7 +1582,7 @@ iosav_write_jedec_write_leveling_sequence(ctrl, channel, slotrank, bank, mr1reg); - for (tx_dqs = 0; tx_dqs < 128; tx_dqs++) { + for (tx_dqs = 0; tx_dqs < TX_DQS_PI_LENGTH; tx_dqs++) { FOR_ALL_LANES { ctrl->timings[channel][slotrank].lanes[lane].tx_dqs = tx_dqs; } @@ -1590,7 +1597,7 @@ } } FOR_ALL_LANES { - struct run rn = get_longest_zero_run(statistics[lane], 128); + struct run rn = get_longest_zero_run(statistics[lane], TX_DQS_PI_LENGTH); /* * tx_dq is a direct function of tx_dqs's 6 LSBs. Some tests increment the value * of tx_dqs by a small value, which might cause the 6-bit value to overflow if @@ -1736,7 +1743,7 @@ old = ctrl->timings[channel][slotrank].lanes[lane].tx_dqs; ctrl->timings[channel][slotrank].lanes[lane].tx_dqs += - get_dqs_flyby_adjust(res) * 64; + get_dqs_flyby_adjust(res) * QCLK_PI; printram("High adjust %d:%016llx\n", lane, res); printram("Bval+: %d, %d, %d, % 4d -> % 4d\n", channel, slotrank, lane, @@ -1974,8 +1981,8 @@ toggle_io_reset(); } -#define CT_MIN_PI -127 -#define CT_MAX_PI 128 +#define CT_MIN_PI (-CCC_MAX_PI) +#define CT_MAX_PI (+CCC_MAX_PI + 1) #define CT_PI_LENGTH (CT_MAX_PI - CT_MIN_PI + 1) #define MIN_C320C_LEN 13 diff --git a/src/northbridge/intel/sandybridge/raminit_common.h b/src/northbridge/intel/sandybridge/raminit_common.h index 3f094d0..0015a09 100644 --- a/src/northbridge/intel/sandybridge/raminit_common.h +++ b/src/northbridge/intel/sandybridge/raminit_common.h @@ -433,6 +433,12 @@ #define MAX_CAS 18 #define MIN_CAS 4 +/* + * 1 QCLK (quarter of a clock cycle) equals 64 PI (phase interpolator) ticks. + * Logic delay values in I/O register bitfields are expressed in QCLKs. + */ +#define QCLK_PI 64 + #define MAKE_ERR ((channel << 16) | (slotrank << 8) | 1) #define GET_ERR_CHANNEL(x) (x >> 16) -- To view, visit https://review.coreboot.org/c/coreboot/+/49065 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id6ba32eb1278ef71cecb7e63bd8a95d17430ae54 Gerrit-Change-Number: 49065 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-MessageType: newchange

3 3

Change in coreboot[master]: soc/intel/jasperlake: Enable USBSUSPGQDIS for s0ix qualification
by Maulik V Vaghela (Code Review) 06 Jan '21

06 Jan '21

Maulik V Vaghela has uploaded a new patch set (#2) to the change originally created by Krishna P Bhat D. ( https://review.coreboot.org/c/coreboot/+/49012 ) Change subject: soc/intel/jasperlake: Enable USBSUSPGQDIS for s0ix qualification ...................................................................... soc/intel/jasperlake: Enable USBSUSPGQDIS for s0ix qualification Enable USBSUSPGQDIS for s0ix qualification. BUG=b:175767084 BRANCH=dedede TEST=s0ix works and USB wake from s0ix works fine. Change-Id: I20bad3f79141799c88a16272ea822b9e3dede504 Signed-off-by: Krishna Prasad Bhat <krishna.p.bhat.d(a)intel.com> --- M src/soc/intel/jasperlake/finalize.c M src/soc/intel/jasperlake/include/soc/pmc.h 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/49012/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/49012 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I20bad3f79141799c88a16272ea822b9e3dede504 Gerrit-Change-Number: 49012 Gerrit-PatchSet: 2 Gerrit-Owner: Krishna P Bhat D <krishna.p.bhat.d(a)intel.com> Gerrit-Reviewer: Divagar Mohandass <divagar.mohandass(a)intel.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Maulik V Vaghela <maulik.v.vaghela(a)intel.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Rizwan Qureshi <rizwan.qureshi(a)intel.com> Gerrit-Reviewer: Ronak Kanabar <ronak.kanabar(a)intel.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Deepti Vaidya <deepti.vaidya(a)intel.com> Gerrit-MessageType: newpatchset

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2021