coreboot-gerrit February 2021

coreboot-gerrit@coreboot.org

1 participants
7192 discussions

Change in coreboot[master]: lib/selfboot.c: Fix indentation and drop one newline
by Angel Pons (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Nico Huber, Julius Werner, Arthur Heymans, HAOUAS Elyes. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50397 ) Change subject: lib/selfboot.c: Fix indentation and drop one newline ...................................................................... Patch Set 2: (1 comment) Commit Message: https://review.coreboot.org/c/coreboot/+/50397/comment/5ec27cd2_d7b5c0ac PS1, Line 7: Remove unnecessary whitespace > I also removed one newline, so it's not just indentation... Managed to squeeze both things in the commit summary. -- To view, visit https://review.coreboot.org/c/coreboot/+/50397 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ica4254297f5d05e75f852d7e9a9e7bb833dfcea7 Gerrit-Change-Number: 50397 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Comment-Date: Mon, 08 Feb 2021 22:00:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: lib/selfboot.c: Fix indentation and drop one newline
by Angel Pons (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Nico Huber, Julius Werner, Arthur Heymans, HAOUAS Elyes. Hello build bot (Jenkins), Nico Huber, Patrick Georgi, Julius Werner, Arthur Heymans, HAOUAS Elyes, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/50397 to look at the new patch set (#2). Change subject: lib/selfboot.c: Fix indentation and drop one newline ...................................................................... lib/selfboot.c: Fix indentation and drop one newline Change-Id: Ica4254297f5d05e75f852d7e9a9e7bb833dfcea7 Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M src/lib/selfboot.c 1 file changed, 54 insertions(+), 55 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/50397/2 -- To view, visit https://review.coreboot.org/c/coreboot/+/50397 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ica4254297f5d05e75f852d7e9a9e7bb833dfcea7 Gerrit-Change-Number: 50397 Gerrit-PatchSet: 2 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: lib/selfboot.c: Remove unnecessary whitespace
by Angel Pons (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Nico Huber, Julius Werner, Arthur Heymans, HAOUAS Elyes. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50397 ) Change subject: lib/selfboot.c: Remove unnecessary whitespace ...................................................................... Patch Set 1: (1 comment) Commit Message: https://review.coreboot.org/c/coreboot/+/50397/comment/39faef88_18703328 PS1, Line 7: Remove unnecessary whitespace > How about "Fix indentation"? Unnecessary whitespace sounds like […] I also removed one newline, so it's not just indentation... -- To view, visit https://review.coreboot.org/c/coreboot/+/50397 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ica4254297f5d05e75f852d7e9a9e7bb833dfcea7 Gerrit-Change-Number: 50397 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nico Huber <nico.h(a)gmx.de> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Comment-Date: Mon, 08 Feb 2021 21:59:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: soc/amd/picasso/cpu: move get_cpu_count to common code
by Marshall Dawson (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Jason Glenesk, Raul Rangel, Martin Roth, Felix Held. Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50406 ) Change subject: soc/amd/picasso/cpu: move get_cpu_count to common code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/50406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0690787f492d764a20a4219822eb10fb5cd86de0 Gerrit-Change-Number: 50406 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-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Mon, 08 Feb 2021 21:54:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: soc/amd/picasso/cpu: move set_cstate_io_addr to common code
by Marshall Dawson (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Jason Glenesk, Raul Rangel, Felix Held. Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50407 ) Change subject: soc/amd/picasso/cpu: move set_cstate_io_addr to common code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/50407 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3b8a38ea39d8dc56ff1249a3212fe352b3e805ce Gerrit-Change-Number: 50407 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-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Comment-Date: Mon, 08 Feb 2021 21:54:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: lib/selfboot.c: Remove unnecessary whitespace
by Nico Huber (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Angel Pons, Julius Werner, Arthur Heymans, HAOUAS Elyes. Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50397 ) Change subject: lib/selfboot.c: Remove unnecessary whitespace ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Commit Message: https://review.coreboot.org/c/coreboot/+/50397/comment/e1b6d16f_0cb7cc34 PS1, Line 7: Remove unnecessary whitespace How about "Fix indentation"? Unnecessary whitespace sounds like something invisible. -- To view, visit https://review.coreboot.org/c/coreboot/+/50397 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ica4254297f5d05e75f852d7e9a9e7bb833dfcea7 Gerrit-Change-Number: 50397 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Attention: Julius Werner <jwerner(a)chromium.org> Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Attention: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Comment-Date: Mon, 08 Feb 2021 21:53:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: soc/amd/cezanne: Enable early LPC support in bootblock stage
by Felix Held (Code Review) 08 Feb '21

08 Feb '21

Attention is currently required from: Bao Zheng, Jason Glenesk, Raul Rangel, Marshall Dawson, Zheng Bao. Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49929 ) Change subject: soc/amd/cezanne: Enable early LPC support in bootblock stage ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/49929 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I739d97ddc5afd84a4bbc7e505b423158eb820767 Gerrit-Change-Number: 49929 Gerrit-PatchSet: 10 Gerrit-Owner: Bao Zheng <fishbaozi(a)gmail.com> Gerrit-Reviewer: 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-Reviewer: Raul Rangel <rrangel(a)chromium.org> Gerrit-Reviewer: Zheng Bao Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Attention: Bao Zheng <fishbaozi(a)gmail.com> Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com> Gerrit-Attention: Raul Rangel <rrangel(a)chromium.org> Gerrit-Attention: Marshall Dawson <marshalldawson3rd(a)gmail.com> Gerrit-Attention: Zheng Bao Gerrit-Comment-Date: Mon, 08 Feb 2021 21:53:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/system76/addw1: Add System76 Adder Workstation 1
by Tim Crawford (Code Review) 08 Feb '21

08 Feb '21

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Jeremy Soller, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/48421 to look at the new patch set (#6). Change subject: mb/system76/addw1: Add System76 Adder Workstation 1 ...................................................................... mb/system76/addw1: Add System76 Adder Workstation 1 Tested with TianoCore payload (UefiPayloadPkg). Not working: - Discrete/Hybrid graphics - Internal speakers Change-Id: I5dd3bc320ca640728e1d86180c6bfa0dc7295760 Signed-off-by: Jeremy Soller <jeremy(a)system76.com> Signed-off-by: Tim Crawford <tcrawford(a)system76.com> --- M Documentation/mainboard/index.md A Documentation/mainboard/system76/addw1.md A configs/config.system76_addw1 A src/mainboard/system76/addw1/Kconfig A src/mainboard/system76/addw1/Kconfig.name A src/mainboard/system76/addw1/Makefile.inc A src/mainboard/system76/addw1/acpi/gpe.asl A src/mainboard/system76/addw1/acpi/mainboard.asl A src/mainboard/system76/addw1/acpi/sleep.asl A src/mainboard/system76/addw1/board_info.txt A src/mainboard/system76/addw1/bootblock.c A src/mainboard/system76/addw1/data.vbt A src/mainboard/system76/addw1/devicetree.cb A src/mainboard/system76/addw1/dsdt.asl A src/mainboard/system76/addw1/gpio.c A src/mainboard/system76/addw1/gpio_early.c A src/mainboard/system76/addw1/hda_verb.c A src/mainboard/system76/addw1/include/mainboard/gpio.h A src/mainboard/system76/addw1/ramstage.c A src/mainboard/system76/addw1/romstage.c 20 files changed, 822 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/48421/6 -- To view, visit https://review.coreboot.org/c/coreboot/+/48421 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5dd3bc320ca640728e1d86180c6bfa0dc7295760 Gerrit-Change-Number: 48421 Gerrit-PatchSet: 6 Gerrit-Owner: Tim Crawford <tcrawford(a)system76.com> Gerrit-Reviewer: Jeremy Soller <jeremy(a)system76.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: soc/amd/picasso/cpu: move set_cstate_io_addr to common code
by Felix Held (Code Review) 08 Feb '21

08 Feb '21

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50407 ) Change subject: soc/amd/picasso/cpu: move set_cstate_io_addr to common code ...................................................................... soc/amd/picasso/cpu: move set_cstate_io_addr to common code Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I3b8a38ea39d8dc56ff1249a3212fe352b3e805ce --- M src/soc/amd/common/block/cpu/noncar/cpu.c M src/soc/amd/common/block/include/amdblocks/cpu.h M src/soc/amd/picasso/cpu.c 3 files changed, 13 insertions(+), 9 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/50407/1 diff --git a/src/soc/amd/common/block/cpu/noncar/cpu.c b/src/soc/amd/common/block/cpu/noncar/cpu.c index 7c1daf9..98926bf 100644 --- a/src/soc/amd/common/block/cpu/noncar/cpu.c +++ b/src/soc/amd/common/block/cpu/noncar/cpu.c @@ -2,8 +2,20 @@ #include <amdblocks/cpu.h> #include <cpu/cpu.h> +#include <cpu/x86/msr.h> +#include <cpu/amd/msr.h> +#include <soc/iomap.h> int get_cpu_count(void) { return 1 + (cpuid_ecx(0x80000008) & 0xff); } + +void set_cstate_io_addr(void) +{ + msr_t cst_addr; + + cst_addr.hi = 0; + cst_addr.lo = ACPI_CPU_CONTROL; + wrmsr(MSR_CSTATE_ADDRESS, cst_addr); +} diff --git a/src/soc/amd/common/block/include/amdblocks/cpu.h b/src/soc/amd/common/block/include/amdblocks/cpu.h index 50300d5..0627bc1 100644 --- a/src/soc/amd/common/block/include/amdblocks/cpu.h +++ b/src/soc/amd/common/block/include/amdblocks/cpu.h @@ -4,6 +4,7 @@ #define AMD_BLOCK_CPU_H int get_cpu_count(void); +void set_cstate_io_addr(void); void write_resume_eip(void); #endif /* AMD_BLOCK_CPU_H */ diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index b18a3b4..9460485 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -42,15 +42,6 @@ x86_mtrr_check(); } -static void set_cstate_io_addr(void) -{ - msr_t cst_addr; - - cst_addr.hi = 0; - cst_addr.lo = ACPI_CPU_CONTROL; - wrmsr(MSR_CSTATE_ADDRESS, cst_addr); -} - static void fill_in_relocation_params(struct smm_relocation_params *params) { uintptr_t tseg_base; -- To view, visit https://review.coreboot.org/c/coreboot/+/50407 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I3b8a38ea39d8dc56ff1249a3212fe352b3e805ce Gerrit-Change-Number: 50407 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: soc/amd/picasso/cpu: move get_cpu_count to common code
by Felix Held (Code Review) 08 Feb '21

08 Feb '21

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50406 ) Change subject: soc/amd/picasso/cpu: move get_cpu_count to common code ...................................................................... soc/amd/picasso/cpu: move get_cpu_count to common code Signed-off-by: Felix Held <felix-coreboot(a)felixheld.de> Change-Id: I0690787f492d764a20a4219822eb10fb5cd86de0 --- M src/soc/amd/common/block/cpu/noncar/Makefile.inc A src/soc/amd/common/block/cpu/noncar/cpu.c M src/soc/amd/common/block/include/amdblocks/cpu.h M src/soc/amd/picasso/acpi.c M src/soc/amd/picasso/agesa_acpi.c M src/soc/amd/picasso/cpu.c M src/soc/amd/picasso/include/soc/cpu.h 7 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/50406/1 diff --git a/src/soc/amd/common/block/cpu/noncar/Makefile.inc b/src/soc/amd/common/block/cpu/noncar/Makefile.inc index dd95941..808679d 100644 --- a/src/soc/amd/common/block/cpu/noncar/Makefile.inc +++ b/src/soc/amd/common/block/cpu/noncar/Makefile.inc @@ -3,6 +3,7 @@ bootblock-y += pre_c.S bootblock-y += write_resume_eip.c romstage-y += memmap.c +ramstage-y += cpu.c ramstage-y += memmap.c endif # CONFIG_SOC_AMD_COMMON_BLOCK_NONCAR diff --git a/src/soc/amd/common/block/cpu/noncar/cpu.c b/src/soc/amd/common/block/cpu/noncar/cpu.c new file mode 100644 index 0000000..7c1daf9 --- /dev/null +++ b/src/soc/amd/common/block/cpu/noncar/cpu.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <amdblocks/cpu.h> +#include <cpu/cpu.h> + +int get_cpu_count(void) +{ + return 1 + (cpuid_ecx(0x80000008) & 0xff); +} diff --git a/src/soc/amd/common/block/include/amdblocks/cpu.h b/src/soc/amd/common/block/include/amdblocks/cpu.h index 0a93643..50300d5 100644 --- a/src/soc/amd/common/block/include/amdblocks/cpu.h +++ b/src/soc/amd/common/block/include/amdblocks/cpu.h @@ -3,6 +3,7 @@ #ifndef AMD_BLOCK_CPU_H #define AMD_BLOCK_CPU_H +int get_cpu_count(void); void write_resume_eip(void); #endif /* AMD_BLOCK_CPU_H */ diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index eba9dfe..2f08dce 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -19,9 +19,9 @@ #include <device/pci.h> #include <amdblocks/acpimmio.h> #include <amdblocks/acpi.h> +#include <amdblocks/cpu.h> #include <soc/acpi.h> #include <soc/pci_devs.h> -#include <soc/cpu.h> #include <soc/msr.h> #include <soc/southbridge.h> #include <soc/nvs.h> diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 6020ec0..119dd55 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -12,7 +12,7 @@ #include <stdint.h> #include <device/pci_def.h> #include <device/pci_ops.h> -#include <soc/cpu.h> +#include <amdblocks/cpu.h> #include <soc/data_fabric.h> #include <soc/pci_devs.h> #include <stdlib.h> diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index 5979fc6..b18a3b4 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/cpu.h> #include <cpu/cpu.h> #include <cpu/x86/mp.h> #include <cpu/x86/mtrr.h> @@ -41,11 +42,6 @@ x86_mtrr_check(); } -int get_cpu_count(void) -{ - return 1 + (cpuid_ecx(0x80000008) & 0xff); -} - static void set_cstate_io_addr(void) { msr_t cst_addr; diff --git a/src/soc/amd/picasso/include/soc/cpu.h b/src/soc/amd/picasso/include/soc/cpu.h index 3f6cd24..79d5cc6 100644 --- a/src/soc/amd/picasso/include/soc/cpu.h +++ b/src/soc/amd/picasso/include/soc/cpu.h @@ -3,7 +3,6 @@ #ifndef AMD_PICASSO_CPU_H #define AMD_PICASSO_CPU_H -int get_cpu_count(void); void check_mca(void); #define RAVEN1_B0_CPUID 0x00810f10 -- To view, visit https://review.coreboot.org/c/coreboot/+/50406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I0690787f492d764a20a4219822eb10fb5cd86de0 Gerrit-Change-Number: 50406 Gerrit-PatchSet: 1 Gerrit-Owner: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-MessageType: newchange

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2021