You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2026/01/26 13:17:33 UTC
(nuttx) branch master updated (a89b7f7add2 -> ae6ad9c193c)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from a89b7f7add2 clock: remove 64-bit perf support for 32-bit systems
new abe28e1bcf5 drivers/rpmsg_port_spi/slave: add pm ops support for rpmsg port spi
new de5ec3be6ca drivers/rpmsg_port_spi/slave: notify remote core when reboot
new 6ca67e40616 drivers/rpmsg_port_spi: check crc value only when crc is enabled
new 8981810e968 drivers/rpmsg_port_spi: call rpmsg_port_spi_pm_action(false) in inactive path
new fa947f95ee4 drivers/rpmsg_port_spi/slave: add RPMSG_PORT_SPI_ prefix to BYTES2WORDS
new a52dc0e7858 drivers/rpmsg_port_spi_slave: unbind spictrl when peer shutdown
new 49d95aa0d1e drivers/rpmsg_port_spi/slave: remove the pm prepare ops
new 986a1f38a60 drivers/rpmsg_port_spi/slave: increase rx thread default stack size
new 9f4708f643a drivers/rpmsg_port_spi: fix build error
new ba81948741c drivers/rpmsg_port_spi/slave: update type of pin number to pinset_t
new fd6ab203624 drivers/rpmsg_port_spi: fix SPI exchange length calculation
new ae6ad9c193c drivers/rpmsg_port_spi_slave: add getrecvbuf callback for zero-copy receive
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
drivers/rpmsg/Kconfig | 7 +-
drivers/rpmsg/rpmsg_port_spi.c | 148 +++++++++++++++++++++++++++--
drivers/rpmsg/rpmsg_port_spi_slave.c | 178 +++++++++++++++++++++++++++++++++--
include/nuttx/spi/slave.h | 26 +++++
4 files changed, 340 insertions(+), 19 deletions(-)
(nuttx) 06/12: drivers/rpmsg_port_spi_slave: unbind spictrl when peer shutdown
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit a52dc0e7858414bf465415cefd44c93e5cc86363
Author: liaoao <li...@xiaomi.com>
AuthorDate: Thu Feb 27 15:18:40 2025 +0800
drivers/rpmsg_port_spi_slave: unbind spictrl when peer shutdown
Unbind the spictrl to close the spi controller, and bind it again
when peer boots.
This can help to reduce the leak current caused by the spi gpio.
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi_slave.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index f509b9627d8..d2736010ba2 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -83,6 +83,7 @@ struct rpmsg_port_spi_s
FAR struct spi_slave_ctrlr_s *spictrlr;
struct spi_slave_dev_s spislv;
FAR struct ioexpander_dev_s *ioe;
+ bool bound;
/* GPIOs used for handshake */
@@ -92,6 +93,7 @@ struct rpmsg_port_spi_s
/* SPI devices' configuration */
int nbits;
+ int mode;
/* Reserved for cmd send */
@@ -542,6 +544,14 @@ static int rpmsg_port_spi_mreq_handler(FAR struct ioexpander_dev_s *dev,
FAR struct rpmsg_port_spi_s *rpspi = arg;
rpmsginfo("received a mreq\n");
+
+ if (!rpspi->bound)
+ {
+ SPIS_CTRLR_BIND(rpspi->spictrlr, &rpspi->spislv,
+ rpspi->mode, rpspi->nbits);
+ rpspi->bound = true;
+ }
+
rpmsg_port_spi_exchange(rpspi);
return 0;
}
@@ -612,6 +622,8 @@ rpmsg_port_spi_process_packet(FAR struct rpmsg_port_spi_s *rpspi,
flags = spin_lock_irqsave(&rpspi->lock);
if (rpspi->state == RPMSG_PORT_SPI_STATE_DISCONNECTING)
{
+ SPIS_CTRLR_UNBIND(rpspi->spictrlr);
+ rpspi->bound = false;
rpspi->state = RPMSG_PORT_SPI_STATE_UNCONNECTED;
spin_unlock_irqrestore(&rpspi->lock, flags);
IOEXP_WRITEPIN(rpspi->ioe, rpspi->sreq, 0);
@@ -752,7 +764,9 @@ rpmsg_port_spi_init_hardware(FAR struct rpmsg_port_spi_s *rpspi,
rpspi->spictrlr = spictrlr;
rpspi->spislv.ops = &g_rpmsg_port_spi_slave_ops;
rpspi->nbits = spicfg->nbits;
+ rpspi->mode = spicfg->mode;
SPIS_CTRLR_BIND(spictrlr, &rpspi->spislv, spicfg->mode, spicfg->nbits);
+ rpspi->bound = true;
return 0;
}
(nuttx) 03/12: drivers/rpmsg_port_spi: check crc value only when crc is enabled
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 6ca67e406160bfa7bb373b4a4a87a004b8bef9f5
Author: liaoao <li...@xiaomi.com>
AuthorDate: Tue Feb 25 19:13:51 2025 +0800
drivers/rpmsg_port_spi: check crc value only when crc is enabled
Allow one side enables crc check while the other side not enabled.
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index ad74cbcb475..db227192aa8 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -384,7 +384,7 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
{
uint16_t crc = rpmsg_port_spi_crc16(rpspi->rxhdr);
- if (rpspi->rxhdr->crc != crc)
+ if (crc != 0 && rpspi->rxhdr->crc != crc)
{
rpmsgerr("crc check fail received: %u calculated: %u\n",
rpspi->rxhdr->crc, crc);
(nuttx) 12/12: drivers/rpmsg_port_spi_slave: add getrecvbuf callback for zero-copy receive
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ae6ad9c193c7f9f61d20803b2bfb69446dfce6f9
Author: liaoao <li...@xiaomi.com>
AuthorDate: Fri May 30 20:53:36 2025 +0800
drivers/rpmsg_port_spi_slave: add getrecvbuf callback for zero-copy receive
Add a new getrecvbuf callback to the SPI slave device operations
that allows the slave device to provide a pre-allocated receive
buffer directly to the controller. This enables zero-copy data
transfer by allowing the controller to receive data directly into
the device's buffer instead of copying.
Changes:
- Add SPIS_DEV_GETRECVBUF macro and getrecvbuf callback to
spi_slave_devops_s structure in include/nuttx/spi/slave.h
- Implement getrecvbuf in rpmsg_port_spi_slave driver
- Update getdata to return 0 as it's no longer used for this path
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi_slave.c | 17 ++++++++++++++++-
include/nuttx/spi/slave.h | 26 ++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index 934245856f4..db4ef36c4f9 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -146,6 +146,9 @@ static size_t rpmsg_port_spi_slave_receive(FAR struct spi_slave_dev_s *dev,
size_t nwords);
static void rpmsg_port_spi_slave_notify(FAR struct spi_slave_dev_s *dev,
spi_slave_state_t state);
+static size_t
+rpmsg_port_spi_slave_getrecvbuf(FAR struct spi_slave_dev_s *dev,
+ FAR void **buffer);
/****************************************************************************
* Private Data
@@ -165,6 +168,7 @@ static const struct spi_slave_devops_s g_rpmsg_port_spi_slave_ops =
rpmsg_port_spi_slave_getdata, /* getdata */
rpmsg_port_spi_slave_receive, /* receive */
rpmsg_port_spi_slave_notify, /* notify */
+ rpmsg_port_spi_slave_getrecvbuf, /* getrecvbuf */
};
/****************************************************************************
@@ -359,11 +363,22 @@ static void rpmsg_port_spi_slave_cmddata(FAR struct spi_slave_dev_s *dev,
static size_t rpmsg_port_spi_slave_getdata(FAR struct spi_slave_dev_s *dev,
FAR const void **data)
+{
+ return 0;
+}
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_slave_getrecvbuf
+ ****************************************************************************/
+
+static size_t
+rpmsg_port_spi_slave_getrecvbuf(FAR struct spi_slave_dev_s *dev,
+ FAR void **buffer)
{
FAR struct rpmsg_port_spi_s *rpspi =
container_of(dev, struct rpmsg_port_spi_s, spislv);
- *data = rpspi->rxhdr;
+ *buffer = rpspi->rxhdr;
return RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->port.rxq.len);
}
diff --git a/include/nuttx/spi/slave.h b/include/nuttx/spi/slave.h
index bdd5c48d95c..e64d14c1624 100644
--- a/include/nuttx/spi/slave.h
+++ b/include/nuttx/spi/slave.h
@@ -266,6 +266,30 @@
#define SPIS_DEV_GETDATA(d,v) ((d)->ops->getdata(d,v))
+/****************************************************************************
+ * Name: SPIS_DEV_GETRECVBUF
+ *
+ * Description:
+ * This is a SPI device callback should be called when the device would
+ * like to do a nocopy transfer though the device. When the buffer pointer
+ * controller get is not NULL, it will transfer the data from enqueue
+ * directly.
+ *
+ * Input Parameters:
+ * dev - SPI Slave device interface instance
+ * buffer - Pointer to the receive buffer pointer to be shifted in.
+ *
+ * Returned Value:
+ * The size of data units can be received from this exchange.
+ *
+ * Assumptions:
+ * May be called from an interrupt handler and the response is usually
+ * time-critical.
+ *
+ ****************************************************************************/
+
+#define SPIS_DEV_GETRECVBUF(d,b) ((d)->ops->getrecvbuf(d,b))
+
/****************************************************************************
* Name: SPIS_DEV_RECEIVE
*
@@ -544,6 +568,8 @@ struct spi_slave_devops_s
FAR const void *data, size_t nwords);
CODE void (*notify)(FAR struct spi_slave_dev_s *sdev,
spi_slave_state_t state);
+ CODE size_t (*getrecvbuf)(FAR struct spi_slave_dev_s *sdev,
+ FAR void **buffer);
};
/* SPI slave device private data. This structure only defines the initial
(nuttx) 01/12: drivers/rpmsg_port_spi/slave: add pm ops support for rpmsg port spi
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit abe28e1bcf533867d38e12f9e75f232fec6a3082
Author: liaoao <li...@xiaomi.com>
AuthorDate: Mon Jan 6 22:11:06 2025 +0800
drivers/rpmsg_port_spi/slave: add pm ops support for rpmsg port spi
Add low power support for the rpmsg port spi/slave transport, now
the rpmsg port spi/slave transport will not allow enter into the
low power state when there are still tx data to sent or rx data
to processed.
Signed-off-by: liaoao <li...@xiaomi.com>
Signed-off-by: Bowen Wang <wa...@xiaomi.com>
---
drivers/rpmsg/Kconfig | 5 ++
drivers/rpmsg/rpmsg_port_spi.c | 113 +++++++++++++++++++++++++++++++++++
drivers/rpmsg/rpmsg_port_spi_slave.c | 113 +++++++++++++++++++++++++++++++++++
3 files changed, 231 insertions(+)
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
index dc2657194c3..5d7e82f2d06 100644
--- a/drivers/rpmsg/Kconfig
+++ b/drivers/rpmsg/Kconfig
@@ -75,6 +75,11 @@ config RPMSG_PORT_SPI_RX_THRESHOLD
default 50
range 0 100
+config RPMSG_PORT_SPI_PM_TIMEOUT
+ int "Rpmsg SPI Port PM Stay Timeout in Milliseconds"
+ default 1
+ depends on PM
+
endif # RPMSG_PORT_SPI
config RPMSG_PORT_UART
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index 4ab47603596..8f355e86560 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -32,6 +32,7 @@
#include <nuttx/crc16.h>
#include <nuttx/kmalloc.h>
#include <nuttx/kthread.h>
+#include <nuttx/power/pm.h>
#include <nuttx/irq.h>
#include <nuttx/mutex.h>
#include <nuttx/spinlock.h>
@@ -103,6 +104,12 @@ struct rpmsg_port_spi_s
rpmsg_port_rx_cb_t rxcb;
volatile uint8_t state;
spinlock_t lock;
+#ifdef CONFIG_PM
+ struct pm_callback_s pmcb;
+ spinlock_t pmlock;
+ struct wdog_s wdog;
+ struct pm_wakelock_s wakelock;
+#endif
/* Used for flow control */
@@ -137,6 +144,102 @@ static const struct rpmsg_port_ops_s g_rpmsg_port_spi_ops =
* Private Functions
****************************************************************************/
+#ifdef CONFIG_PM
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_pm_callback
+ ****************************************************************************/
+
+static void rpmsg_port_spi_pm_callback(wdparm_t arg)
+{
+ FAR struct rpmsg_port_spi_s *rpspi = (FAR struct rpmsg_port_spi_s *)arg;
+ irqstate_t flags;
+ int count;
+
+ flags = spin_lock_irqsave(&rpspi->pmlock);
+ count = pm_wakelock_staycount(&rpspi->wakelock);
+ if (count > 0 && atomic_load(&rpspi->transferring) == 0 &&
+ rpmsg_port_queue_nused(&rpspi->port.txq) == 0 &&
+ rpmsg_port_queue_nused(&rpspi->port.rxq) == 0)
+ {
+ pm_wakelock_relax(&rpspi->wakelock);
+ }
+ else
+ {
+ wd_start(&rpspi->wdog, MSEC2TICK(CONFIG_RPMSG_PORT_SPI_PM_TIMEOUT),
+ rpmsg_port_spi_pm_callback, (wdparm_t)rpspi);
+ }
+
+ spin_unlock_irqrestore(&rpspi->pmlock, flags);
+}
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_pm_action
+ ****************************************************************************/
+
+static inline void
+rpmsg_port_spi_pm_action(FAR struct rpmsg_port_spi_s *rpspi, bool stay)
+{
+ irqstate_t flags;
+ int count;
+
+ flags = spin_lock_irqsave(&rpspi->pmlock);
+ count = pm_wakelock_staycount(&rpspi->wakelock);
+ if (stay && count == 0)
+ {
+ pm_wakelock_stay(&rpspi->wakelock);
+ }
+ else if (!stay && count > 0 &&
+ rpmsg_port_queue_nused(&rpspi->port.txq) == 0)
+ {
+ wd_start(&rpspi->wdog, MSEC2TICK(CONFIG_RPMSG_PORT_SPI_PM_TIMEOUT),
+ rpmsg_port_spi_pm_callback, (wdparm_t)rpspi);
+ }
+
+ spin_unlock_irqrestore(&rpspi->pmlock, flags);
+}
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_prepare
+ ****************************************************************************/
+
+static int rpmsg_port_spi_prepare(FAR struct pm_callback_s *cb, int domain,
+ enum pm_state_e pmstate)
+{
+ FAR struct rpmsg_port_spi_s *rpspi =
+ container_of(cb, struct rpmsg_port_spi_s, pmcb);
+ enum pm_state_e oldstate;
+
+ oldstate = pm_querystate(PM_IDLE_DOMAIN);
+ switch (oldstate)
+ {
+ case PM_NORMAL:
+ case PM_IDLE:
+ case PM_STANDBY:
+ if (pmstate == PM_SLEEP)
+ {
+ if (atomic_load(&rpspi->transferring) ||
+ rpmsg_port_queue_nused(&rpspi->port.rxq) > 0 ||
+ rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
+ {
+ rpmsgerr("rpmsg port spi busy\n");
+ return -EBUSY;
+ }
+ }
+ break;
+
+ case PM_SLEEP:
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+#else
+# define rpmsg_port_spi_pm_action(rpspi, stay)
+#endif
+
/****************************************************************************
* Name: rpmsg_port_spi_notify_tx_ready
****************************************************************************/
@@ -237,6 +340,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
rpmsginfo("irq send cmd:%u avail:%u\n", txhdr->cmd, txhdr->avail);
+ rpmsg_port_spi_pm_action(rpspi, true);
SPI_SELECT(rpspi->spi, rpspi->devid, true);
SPI_EXCHANGE(rpspi->spi, txhdr, rpspi->rxhdr,
BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
@@ -345,6 +449,7 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
unlock:
spin_unlock_irqrestore(&rpspi->lock, flags);
out:
+ rpmsg_port_spi_pm_action(rpspi, false);
if (atomic_xchg(&rpspi->transferring, 0) > 1)
{
rpmsg_port_spi_exchange(rpspi);
@@ -679,6 +784,14 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
goto out;
}
+#ifdef CONFIG_PM
+ rpspi->pmcb.prepare = rpmsg_port_spi_prepare;
+ pm_register(&rpspi->pmcb);
+ spin_lock_init(&rpspi->pmlock);
+ pm_wakelock_init(&rpspi->wakelock, cfg->remotecpu,
+ PM_IDLE_DOMAIN, PM_NORMAL);
+#endif
+
return 0;
out:
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index aeb2a45143b..71495b3254b 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -32,6 +32,7 @@
#include <nuttx/crc16.h>
#include <nuttx/kmalloc.h>
#include <nuttx/kthread.h>
+#include <nuttx/power/pm.h>
#include <nuttx/irq.h>
#include <nuttx/mutex.h>
#include <nuttx/spinlock.h>
@@ -104,6 +105,12 @@ struct rpmsg_port_spi_s
rpmsg_port_rx_cb_t rxcb;
volatile uint8_t state;
spinlock_t lock;
+#ifdef CONFIG_PM
+ struct pm_callback_s pmcb;
+ spinlock_t pmlock;
+ struct wdog_s wdog;
+ struct pm_wakelock_s wakelock;
+#endif
/* Used for flow control */
@@ -158,6 +165,102 @@ static const struct spi_slave_devops_s g_rpmsg_port_spi_slave_ops =
* Private Functions
****************************************************************************/
+#ifdef CONFIG_PM
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_pm_callback
+ ****************************************************************************/
+
+static void rpmsg_port_spi_pm_callback(wdparm_t arg)
+{
+ FAR struct rpmsg_port_spi_s *rpspi = (FAR struct rpmsg_port_spi_s *)arg;
+ irqstate_t flags;
+ int count;
+
+ flags = spin_lock_irqsave(&rpspi->pmlock);
+ count = pm_wakelock_staycount(&rpspi->wakelock);
+ if (count > 0 && atomic_load(&rpspi->transferring) == 0 &&
+ rpmsg_port_queue_nused(&rpspi->port.txq) == 0 &&
+ rpmsg_port_queue_nused(&rpspi->port.rxq) == 0)
+ {
+ pm_wakelock_relax(&rpspi->wakelock);
+ }
+ else
+ {
+ wd_start(&rpspi->wdog, MSEC2TICK(CONFIG_RPMSG_PORT_SPI_PM_TIMEOUT),
+ rpmsg_port_spi_pm_callback, (wdparm_t)rpspi);
+ }
+
+ spin_unlock_irqrestore(&rpspi->pmlock, flags);
+}
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_pm_action
+ ****************************************************************************/
+
+static inline void
+rpmsg_port_spi_pm_action(FAR struct rpmsg_port_spi_s *rpspi, bool stay)
+{
+ irqstate_t flags;
+ int count;
+
+ flags = spin_lock_irqsave(&rpspi->pmlock);
+ count = pm_wakelock_staycount(&rpspi->wakelock);
+ if (stay && count == 0)
+ {
+ pm_wakelock_stay(&rpspi->wakelock);
+ }
+ else if (!stay && count > 0 &&
+ rpmsg_port_queue_nused(&rpspi->port.txq) == 0)
+ {
+ wd_start(&rpspi->wdog, MSEC2TICK(CONFIG_RPMSG_PORT_SPI_PM_TIMEOUT),
+ rpmsg_port_spi_pm_callback, (wdparm_t)rpspi);
+ }
+
+ spin_unlock_irqrestore(&rpspi->pmlock, flags);
+}
+
+/****************************************************************************
+ * Name: rpmsg_port_spi_prepare
+ ****************************************************************************/
+
+static int rpmsg_port_spi_prepare(FAR struct pm_callback_s *cb, int domain,
+ enum pm_state_e pmstate)
+{
+ FAR struct rpmsg_port_spi_s *rpspi =
+ container_of(cb, struct rpmsg_port_spi_s, pmcb);
+ enum pm_state_e oldstate;
+
+ oldstate = pm_querystate(PM_IDLE_DOMAIN);
+ switch (oldstate)
+ {
+ case PM_NORMAL:
+ case PM_IDLE:
+ case PM_STANDBY:
+ if (pmstate == PM_SLEEP)
+ {
+ if (atomic_load(&rpspi->transferring) ||
+ rpmsg_port_queue_nused(&rpspi->port.rxq) > 0 ||
+ rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
+ {
+ rpmsgerr("rpmsg port spi busy\n");
+ return -EBUSY;
+ }
+ }
+ break;
+
+ case PM_SLEEP:
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+#else
+# define rpmsg_port_spi_pm_action(rpspi, stay)
+#endif
+
/****************************************************************************
* Name: rpmsg_port_spi_exchange
****************************************************************************/
@@ -199,6 +302,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
rpmsginfo("send cmd:%u avail:%u\n", txhdr->cmd, txhdr->avail);
+ rpmsg_port_spi_pm_action(rpspi, true);
SPIS_CTRLR_ENQUEUE(rpspi->spictrlr, txhdr,
BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
IOEXP_WRITEPIN(rpspi->ioe, rpspi->sreq, 1);
@@ -406,6 +510,7 @@ static void rpmsg_port_spi_slave_notify(FAR struct spi_slave_dev_s *dev,
unlock:
spin_unlock_irqrestore(&rpspi->lock, flags);
out:
+ rpmsg_port_spi_pm_action(rpspi, false);
if (atomic_xchg(&rpspi->transferring, 0) > 1 ||
(rpspi->txavail > 0 && rpmsg_port_queue_nused(&rpspi->port.txq) > 0))
{
@@ -705,6 +810,14 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
goto out;
}
+#ifdef CONFIG_PM
+ rpspi->pmcb.prepare = rpmsg_port_spi_prepare;
+ pm_register(&rpspi->pmcb);
+ spin_lock_init(&rpspi->pmlock);
+ pm_wakelock_init(&rpspi->wakelock, cfg->remotecpu,
+ PM_IDLE_DOMAIN, PM_NORMAL);
+#endif
+
return 0;
out:
(nuttx) 05/12: drivers/rpmsg_port_spi/slave: add RPMSG_PORT_SPI_ prefix to BYTES2WORDS
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fa947f95ee4d1f7affdc618e0c5bcd7e70aa7724
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Feb 24 14:58:07 2025 +0800
drivers/rpmsg_port_spi/slave: add RPMSG_PORT_SPI_ prefix to BYTES2WORDS
Code format optimization
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 13 ++++++-------
drivers/rpmsg/rpmsg_port_spi_slave.c | 15 +++++++--------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index 7aedb67ac55..15a6c6a71ec 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -45,15 +45,14 @@
****************************************************************************/
#ifdef CONFIG_RPMSG_PORT_SPI_CRC
-# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \
- (hdr)->len - sizeof((hdr)->crc))
+# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \
+ (hdr)->len - sizeof((hdr)->crc))
#else
-# define rpmsg_port_spi_crc16(hdr) 0
+# define rpmsg_port_spi_crc16(hdr) 0
#endif
-#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000
-
-#define BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3))
+#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000
+#define RPMSG_PORT_SPI_BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3))
/****************************************************************************
* Private Types
@@ -351,7 +350,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
rpmsg_port_spi_pm_action(rpspi, true);
SPI_SELECT(rpspi->spi, rpspi->devid, true);
SPI_EXCHANGE(rpspi->spi, txhdr, rpspi->rxhdr,
- BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
+ RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
rpspi->rxavail = txhdr->avail;
}
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index d3dbb9f9d3f..f509b9627d8 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -45,15 +45,14 @@
****************************************************************************/
#ifdef CONFIG_RPMSG_PORT_SPI_CRC
-# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \
- (hdr)->len - sizeof((hdr)->crc))
+# define rpmsg_port_spi_crc16(hdr) crc16ibm((FAR uint8_t *)&(hdr)->cmd, \
+ (hdr)->len - sizeof((hdr)->crc))
#else
-# define rpmsg_port_spi_crc16(hdr) 0
+# define rpmsg_port_spi_crc16(hdr) 0
#endif
-#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000
-
-#define BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3))
+#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000
+#define RPMSG_PORT_SPI_BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3))
/****************************************************************************
* Private Types
@@ -312,7 +311,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
rpmsg_port_spi_pm_action(rpspi, true);
SPIS_CTRLR_ENQUEUE(rpspi->spictrlr, txhdr,
- BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
+ RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
IOEXP_WRITEPIN(rpspi->ioe, rpspi->sreq, 1);
rpspi->rxavail = txhdr->avail;
@@ -400,7 +399,7 @@ static size_t rpmsg_port_spi_slave_getdata(FAR struct spi_slave_dev_s *dev,
container_of(dev, struct rpmsg_port_spi_s, spislv);
*data = rpspi->rxhdr;
- return BYTES2WORDS(rpspi, rpspi->cmdhdr->len);
+ return RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len);
}
/****************************************************************************
(nuttx) 10/12: drivers/rpmsg_port_spi/slave: update type of pin number to pinset_t
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ba81948741c77fc85f7b2b2c4946585fbd40de1e
Author: liaoao <li...@xiaomi.com>
AuthorDate: Tue May 13 20:09:10 2025 +0800
drivers/rpmsg_port_spi/slave: update type of pin number to pinset_t
Correct the gpio pin number type
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 4 ++++
drivers/rpmsg/rpmsg_port_spi_slave.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index 79e427cb197..10756b98212 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -628,7 +628,11 @@ rpmsg_port_spi_init_gpio(FAR struct ioexpander_dev_s *ioe,
return ret;
}
+#if CONFIG_IOEXPANDER_NPINS <= 64
+ ptr = IOEP_ATTACH(ioe, 1 << pin, callback, args);
+#else
ptr = IOEP_ATTACH(ioe, pin, callback, args);
+#endif
if (ptr == NULL)
{
rpmsgerr("gpio attach error: %d\n", ret);
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index 755f6a1d942..18796ae90d0 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -673,7 +673,11 @@ rpmsg_port_spi_init_gpio(FAR struct ioexpander_dev_s *ioe,
return ret;
}
+#if CONFIG_IOEXPANDER_NPINS <= 64
+ ptr = IOEP_ATTACH(ioe, 1 << pin, callback, args);
+#else
ptr = IOEP_ATTACH(ioe, pin, callback, args);
+#endif
if (ptr == NULL)
{
rpmsgerr("gpio attach error: %d\n", ret);
(nuttx) 07/12: drivers/rpmsg_port_spi/slave: remove the pm prepare ops
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 49d95aa0d1e3e6bcdd370e62df7b97ff4a4a989c
Author: liaoao <li...@xiaomi.com>
AuthorDate: Fri Mar 21 15:16:28 2025 +0800
drivers/rpmsg_port_spi/slave: remove the pm prepare ops
Use pm wakelock is enough to make sure system will not suspend
when there is a transfer in process, and it can actually sleep when
there is buffer to send but peer side not response in 1ms which is
the timeout we set.
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 40 ------------------------------------
drivers/rpmsg/rpmsg_port_spi_slave.c | 40 ------------------------------------
2 files changed, 80 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index 15a6c6a71ec..c14ae8d5d45 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -107,7 +107,6 @@ struct rpmsg_port_spi_s
volatile uint8_t state;
spinlock_t lock;
#ifdef CONFIG_PM
- struct pm_callback_s pmcb;
spinlock_t pmlock;
struct wdog_s wdog;
struct pm_wakelock_s wakelock;
@@ -203,43 +202,6 @@ rpmsg_port_spi_pm_action(FAR struct rpmsg_port_spi_s *rpspi, bool stay)
spin_unlock_irqrestore(&rpspi->pmlock, flags);
}
-/****************************************************************************
- * Name: rpmsg_port_spi_prepare
- ****************************************************************************/
-
-static int rpmsg_port_spi_prepare(FAR struct pm_callback_s *cb, int domain,
- enum pm_state_e pmstate)
-{
- FAR struct rpmsg_port_spi_s *rpspi =
- container_of(cb, struct rpmsg_port_spi_s, pmcb);
- enum pm_state_e oldstate;
-
- oldstate = pm_querystate(PM_IDLE_DOMAIN);
- switch (oldstate)
- {
- case PM_NORMAL:
- case PM_IDLE:
- case PM_STANDBY:
- if (pmstate == PM_SLEEP)
- {
- if (atomic_load(&rpspi->transferring) ||
- rpmsg_port_queue_nused(&rpspi->port.rxq) > 0 ||
- rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
- {
- rpmsgerr("rpmsg port spi busy\n");
- return -EBUSY;
- }
- }
- break;
-
- case PM_SLEEP:
- default:
- break;
- }
-
- return 0;
-}
-
#else
# define rpmsg_port_spi_pm_action(rpspi, stay)
#endif
@@ -834,8 +796,6 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
}
#ifdef CONFIG_PM
- rpspi->pmcb.prepare = rpmsg_port_spi_prepare;
- pm_register(&rpspi->pmcb);
spin_lock_init(&rpspi->pmlock);
pm_wakelock_init(&rpspi->wakelock, cfg->remotecpu,
PM_IDLE_DOMAIN, PM_NORMAL);
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index d2736010ba2..330a451ec5e 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -110,7 +110,6 @@ struct rpmsg_port_spi_s
volatile uint8_t state;
spinlock_t lock;
#ifdef CONFIG_PM
- struct pm_callback_s pmcb;
spinlock_t pmlock;
struct wdog_s wdog;
struct pm_wakelock_s wakelock;
@@ -226,43 +225,6 @@ rpmsg_port_spi_pm_action(FAR struct rpmsg_port_spi_s *rpspi, bool stay)
spin_unlock_irqrestore(&rpspi->pmlock, flags);
}
-/****************************************************************************
- * Name: rpmsg_port_spi_prepare
- ****************************************************************************/
-
-static int rpmsg_port_spi_prepare(FAR struct pm_callback_s *cb, int domain,
- enum pm_state_e pmstate)
-{
- FAR struct rpmsg_port_spi_s *rpspi =
- container_of(cb, struct rpmsg_port_spi_s, pmcb);
- enum pm_state_e oldstate;
-
- oldstate = pm_querystate(PM_IDLE_DOMAIN);
- switch (oldstate)
- {
- case PM_NORMAL:
- case PM_IDLE:
- case PM_STANDBY:
- if (pmstate == PM_SLEEP)
- {
- if (atomic_load(&rpspi->transferring) ||
- rpmsg_port_queue_nused(&rpspi->port.rxq) > 0 ||
- rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
- {
- rpmsgerr("rpmsg port spi busy\n");
- return -EBUSY;
- }
- }
- break;
-
- case PM_SLEEP:
- default:
- break;
- }
-
- return 0;
-}
-
#else
# define rpmsg_port_spi_pm_action(rpspi, stay)
#endif
@@ -874,8 +836,6 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
}
#ifdef CONFIG_PM
- rpspi->pmcb.prepare = rpmsg_port_spi_prepare;
- pm_register(&rpspi->pmcb);
spin_lock_init(&rpspi->pmlock);
pm_wakelock_init(&rpspi->wakelock, cfg->remotecpu,
PM_IDLE_DOMAIN, PM_NORMAL);
(nuttx) 11/12: drivers/rpmsg_port_spi: fix SPI exchange length calculation
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fd6ab203624ad1d1154b59ef5748c1c6ebf3dbd3
Author: liaoao <li...@xiaomi.com>
AuthorDate: Mon May 19 15:41:39 2025 +0800
drivers/rpmsg_port_spi: fix SPI exchange length calculation
The cmdhdr->len was uninitialized before being used in SPI exchange
operations. This caused incorrect transfer lengths.
Changes:
- Initialize cmdhdr->len to sizeof(struct rpmsg_port_header_s) during
initialization for both SPI master and slave drivers
- Use port.txq.len instead of cmdhdr->len for TX exchange length
- Use port.rxq.len instead of cmdhdr->len for RX getdata length
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 3 ++-
drivers/rpmsg/rpmsg_port_spi_slave.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index 10756b98212..8ec6bf9ea77 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -312,7 +312,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
rpmsg_port_spi_pm_action(rpspi, true);
SPI_SELECT(rpspi->spi, rpspi->devid, true);
SPI_EXCHANGE(rpspi->spi, txhdr, rpspi->rxhdr,
- RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
+ RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->port.txq.len));
rpspi->rxavail = txhdr->avail;
}
@@ -772,6 +772,7 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
rpspi->rxhdr = rpmsg_port_queue_get_available_buffer(
&rpspi->port.rxq, true);
DEBUGASSERT(rpspi->cmdhdr != NULL && rpspi->rxhdr != NULL);
+ rpspi->cmdhdr->len = sizeof(struct rpmsg_port_header_s);
rpspi->rxthres = rpmsg_port_queue_navail(&rpspi->port.rxq) *
CONFIG_RPMSG_PORT_SPI_RX_THRESHOLD / 100;
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index 18796ae90d0..934245856f4 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -276,7 +276,7 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
rpmsg_port_spi_pm_action(rpspi, true);
SPIS_CTRLR_ENQUEUE(rpspi->spictrlr, txhdr,
- RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len));
+ RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->port.txq.len));
IOEXP_WRITEPIN(rpspi->ioe, rpspi->sreq, 1);
rpspi->rxavail = txhdr->avail;
@@ -364,7 +364,7 @@ static size_t rpmsg_port_spi_slave_getdata(FAR struct spi_slave_dev_s *dev,
container_of(dev, struct rpmsg_port_spi_s, spislv);
*data = rpspi->rxhdr;
- return RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->cmdhdr->len);
+ return RPMSG_PORT_SPI_BYTES2WORDS(rpspi, rpspi->port.rxq.len);
}
/****************************************************************************
@@ -813,6 +813,7 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
rpspi->rxhdr = rpmsg_port_queue_get_available_buffer(
&rpspi->port.rxq, true);
DEBUGASSERT(rpspi->cmdhdr != NULL && rpspi->rxhdr != NULL);
+ rpspi->cmdhdr->len = sizeof(struct rpmsg_port_header_s);
rpspi->rxthres = rpmsg_port_queue_navail(&rpspi->port.rxq) *
CONFIG_RPMSG_PORT_SPI_RX_THRESHOLD / 100;
(nuttx) 08/12: drivers/rpmsg_port_spi/slave: increase rx thread default stack size
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 986a1f38a607af18ddb8b4261fafc203c7863066
Author: liaoao <li...@xiaomi.com>
AuthorDate: Mon Mar 31 14:35:55 2025 +0800
drivers/rpmsg_port_spi/slave: increase rx thread default stack size
The default stack size should be large enough to avoid the stack
overflow:
0x18551ad8 1968 1968 100.0%! 24.2% rpmsg-spi
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
index 5d7e82f2d06..22e815b3572 100644
--- a/drivers/rpmsg/Kconfig
+++ b/drivers/rpmsg/Kconfig
@@ -64,7 +64,7 @@ config RPMSG_PORT_SPI_THREAD_PRIORITY
config RPMSG_PORT_SPI_THREAD_STACKSIZE
int "Rpmsg SPI Port Stack Size"
- default DEFAULT_TASK_STACKSIZE
+ default 4096
config RPMSG_PORT_SPI_CRC
bool "Rpmsg SPI Port Use CRC Check"
(nuttx) 02/12: drivers/rpmsg_port_spi/slave: notify remote core when reboot
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit de5ec3be6cab5d18c6055bef6a2c1fcf8d393334
Author: liaoao <li...@xiaomi.com>
AuthorDate: Fri Feb 7 17:14:52 2025 +0800
drivers/rpmsg_port_spi/slave: notify remote core when reboot
Now rpmsg_port_spi/slave support send shutdown command to remote
core to notify then local core will reboot, so remote core can
notify all the rpmsg services to do the unregister.
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 54 ++++++++++++++++++++++++++++++++++--
drivers/rpmsg/rpmsg_port_spi_slave.c | 54 ++++++++++++++++++++++++++++++++++--
2 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index 8f355e86560..ad74cbcb475 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -35,6 +35,7 @@
#include <nuttx/power/pm.h>
#include <nuttx/irq.h>
#include <nuttx/mutex.h>
+#include <nuttx/reboot_notifier.h>
#include <nuttx/spinlock.h>
#include "rpmsg_port.h"
@@ -50,6 +51,8 @@
# define rpmsg_port_spi_crc16(hdr) 0
#endif
+#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000
+
#define BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3))
/****************************************************************************
@@ -110,6 +113,8 @@ struct rpmsg_port_spi_s
struct wdog_s wdog;
struct pm_wakelock_s wakelock;
#endif
+ volatile bool shutdown;
+ struct notifier_block nb;
/* Used for flow control */
@@ -312,13 +317,17 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
return;
}
+ txhdr = rpspi->cmdhdr;
if (rpspi->state == RPMSG_PORT_SPI_STATE_UNCONNECTED)
{
- txhdr = rpspi->cmdhdr;
txhdr->cmd = RPMSG_PORT_SPI_CMD_CONNECT;
strlcpy((FAR char *)(txhdr + 1), rpspi->port.rpmsg.cpuname,
RPMSG_NAME_SIZE);
}
+ else if (rpspi->shutdown)
+ {
+ txhdr->cmd = RPMSG_PORT_SPI_CMD_SHUTDOWN;
+ }
else if (rpspi->txavail > 0 &&
rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
{
@@ -330,7 +339,6 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
}
else
{
- txhdr = rpspi->cmdhdr;
txhdr->cmd = RPMSG_PORT_SPI_CMD_AVAIL;
}
@@ -367,6 +375,10 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
rpmsg_port_queue_return_buffer(&rpspi->port.txq, rpspi->txhdr);
rpspi->txhdr = NULL;
}
+ else if (rpspi->cmdhdr->cmd == RPMSG_PORT_SPI_CMD_SHUTDOWN)
+ {
+ rpspi->shutdown = false;
+ }
if (rpspi->rxhdr->crc != 0)
{
@@ -710,6 +722,41 @@ rpmsg_port_spi_init_hardware(FAR struct rpmsg_port_spi_s *rpspi,
return 0;
}
+/****************************************************************************
+ * Name: rpmsg_port_spi_reboot_handler
+ ****************************************************************************/
+
+static int
+rpmsg_port_spi_reboot_handler(FAR struct notifier_block *nb,
+ unsigned long action, FAR void *data)
+{
+ FAR struct rpmsg_port_spi_s *rpspi =
+ container_of(nb, struct rpmsg_port_spi_s, nb);
+ int timeout = RPMSG_PORT_SPI_CMD_TIMEOUT / 10;
+
+ if ((action == SYS_POWER_OFF || action == SYS_RESTART) &&
+ rpspi->state == RPMSG_PORT_SPI_STATE_CONNECTED)
+ {
+ rpspi->shutdown = true;
+ IOEXP_WRITEPIN(rpspi->ioe, rpspi->mreq, 1);
+
+ /* Wait until shutdown cmd has been sent done. */
+
+ while (timeout >= 0 && rpspi->shutdown)
+ {
+ usleep(10000);
+ timeout--;
+ }
+
+ if (timeout < 0)
+ {
+ rpmsgerr("send cmd shutdown cmd timedout\n");
+ }
+ }
+
+ return 0;
+}
+
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -792,6 +839,9 @@ rpmsg_port_spi_initialize(FAR const struct rpmsg_port_config_s *cfg,
PM_IDLE_DOMAIN, PM_NORMAL);
#endif
+ rpspi->nb.notifier_call = rpmsg_port_spi_reboot_handler;
+ register_reboot_notifier(&rpspi->nb);
+
return 0;
out:
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index 71495b3254b..46c527abce3 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -35,6 +35,7 @@
#include <nuttx/power/pm.h>
#include <nuttx/irq.h>
#include <nuttx/mutex.h>
+#include <nuttx/reboot_notifier.h>
#include <nuttx/spinlock.h>
#include "rpmsg_port.h"
@@ -50,6 +51,8 @@
# define rpmsg_port_spi_crc16(hdr) 0
#endif
+#define RPMSG_PORT_SPI_CMD_TIMEOUT 1000
+
#define BYTES2WORDS(s,b) ((b) / ((s)->nbits >> 3))
/****************************************************************************
@@ -111,6 +114,8 @@ struct rpmsg_port_spi_s
struct wdog_s wdog;
struct pm_wakelock_s wakelock;
#endif
+ volatile bool shutdown;
+ struct notifier_block nb;
/* Used for flow control */
@@ -274,13 +279,17 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
return;
}
+ txhdr = rpspi->cmdhdr;
if (rpspi->state == RPMSG_PORT_SPI_STATE_UNCONNECTED)
{
- txhdr = rpspi->cmdhdr;
txhdr->cmd = RPMSG_PORT_SPI_CMD_CONNECT;
strlcpy((FAR char *)(txhdr + 1), rpspi->port.rpmsg.cpuname,
RPMSG_NAME_SIZE);
}
+ else if (rpspi->shutdown)
+ {
+ txhdr->cmd = RPMSG_PORT_SPI_CMD_SHUTDOWN;
+ }
else if (rpspi->txavail > 0 &&
rpmsg_port_queue_nused(&rpspi->port.txq) > 0)
{
@@ -292,7 +301,6 @@ static void rpmsg_port_spi_exchange(FAR struct rpmsg_port_spi_s *rpspi)
}
else
{
- txhdr = rpspi->cmdhdr;
txhdr->cmd = RPMSG_PORT_SPI_CMD_AVAIL;
}
@@ -428,6 +436,10 @@ static void rpmsg_port_spi_slave_notify(FAR struct spi_slave_dev_s *dev,
rpmsg_port_queue_return_buffer(&rpspi->port.txq, rpspi->txhdr);
rpspi->txhdr = NULL;
}
+ else if (rpspi->cmdhdr->cmd == RPMSG_PORT_SPI_CMD_SHUTDOWN)
+ {
+ rpspi->shutdown = false;
+ }
if (rpspi->rxhdr->crc != 0)
{
@@ -743,6 +755,41 @@ rpmsg_port_spi_init_hardware(FAR struct rpmsg_port_spi_s *rpspi,
return 0;
}
+/****************************************************************************
+ * Name: rpmsg_port_spi_reboot_handler
+ ****************************************************************************/
+
+static int
+rpmsg_port_spi_reboot_handler(FAR struct notifier_block *nb,
+ unsigned long action, FAR void *data)
+{
+ FAR struct rpmsg_port_spi_s *rpspi =
+ container_of(nb, struct rpmsg_port_spi_s, nb);
+ int timeout = RPMSG_PORT_SPI_CMD_TIMEOUT / 10;
+
+ if ((action == SYS_POWER_OFF || action == SYS_RESTART) &&
+ rpspi->state == RPMSG_PORT_SPI_STATE_CONNECTED)
+ {
+ rpspi->shutdown = true;
+ rpmsg_port_spi_exchange(rpspi);
+
+ /* Wait until shutdown cmd has been sent done. */
+
+ while (timeout >= 0 && rpspi->shutdown)
+ {
+ usleep(10000);
+ timeout--;
+ }
+
+ if (timeout < 0)
+ {
+ rpmsgerr("send cmd shutdown cmd timedout\n");
+ }
+ }
+
+ return 0;
+}
+
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -818,6 +865,9 @@ rpmsg_port_spi_slave_initialize(FAR const struct rpmsg_port_config_s *cfg,
PM_IDLE_DOMAIN, PM_NORMAL);
#endif
+ rpspi->nb.notifier_call = rpmsg_port_spi_reboot_handler;
+ register_reboot_notifier(&rpspi->nb);
+
return 0;
out:
(nuttx) 09/12: drivers/rpmsg_port_spi: fix build error
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 9f4708f643ad8f412661a33111eb0ea6b7c761e3
Author: liaoao <li...@xiaomi.com>
AuthorDate: Mon Apr 21 13:49:55 2025 +0800
drivers/rpmsg_port_spi: fix build error
CC: vfs/fs_unlink.c rpmsg/rpmsg_port_spi.c: In function ‘rpmsg_port_spi_complete_handler’:
rpmsg/rpmsg_port_spi.c:415:11: warning: implicit declaration of function ‘rpmsg_port_spi_drop_packets’; did you mean ‘rpmsg_port_drop_packets’? [-Wimplicit-function-declaration]
415 | rpmsg_port_spi_drop_packets(rpspi, RPMSG_PORT_SPI_DROP_ALL);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
| rpmsg_port_drop_packets
rpmsg/rpmsg_port_spi.c:415:46: error: ‘RPMSG_PORT_SPI_DROP_ALL’ undeclared (first use in this function); did you mean ‘RPMSG_PORT_DROP_ALL’?
415 | rpmsg_port_spi_drop_packets(rpspi, RPMSG_PORT_SPI_DROP_ALL);
| ^~~~~~~~~~~~~~~~~~~~~~~
| RPMSG_PORT_DROP_ALL
rpmsg/rpmsg_port_spi_slave.c:292:5: warning: implicit declaration of function ‘container_of’; did you mean ‘list_container_of’? [-Wimplicit-function-declaration]
292 | container_of(port, struct rpmsg_port_spi_s, port);
| ^~~~~~~~~~~~
| list_container_of
Signed-off-by: liaoao <li...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 2 +-
drivers/rpmsg/rpmsg_port_spi_slave.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index c14ae8d5d45..79e427cb197 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -410,7 +410,7 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
if (rpspi->rxhdr->cmd == RPMSG_PORT_SPI_CMD_SHUTDOWN)
{
rpspi->state = RPMSG_PORT_SPI_STATE_DISCONNECTING;
- rpmsg_port_spi_drop_packets(rpspi, RPMSG_PORT_SPI_DROP_ALL);
+ rpmsg_port_drop_packets(&rpspi->port, RPMSG_PORT_DROP_ALL);
}
rpmsg_port_queue_add_buffer(&rpspi->port.rxq, rpspi->rxhdr);
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index 330a451ec5e..755f6a1d942 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -32,6 +32,7 @@
#include <nuttx/crc16.h>
#include <nuttx/kmalloc.h>
#include <nuttx/kthread.h>
+#include <nuttx/nuttx.h>
#include <nuttx/power/pm.h>
#include <nuttx/irq.h>
#include <nuttx/mutex.h>
(nuttx) 04/12: drivers/rpmsg_port_spi: call rpmsg_port_spi_pm_action(false) in inactive path
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 8981810e9689786db26c905a6cc609fe0f1898ed
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Mon Feb 24 17:00:11 2025 +0800
drivers/rpmsg_port_spi: call rpmsg_port_spi_pm_action(false) in inactive path
Only call rpmsg_port_spi_pm_action(false) when no more data to
transfer to avoid unnecessary pm unlock/lock operations.
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
drivers/rpmsg/rpmsg_port_spi.c | 5 ++++-
drivers/rpmsg/rpmsg_port_spi_slave.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/rpmsg/rpmsg_port_spi.c b/drivers/rpmsg/rpmsg_port_spi.c
index db227192aa8..7aedb67ac55 100644
--- a/drivers/rpmsg/rpmsg_port_spi.c
+++ b/drivers/rpmsg/rpmsg_port_spi.c
@@ -461,7 +461,6 @@ static void rpmsg_port_spi_complete_handler(FAR void *arg)
unlock:
spin_unlock_irqrestore(&rpspi->lock, flags);
out:
- rpmsg_port_spi_pm_action(rpspi, false);
if (atomic_xchg(&rpspi->transferring, 0) > 1)
{
rpmsg_port_spi_exchange(rpspi);
@@ -471,6 +470,10 @@ out:
{
IOEXP_WRITEPIN(rpspi->ioe, rpspi->mreq, 1);
}
+ else
+ {
+ rpmsg_port_spi_pm_action(rpspi, false);
+ }
}
/****************************************************************************
diff --git a/drivers/rpmsg/rpmsg_port_spi_slave.c b/drivers/rpmsg/rpmsg_port_spi_slave.c
index 46c527abce3..d3dbb9f9d3f 100644
--- a/drivers/rpmsg/rpmsg_port_spi_slave.c
+++ b/drivers/rpmsg/rpmsg_port_spi_slave.c
@@ -522,12 +522,15 @@ static void rpmsg_port_spi_slave_notify(FAR struct spi_slave_dev_s *dev,
unlock:
spin_unlock_irqrestore(&rpspi->lock, flags);
out:
- rpmsg_port_spi_pm_action(rpspi, false);
if (atomic_xchg(&rpspi->transferring, 0) > 1 ||
(rpspi->txavail > 0 && rpmsg_port_queue_nused(&rpspi->port.txq) > 0))
{
rpmsg_port_spi_exchange(rpspi);
}
+ else
+ {
+ rpmsg_port_spi_pm_action(rpspi, false);
+ }
}
/****************************************************************************