Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (25 commits) firewire: fw-cdev: reorder wakeup vs. spinlock firewire: in-code doc updates. firewire: a header cleanup firewire: adopt read cycle timer ABI from raw1394 firewire: fw-ohci: check for misconfigured bus (phyID == 63) firewire: fw-ohci: missing dma_unmap_single firewire: fw-ohci: log posted write errors firewire: fw-ohci: reorder includes firewire: fw-ohci: fix includes firewire: fw-ohci: enforce read order for selfID generation firewire: fw-sbp2: use an own workqueue (fix system responsiveness) firewire: fw-sbp2: expose module parameter for workarounds firewire: fw-sbp2: add support for multiple logical units per target firewire: fw-sbp2: always enable IRQs before calling command ORB callback firewire: fw-core: local variable shadows a global one firewire: optimize fw_core_add_address_handler ieee1394: ieee1394_core.c: use DEFINE_SPINLOCK for spinlock definition ieee1394: csr1212: proper refcounting ieee1394: nodemgr: fix leak of struct csr1212_keyval ieee1394: pcilynx: I2C cleanups ...
This commit is contained in:
Linus Torvalds
commit
1316ff5d52
|
|
@ -25,11 +25,14 @@
|
|||
#include <linux/device.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/preempt.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/idr.h>
|
||||
#include <linux/compat.h>
|
||||
#include <linux/firewire-cdev.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include "fw-transaction.h"
|
||||
#include "fw-topology.h"
|
||||
|
|
@ -140,11 +143,10 @@ static void queue_event(struct client *client, struct event *event,
|
|||
event->v[1].size = size1;
|
||||
|
||||
spin_lock_irqsave(&client->lock, flags);
|
||||
|
||||
list_add_tail(&event->link, &client->event_list);
|
||||
wake_up_interruptible(&client->wait);
|
||||
|
||||
spin_unlock_irqrestore(&client->lock, flags);
|
||||
|
||||
wake_up_interruptible(&client->wait);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -621,20 +623,19 @@ iso_callback(struct fw_iso_context *context, u32 cycle,
|
|||
size_t header_length, void *header, void *data)
|
||||
{
|
||||
struct client *client = data;
|
||||
struct iso_interrupt *interrupt;
|
||||
struct iso_interrupt *irq;
|
||||
|
||||
interrupt = kzalloc(sizeof(*interrupt) + header_length, GFP_ATOMIC);
|
||||
if (interrupt == NULL)
|
||||
irq = kzalloc(sizeof(*irq) + header_length, GFP_ATOMIC);
|
||||
if (irq == NULL)
|
||||
return;
|
||||
|
||||
interrupt->interrupt.type = FW_CDEV_EVENT_ISO_INTERRUPT;
|
||||
interrupt->interrupt.closure = client->iso_closure;
|
||||
interrupt->interrupt.cycle = cycle;
|
||||
interrupt->interrupt.header_length = header_length;
|
||||
memcpy(interrupt->interrupt.header, header, header_length);
|
||||
queue_event(client, &interrupt->event,
|
||||
&interrupt->interrupt,
|
||||
sizeof(interrupt->interrupt) + header_length, NULL, 0);
|
||||
irq->interrupt.type = FW_CDEV_EVENT_ISO_INTERRUPT;
|
||||
irq->interrupt.closure = client->iso_closure;
|
||||
irq->interrupt.cycle = cycle;
|
||||
irq->interrupt.header_length = header_length;
|
||||
memcpy(irq->interrupt.header, header, header_length);
|
||||
queue_event(client, &irq->event, &irq->interrupt,
|
||||
sizeof(irq->interrupt) + header_length, NULL, 0);
|
||||
}
|
||||
|
||||
static int ioctl_create_iso_context(struct client *client, void *buffer)
|
||||
|
|
@ -812,6 +813,28 @@ static int ioctl_stop_iso(struct client *client, void *buffer)
|
|||
return fw_iso_context_stop(client->iso_context);
|
||||
}
|
||||
|
||||
static int ioctl_get_cycle_timer(struct client *client, void *buffer)
|
||||
{
|
||||
struct fw_cdev_get_cycle_timer *request = buffer;
|
||||
struct fw_card *card = client->device->card;
|
||||
unsigned long long bus_time;
|
||||
struct timeval tv;
|
||||
unsigned long flags;
|
||||
|
||||
preempt_disable();
|
||||
local_irq_save(flags);
|
||||
|
||||
bus_time = card->driver->get_bus_time(card);
|
||||
do_gettimeofday(&tv);
|
||||
|
||||
local_irq_restore(flags);
|
||||
preempt_enable();
|
||||
|
||||
request->local_time = tv.tv_sec * 1000000ULL + tv.tv_usec;
|
||||
request->cycle_timer = bus_time & 0xffffffff;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
|
||||
ioctl_get_info,
|
||||
ioctl_send_request,
|
||||
|
|
@ -825,6 +848,7 @@ static int (* const ioctl_handlers[])(struct client *client, void *buffer) = {
|
|||
ioctl_queue_iso,
|
||||
ioctl_start_iso,
|
||||
ioctl_stop_iso,
|
||||
ioctl_get_cycle_timer,
|
||||
};
|
||||
|
||||
static int
|
||||
|
|
|
|||
|
|
@ -102,11 +102,6 @@ fw_unit(struct device *dev)
|
|||
#define CSR_INSTANCE 0x18
|
||||
#define CSR_DIRECTORY_ID 0x20
|
||||
|
||||
#define SBP2_COMMAND_SET_SPECIFIER 0x38
|
||||
#define SBP2_COMMAND_SET 0x39
|
||||
#define SBP2_COMMAND_SET_REVISION 0x3b
|
||||
#define SBP2_FIRMWARE_REVISION 0x3c
|
||||
|
||||
struct fw_csr_iterator {
|
||||
u32 *p;
|
||||
u32 *end;
|
||||
|
|
|
|||
|
|
@ -18,21 +18,23 @@
|
|||
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/poll.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/semaphore.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
#include "fw-transaction.h"
|
||||
#include "fw-ohci.h"
|
||||
#include "fw-transaction.h"
|
||||
|
||||
#define DESCRIPTOR_OUTPUT_MORE 0
|
||||
#define DESCRIPTOR_OUTPUT_LAST (1 << 12)
|
||||
|
|
@ -678,6 +680,9 @@ at_context_queue_packet(struct context *ctx, struct fw_packet *packet)
|
|||
|
||||
/* FIXME: Document how the locking works. */
|
||||
if (ohci->generation != packet->generation) {
|
||||
if (packet->payload_length > 0)
|
||||
dma_unmap_single(ohci->card.device, payload_bus,
|
||||
packet->payload_length, DMA_TO_DEVICE);
|
||||
packet->ack = RCODE_GENERATION;
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -912,10 +917,15 @@ static void bus_reset_tasklet(unsigned long data)
|
|||
|
||||
reg = reg_read(ohci, OHCI1394_NodeID);
|
||||
if (!(reg & OHCI1394_NodeID_idValid)) {
|
||||
fw_error("node ID not valid, new bus reset in progress\n");
|
||||
fw_notify("node ID not valid, new bus reset in progress\n");
|
||||
return;
|
||||
}
|
||||
ohci->node_id = reg & 0xffff;
|
||||
if ((reg & OHCI1394_NodeID_nodeNumber) == 63) {
|
||||
fw_notify("malconfigured bus\n");
|
||||
return;
|
||||
}
|
||||
ohci->node_id = reg & (OHCI1394_NodeID_busNumber |
|
||||
OHCI1394_NodeID_nodeNumber);
|
||||
|
||||
/*
|
||||
* The count in the SelfIDCount register is the number of
|
||||
|
|
@ -926,12 +936,14 @@ static void bus_reset_tasklet(unsigned long data)
|
|||
|
||||
self_id_count = (reg_read(ohci, OHCI1394_SelfIDCount) >> 3) & 0x3ff;
|
||||
generation = (le32_to_cpu(ohci->self_id_cpu[0]) >> 16) & 0xff;
|
||||
rmb();
|
||||
|
||||
for (i = 1, j = 0; j < self_id_count; i += 2, j++) {
|
||||
if (ohci->self_id_cpu[i] != ~ohci->self_id_cpu[i + 1])
|
||||
fw_error("inconsistent self IDs\n");
|
||||
ohci->self_id_buffer[j] = le32_to_cpu(ohci->self_id_cpu[i]);
|
||||
}
|
||||
rmb();
|
||||
|
||||
/*
|
||||
* Check the consistency of the self IDs we just read. The
|
||||
|
|
@ -1046,6 +1058,9 @@ static irqreturn_t irq_handler(int irq, void *data)
|
|||
iso_event &= ~(1 << i);
|
||||
}
|
||||
|
||||
if (unlikely(event & OHCI1394_postedWriteErr))
|
||||
fw_error("PCI posted write error\n");
|
||||
|
||||
if (event & OHCI1394_cycle64Seconds) {
|
||||
cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer);
|
||||
if ((cycle_time & 0x80000000) == 0)
|
||||
|
|
@ -1119,8 +1134,8 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length)
|
|||
OHCI1394_RQPkt | OHCI1394_RSPkt |
|
||||
OHCI1394_reqTxComplete | OHCI1394_respTxComplete |
|
||||
OHCI1394_isochRx | OHCI1394_isochTx |
|
||||
OHCI1394_masterIntEnable |
|
||||
OHCI1394_cycle64Seconds);
|
||||
OHCI1394_postedWriteErr | OHCI1394_cycle64Seconds |
|
||||
OHCI1394_masterIntEnable);
|
||||
|
||||
/* Activate link_on bit and contender bit in our self ID packets.*/
|
||||
if (ohci_update_phy_reg(card, 4, 0,
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@
|
|||
#define OHCI1394_LinkControl_cycleSource (1 << 22)
|
||||
#define OHCI1394_NodeID 0x0E8
|
||||
#define OHCI1394_NodeID_idValid 0x80000000
|
||||
#define OHCI1394_NodeID_nodeNumber 0x0000003f
|
||||
#define OHCI1394_NodeID_busNumber 0x0000ffc0
|
||||
#define OHCI1394_PhyControl 0x0EC
|
||||
#define OHCI1394_PhyControl_Read(addr) (((addr) << 8) | 0x00008000)
|
||||
#define OHCI1394_PhyControl_ReadDone 0x80000000
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -152,6 +152,10 @@ static void update_hop_count(struct fw_node *node)
|
|||
node->max_hops = max(max_child_hops, depths[0] + depths[1] + 2);
|
||||
}
|
||||
|
||||
static inline struct fw_node *fw_node(struct list_head *l)
|
||||
{
|
||||
return list_entry(l, struct fw_node, link);
|
||||
}
|
||||
|
||||
/**
|
||||
* build_tree - Build the tree representation of the topology
|
||||
|
|
@ -162,7 +166,7 @@ static void update_hop_count(struct fw_node *node)
|
|||
* This function builds the tree representation of the topology given
|
||||
* by the self IDs from the latest bus reset. During the construction
|
||||
* of the tree, the function checks that the self IDs are valid and
|
||||
* internally consistent. On succcess this funtions returns the
|
||||
* internally consistent. On succcess this function returns the
|
||||
* fw_node corresponding to the local card otherwise NULL.
|
||||
*/
|
||||
static struct fw_node *build_tree(struct fw_card *card,
|
||||
|
|
@ -211,6 +215,10 @@ static struct fw_node *build_tree(struct fw_card *card,
|
|||
*/
|
||||
for (i = 0, h = &stack; i < child_port_count; i++)
|
||||
h = h->prev;
|
||||
/*
|
||||
* When the stack is empty, this yields an invalid value,
|
||||
* but that pointer will never be dereferenced.
|
||||
*/
|
||||
child = fw_node(h);
|
||||
|
||||
node = fw_node_create(q, port_count, card->color);
|
||||
|
|
|
|||
|
|
@ -50,12 +50,6 @@ struct fw_node {
|
|||
struct fw_node *ports[0];
|
||||
};
|
||||
|
||||
static inline struct fw_node *
|
||||
fw_node(struct list_head *l)
|
||||
{
|
||||
return list_entry(l, struct fw_node, link);
|
||||
}
|
||||
|
||||
static inline struct fw_node *
|
||||
fw_node_get(struct fw_node *node)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -410,7 +410,12 @@ EXPORT_SYMBOL(fw_unit_space_region);
|
|||
* controller. When a request is received that falls within the
|
||||
* specified address range, the specified callback is invoked. The
|
||||
* parameters passed to the callback give the details of the
|
||||
* particular request
|
||||
* particular request.
|
||||
*
|
||||
* Return value: 0 on success, non-zero otherwise.
|
||||
* The start offset of the handler's address region is determined by
|
||||
* fw_core_add_address_handler() and is returned in handler->offset.
|
||||
* The offset is quadlet-aligned.
|
||||
*/
|
||||
int
|
||||
fw_core_add_address_handler(struct fw_address_handler *handler,
|
||||
|
|
@ -422,14 +427,15 @@ fw_core_add_address_handler(struct fw_address_handler *handler,
|
|||
|
||||
spin_lock_irqsave(&address_handler_lock, flags);
|
||||
|
||||
handler->offset = region->start;
|
||||
handler->offset = roundup(region->start, 4);
|
||||
while (handler->offset + handler->length <= region->end) {
|
||||
other =
|
||||
lookup_overlapping_address_handler(&address_handler_list,
|
||||
handler->offset,
|
||||
handler->length);
|
||||
if (other != NULL) {
|
||||
handler->offset += other->length;
|
||||
handler->offset =
|
||||
roundup(other->offset + other->length, 4);
|
||||
} else {
|
||||
list_add_tail(&handler->link, &address_handler_list);
|
||||
ret = 0;
|
||||
|
|
|
|||
|
|
@ -218,12 +218,10 @@ static struct csr1212_keyval *csr1212_new_keyval(u8 type, u8 key)
|
|||
if (!kv)
|
||||
return NULL;
|
||||
|
||||
atomic_set(&kv->refcnt, 1);
|
||||
kv->key.type = type;
|
||||
kv->key.id = key;
|
||||
|
||||
kv->associate = NULL;
|
||||
kv->refcnt = 1;
|
||||
|
||||
kv->next = NULL;
|
||||
kv->prev = NULL;
|
||||
kv->offset = 0;
|
||||
|
|
@ -326,12 +324,13 @@ void csr1212_associate_keyval(struct csr1212_keyval *kv,
|
|||
if (kv->associate)
|
||||
csr1212_release_keyval(kv->associate);
|
||||
|
||||
associate->refcnt++;
|
||||
csr1212_keep_keyval(associate);
|
||||
kv->associate = associate;
|
||||
}
|
||||
|
||||
int csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
|
||||
struct csr1212_keyval *kv)
|
||||
static int __csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
|
||||
struct csr1212_keyval *kv,
|
||||
bool keep_keyval)
|
||||
{
|
||||
struct csr1212_dentry *dentry;
|
||||
|
||||
|
|
@ -341,10 +340,10 @@ int csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
|
|||
if (!dentry)
|
||||
return -ENOMEM;
|
||||
|
||||
if (keep_keyval)
|
||||
csr1212_keep_keyval(kv);
|
||||
dentry->kv = kv;
|
||||
|
||||
kv->refcnt++;
|
||||
|
||||
dentry->next = NULL;
|
||||
dentry->prev = dir->value.directory.dentries_tail;
|
||||
|
||||
|
|
@ -358,6 +357,12 @@ int csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
|
|||
return CSR1212_SUCCESS;
|
||||
}
|
||||
|
||||
int csr1212_attach_keyval_to_directory(struct csr1212_keyval *dir,
|
||||
struct csr1212_keyval *kv)
|
||||
{
|
||||
return __csr1212_attach_keyval_to_directory(dir, kv, true);
|
||||
}
|
||||
|
||||
#define CSR1212_DESCRIPTOR_LEAF_DATA(kv) \
|
||||
(&((kv)->value.leaf.data[1]))
|
||||
|
||||
|
|
@ -483,15 +488,18 @@ void csr1212_detach_keyval_from_directory(struct csr1212_keyval *dir,
|
|||
|
||||
/* This function is used to free the memory taken by a keyval. If the given
|
||||
* keyval is a directory type, then any keyvals contained in that directory
|
||||
* will be destroyed as well if their respective refcnts are 0. By means of
|
||||
* will be destroyed as well if noone holds a reference on them. By means of
|
||||
* list manipulation, this routine will descend a directory structure in a
|
||||
* non-recursive manner. */
|
||||
static void csr1212_destroy_keyval(struct csr1212_keyval *kv)
|
||||
void csr1212_release_keyval(struct csr1212_keyval *kv)
|
||||
{
|
||||
struct csr1212_keyval *k, *a;
|
||||
struct csr1212_dentry dentry;
|
||||
struct csr1212_dentry *head, *tail;
|
||||
|
||||
if (!atomic_dec_and_test(&kv->refcnt))
|
||||
return;
|
||||
|
||||
dentry.kv = kv;
|
||||
dentry.next = NULL;
|
||||
dentry.prev = NULL;
|
||||
|
|
@ -503,9 +511,8 @@ static void csr1212_destroy_keyval(struct csr1212_keyval *kv)
|
|||
k = head->kv;
|
||||
|
||||
while (k) {
|
||||
k->refcnt--;
|
||||
|
||||
if (k->refcnt > 0)
|
||||
/* must not dec_and_test kv->refcnt again */
|
||||
if (k != kv && !atomic_dec_and_test(&k->refcnt))
|
||||
break;
|
||||
|
||||
a = k->associate;
|
||||
|
|
@ -536,14 +543,6 @@ static void csr1212_destroy_keyval(struct csr1212_keyval *kv)
|
|||
}
|
||||
}
|
||||
|
||||
void csr1212_release_keyval(struct csr1212_keyval *kv)
|
||||
{
|
||||
if (kv->refcnt > 1)
|
||||
kv->refcnt--;
|
||||
else
|
||||
csr1212_destroy_keyval(kv);
|
||||
}
|
||||
|
||||
void csr1212_destroy_csr(struct csr1212_csr *csr)
|
||||
{
|
||||
struct csr1212_csr_rom_cache *c, *oc;
|
||||
|
|
@ -1126,6 +1125,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
|
|||
int ret = CSR1212_SUCCESS;
|
||||
struct csr1212_keyval *k = NULL;
|
||||
u32 offset;
|
||||
bool keep_keyval = true;
|
||||
|
||||
switch (CSR1212_KV_KEY_TYPE(ki)) {
|
||||
case CSR1212_KV_TYPE_IMMEDIATE:
|
||||
|
|
@ -1135,8 +1135,8 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
|
|||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
k->refcnt = 0; /* Don't keep local reference when parsing. */
|
||||
/* Don't keep local reference when parsing. */
|
||||
keep_keyval = false;
|
||||
break;
|
||||
|
||||
case CSR1212_KV_TYPE_CSR_OFFSET:
|
||||
|
|
@ -1146,7 +1146,8 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
|
|||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
k->refcnt = 0; /* Don't keep local reference when parsing. */
|
||||
/* Don't keep local reference when parsing. */
|
||||
keep_keyval = false;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -1174,8 +1175,10 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
|
|||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
k->refcnt = 0; /* Don't keep local reference when parsing. */
|
||||
k->valid = 0; /* Contents not read yet so it's not valid. */
|
||||
/* Don't keep local reference when parsing. */
|
||||
keep_keyval = false;
|
||||
/* Contents not read yet so it's not valid. */
|
||||
k->valid = 0;
|
||||
k->offset = offset;
|
||||
|
||||
k->prev = dir;
|
||||
|
|
@ -1183,7 +1186,7 @@ csr1212_parse_dir_entry(struct csr1212_keyval *dir, u32 ki, u32 kv_pos)
|
|||
dir->next->prev = k;
|
||||
dir->next = k;
|
||||
}
|
||||
ret = csr1212_attach_keyval_to_directory(dir, k);
|
||||
ret = __csr1212_attach_keyval_to_directory(dir, k, keep_keyval);
|
||||
out:
|
||||
if (ret != CSR1212_SUCCESS && k != NULL)
|
||||
free_keyval(k);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
#include <linux/slab.h>
|
||||
#include <asm/atomic.h>
|
||||
|
||||
#define CSR1212_MALLOC(size) kmalloc((size), GFP_KERNEL)
|
||||
#define CSR1212_FREE(ptr) kfree(ptr)
|
||||
|
|
@ -149,7 +150,7 @@ struct csr1212_keyval {
|
|||
struct csr1212_directory directory;
|
||||
} value;
|
||||
struct csr1212_keyval *associate;
|
||||
int refcnt;
|
||||
atomic_t refcnt;
|
||||
|
||||
/* used in generating and/or parsing CSR image */
|
||||
struct csr1212_keyval *next, *prev; /* flat list of CSR elements */
|
||||
|
|
@ -350,7 +351,8 @@ csr1212_get_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv);
|
|||
* need for code to retain a keyval that has been parsed. */
|
||||
static inline void csr1212_keep_keyval(struct csr1212_keyval *kv)
|
||||
{
|
||||
kv->refcnt++;
|
||||
atomic_inc(&kv->refcnt);
|
||||
smp_mb__after_atomic_inc();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1153,8 +1153,6 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid,
|
|||
pdg->sz++;
|
||||
lh = find_partial_datagram(pdgl, dgl);
|
||||
} else {
|
||||
struct partial_datagram *pd;
|
||||
|
||||
pd = list_entry(lh, struct partial_datagram, list);
|
||||
|
||||
if (fragment_overlap(&pd->frag_info, fg_off, fg_len)) {
|
||||
|
|
@ -1222,23 +1220,19 @@ static int ether1394_data_handler(struct net_device *dev, int srcid, int destid,
|
|||
priv->stats.rx_errors++;
|
||||
priv->stats.rx_dropped++;
|
||||
dev_kfree_skb_any(skb);
|
||||
goto bad_proto;
|
||||
}
|
||||
|
||||
if (netif_rx(skb) == NET_RX_DROP) {
|
||||
} else if (netif_rx(skb) == NET_RX_DROP) {
|
||||
priv->stats.rx_errors++;
|
||||
priv->stats.rx_dropped++;
|
||||
goto bad_proto;
|
||||
} else {
|
||||
priv->stats.rx_packets++;
|
||||
priv->stats.rx_bytes += skb->len;
|
||||
}
|
||||
|
||||
/* Statistics */
|
||||
priv->stats.rx_packets++;
|
||||
priv->stats.rx_bytes += skb->len;
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
bad_proto:
|
||||
if (netif_queue_stopped(dev))
|
||||
netif_wake_queue(dev);
|
||||
spin_unlock_irqrestore(&priv->lock, flags);
|
||||
|
||||
dev->last_rx = jiffies;
|
||||
|
||||
|
|
|
|||
|
|
@ -488,7 +488,7 @@ void hpsb_selfid_complete(struct hpsb_host *host, int phyid, int isroot)
|
|||
highlevel_host_reset(host);
|
||||
}
|
||||
|
||||
static spinlock_t pending_packets_lock = SPIN_LOCK_UNLOCKED;
|
||||
static DEFINE_SPINLOCK(pending_packets_lock);
|
||||
|
||||
/**
|
||||
* hpsb_packet_sent - notify core of sending a packet
|
||||
|
|
|
|||
|
|
@ -1014,13 +1014,13 @@ static struct unit_directory *nodemgr_process_unit_directory
|
|||
CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE(kv) == 0) {
|
||||
switch (last_key_id) {
|
||||
case CSR1212_KV_ID_VENDOR:
|
||||
ud->vendor_name_kv = kv;
|
||||
csr1212_keep_keyval(kv);
|
||||
ud->vendor_name_kv = kv;
|
||||
break;
|
||||
|
||||
case CSR1212_KV_ID_MODEL:
|
||||
ud->model_name_kv = kv;
|
||||
csr1212_keep_keyval(kv);
|
||||
ud->model_name_kv = kv;
|
||||
break;
|
||||
|
||||
}
|
||||
|
|
@ -1112,7 +1112,7 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
|
|||
{
|
||||
unsigned int ud_id = 0;
|
||||
struct csr1212_dentry *dentry;
|
||||
struct csr1212_keyval *kv;
|
||||
struct csr1212_keyval *kv, *vendor_name_kv = NULL;
|
||||
u8 last_key_id = 0;
|
||||
|
||||
ne->needs_probe = 0;
|
||||
|
|
@ -1139,8 +1139,8 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
|
|||
CSR1212_TEXTUAL_DESCRIPTOR_LEAF_WIDTH(kv) == 0 &&
|
||||
CSR1212_TEXTUAL_DESCRIPTOR_LEAF_CHAR_SET(kv) == 0 &&
|
||||
CSR1212_TEXTUAL_DESCRIPTOR_LEAF_LANGUAGE(kv) == 0) {
|
||||
ne->vendor_name_kv = kv;
|
||||
csr1212_keep_keyval(kv);
|
||||
vendor_name_kv = kv;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -1149,10 +1149,13 @@ static void nodemgr_process_root_directory(struct host_info *hi, struct node_ent
|
|||
}
|
||||
|
||||
if (ne->vendor_name_kv) {
|
||||
int error = device_create_file(&ne->device,
|
||||
&dev_attr_ne_vendor_name_kv);
|
||||
|
||||
if (error && error != -EEXIST)
|
||||
kv = ne->vendor_name_kv;
|
||||
ne->vendor_name_kv = vendor_name_kv;
|
||||
csr1212_release_keyval(kv);
|
||||
} else if (vendor_name_kv) {
|
||||
ne->vendor_name_kv = vendor_name_kv;
|
||||
if (device_create_file(&ne->device,
|
||||
&dev_attr_ne_vendor_name_kv) != 0)
|
||||
HPSB_ERR("Failed to add sysfs attribute");
|
||||
}
|
||||
}
|
||||
|
|
@ -1712,7 +1715,8 @@ static int nodemgr_host_thread(void *__hi)
|
|||
* to make sure things settle down. */
|
||||
g = get_hpsb_generation(host);
|
||||
for (i = 0; i < 4 ; i++) {
|
||||
if (msleep_interruptible(63) || kthread_should_stop())
|
||||
msleep_interruptible(63);
|
||||
if (kthread_should_stop())
|
||||
goto exit;
|
||||
|
||||
/* Now get the generation in which the node ID's we collect
|
||||
|
|
|
|||
|
|
@ -121,16 +121,6 @@ static int bit_getsda(void *data)
|
|||
return reg_read((struct ti_lynx *) data, SERIAL_EEPROM_CONTROL) & 0x00000010;
|
||||
}
|
||||
|
||||
static int bit_reg(struct i2c_client *client)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bit_unreg(struct i2c_client *client)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct i2c_algo_bit_data bit_data = {
|
||||
.setsda = bit_setsda,
|
||||
.setscl = bit_setscl,
|
||||
|
|
@ -140,14 +130,6 @@ static struct i2c_algo_bit_data bit_data = {
|
|||
.timeout = 100,
|
||||
};
|
||||
|
||||
static struct i2c_adapter bit_ops = {
|
||||
.id = 0xAA, //FIXME: probably we should get an id in i2c-id.h
|
||||
.client_register = bit_reg,
|
||||
.client_unregister = bit_unreg,
|
||||
.name = "PCILynx I2C",
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* PCL handling functions.
|
||||
|
|
@ -765,7 +747,6 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg)
|
|||
} else {
|
||||
struct ti_pcl pcl;
|
||||
u32 ack;
|
||||
struct hpsb_packet *packet;
|
||||
|
||||
PRINT(KERN_INFO, lynx->id, "cancelling async packet, that was already in PCL");
|
||||
|
||||
|
|
@ -1436,9 +1417,11 @@ static int __devinit add_card(struct pci_dev *dev,
|
|||
struct i2c_algo_bit_data i2c_adapter_data;
|
||||
|
||||
error = -ENOMEM;
|
||||
i2c_ad = kmemdup(&bit_ops, sizeof(*i2c_ad), GFP_KERNEL);
|
||||
i2c_ad = kzalloc(sizeof(*i2c_ad), GFP_KERNEL);
|
||||
if (!i2c_ad) FAIL("failed to allocate I2C adapter memory");
|
||||
|
||||
i2c_ad->id = I2C_HW_B_PCILYNX;
|
||||
strlcpy(i2c_ad->name, "PCILynx I2C", sizeof(i2c_ad->name));
|
||||
i2c_adapter_data = bit_data;
|
||||
i2c_ad->algo_data = &i2c_adapter_data;
|
||||
i2c_adapter_data.data = lynx;
|
||||
|
|
@ -1465,13 +1448,11 @@ static int __devinit add_card(struct pci_dev *dev,
|
|||
{ 0x50, I2C_M_RD, 20, (unsigned char*) lynx->bus_info_block }
|
||||
};
|
||||
|
||||
/* we use i2c_transfer, because i2c_smbus_read_block_data does not work properly and we
|
||||
do it more efficiently in one transaction rather then using several reads */
|
||||
/* we use i2c_transfer because we have no i2c_client
|
||||
at hand */
|
||||
if (i2c_transfer(i2c_ad, msg, 2) < 0) {
|
||||
PRINT(KERN_ERR, lynx->id, "unable to read bus info block from i2c");
|
||||
} else {
|
||||
int i;
|
||||
|
||||
PRINT(KERN_INFO, lynx->id, "got bus info block from serial eeprom");
|
||||
/* FIXME: probably we shoud rewrite the max_rec, max_ROM(1394a),
|
||||
* generation(1394a) and link_spd(1394a) field and recalculate
|
||||
|
|
|
|||
|
|
@ -242,6 +242,8 @@ static int sbp2_max_speed_and_size(struct sbp2_lu *);
|
|||
|
||||
static const u8 sbp2_speedto_max_payload[] = { 0x7, 0x8, 0x9, 0xA, 0xB, 0xC };
|
||||
|
||||
static DEFINE_RWLOCK(sbp2_hi_logical_units_lock);
|
||||
|
||||
static struct hpsb_highlevel sbp2_highlevel = {
|
||||
.name = SBP2_DEVICE_NAME,
|
||||
.host_reset = sbp2_host_reset,
|
||||
|
|
@ -732,6 +734,7 @@ static struct sbp2_lu *sbp2_alloc_device(struct unit_directory *ud)
|
|||
struct sbp2_fwhost_info *hi;
|
||||
struct Scsi_Host *shost = NULL;
|
||||
struct sbp2_lu *lu = NULL;
|
||||
unsigned long flags;
|
||||
|
||||
lu = kzalloc(sizeof(*lu), GFP_KERNEL);
|
||||
if (!lu) {
|
||||
|
|
@ -784,7 +787,9 @@ static struct sbp2_lu *sbp2_alloc_device(struct unit_directory *ud)
|
|||
|
||||
lu->hi = hi;
|
||||
|
||||
write_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
|
||||
list_add_tail(&lu->lu_list, &hi->logical_units);
|
||||
write_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
|
||||
|
||||
/* Register the status FIFO address range. We could use the same FIFO
|
||||
* for targets at different nodes. However we need different FIFOs per
|
||||
|
|
@ -828,16 +833,20 @@ static void sbp2_host_reset(struct hpsb_host *host)
|
|||
{
|
||||
struct sbp2_fwhost_info *hi;
|
||||
struct sbp2_lu *lu;
|
||||
unsigned long flags;
|
||||
|
||||
hi = hpsb_get_hostinfo(&sbp2_highlevel, host);
|
||||
if (!hi)
|
||||
return;
|
||||
|
||||
read_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
|
||||
list_for_each_entry(lu, &hi->logical_units, lu_list)
|
||||
if (likely(atomic_read(&lu->state) !=
|
||||
SBP2LU_STATE_IN_SHUTDOWN)) {
|
||||
atomic_set(&lu->state, SBP2LU_STATE_IN_RESET);
|
||||
scsi_block_requests(lu->shost);
|
||||
}
|
||||
read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
|
||||
}
|
||||
|
||||
static int sbp2_start_device(struct sbp2_lu *lu)
|
||||
|
|
@ -919,6 +928,7 @@ alloc_fail:
|
|||
static void sbp2_remove_device(struct sbp2_lu *lu)
|
||||
{
|
||||
struct sbp2_fwhost_info *hi;
|
||||
unsigned long flags;
|
||||
|
||||
if (!lu)
|
||||
return;
|
||||
|
|
@ -933,7 +943,9 @@ static void sbp2_remove_device(struct sbp2_lu *lu)
|
|||
flush_scheduled_work();
|
||||
sbp2util_remove_command_orb_pool(lu, hi->host);
|
||||
|
||||
write_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
|
||||
list_del(&lu->lu_list);
|
||||
write_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
|
||||
|
||||
if (lu->login_response)
|
||||
dma_free_coherent(hi->host->device.parent,
|
||||
|
|
@ -1707,6 +1719,7 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
|
|||
}
|
||||
|
||||
/* Find the unit which wrote the status. */
|
||||
read_lock_irqsave(&sbp2_hi_logical_units_lock, flags);
|
||||
list_for_each_entry(lu_tmp, &hi->logical_units, lu_list) {
|
||||
if (lu_tmp->ne->nodeid == nodeid &&
|
||||
lu_tmp->status_fifo_addr == addr) {
|
||||
|
|
@ -1714,6 +1727,8 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid,
|
|||
break;
|
||||
}
|
||||
}
|
||||
read_unlock_irqrestore(&sbp2_hi_logical_units_lock, flags);
|
||||
|
||||
if (unlikely(!lu)) {
|
||||
SBP2_ERR("lu is NULL - device is gone?");
|
||||
return RCODE_ADDRESS_ERROR;
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ union fw_cdev_event {
|
|||
#define FW_CDEV_IOC_QUEUE_ISO _IOWR('#', 0x09, struct fw_cdev_queue_iso)
|
||||
#define FW_CDEV_IOC_START_ISO _IOW('#', 0x0a, struct fw_cdev_start_iso)
|
||||
#define FW_CDEV_IOC_STOP_ISO _IOW('#', 0x0b, struct fw_cdev_stop_iso)
|
||||
#define FW_CDEV_IOC_GET_CYCLE_TIMER _IOR('#', 0x0c, struct fw_cdev_get_cycle_timer)
|
||||
|
||||
/* FW_CDEV_VERSION History
|
||||
*
|
||||
|
|
@ -459,4 +460,18 @@ struct fw_cdev_stop_iso {
|
|||
__u32 handle;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fw_cdev_get_cycle_timer - read cycle timer register
|
||||
* @local_time: system time, in microseconds since the Epoch
|
||||
* @cycle_timer: isochronous cycle timer, as per OHCI 1.1 clause 5.13
|
||||
*
|
||||
* The %FW_CDEV_IOC_GET_CYCLE_TIMER ioctl reads the isochronous cycle timer
|
||||
* and also the system clock. This allows to express the receive time of an
|
||||
* isochronous packet as a system time with microsecond accuracy.
|
||||
*/
|
||||
struct fw_cdev_get_cycle_timer {
|
||||
__u64 local_time;
|
||||
__u32 cycle_timer;
|
||||
};
|
||||
|
||||
#endif /* _LINUX_FIREWIRE_CDEV_H */
|
||||
|
|
|
|||
Reference in New Issue