Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
soc/amd/picasso: Move some SMI utility functions
Change-Id: Ic379723c0bf6e5edf5f3d63cc11b24d0e59b5075 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/amd/picasso/Makefile.inc M src/soc/amd/picasso/gpio.c D src/soc/amd/picasso/smi.c M src/soc/amd/picasso/smi_util.c M src/soc/amd/picasso/smihandler.c 5 files changed, 22 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/42988/1
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 39269e9..9a72d60 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -61,7 +61,6 @@ ramstage-y += acp.c ramstage-y += sata.c ramstage-y += memmap.c -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi_util.c ramstage-y += uart.c ramstage-$(CONFIG_PICASSO_CONSOLE_UART) += uart_console.c diff --git a/src/soc/amd/picasso/gpio.c b/src/soc/amd/picasso/gpio.c index c402fb5..47c005e 100644 --- a/src/soc/amd/picasso/gpio.c +++ b/src/soc/amd/picasso/gpio.c @@ -33,11 +33,6 @@ { GPIO_129, GEVENT_17 }, };
-void soc_route_sci(uint8_t event) -{ - smi_write8(SMI_SCI_MAP(event), event); -} - void soc_get_gpio_event_table(const struct soc_amd_event **table, size_t *items) { *table = gpio_event_table; diff --git a/src/soc/amd/picasso/smi.c b/src/soc/amd/picasso/smi.c deleted file mode 100644 index fb6d348..0000000 --- a/src/soc/amd/picasso/smi.c +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -/* - * Utilities for SMM setup - */ - -#include <console/console.h> -#include <cpu/x86/smm.h> -#include <amdblocks/acpimmio.h> -#include <soc/southbridge.h> -#include <soc/smi.h> - -/** Set the EOS bit and enable SMI generation from southbridge */ -void global_smi_enable(void) -{ - uint32_t reg = smi_read32(SMI_REG_SMITRIG0); - reg &= ~SMITRG0_SMIENB; /* Enable SMI generation */ - reg |= SMITRG0_EOS; /* Set EOS bit */ - smi_write32(SMI_REG_SMITRIG0, reg); -} diff --git a/src/soc/amd/picasso/smi_util.c b/src/soc/amd/picasso/smi_util.c index 2c5085b..b65bfc0 100644 --- a/src/soc/amd/picasso/smi_util.c +++ b/src/soc/amd/picasso/smi_util.c @@ -5,6 +5,7 @@ */
#include <console/console.h> +#include <cpu/x86/smm.h> #include <soc/southbridge.h> #include <soc/smi.h> #include <amdblocks/acpimmio.h> @@ -56,6 +57,27 @@ smi_write32(SMI_REG_SMITRIG0, reg32); }
+/** Set the EOS bit and enable SMI generation from southbridge */ +void global_smi_enable(void) +{ + uint32_t reg = smi_read32(SMI_REG_SMITRIG0); + reg &= ~SMITRG0_SMIENB; /* Enable SMI generation */ + reg |= SMITRG0_EOS; /* Set EOS bit */ + smi_write32(SMI_REG_SMITRIG0, reg); +} + +void southbridge_smi_set_eos(void) +{ + uint32_t reg = smi_read32(SMI_REG_SMITRIG0); + reg |= SMITRG0_EOS; + smi_write32(SMI_REG_SMITRIG0, reg); +} + +void soc_route_sci(uint8_t event) +{ + smi_write8(SMI_SCI_MAP(event), event); +} + /** * Configure generation of SCIs. */ diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c index 992dc2b..a9a2b2e 100644 --- a/src/soc/amd/picasso/smihandler.c +++ b/src/soc/amd/picasso/smihandler.c @@ -291,10 +291,3 @@ if (smi_src & SMI_STATUS_SRC_4) process_smi_sources(SMI_REG_SMISTS4); } - -void southbridge_smi_set_eos(void) -{ - uint32_t reg = smi_read32(SMI_REG_SMITRIG0); - reg |= SMITRG0_EOS; - smi_write32(SMI_REG_SMITRIG0, reg); -}
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
Patch Set 3: Code-Review+2
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
Abandoned
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
Patch Set 3:
i like where this patch is heading. was planning to do a soc/amd wide sci/smi/gpio cleanup and also move the smi/sci setup function from the common gpio.c file to another file that only gets built into ramstage and replace the check if we're not in verstage on psp with a check if we're in ramstage; if we're not in ramstage and the smi/sci flags are set than print a warning. this will also allow to link the the soc's gpio.c file only in ramstage. i'll probably just push a few gpio fixes this week and look into the refactoring more when cezanne gets through romstage or maybe ramstage to unblock the rest of the team
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3: would be good if you could un-abandon this one; can take over if you want
Kyösti Mälkki has restored this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
Restored
Kyösti Mälkki has removed a vote from this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd/picasso: Move some SMI utility functions ......................................................................
Removed Code-Review+2 by Angel Pons th3fanbus@gmail.com
Attention is currently required from: Jason Glenesk, Marshall Dawson, Felix Held. Felix Held has uploaded a new patch set (#4) to the change originally created by Kyösti Mälkki. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd: Move soc_route_sci to common/blocks/smi/smi_util ......................................................................
soc/amd: Move soc_route_sci to common/blocks/smi/smi_util
Change-Id: Ic379723c0bf6e5edf5f3d63cc11b24d0e59b5075 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Signed-off-by: Felix Held felix-coreboot@felixheld.de --- M src/soc/amd/cezanne/gpio.c M src/soc/amd/common/block/smi/smi_util.c M src/soc/amd/picasso/gpio.c M src/soc/amd/stoneyridge/gpio.c 4 files changed, 5 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/42988/4
Attention is currently required from: Jason Glenesk, Marshall Dawson, Kyösti Mälkki. Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd: Move soc_route_sci to common/blocks/smi/smi_util ......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4: had to restructure the 2 existing patches, but i'd say that that didn't make things too messy, since there weren't a ton of comments on the patches
Attention is currently required from: Jason Glenesk, Kyösti Mälkki, Felix Held. Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd: Move soc_route_sci to common/blocks/smi/smi_util ......................................................................
Patch Set 4: Code-Review+2
Attention is currently required from: Jason Glenesk, Kyösti Mälkki, Felix Held. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd: Move soc_route_sci to common/blocks/smi/smi_util ......................................................................
Patch Set 4: Code-Review+2
Attention is currently required from: Jason Glenesk, Felix Held. Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd: Move soc_route_sci to common/blocks/smi/smi_util ......................................................................
Patch Set 4: Code-Review+1
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42988 )
Change subject: soc/amd: Move soc_route_sci to common/blocks/smi/smi_util ......................................................................
soc/amd: Move soc_route_sci to common/blocks/smi/smi_util
Change-Id: Ic379723c0bf6e5edf5f3d63cc11b24d0e59b5075 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Signed-off-by: Felix Held felix-coreboot@felixheld.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/42988 Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/amd/cezanne/gpio.c M src/soc/amd/common/block/smi/smi_util.c M src/soc/amd/picasso/gpio.c M src/soc/amd/stoneyridge/gpio.c 4 files changed, 5 insertions(+), 15 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, but someone else must approve Marshall Dawson: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/soc/amd/cezanne/gpio.c b/src/soc/amd/cezanne/gpio.c index d14f850..6bfdf4d 100644 --- a/src/soc/amd/cezanne/gpio.c +++ b/src/soc/amd/cezanne/gpio.c @@ -35,11 +35,6 @@ { GPIO_129, GEVENT_17 }, };
-void soc_route_sci(uint8_t event) -{ - smi_write8(SMI_SCI_MAP(event), event); -} - void soc_get_gpio_event_table(const struct soc_amd_event **table, size_t *items) { *table = gpio_event_table; diff --git a/src/soc/amd/common/block/smi/smi_util.c b/src/soc/amd/common/block/smi/smi_util.c index 19a4e32e..dcf0c84 100644 --- a/src/soc/amd/common/block/smi/smi_util.c +++ b/src/soc/amd/common/block/smi/smi_util.c @@ -56,6 +56,11 @@ smi_write32(SMI_REG_SMITRIG0, reg32); }
+void soc_route_sci(uint8_t event) +{ + smi_write8(SMI_SCI_MAP(event), event); +} + /** * Configure generation of SCIs. */ diff --git a/src/soc/amd/picasso/gpio.c b/src/soc/amd/picasso/gpio.c index 3ad4c5c..3d5dc73 100644 --- a/src/soc/amd/picasso/gpio.c +++ b/src/soc/amd/picasso/gpio.c @@ -34,11 +34,6 @@ { GPIO_129, GEVENT_17 }, };
-void soc_route_sci(uint8_t event) -{ - smi_write8(SMI_SCI_MAP(event), event); -} - void soc_get_gpio_event_table(const struct soc_amd_event **table, size_t *items) { *table = gpio_event_table; diff --git a/src/soc/amd/stoneyridge/gpio.c b/src/soc/amd/stoneyridge/gpio.c index f1ed202..93264db 100644 --- a/src/soc/amd/stoneyridge/gpio.c +++ b/src/soc/amd/stoneyridge/gpio.c @@ -34,11 +34,6 @@ { GPIO_69, GEVENT_17 }, };
-void soc_route_sci(uint8_t event) -{ - smi_write8(SMI_SCI_MAP(event), event); -} - void soc_get_gpio_event_table(const struct soc_amd_event **table, size_t *items) { *table = gpio_event_table;
-
Angel Pons (Code Review) -
Felix Held (Code Review)
-
Kyösti Mälkki (Code Review)
-
Marshall Dawson (Code Review)