summaryrefslogtreecommitdiff
path: root/lwis_periodic_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'lwis_periodic_io.c')
-rw-r--r--lwis_periodic_io.c68
1 files changed, 57 insertions, 11 deletions
diff --git a/lwis_periodic_io.c b/lwis_periodic_io.c
index 85229bc..39145ab 100644
--- a/lwis_periodic_io.c
+++ b/lwis_periodic_io.c
@@ -23,6 +23,7 @@
#include "lwis_ioreg.h"
#include "lwis_transaction.h"
#include "lwis_util.h"
+#include "lwis_i2c_bus_manager.h"
static enum hrtimer_restart periodic_io_timer_func(struct hrtimer *timer)
{
@@ -34,10 +35,15 @@ static enum hrtimer_restart periodic_io_timer_func(struct hrtimer *timer)
struct lwis_periodic_io_proxy *periodic_io_proxy;
struct lwis_client *client;
bool active_periodic_io_present = false;
+ struct lwis_device *lwis_dev;
+ struct lwis_i2c_bus_manager *i2c_bus_manager = NULL;
periodic_io_list = container_of(timer, struct lwis_periodic_io_list, hr_timer);
client = periodic_io_list->client;
+ lwis_dev = client->lwis_dev;
+ i2c_bus_manager = lwis_i2c_bus_manager_get_manager(lwis_dev);
+
/* Go through all periodic io under the chosen periodic list */
spin_lock_irqsave(&client->periodic_io_lock, flags);
list_for_each_safe (it_period, it_period_tmp, &periodic_io_list->list) {
@@ -47,7 +53,7 @@ static enum hrtimer_restart periodic_io_timer_func(struct hrtimer *timer)
client->lwis_dev, sizeof(*periodic_io_proxy), GFP_ATOMIC);
if (!periodic_io_proxy) {
/* Non-fatal, skip this period */
- pr_warn("Cannot allocate new periodic io proxy.\n");
+ dev_warn(lwis_dev->dev, "Cannot allocate new periodic io proxy.\n");
} else {
periodic_io_proxy->periodic_io = periodic_io;
list_add_tail(&periodic_io_proxy->process_queue_node,
@@ -57,8 +63,12 @@ static enum hrtimer_restart periodic_io_timer_func(struct hrtimer *timer)
}
}
if (active_periodic_io_present) {
- kthread_queue_work(&client->lwis_dev->transaction_worker,
- &client->transaction_work);
+ if (i2c_bus_manager) {
+ kthread_queue_work(&i2c_bus_manager->i2c_bus_worker, &client->i2c_work);
+ } else {
+ kthread_queue_work(&client->lwis_dev->transaction_worker,
+ &client->transaction_work);
+ }
}
spin_unlock_irqrestore(&client->periodic_io_lock, flags);
if (!active_periodic_io_present) {
@@ -89,10 +99,11 @@ static struct lwis_periodic_io_list *periodic_io_list_create_locked(struct lwis_
int64_t period_ns)
{
ktime_t ktime;
+ struct lwis_device *lwis_dev = client->lwis_dev;
struct lwis_periodic_io_list *periodic_io_list =
kmalloc(sizeof(struct lwis_periodic_io_list), GFP_ATOMIC);
if (!periodic_io_list) {
- pr_err("Cannot allocate new event list\n");
+ dev_err(lwis_dev->dev, "Cannot allocate new event list\n");
return NULL;
}
@@ -104,7 +115,7 @@ static struct lwis_periodic_io_list *periodic_io_list_create_locked(struct lwis_
* into the client timer list */
INIT_LIST_HEAD(&periodic_io_list->list);
hash_add(client->timer_list, &periodic_io_list->node, period_ns);
- pr_info("Created hrtimer with timeout time %lldns", period_ns);
+ dev_info(lwis_dev->dev, "Created hrtimer with timeout time %lldns", period_ns);
/* Initialize and start the hrtimer for this periodic io list */
hrtimer_init(&periodic_io_list->hr_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -184,6 +195,7 @@ static int process_io_entries(struct lwis_client *client,
}
reinit_completion(&periodic_io->io_done);
+ lwis_i2c_bus_manager_lock_i2c_bus(lwis_dev);
for (i = 0; i < info->num_io_entries; ++i) {
/* Abort if periodic io is deactivated during processing.
* Abort can only apply to <= 1 write entries to prevent partial writes,
@@ -267,6 +279,8 @@ static int process_io_entries(struct lwis_client *client,
event_push:
complete(&periodic_io->io_done);
+ lwis_i2c_bus_manager_unlock_i2c_bus(lwis_dev);
+
/* Use read memory barrier at the beginning of I/O entries if the access protocol
* allows it */
if (lwis_dev->vops.register_io_barrier != NULL) {
@@ -280,8 +294,10 @@ event_push:
* there is an error */
if (!pending_events) {
if (resp->error_code && resp->error_code != -ECANCELED) {
- pr_err("process_io_entries fails with error code %d, periodic io %lld, io_entries[%d], entry_type %d",
- resp->error_code, info->id, i, entry->type);
+ dev_info(
+ lwis_dev->dev,
+ "process_io_entries fails with error code %d, periodic io %lld, io_entries[%d], entry_type %d",
+ resp->error_code, info->id, i, entry->type);
}
return ret;
}
@@ -328,7 +344,7 @@ void lwis_process_periodic_io_in_queue(struct lwis_client *client)
/* Error indicates the cancellation of the periodic io */
if (periodic_io->resp->error_code || !periodic_io->active) {
error_code = periodic_io->resp->error_code ? periodic_io->resp->error_code :
- -ECANCELED;
+ -ECANCELED;
push_periodic_io_error_event_locked(periodic_io, error_code,
&pending_events);
} else {
@@ -507,6 +523,15 @@ int lwis_periodic_io_client_flush(struct lwis_client *client)
struct lwis_periodic_io_list *it_periodic_io_list;
unsigned long flags;
+ struct lwis_device *lwis_dev = client->lwis_dev;
+ struct lwis_i2c_bus_manager *i2c_bus_manager = NULL;
+
+ struct lwis_periodic_io *periodic_cleanup_io;
+ struct lwis_periodic_io_proxy *periodic_cleanup_io_proxy;
+ struct list_head *it_cleanup_period, *it_cleanup_period_tmp;
+
+ i2c_bus_manager = lwis_i2c_bus_manager_get_manager(lwis_dev);
+
/* First, cancel all timers */
hash_for_each_safe (client->timer_list, i, tmp, it_periodic_io_list, node) {
spin_lock_irqsave(&client->periodic_io_lock, flags);
@@ -521,11 +546,30 @@ int lwis_periodic_io_client_flush(struct lwis_client *client)
}
/* Wait until all workload in process queue are processed */
- if (client->lwis_dev->transaction_worker_thread) {
- kthread_flush_worker(&client->lwis_dev->transaction_worker);
+ if (i2c_bus_manager) {
+ lwis_i2c_bus_manager_flush_i2c_worker(lwis_dev);
+ } else {
+ if (client->lwis_dev->transaction_worker_thread) {
+ kthread_flush_worker(&client->lwis_dev->transaction_worker);
+ }
}
spin_lock_irqsave(&client->periodic_io_lock, flags);
+ /* Cleanup any stale entries remaining after the flush */
+ list_for_each_safe (it_cleanup_period, it_cleanup_period_tmp,
+ &client->periodic_io_process_queue) {
+ periodic_cleanup_io_proxy = list_entry(
+ it_cleanup_period, struct lwis_periodic_io_proxy, process_queue_node);
+ if (periodic_cleanup_io_proxy) {
+ periodic_cleanup_io = periodic_cleanup_io_proxy->periodic_io;
+ list_del(&periodic_cleanup_io_proxy->process_queue_node);
+ if (periodic_cleanup_io) {
+ periodic_cleanup_io->active = false;
+ }
+ lwis_allocator_free(client->lwis_dev, periodic_cleanup_io_proxy);
+ }
+ }
+
/* Release the periodic io list of from all timers */
hash_for_each_safe (client->timer_list, i, tmp, it_periodic_io_list, node) {
list_for_each_safe (it_period, it_period_tmp, &it_periodic_io_list->list) {
@@ -535,6 +579,7 @@ int lwis_periodic_io_client_flush(struct lwis_client *client)
lwis_periodic_io_free(client->lwis_dev, periodic_io);
}
}
+
spin_unlock_irqrestore(&client->periodic_io_lock, flags);
return 0;
}
@@ -548,7 +593,8 @@ int lwis_periodic_io_client_cleanup(struct lwis_client *client)
ret = lwis_periodic_io_client_flush(client);
if (ret) {
- pr_err("Failed to wait for all in-process periodic io to complete\n");
+ dev_err(client->lwis_dev->dev,
+ "Failed to wait for all in-process periodic io to complete\n");
return ret;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 16:40:57 +0000