Commit 1316ff5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents f563d53c 83431cba

drivers/firewire/fw-cdev.c

+38 −14
Original line number Diff line number Diff line
@@ -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

drivers/firewire/fw-device.h

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/firewire/fw-ohci.c

+28 −13
Original line number Diff line number Diff line
@@ -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/init.h>

#include <linux/interrupt.h>

#include <linux/pci.h>

#include <linux/compiler.h>

#include <linux/delay.h>

#include <linux/poll.h>

#include <linux/dma-mapping.h>

#include <linux/gfp.h>

#include <linux/init.h>

#include <linux/interrupt.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;

	}

	if ((reg & OHCI1394_NodeID_nodeNumber) == 63) {

		fw_notify("malconfigured bus\n");

		return;

	}

	ohci->node_id = reg & 0xffff;

	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,

drivers/firewire/fw-ohci.h

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/firewire/fw-sbp2.c

+386 −261

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE