@@ -1217,6 +1217,7 @@ EXPORT_SYMBOL_GPL(spi_finalize_current_transfer);
*/
static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
{
+ struct spi_message *msg;
unsigned long flags;
bool was_busy = false;
int ret;
@@ -1276,10 +1277,16 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread)
return;
}
- /* Extract head of queue */
- ctlr->cur_msg =
- list_first_entry(&ctlr->queue, struct spi_message, queue);
+ /* If device for this message needs a realtime thread; queue it */
+ msg = list_first_entry(&ctlr->queue, struct spi_message, queue);
+ if (msg->spi->force_rt_transfers & !in_kthread) {
+ kthread_queue_work(&ctlr->kworker, &ctlr->pump_messages);
+ spin_unlock_irqrestore(&ctlr->queue_lock, flags);
+ return;
+ }
+ /* Extract head of queue */
+ ctlr->cur_msg = msg;
list_del_init(&ctlr->cur_msg->queue);
if (ctlr->busy)
was_busy = true;
@@ -1364,10 +1371,32 @@ static void spi_pump_messages(struct kthread_work *work)
__spi_pump_messages(ctlr, true);
}
-static int spi_init_queue(struct spi_controller *ctlr)
+/**
+ * spi_set_thread_rt - set the controller to pump at realtime priority
+ * @ctlr: controller to boost priority of
+ *
+ * This can be called because the controller requested realtime priority
+ * (by setting the ->rt value before calling spi_register_controller()) or
+ * because a device on the bus said that its transfers needed realtime
+ * priority.
+ *
+ * NOTE: at the moment if any device on a bus says it needs realtime then
+ * the thread will be at realtime priority for all transfers on that
+ * controller. If this eventually becomes a problem we may see if we can
+ * find a way to boost the priority only temporarily during relevant
+ * transfers.
+ */
+static void spi_set_thread_rt(struct spi_controller *ctlr)
{
struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 };
+ dev_info(&ctlr->dev,
+ "will run message pump with realtime priority\n");
+ sched_setscheduler(ctlr->kworker_task, SCHED_FIFO, ¶m);
+}
+
+static int spi_init_queue(struct spi_controller *ctlr)
+{
ctlr->running = false;
ctlr->busy = false;
@@ -1387,11 +1416,8 @@ static int spi_init_queue(struct spi_controller *ctlr)
* request and the scheduling of the message pump thread. Without this
* setting the message pump thread will remain at default priority.
*/
- if (ctlr->rt) {
- dev_info(&ctlr->dev,
- "will run message pump with realtime priority\n");
- sched_setscheduler(ctlr->kworker_task, SCHED_FIFO, ¶m);
- }
+ if (ctlr->rt)
+ spi_set_thread_rt(ctlr);
return 0;
}
@@ -2982,6 +3008,11 @@ int spi_setup(struct spi_device *spi)
spi_set_cs(spi, false);
+ if (spi->force_rt_transfers && !spi->controller->rt) {
+ spi->controller->rt = true;
+ spi_set_thread_rt(spi->controller);
+ }
+
dev_dbg(&spi->dev, "setup mode %d, %s%s%s%s%u bits/w, %u Hz max --> %d\n",
(int) (spi->mode & (SPI_CPOL | SPI_CPHA)),
(spi->mode & SPI_CS_HIGH) ? "cs_high, " : "",
@@ -109,6 +109,10 @@ void spi_statistics_add_transfer_stats(struct spi_statistics *stats,
* This may be changed by the device's driver, or left at the
* default (0) indicating protocol words are eight bit bytes.
* The spi_transfer.bits_per_word can override this for each transfer.
+ * @force_rt_transfers: Transfers for this device should always be done
+ * at realtime priority. NOTE that this might add some latency in
+ * starting the transfer (since we may need to context switch) but
+ * once the transfer starts it will be done at high priority.
* @irq: Negative, or the number passed to request_irq() to receive
* interrupts from this device.
* @controller_state: Controller's runtime state
@@ -143,6 +147,7 @@ struct spi_device {
u32 max_speed_hz;
u8 chip_select;
u8 bits_per_word;
+ bool force_rt_transfers;
u32 mode;
#define SPI_CPHA 0x01 /* clock phase */
#define SPI_CPOL 0x02 /* clock polarity */
For communication with some SPI devices it may be necessary (for correctness) not to get interrupted during a transfer. One example is the EC (Embedded Controller) on Chromebooks. The Chrome OS EC will drop a transfer if more than ~8ms passes between the chip select being asserted and the transfer finishing. The best way to make transfers to devices like this succeed is to run the transfers at realtime priority. ...but, since there is no easy way in the kernel to just temporarily bump the priority of the current thread the current best way to do this is to schedule work on another thread and give that thread a boosted priority. The SPI framework already has another thread and, in fact, that other thread is already made realtime priority in some cases. Let's add an ability for a SPI device driver to request that this thread always be used and that it's realtime priority. NOTE: Forcing all transfers to the message pumping thread will add extra overhead to each transfer. On some systems this may lower your overall bus throughput and may increase CPU utilization. You only want to use this feature when it's important that a transfer not get interrupt once started. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Another option is to change this patch to allow a SPI device driver to request that the pumping thread be realtime but not to _force_ all messages onto that thread. In the case of cros_ec this means a bunch of code duplication (we need to create a thread to do basically the same thing as the SPI core) but that would make sense if the SPI framework doesn't expect other use cases like this and doesn't want to carry the baggage in the SPI core. Changes in v2: - Now only force transfers to the thread for devices that want it. - Squashed patch #1 and #2 together. - Renamed variable to "force_rt_transfers". drivers/spi/spi.c | 49 +++++++++++++++++++++++++++++++++-------- include/linux/spi/spi.h | 5 +++++ 2 files changed, 45 insertions(+), 9 deletions(-)