diff options
| author | Caveh Jalali <caveh@chromium.org> | 2021-06-03 00:12:24 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-04 22:27:37 +0000 |
| commit | 15d41792a1f4d24a64ed4ebcaa809a48978ff385 (patch) | |
| tree | 409d19c8aa38e9b28ae831446b7bdcdc408365ac /chip/mchp | |
| parent | 670b3eabd0929557f3213ea199744d38914c2a99 (diff) | |
| download | chrome-ec-15d41792a1f4d24a64ed4ebcaa809a48978ff385.tar.gz | |
COIL: espi: replace VW_SLAVE_BTLD_STATUS_DONE with VW_PERIPHERAL_BTLD_STATUS_DONE
This replaces VW_SLAVE_BTLD_STATUS_DONE with
VW_PERIPHERAL_BTLD_STATUS_DONE.
BRANCH=none
BUG=b:163885307
TEST=buildall, compare_build.sh pass
Change-Id: I0b8c71fa7e590dc89357e22aafce0b67717af183
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2938041
Reviewed-by: Harry Cutts <hcutts@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
Diffstat (limited to 'chip/mchp')
| -rw-r--r-- | chip/mchp/espi.c | 50 |
1 files changed, 25 insertions, 25 deletions
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 */ |