diff options
| author | Corey Minyard <corey@minyard.net> | 2025-03-18 17:27:41 -0500 |
|---|---|---|
| committer | Corey Minyard <corey@minyard.net> | 2025-05-07 17:25:47 -0500 |
| commit | 646e40bbc7edbcb0b9e78ad425486e7fb918fcf9 (patch) | |
| tree | 1453ed153fbffdb99ebc446045b9d83d81dc3ffc | |
| parent | 557602f23307b20d5dc9d4331314772604fd6ac0 (diff) | |
ipmi_msghandler: Change the events lock to a mutex
It can only be called from thread context now.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
| -rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index f5e58533ca7a..0b2d56704411 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -528,7 +528,7 @@ struct ipmi_smi { * Events that were queues because no one was there to receive * them. */ - spinlock_t events_lock; /* For dealing with event stuff. */ + struct mutex events_mutex; /* For dealing with event stuff. */ struct list_head waiting_events; unsigned int waiting_events_count; /* How many events in queue? */ char event_msg_printed; @@ -1594,7 +1594,6 @@ EXPORT_SYMBOL(ipmi_set_maintenance_mode); int ipmi_set_gets_events(struct ipmi_user *user, bool val) { - unsigned long flags; struct ipmi_smi *intf = user->intf; struct ipmi_recv_msg *msg, *msg2; struct list_head msgs; @@ -1606,7 +1605,7 @@ int ipmi_set_gets_events(struct ipmi_user *user, bool val) INIT_LIST_HEAD(&msgs); - spin_lock_irqsave(&intf->events_lock, flags); + mutex_lock(&intf->events_mutex); if (user->gets_events == val) goto out; @@ -1637,7 +1636,7 @@ int ipmi_set_gets_events(struct ipmi_user *user, bool val) } out: - spin_unlock_irqrestore(&intf->events_lock, flags); + mutex_unlock(&intf->events_mutex); release_ipmi_user(user, index); return 0; @@ -3605,7 +3604,7 @@ int ipmi_add_smi(struct module *owner, spin_lock_init(&intf->xmit_msgs_lock); INIT_LIST_HEAD(&intf->xmit_msgs); INIT_LIST_HEAD(&intf->hp_xmit_msgs); - spin_lock_init(&intf->events_lock); + mutex_init(&intf->events_mutex); spin_lock_init(&intf->watch_lock); atomic_set(&intf->event_waiters, 0); intf->ticks_to_req_ev = IPMI_REQUEST_EV_TIME; @@ -4391,7 +4390,6 @@ static int handle_read_event_rsp(struct ipmi_smi *intf, struct list_head msgs; struct ipmi_user *user; int rv = 0, deliver_count = 0, index; - unsigned long flags; if (msg->rsp_size < 19) { /* Message is too small to be an IPMB event. */ @@ -4406,7 +4404,7 @@ static int handle_read_event_rsp(struct ipmi_smi *intf, INIT_LIST_HEAD(&msgs); - spin_lock_irqsave(&intf->events_lock, flags); + mutex_lock(&intf->events_mutex); ipmi_inc_stat(intf, events); @@ -4481,7 +4479,7 @@ static int handle_read_event_rsp(struct ipmi_smi *intf, } out: - spin_unlock_irqrestore(&intf->events_lock, flags); + mutex_unlock(&intf->events_mutex); return rv; } |