mb/google/poppy: Allow variants to provide event info at runtime
This change adds a variant callback to read google_chromeec_event_info from variant at runtime to allow override of any events based on factors like board id. This callback is used in ramstage and smm to get google_chromeec_event_info structure for performing various actions like setting masks and logging wake events from EC. BUG=b:112366846,b:112112483,b:112111610 Change-Id: If89e904c92372530a0f555952f87702f068e0b03 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/28983 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Enrico Granata <egranata@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
8dcfcb3106
commit
6985c90ff4
|
@ -26,6 +26,7 @@ ramstage-y += mainboard.c
|
||||||
ramstage-y += ramstage.c
|
ramstage-y += ramstage.c
|
||||||
|
|
||||||
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
|
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
|
||||||
|
smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
|
||||||
|
|
||||||
subdirs-y += variants/baseboard
|
subdirs-y += variants/baseboard
|
||||||
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
|
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include
|
||||||
|
|
|
@ -14,13 +14,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <arch/acpi.h>
|
#include <arch/acpi.h>
|
||||||
|
#include <baseboard/variants.h>
|
||||||
#include <ec/google/chromeec/ec.h>
|
#include <ec/google/chromeec/ec.h>
|
||||||
|
|
||||||
#include <variant/ec.h>
|
#include <variant/ec.h>
|
||||||
|
|
||||||
void mainboard_ec_init(void)
|
__weak const struct google_chromeec_event_info *variant_get_event_info(void)
|
||||||
{
|
{
|
||||||
const struct google_chromeec_event_info info = {
|
static const struct google_chromeec_event_info info = {
|
||||||
.log_events = MAINBOARD_EC_LOG_EVENTS,
|
.log_events = MAINBOARD_EC_LOG_EVENTS,
|
||||||
.sci_events = MAINBOARD_EC_SCI_EVENTS,
|
.sci_events = MAINBOARD_EC_SCI_EVENTS,
|
||||||
.s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
|
.s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
|
||||||
|
@ -28,6 +29,11 @@ void mainboard_ec_init(void)
|
||||||
.s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,
|
.s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,
|
||||||
};
|
};
|
||||||
|
|
||||||
google_chromeec_events_init(&info, acpi_is_wakeup_s3());
|
return &info;
|
||||||
|
}
|
||||||
|
|
||||||
|
void mainboard_ec_init(void)
|
||||||
|
{
|
||||||
|
google_chromeec_events_init(variant_get_event_info(),
|
||||||
|
acpi_is_wakeup_s3());
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,20 +34,30 @@ void __weak variant_smi_sleep(u8 slp_typ) {}
|
||||||
|
|
||||||
void mainboard_smi_sleep(u8 slp_typ)
|
void mainboard_smi_sleep(u8 slp_typ)
|
||||||
{
|
{
|
||||||
|
const struct google_chromeec_event_info *info;
|
||||||
|
|
||||||
|
info = variant_get_event_info();
|
||||||
|
|
||||||
variant_smi_sleep(slp_typ);
|
variant_smi_sleep(slp_typ);
|
||||||
chromeec_smi_sleep(slp_typ, MAINBOARD_EC_S3_WAKE_EVENTS,
|
chromeec_smi_sleep(slp_typ, info->s3_wake_events, info->s5_wake_events);
|
||||||
MAINBOARD_EC_S5_WAKE_EVENTS);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int mainboard_smi_apmc(u8 apmc)
|
int mainboard_smi_apmc(u8 apmc)
|
||||||
{
|
{
|
||||||
chromeec_smi_apmc(apmc, MAINBOARD_EC_SCI_EVENTS,
|
const struct google_chromeec_event_info *info;
|
||||||
MAINBOARD_EC_SMI_EVENTS);
|
|
||||||
|
info = variant_get_event_info();
|
||||||
|
|
||||||
|
chromeec_smi_apmc(apmc, info->sci_events, info->smi_events);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void elog_gsmi_cb_mainboard_log_wake_source(void)
|
void elog_gsmi_cb_mainboard_log_wake_source(void)
|
||||||
{
|
{
|
||||||
google_chromeec_log_events(MAINBOARD_EC_LOG_EVENTS |
|
const struct google_chromeec_event_info *info;
|
||||||
MAINBOARD_EC_S0IX_WAKE_EVENTS);
|
|
||||||
|
info = variant_get_event_info();
|
||||||
|
|
||||||
|
google_chromeec_log_events(info->log_events | info->s0ix_wake_events);
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,4 +73,11 @@ void variant_nhlt_init(struct nhlt *nhlt);
|
||||||
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
||||||
uint32_t *oem_revision);
|
uint32_t *oem_revision);
|
||||||
|
|
||||||
|
struct google_chromeec_event_info;
|
||||||
|
/*
|
||||||
|
* Read google_chromeec_event_info structure from variant to set different masks
|
||||||
|
* on the EC e.g. SCI, S3, S5, S0ix, SMI.
|
||||||
|
*/
|
||||||
|
const struct google_chromeec_event_info *variant_get_event_info(void);
|
||||||
|
|
||||||
#endif /* __BASEBOARD_VARIANTS_H__ */
|
#endif /* __BASEBOARD_VARIANTS_H__ */
|
||||||
|
|
Loading…
Reference in New Issue