mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
rapidio: add lock protection for doorbell list
Add lock protection around doorbell list handling to prevent list corruption on SMP platforms. Signed-off-by: Alexandre Bounine <[email protected]> Cc: Matt Porter <[email protected]> Cc: Aurelien Jacquiot <[email protected]> Cc: Andre van Herk <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
b7dfca8bd4
commit
a7b4c636d8
2 changed files with 8 additions and 3 deletions
|
|
@ -362,7 +362,9 @@ rio_setup_inb_dbell(struct rio_mport *mport, void *dev_id, struct resource *res,
|
|||
dbell->dinb = dinb;
|
||||
dbell->dev_id = dev_id;
|
||||
|
||||
mutex_lock(&mport->lock);
|
||||
list_add_tail(&dbell->node, &mport->dbells);
|
||||
mutex_unlock(&mport->lock);
|
||||
|
||||
out:
|
||||
return rc;
|
||||
|
|
@ -426,12 +428,15 @@ int rio_release_inb_dbell(struct rio_mport *mport, u16 start, u16 end)
|
|||
int rc = 0, found = 0;
|
||||
struct rio_dbell *dbell;
|
||||
|
||||
mutex_lock(&mport->lock);
|
||||
list_for_each_entry(dbell, &mport->dbells, node) {
|
||||
if ((dbell->res->start == start) && (dbell->res->end == end)) {
|
||||
list_del(&dbell->node);
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
mutex_unlock(&mport->lock);
|
||||
|
||||
/* If we can't find an exact match, fail */
|
||||
if (!found) {
|
||||
|
|
@ -439,9 +444,6 @@ int rio_release_inb_dbell(struct rio_mport *mport, u16 start, u16 end)
|
|||
goto out;
|
||||
}
|
||||
|
||||
/* Delete from list */
|
||||
list_del(&dbell->node);
|
||||
|
||||
/* Release the doorbell resource */
|
||||
rc = release_resource(dbell->res);
|
||||
|
||||
|
|
@ -2024,6 +2026,7 @@ int rio_mport_initialize(struct rio_mport *mport)
|
|||
mport->id = next_portid++;
|
||||
mport->host_deviceid = rio_get_hdid(mport->id);
|
||||
mport->nscan = NULL;
|
||||
mutex_init(&mport->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue