forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

firewire: core: convert AR-req handler lock from _irqsave to _bh

Browse source 
fw_core_handle_request() is called by the low-level driver in tasklet
context or process context, and fw_core_add/remove_address_handler() is
called by mid- or high-level code in process context.  So convert
address_handler_lock accesses from those which disable local IRQs to
ones which just disable local softIRQs.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2012-02-18 20:42:00 +01:00
commit ea102d0ec4
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
drivers/firewire/core-transaction.c
View file

@ -565,7 +565,6 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
const struct fw_address_region *region) const struct fw_address_region *region)
{ {
struct fw_address_handler *other; struct fw_address_handler *other;
unsigned long flags;
int ret = -EBUSY; int ret = -EBUSY;
if (region->start & 0xffff000000000003ULL || if (region->start & 0xffff000000000003ULL ||
@ -575,7 +574,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
handler->length == 0) handler->length == 0)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&address_handler_lock, flags); spin_lock_bh(&address_handler_lock);
handler->offset = region->start; handler->offset = region->start;
while (handler->offset + handler->length <= region->end) { while (handler->offset + handler->length <= region->end) {
@ -594,7 +593,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler,
} }
} }
spin_unlock_irqrestore(&address_handler_lock, flags); spin_unlock_bh(&address_handler_lock);
return ret; return ret;
} }
@ -608,11 +607,9 @@ EXPORT_SYMBOL(fw_core_add_address_handler);
*/ */
void fw_core_remove_address_handler(struct fw_address_handler *handler) void fw_core_remove_address_handler(struct fw_address_handler *handler)
{ {
unsigned long flags; spin_lock_bh(&address_handler_lock);
spin_lock_irqsave(&address_handler_lock, flags);
list_del(&handler->link); list_del(&handler->link);
spin_unlock_irqrestore(&address_handler_lock, flags); spin_unlock_bh(&address_handler_lock);
} }
EXPORT_SYMBOL(fw_core_remove_address_handler); EXPORT_SYMBOL(fw_core_remove_address_handler);
@ -829,7 +826,6 @@ static void handle_exclusive_region_request(struct fw_card *card,
unsigned long long offset) unsigned long long offset)
{ {
struct fw_address_handler *handler; struct fw_address_handler *handler;
unsigned long flags;
int tcode, destination, source; int tcode, destination, source;
destination = HEADER_GET_DESTINATION(p->header[0]); destination = HEADER_GET_DESTINATION(p->header[0]);
@ -838,7 +834,7 @@ static void handle_exclusive_region_request(struct fw_card *card,
if (tcode == TCODE_LOCK_REQUEST) if (tcode == TCODE_LOCK_REQUEST)
tcode = 0x10 + HEADER_GET_EXTENDED_TCODE(p->header[3]); tcode = 0x10 + HEADER_GET_EXTENDED_TCODE(p->header[3]);
spin_lock_irqsave(&address_handler_lock, flags); spin_lock_bh(&address_handler_lock);
handler = lookup_enclosing_address_handler(&address_handler_list, handler = lookup_enclosing_address_handler(&address_handler_list,
offset, request->length); offset, request->length);
if (handler) if (handler)
@ -847,7 +843,7 @@ static void handle_exclusive_region_request(struct fw_card *card,
p->generation, offset, p->generation, offset,
request->data, request->length, request->data, request->length,
handler->callback_data); handler->callback_data);
spin_unlock_irqrestore(&address_handler_lock, flags); spin_unlock_bh(&address_handler_lock);
if (!handler) if (!handler)
fw_send_response(card, request, RCODE_ADDRESS_ERROR); fw_send_response(card, request, RCODE_ADDRESS_ERROR);
@ -859,7 +855,6 @@ static void handle_fcp_region_request(struct fw_card *card,
unsigned long long offset) unsigned long long offset)
{ {
struct fw_address_handler *handler; struct fw_address_handler *handler;
unsigned long flags;
int tcode, destination, source; int tcode, destination, source;
if ((offset != (CSR_REGISTER_BASE | CSR_FCP_COMMAND) && if ((offset != (CSR_REGISTER_BASE | CSR_FCP_COMMAND) &&
@ -881,7 +876,7 @@ static void handle_fcp_region_request(struct fw_card *card,
return; return;
} }
spin_lock_irqsave(&address_handler_lock, flags); spin_lock_bh(&address_handler_lock);
list_for_each_entry(handler, &address_handler_list, link) { list_for_each_entry(handler, &address_handler_list, link) {
if (is_enclosing_handler(handler, offset, request->length)) if (is_enclosing_handler(handler, offset, request->length))
handler->address_callback(card, NULL, tcode, handler->address_callback(card, NULL, tcode,
@ -891,7 +886,7 @@ static void handle_fcp_region_request(struct fw_card *card,
request->length, request->length,
handler->callback_data); handler->callback_data);
} }
spin_unlock_irqrestore(&address_handler_lock, flags); spin_unlock_bh(&address_handler_lock);
fw_send_response(card, request, RCODE_COMPLETE); fw_send_response(card, request, RCODE_COMPLETE);
} }