diff options
| -rw-r--r-- | chip/it83xx/espi.c | 2 | ||||
| -rw-r--r-- | chip/mchp/espi.c | 50 | ||||
| -rw-r--r-- | chip/npcx/espi.c | 49 | ||||
| -rw-r--r-- | common/espi.c | 2 | ||||
| -rw-r--r-- | include/espi.h | 2 | ||||
| -rw-r--r-- | zephyr/shim/src/espi.c | 44 |
6 files changed, 75 insertions, 74 deletions
diff --git a/chip/it83xx/espi.c b/chip/it83xx/espi.c index 8c81561712..d5ec41cab7 100644 --- a/chip/it83xx/espi.c +++ b/chip/it83xx/espi.c @@ -111,7 +111,7 @@ static const struct vw_channel_t vw_channel_list[] = { ESPI_SYSTEM_EVENT_VW_IDX_5, VW_LEVEL_FIELD(VW_IDX_5_NON_FATAL), VW_VALID_FIELD(VW_IDX_5_NON_FATAL)), - VW_CHAN(VW_SLAVE_BTLD_STATUS_DONE, + VW_CHAN(VW_PERIPHERAL_BTLD_STATUS_DONE, ESPI_SYSTEM_EVENT_VW_IDX_5, VW_LEVEL_FIELD(VW_IDX_5_BTLD_STATUS_DONE), VW_VALID_FIELD(VW_IDX_5_BTLD_STATUS_DONE)), diff --git a/chip/mchp/espi.c b/chip/mchp/espi.c index c64985252f..8a38a82688 100644 --- a/chip/mchp/espi.c +++ b/chip/mchp/espi.c @@ -155,7 +155,7 @@ struct vw_info_t { * SRC0 = SLAVE_BOOT_LOAD_DONE !!! NOTE: Google combines SRC0 & SRC3 * SRC1 = VW_ERROR_FATAL * SRC2 = VW_ERROR_NON_FATAL - * SRC3 = SLAVE_BOOT_LOAD_STATUS !!! into VW_SLAVE_BTLD_STATUS_DONE + * SRC3 = SLAVE_BOOT_LOAD_STATUS !!! into VW_PERIPHERAL_BTLD_STATUS_DONE * SMVW02 index=06h PORValue=00010101_00007306 STOM=0111 reset=PLTRST * SRC0 = VW_SCI_L * SRC1 = VW_SMI_L @@ -193,37 +193,37 @@ static const struct vw_info_t vw_info_tbl[] = { * index value flags index num rsvd */ /* MSVW00 Host index 02h (In) */ - {VW_SLP_S3_L, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}, - {VW_SLP_S4_L, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00}, - {VW_SLP_S5_L, 0x02, 0x00, 0x10, 0x00, 0x02, 0x00}, + {VW_SLP_S3_L, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}, + {VW_SLP_S4_L, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00}, + {VW_SLP_S5_L, 0x02, 0x00, 0x10, 0x00, 0x02, 0x00}, /* MSVW01 Host index 03h (In) */ - {VW_SUS_STAT_L, 0x03, 0x00, 0x10, 0x01, 0x00, 0x00}, - {VW_PLTRST_L, 0x03, 0x00, 0x10, 0x01, 0x01, 0x00}, - {VW_OOB_RST_WARN, 0x03, 0x00, 0x10, 0x01, 0x02, 0x00}, + {VW_SUS_STAT_L, 0x03, 0x00, 0x10, 0x01, 0x00, 0x00}, + {VW_PLTRST_L, 0x03, 0x00, 0x10, 0x01, 0x01, 0x00}, + {VW_OOB_RST_WARN, 0x03, 0x00, 0x10, 0x01, 0x02, 0x00}, /* SMVW00 Host Index 04h (Out) */ - {VW_OOB_RST_ACK, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00}, - {VW_WAKE_L, 0x04, 0x01, 0x01, 0x00, 0x02, 0x00}, - {VW_PME_L, 0x04, 0x01, 0x01, 0x00, 0x03, 0x00}, + {VW_OOB_RST_ACK, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00}, + {VW_WAKE_L, 0x04, 0x01, 0x01, 0x00, 0x02, 0x00}, + {VW_PME_L, 0x04, 0x01, 0x01, 0x00, 0x03, 0x00}, /* SMVW01 Host index 05h (Out) */ - {VW_ERROR_FATAL, 0x05, 0x00, 0x01, 0x01, 0x01, 0x00}, - {VW_ERROR_NON_FATAL, 0x05, 0x00, 0x01, 0x01, 0x02, 0x00}, - {VW_SLAVE_BTLD_STATUS_DONE, 0x05, 0x00, 0x01, 0x01, 0x30, 0x00}, + {VW_ERROR_FATAL, 0x05, 0x00, 0x01, 0x01, 0x01, 0x00}, + {VW_ERROR_NON_FATAL, 0x05, 0x00, 0x01, 0x01, 0x02, 0x00}, + {VW_PERIPHERAL_BTLD_STATUS_DONE, 0x05, 0x00, 0x01, 0x01, 0x30, 0x00}, /* SMVW02 Host index 06h (Out) */ - {VW_SCI_L, 0x06, 0x01, 0x01, 0x02, 0x00, 0x00}, - {VW_SMI_L, 0x06, 0x01, 0x01, 0x02, 0x01, 0x00}, - {VW_RCIN_L, 0x06, 0x01, 0x01, 0x02, 0x02, 0x00}, - {VW_HOST_RST_ACK, 0x06, 0x00, 0x01, 0x02, 0x03, 0x00}, + {VW_SCI_L, 0x06, 0x01, 0x01, 0x02, 0x00, 0x00}, + {VW_SMI_L, 0x06, 0x01, 0x01, 0x02, 0x01, 0x00}, + {VW_RCIN_L, 0x06, 0x01, 0x01, 0x02, 0x02, 0x00}, + {VW_HOST_RST_ACK, 0x06, 0x00, 0x01, 0x02, 0x03, 0x00}, /* MSVW02 Host index 07h (In) */ - {VW_HOST_RST_WARN, 0x07, 0x00, 0x10, 0x02, 0x00, 0x00}, + {VW_HOST_RST_WARN, 0x07, 0x00, 0x10, 0x02, 0x00, 0x00}, /* SMVW03 Host Index 40h (Out) */ - {VW_SUS_ACK, 0x40, 0x00, 0x01, 0x03, 0x00, 0x00}, + {VW_SUS_ACK, 0x40, 0x00, 0x01, 0x03, 0x00, 0x00}, /* MSVW03 Host Index 41h (In) */ - {VW_SUS_WARN_L, 0x41, 0x00, 0x10, 0x03, 0x00, 0x00}, - {VW_SUS_PWRDN_ACK_L, 0x41, 0x00, 0x10, 0x03, 0x01, 0x00}, - {VW_SLP_A_L, 0x41, 0x00, 0x10, 0x03, 0x03, 0x00}, + {VW_SUS_WARN_L, 0x41, 0x00, 0x10, 0x03, 0x00, 0x00}, + {VW_SUS_PWRDN_ACK_L, 0x41, 0x00, 0x10, 0x03, 0x01, 0x00}, + {VW_SLP_A_L, 0x41, 0x00, 0x10, 0x03, 0x03, 0x00}, /* MSVW04 Host index 42h (In) */ - {VW_SLP_LAN, 0x42, 0x00, 0x10, 0x04, 0x00, 0x00}, - {VW_SLP_WLAN, 0x42, 0x00, 0x10, 0x04, 0x01, 0x00} + {VW_SLP_LAN, 0x42, 0x00, 0x10, 0x04, 0x00, 0x00}, + {VW_SLP_WLAN, 0x42, 0x00, 0x10, 0x04, 0x01, 0x00} }; BUILD_ASSERT(ARRAY_SIZE(vw_info_tbl) == VW_SIGNAL_COUNT); @@ -622,7 +622,7 @@ int espi_vw_set_wire(enum espi_vw_signal signal, uint8_t level) if (level) level = 1; - if (signal == VW_SLAVE_BTLD_STATUS_DONE) { + if (signal == VW_PERIPHERAL_BTLD_STATUS_DONE) { /* SLAVE_BOOT_LOAD_STATUS */ MCHP_ESPI_VW_S2M_SRC3(ridx) = level; /* SLAVE_BOOT_LOAD_DONE after status */ diff --git a/chip/npcx/espi.c b/chip/npcx/espi.c index 5827c5ba9e..903e0be0a5 100644 --- a/chip/npcx/espi.c +++ b/chip/npcx/espi.c @@ -109,29 +109,29 @@ static const struct host_wui_item espi_vw_int_list[] = { /* VW signals used in eSPI */ static const struct vw_event_t vw_events_list[] = { - {VW_SLP_S3_L, 0x02, 0x01}, /* index 02h (In) */ - {VW_SLP_S4_L, 0x02, 0x02}, - {VW_SLP_S5_L, 0x02, 0x04}, - {VW_SUS_STAT_L, 0x03, 0x01}, /* index 03h (In) */ - {VW_PLTRST_L, 0x03, 0x02}, - {VW_OOB_RST_WARN, 0x03, 0x04}, - {VW_OOB_RST_ACK, 0x04, 0x01}, /* index 04h (Out) */ - {VW_WAKE_L, 0x04, 0x04}, - {VW_PME_L, 0x04, 0x08}, - {VW_ERROR_FATAL, 0x05, 0x02}, /* index 05h (Out) */ - {VW_ERROR_NON_FATAL, 0x05, 0x04}, - {VW_SLAVE_BTLD_STATUS_DONE, 0x05, 0x09}, - {VW_SCI_L, 0x06, 0x01}, /* index 06h (Out) */ - {VW_SMI_L, 0x06, 0x02}, - {VW_RCIN_L, 0x06, 0x04}, - {VW_HOST_RST_ACK, 0x06, 0x08}, - {VW_HOST_RST_WARN, 0x07, 0x01}, /* index 07h (In) */ - {VW_SUS_ACK, 0x40, 0x01}, /* index 40h (Out) */ - {VW_SUS_WARN_L, 0x41, 0x01}, /* index 41h (In) */ - {VW_SUS_PWRDN_ACK_L, 0x41, 0x02}, - {VW_SLP_A_L, 0x41, 0x08}, - {VW_SLP_LAN, 0x42, 0x01}, /* index 42h (In) */ - {VW_SLP_WLAN, 0x42, 0x02}, + {VW_SLP_S3_L, 0x02, 0x01}, /* index 02h (In) */ + {VW_SLP_S4_L, 0x02, 0x02}, + {VW_SLP_S5_L, 0x02, 0x04}, + {VW_SUS_STAT_L, 0x03, 0x01}, /* index 03h (In) */ + {VW_PLTRST_L, 0x03, 0x02}, + {VW_OOB_RST_WARN, 0x03, 0x04}, + {VW_OOB_RST_ACK, 0x04, 0x01}, /* index 04h (Out) */ + {VW_WAKE_L, 0x04, 0x04}, + {VW_PME_L, 0x04, 0x08}, + {VW_ERROR_FATAL, 0x05, 0x02}, /* index 05h (Out) */ + {VW_ERROR_NON_FATAL, 0x05, 0x04}, + {VW_PERIPHERAL_BTLD_STATUS_DONE, 0x05, 0x09}, + {VW_SCI_L, 0x06, 0x01}, /* index 06h (Out) */ + {VW_SMI_L, 0x06, 0x02}, + {VW_RCIN_L, 0x06, 0x04}, + {VW_HOST_RST_ACK, 0x06, 0x08}, + {VW_HOST_RST_WARN, 0x07, 0x01}, /* index 07h (In) */ + {VW_SUS_ACK, 0x40, 0x01}, /* index 40h (Out) */ + {VW_SUS_WARN_L, 0x41, 0x01}, /* index 41h (In) */ + {VW_SUS_PWRDN_ACK_L, 0x41, 0x02}, + {VW_SLP_A_L, 0x41, 0x08}, + {VW_SLP_LAN, 0x42, 0x01}, /* index 42h (In) */ + {VW_SLP_WLAN, 0x42, 0x02}, }; /* Flag for boot load signals */ @@ -600,7 +600,8 @@ void espi_interrupt(void) if (boot_load_done == 0 && IS_SLAVE_CHAN_ENABLE(NPCX_ESPI_CH_VW)) { - espi_vw_set_wire(VW_SLAVE_BTLD_STATUS_DONE, 1); + espi_vw_set_wire( + VW_PERIPHERAL_BTLD_STATUS_DONE, 1); boot_load_done = 1; } } diff --git a/common/espi.c b/common/espi.c index 0904f102d7..0a747d3bda 100644 --- a/common/espi.c +++ b/common/espi.c @@ -26,7 +26,7 @@ const char *espi_vw_names[] = { "VW_ERROR_FATAL", "VW_ERROR_NON_FATAL", /* Merge bit 3/0 into one signal. Need to set them simultaneously */ - "VW_SLAVE_BTLD_STATUS_DONE", + "VW_PERIPHERAL_BTLD_STATUS_DONE", "VW_SCI_L", "VW_SMI_L", "VW_RCIN_L", diff --git a/include/espi.h b/include/espi.h index 6d4de73330..d1b8af3425 100644 --- a/include/espi.h +++ b/include/espi.h @@ -26,7 +26,7 @@ enum espi_vw_signal { VW_ERROR_FATAL, /* index 05h (Out) */ VW_ERROR_NON_FATAL, /* Merge bit 3/0 into one signal. Need to set them simultaneously */ - VW_SLAVE_BTLD_STATUS_DONE, + VW_PERIPHERAL_BTLD_STATUS_DONE, VW_SCI_L, /* index 06h (Out) */ VW_SMI_L, VW_RCIN_L, diff --git a/zephyr/shim/src/espi.c b/zephyr/shim/src/espi.c index 5018978f9a..446a51d1a1 100644 --- a/zephyr/shim/src/espi.c +++ b/zephyr/shim/src/espi.c @@ -47,28 +47,28 @@ static bool init_done; * functional application of M to 2-tuples of (platform/ec signal, * zephyr vwire). */ -#define VW_SIGNAL_TRANSLATION_LIST(M) \ - M(VW_SLP_S3_L, ESPI_VWIRE_SIGNAL_SLP_S3) \ - M(VW_SLP_S4_L, ESPI_VWIRE_SIGNAL_SLP_S4) \ - M(VW_SLP_S5_L, ESPI_VWIRE_SIGNAL_SLP_S5) \ - M(VW_SUS_STAT_L, ESPI_VWIRE_SIGNAL_SUS_STAT) \ - M(VW_PLTRST_L, ESPI_VWIRE_SIGNAL_PLTRST) \ - M(VW_OOB_RST_WARN, ESPI_VWIRE_SIGNAL_OOB_RST_WARN) \ - M(VW_OOB_RST_ACK, ESPI_VWIRE_SIGNAL_OOB_RST_ACK) \ - M(VW_WAKE_L, ESPI_VWIRE_SIGNAL_WAKE) \ - M(VW_PME_L, ESPI_VWIRE_SIGNAL_PME) \ - M(VW_ERROR_FATAL, ESPI_VWIRE_SIGNAL_ERR_FATAL) \ - M(VW_ERROR_NON_FATAL, ESPI_VWIRE_SIGNAL_ERR_NON_FATAL) \ - M(VW_SLAVE_BTLD_STATUS_DONE, ESPI_VWIRE_SIGNAL_SLV_BOOT_DONE) \ - M(VW_SCI_L, ESPI_VWIRE_SIGNAL_SCI) \ - M(VW_SMI_L, ESPI_VWIRE_SIGNAL_SMI) \ - M(VW_HOST_RST_ACK, ESPI_VWIRE_SIGNAL_HOST_RST_ACK) \ - M(VW_HOST_RST_WARN, ESPI_VWIRE_SIGNAL_HOST_RST_WARN) \ - M(VW_SUS_ACK, ESPI_VWIRE_SIGNAL_SUS_ACK) \ - M(VW_SUS_WARN_L, ESPI_VWIRE_SIGNAL_SUS_WARN) \ - M(VW_SUS_PWRDN_ACK_L, ESPI_VWIRE_SIGNAL_SUS_PWRDN_ACK) \ - M(VW_SLP_A_L, ESPI_VWIRE_SIGNAL_SLP_A) \ - M(VW_SLP_LAN, ESPI_VWIRE_SIGNAL_SLP_LAN) \ +#define VW_SIGNAL_TRANSLATION_LIST(M) \ + M(VW_SLP_S3_L, ESPI_VWIRE_SIGNAL_SLP_S3) \ + M(VW_SLP_S4_L, ESPI_VWIRE_SIGNAL_SLP_S4) \ + M(VW_SLP_S5_L, ESPI_VWIRE_SIGNAL_SLP_S5) \ + M(VW_SUS_STAT_L, ESPI_VWIRE_SIGNAL_SUS_STAT) \ + M(VW_PLTRST_L, ESPI_VWIRE_SIGNAL_PLTRST) \ + M(VW_OOB_RST_WARN, ESPI_VWIRE_SIGNAL_OOB_RST_WARN) \ + M(VW_OOB_RST_ACK, ESPI_VWIRE_SIGNAL_OOB_RST_ACK) \ + M(VW_WAKE_L, ESPI_VWIRE_SIGNAL_WAKE) \ + M(VW_PME_L, ESPI_VWIRE_SIGNAL_PME) \ + M(VW_ERROR_FATAL, ESPI_VWIRE_SIGNAL_ERR_FATAL) \ + M(VW_ERROR_NON_FATAL, ESPI_VWIRE_SIGNAL_ERR_NON_FATAL) \ + M(VW_PERIPHERAL_BTLD_STATUS_DONE, ESPI_VWIRE_SIGNAL_SLV_BOOT_DONE) \ + M(VW_SCI_L, ESPI_VWIRE_SIGNAL_SCI) \ + M(VW_SMI_L, ESPI_VWIRE_SIGNAL_SMI) \ + M(VW_HOST_RST_ACK, ESPI_VWIRE_SIGNAL_HOST_RST_ACK) \ + M(VW_HOST_RST_WARN, ESPI_VWIRE_SIGNAL_HOST_RST_WARN) \ + M(VW_SUS_ACK, ESPI_VWIRE_SIGNAL_SUS_ACK) \ + M(VW_SUS_WARN_L, ESPI_VWIRE_SIGNAL_SUS_WARN) \ + M(VW_SUS_PWRDN_ACK_L, ESPI_VWIRE_SIGNAL_SUS_PWRDN_ACK) \ + M(VW_SLP_A_L, ESPI_VWIRE_SIGNAL_SLP_A) \ + M(VW_SLP_LAN, ESPI_VWIRE_SIGNAL_SLP_LAN) \ M(VW_SLP_WLAN, ESPI_VWIRE_SIGNAL_SLP_WLAN) /* |