iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firewire: ohci: access bus_seconds atomically

Browse Source 
In the unlikely event that card->driver->get_bus_time() is called during
a cycle64Seconds interrupt, we could read garbage unless atomic accesses
are used.

The switch to atomic ops requires to change the 64 seconds counter from
unsigned to signed, but this shouldn't matter to the end result.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2009-06-04 21:08:43 +02:00
parent e41f8d709c
commit 3dcdc50079
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/firewire/fw-ohci.c
View File

@ -31,6 +31,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/atomic.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/system.h> #include <asm/system.h>
@ -178,7 +179,7 @@ struct fw_ohci {
int node_id; int node_id;
int generation; int generation;
int request_generation; /* for timestamping incoming requests */ int request_generation; /* for timestamping incoming requests */
u32 bus_seconds; atomic_t bus_seconds;
bool use_dualbuffer; bool use_dualbuffer;
bool old_uninorth; bool old_uninorth;
@ -1434,7 +1435,7 @@ static irqreturn_t irq_handler(int irq, void *data)
if (event & OHCI1394_cycle64Seconds) { if (event & OHCI1394_cycle64Seconds) {
cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer); cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
if ((cycle_time & 0x80000000) == 0) if ((cycle_time & 0x80000000) == 0)
ohci->bus_seconds++; atomic_inc(&ohci->bus_seconds);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
@ -1770,7 +1771,7 @@ static u64 ohci_get_bus_time(struct fw_card *card)
u64 bus_time; u64 bus_time;
cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer); cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
bus_time = ((u64) ohci->bus_seconds << 32) | cycle_time; bus_time = ((u64)atomic_read(&ohci->bus_seconds) << 32) | cycle_time;
return bus_time; return bus_time;
} }