michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: espi: xec: Ensure OOB interrupts are not missed

Browse source 
MCHP Soc operation uses clear-on-write register for interrupt
status, read-OR-write operation may clear interrupts unintentional.
Fixes #24464

Signed-off-by: Jose Alberto Meza <jose.a.meza.arellano@intel.com>
This commit is contained in:
Jose Alberto Meza 2020-04-28 11:31:23 -07:00 • committed by Andrew Boie
commit 06d4c6d8b3
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/espi/espi_mchp_xec.c
View file

@ -282,7 +282,7 @@ static int espi_xec_configure(struct device *dev, struct espi_cfg *cfg)
* de-assertion and after pinmux * de-assertion and after pinmux
*/ */
ESPI_EIO_BAR_REGS->IO_ACTV = 1; ESPI_EIO_BAR_REGS->IO_ACTV = 1;
LOG_DBG("eSPI block activated successfully\n"); LOG_DBG("eSPI block activated successfully");
return 0; return 0;
} }
@ -459,7 +459,7 @@ static int espi_xec_send_oob(struct device *dev, struct espi_oob_packet *pckt)
MCHP_ESPI_OOB_TX_STS_OVRUN | MCHP_ESPI_OOB_TX_STS_OVRUN |
MCHP_ESPI_OOB_TX_STS_BADREQ; MCHP_ESPI_OOB_TX_STS_BADREQ;
LOG_DBG("%s\n", __func__); LOG_DBG("%s", __func__);
if (!(ESPI_OOB_REGS->TX_STS & MCHP_ESPI_OOB_TX_STS_CHEN)) { if (!(ESPI_OOB_REGS->TX_STS & MCHP_ESPI_OOB_TX_STS_CHEN)) {
LOG_ERR("OOB channel is disabled"); LOG_ERR("OOB channel is disabled");
@ -489,6 +489,8 @@ static int espi_xec_send_oob(struct device *dev, struct espi_oob_packet *pckt)
} }
if (ESPI_OOB_REGS->TX_STS & err_mask) { if (ESPI_OOB_REGS->TX_STS & err_mask) {
LOG_ERR("Tx failed %x", ESPI_OOB_REGS->TX_STS);
ESPI_OOB_REGS->TX_STS = err_mask;
return -EIO; return -EIO;
} }
@ -706,7 +708,7 @@ static void espi_rst_isr(struct device *dev)
rst_sts = ESPI_CAP_REGS->ERST_STS; rst_sts = ESPI_CAP_REGS->ERST_STS;
/* eSPI reset status register is clear on write register */ /* eSPI reset status register is clear on write register */
ESPI_CAP_REGS->ERST_STS |= MCHP_ESPI_RST_ISTS; ESPI_CAP_REGS->ERST_STS = MCHP_ESPI_RST_ISTS;
if (rst_sts & MCHP_ESPI_RST_ISTS) { if (rst_sts & MCHP_ESPI_RST_ISTS) {
if (rst_sts & MCHP_ESPI_RST_ISTS_PIN_RO_HI) { if (rst_sts & MCHP_ESPI_RST_ISTS_PIN_RO_HI) {
@ -795,7 +797,7 @@ static void setup_espi_io_config(struct device *dev, u16_t host_address)
config_sub_devices(dev); config_sub_devices(dev);
configure_sirq(); configure_sirq();
ESPI_PC_REGS->PC_STATUS |= (MCHP_ESPI_PC_STS_EN_CHG | ESPI_PC_REGS->PC_STATUS = (MCHP_ESPI_PC_STS_EN_CHG |
MCHP_ESPI_PC_STS_BM_EN_CHG_POS); MCHP_ESPI_PC_STS_BM_EN_CHG_POS);
ESPI_PC_REGS->PC_IEN |= MCHP_ESPI_PC_IEN_EN_CHG; ESPI_PC_REGS->PC_IEN |= MCHP_ESPI_PC_IEN_EN_CHG;
ESPI_CAP_REGS->PC_RDY = 1; ESPI_CAP_REGS->PC_RDY = 1;
@ -846,9 +848,10 @@ static void espi_oob_down_isr(struct device *dev)
status = ESPI_OOB_REGS->RX_STS; status = ESPI_OOB_REGS->RX_STS;
LOG_DBG("%s %x\n", __func__, status); LOG_DBG("%s %x", __func__, status);
if (status & MCHP_ESPI_OOB_RX_STS_DONE) { if (status & MCHP_ESPI_OOB_RX_STS_DONE) {
ESPI_OOB_REGS->RX_STS |= MCHP_ESPI_OOB_RX_STS_DONE; /* Register is write-on-clear, ensure only 1 bit is affected */
ESPI_OOB_REGS->RX_STS = MCHP_ESPI_OOB_RX_STS_DONE;
k_sem_give(&data->rx_lock); k_sem_give(&data->rx_lock);
} }
@ -860,10 +863,11 @@ static void espi_oob_up_isr(struct device *dev)
struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data);
status = ESPI_OOB_REGS->TX_STS; status = ESPI_OOB_REGS->TX_STS;
LOG_DBG("%s sts:%x\n", __func__, status); LOG_DBG("%s sts:%x", __func__, status);
if (status & MCHP_ESPI_OOB_TX_STS_DONE) { if (status & MCHP_ESPI_OOB_TX_STS_DONE) {
ESPI_OOB_REGS->TX_STS |= MCHP_ESPI_OOB_TX_STS_DONE; /* Register is write-on-clear, ensure only 1 bit is affected */
ESPI_OOB_REGS->TX_STS = MCHP_ESPI_OOB_TX_STS_DONE;
k_sem_give(&data->tx_lock); k_sem_give(&data->tx_lock);
} }
@ -875,7 +879,8 @@ static void espi_oob_up_isr(struct device *dev)
MCHP_ESPI_OOB_TX_IEN_DONE; MCHP_ESPI_OOB_TX_IEN_DONE;
ESPI_OOB_REGS->RX_IEN |= MCHP_ESPI_OOB_RX_IEN; ESPI_OOB_REGS->RX_IEN |= MCHP_ESPI_OOB_RX_IEN;
} }
ESPI_OOB_REGS->TX_STS |= MCHP_ESPI_OOB_TX_STS_CHG_EN;
ESPI_OOB_REGS->TX_STS = MCHP_ESPI_OOB_TX_STS_CHG_EN;
} }
} }
#endif #endif
@ -1259,9 +1264,9 @@ static int espi_xec_init(struct device *dev)
#endif #endif
/* Clear reset interrupt status and enable interrupts */ /* Clear reset interrupt status and enable interrupts */
ESPI_CAP_REGS->ERST_STS |= MCHP_ESPI_RST_ISTS; ESPI_CAP_REGS->ERST_STS = MCHP_ESPI_RST_ISTS;
ESPI_CAP_REGS->ERST_IEN |= MCHP_ESPI_RST_IEN; ESPI_CAP_REGS->ERST_IEN |= MCHP_ESPI_RST_IEN;
ESPI_PC_REGS->PC_STATUS |= MCHP_ESPI_PC_STS_EN_CHG; ESPI_PC_REGS->PC_STATUS = MCHP_ESPI_PC_STS_EN_CHG;
ESPI_PC_REGS->PC_IEN |= MCHP_ESPI_PC_IEN_EN_CHG; ESPI_PC_REGS->PC_IEN |= MCHP_ESPI_PC_IEN_EN_CHG;
/* Enable VWires interrupts */ /* Enable VWires interrupts */