sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpmsg_port_spi/slave: reorder rpmsg_port_initialize and rpmsg_port_spi_init hardware

Browse Source 
Because the data transmision may has been started before
rpmsg_port_initialize(), this should be not allowed.

Signed-off-by: liaoao <liaoao@xiaomi.com>
This commit is contained in:
liaoao 2024-08-05 19:24:03 +08:00 committed by Xiang Xiao
parent 1f6ba6c7a7
commit 88e0aeaad4
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/rpmsg/rpmsg_port_spi.c
View File

@ -541,13 +541,6 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
return -ENOMEM; return -ENOMEM;
} }
ret = rpmsg_port_spi_init_hardware(rpspi, spicfg, spi, ioe);
if (ret < 0)
{
rpmsgerr("rpmsg port spi hardware init failed\n");
goto rpmsg_err;
}
DEBUGASSERT(cfg->txlen == cfg->rxlen); DEBUGASSERT(cfg->txlen == cfg->rxlen);
ret = rpmsg_port_initialize(&rpspi->port, cfg, &g_rpmsg_port_spi_ops); ret = rpmsg_port_initialize(&rpspi->port, cfg, &g_rpmsg_port_spi_ops);
if (ret < 0) if (ret < 0)
@ -567,6 +560,13 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
rpspi->rxthres = rpmsg_port_queue_navail(&rpspi->port.rxq) * rpspi->rxthres = rpmsg_port_queue_navail(&rpspi->port.rxq) *
CONFIG_RPMSG_PORT_SPI_RX_THRESHOLD / 100; CONFIG_RPMSG_PORT_SPI_RX_THRESHOLD / 100;
ret = rpmsg_port_spi_init_hardware(rpspi, spicfg, spi, ioe);
if (ret < 0)
{
rpmsgerr("rpmsg port spi hardware init failed\n");
goto out;
}
snprintf(arg1, sizeof(arg1), "%p", rpspi); snprintf(arg1, sizeof(arg1), "%p", rpspi);
argv[0] = (FAR void *)cfg->remotecpu; argv[0] = (FAR void *)cfg->remotecpu;
argv[1] = arg1; argv[1] = arg1;
@ -578,12 +578,12 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
if (ret < 0) if (ret < 0)
{ {
rpmsgerr("rpmsg port spi create thread failed\n"); rpmsgerr("rpmsg port spi create thread failed\n");
goto thread_err; goto out;
} }
return 0; return 0;
thread_err: out:
rpmsg_port_uninitialize(&rpspi->port); rpmsg_port_uninitialize(&rpspi->port);
rpmsg_err: rpmsg_err:
kmm_free(rpspi); kmm_free(rpspi);

26
drivers/rpmsg/rpmsg_port_spi_slave.c
View File

@ -165,7 +165,7 @@ static void rpmsg_port_spi_drop_packets(FAR struct rpmsg_port_spi_s *rpspi)
* Name: rpmsg_port_spi_exchange * Name: rpmsg_port_spi_exchange
****************************************************************************/ ****************************************************************************/
void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi) static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
{ {
FAR struct rpmsg_port_header_s *txhdr; FAR struct rpmsg_port_header_s *txhdr;
@ -342,7 +342,7 @@ static void rpmsg_port_spi_slave_notify(FAR struct spi_slave_dev_s *dev,
{ {
if (rpspi->rxhdr->cmd != RPMSG_PORT_SPI_CMD_CONNECT) if (rpspi->rxhdr->cmd != RPMSG_PORT_SPI_CMD_CONNECT)
{ {
return; goto out;
} }
rpspi->txavail = rpspi->rxhdr->avail; rpspi->txavail = rpspi->rxhdr->avail;
@ -394,7 +394,7 @@ static int rpmsg_port_spi_mreq_handler(FAR struct ioexpander_dev_s *dev,
static inline void rpmsg_port_spi_connect(FAR struct rpmsg_port_spi_s *rpspi) static inline void rpmsg_port_spi_connect(FAR struct rpmsg_port_spi_s *rpspi)
{ {
rpmsg_port_spi_mreq_handler(NULL, 0, rpspi); rpmsg_port_spi_exchange(rpspi);
} }
/**************************************************************************** /****************************************************************************
@ -552,8 +552,8 @@ rpmsg_port_spi_init_hardware(FAR struct rpmsg_port_spi_s *rpspi,
rpspi->ioe = ioe; rpspi->ioe = ioe;
rpspi->spictrlr = spictrlr; rpspi->spictrlr = spictrlr;
rpspi->spislv.ops = &g_rpmsg_port_spi_slave_ops; rpspi->spislv.ops = &g_rpmsg_port_spi_slave_ops;
SPIS_CTRLR_BIND(spictrlr, &rpspi->spislv, spicfg->mode, spicfg->nbits);
rpspi->nbits = spicfg->nbits; rpspi->nbits = spicfg->nbits;
SPIS_CTRLR_BIND(spictrlr, &rpspi->spislv, spicfg->mode, spicfg->nbits);
return 0; return 0;
} }
@ -583,13 +583,6 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
return -ENOMEM; return -ENOMEM;
} }
ret = rpmsg_port_spi_init_hardware(rpspi, spicfg, spictrlr, ioe);
if (ret < 0)
{
rpmsgerr("rpmsg port spi hardware init failed\n");
goto rpmsg_err;
}
DEBUGASSERT(cfg->txlen == cfg->rxlen); DEBUGASSERT(cfg->txlen == cfg->rxlen);
ret = rpmsg_port_initialize(&rpspi->port, cfg, &g_rpmsg_port_spi_ops); ret = rpmsg_port_initialize(&rpspi->port, cfg, &g_rpmsg_port_spi_ops);
if (ret < 0) if (ret < 0)
@ -609,6 +602,13 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
rpspi->rxthres = rpmsg_port_queue_navail(&rpspi->port.rxq) * rpspi->rxthres = rpmsg_port_queue_navail(&rpspi->port.rxq) *
CONFIG_RPMSG_PORT_SPI_RX_THRESHOLD / 100; CONFIG_RPMSG_PORT_SPI_RX_THRESHOLD / 100;
ret = rpmsg_port_spi_init_hardware(rpspi, spicfg, spictrlr, ioe);
if (ret < 0)
{
rpmsgerr("rpmsg port spi hardware init failed\n");
goto out;
}
snprintf(arg1, sizeof(arg1), "%p", rpspi); snprintf(arg1, sizeof(arg1), "%p", rpspi);
argv[0] = (FAR char *)cfg->remotecpu; argv[0] = (FAR char *)cfg->remotecpu;
argv[1] = arg1; argv[1] = arg1;
@ -620,12 +620,12 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
if (ret < 0) if (ret < 0)
{ {
rpmsgerr("rpmsg port spi create thread failed\n"); rpmsgerr("rpmsg port spi create thread failed\n");
goto thread_err; goto out;
} }
return 0; return 0;
thread_err: out:
rpmsg_port_uninitialize(&rpspi->port); rpmsg_port_uninitialize(&rpspi->port);
rpmsg_err: rpmsg_err:
kmm_free(rpspi); kmm_free(rpspi);