Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (d5545fa0) · Commits · 戴 / test

drivers/firewire/Kconfig

+15 −17

Original line number	Diff line number	Diff line
		comment "An alternative FireWire stack is available with EXPERIMENTAL=y"
		comment "A new alternative FireWire stack is available with EXPERIMENTAL=y"
		depends on EXPERIMENTAL=n

		comment "Enable only one of the two stacks, unless you know what you are doing"
		depends on EXPERIMENTAL

		config FIREWIRE
		tristate "IEEE 1394 (FireWire) support - alternative stack, EXPERIMENTAL"
		tristate "New FireWire stack, EXPERIMENTAL"
		depends on EXPERIMENTAL
		select CRC_ITU_T
		help
		This is the "Juju" FireWire stack, a new alternative implementation
		designed for robustness and simplicity. You can build either this
		stack, or the classic stack (the ieee1394 driver, ohci1394 etc.)
		or both. Please read http://wiki.linux1394.org/JujuMigration before
		you enable the new stack.
		stack, or the old stack (the ieee1394 driver, ohci1394 etc.) or both.
		Please read http://wiki.linux1394.org/JujuMigration before you
		enable the new stack.

		To compile this driver as a module, say M here: the module will be
		called firewire-core. It functionally replaces ieee1394, raw1394,
		and video1394.

		NOTE:

		You should only build ONE of the stacks, unless you REALLY know what
		you are doing.

		config FIREWIRE_OHCI
		tristate "Support for OHCI FireWire host controllers"
		tristate "OHCI-1394 controllers"
		depends on PCI && FIREWIRE
		help
		Enable this driver if you have a FireWire controller based
		@@ -35,10 +33,10 @@ config FIREWIRE_OHCI

		NOTE:

		You should only build ohci1394 or firewire-ohci, but not both.
		If you nevertheless want to install both, you should configure them
		only as modules and blacklist the driver(s) which you don't want to
		have auto-loaded. Add either
		You should only build either firewire-ohci or the old ohci1394 driver,
		but not both. If you nevertheless want to install both, you should
		configure them only as modules and blacklist the driver(s) which you
		don't want to have auto-loaded. Add either

		blacklist firewire-ohci
		or
		@@ -60,7 +58,7 @@ config FIREWIRE_OHCI_DEBUG
		default y

		config FIREWIRE_SBP2
		tristate "Support for storage devices (SBP-2 protocol driver)"
		tristate "Storage devices (SBP-2 protocol)"
		depends on FIREWIRE && SCSI
		help
		This option enables you to use SBP-2 devices connected to a

drivers/firewire/fw-cdev.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -205,6 +205,7 @@ fw_device_op_read(struct file *file,
		return dequeue_event(client, buffer, count);
		}

		/* caller must hold card->lock so that node pointers can be dereferenced here */
		static void
		fill_bus_reset_event(struct fw_cdev_event_bus_reset *event,
		struct client *client)
		@@ -214,7 +215,6 @@ fill_bus_reset_event(struct fw_cdev_event_bus_reset *event,
		event->closure = client->bus_reset_closure;
		event->type = FW_CDEV_EVENT_BUS_RESET;
		event->generation = client->device->generation;
		smp_rmb(); /* node_id must not be older than generation */
		event->node_id = client->device->node_id;
		event->local_node_id = card->local_node->node_id;
		event->bm_node_id = 0; /* FIXME: We don't track the BM. */
		@@ -274,6 +274,7 @@ static int ioctl_get_info(struct client client, void buffer)
		{
		struct fw_cdev_get_info *get_info = buffer;
		struct fw_cdev_event_bus_reset bus_reset;
		struct fw_card *card = client->device->card;
		unsigned long ret = 0;

		client->version = get_info->version;
		@@ -299,13 +300,17 @@ static int ioctl_get_info(struct client client, void buffer)
		client->bus_reset_closure = get_info->bus_reset_closure;
		if (get_info->bus_reset != 0) {
		void __user *uptr = u64_to_uptr(get_info->bus_reset);
		unsigned long flags;

		spin_lock_irqsave(&card->lock, flags);
		fill_bus_reset_event(&bus_reset, client);
		spin_unlock_irqrestore(&card->lock, flags);

		if (copy_to_user(uptr, &bus_reset, sizeof(bus_reset)))
		return -EFAULT;
		}

		get_info->card = client->device->card->index;
		get_info->card = card->index;

		return 0;
		}

drivers/firewire/fw-ohci.c

+56 −54

Original line number	Diff line number	Diff line
		@@ -265,9 +265,7 @@ static void log_irqs(u32 evt)
		!(evt & OHCI1394_busReset))
		return;

		printk(KERN_DEBUG KBUILD_MODNAME ": IRQ "
		"%08x%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
		evt,
		fw_notify("IRQ %08x%s%s%s%s%s%s%s%s%s%s%s%s%s\n", evt,
		evt & OHCI1394_selfIDComplete ? " selfID" : "",
		evt & OHCI1394_RQPkt ? " AR_req" : "",
		evt & OHCI1394_RSPkt ? " AR_resp" : "",
		@@ -308,20 +306,19 @@ static void log_selfids(int node_id, int generation, int self_id_count, u32 *s)
		if (likely(!(param_debug & OHCI_PARAM_DEBUG_SELFIDS)))
		return;

		printk(KERN_DEBUG KBUILD_MODNAME ": %d selfIDs, generation %d, "
		"local node ID %04x\n", self_id_count, generation, node_id);
		fw_notify("%d selfIDs, generation %d, local node ID %04x\n",
		self_id_count, generation, node_id);

		for (; self_id_count--; ++s)
		if ((*s & 1 << 23) == 0)
		printk(KERN_DEBUG "selfID 0: %08x, phy %d [%c%c%c] "
		fw_notify("selfID 0: %08x, phy %d [%c%c%c] "
		"%s gc=%d %s %s%s%s\n",
		s, s >> 24 & 63, _p(s, 6), _p(s, 4), _p(s, 2),
		speed[s >> 14 & 3], s >> 16 & 63,
		power[s >> 8 & 7], s >> 22 & 1 ? "L" : "",
		s >> 11 & 1 ? "c" : "", s & 2 ? "i" : "");
		else
		printk(KERN_DEBUG "selfID n: %08x, phy %d "
		"[%c%c%c%c%c%c%c%c]\n",
		fw_notify("selfID n: %08x, phy %d [%c%c%c%c%c%c%c%c]\n",
		s, s >> 24 & 63,
		_p(s, 16), _p(s, 14), _p(s, 12), _p(s, 10),
		_p(s, 8), _p(s, 6), _p(s, 4), _p(s, 2));
		@@ -373,15 +370,14 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt)
		evt = 0x1f;

		if (evt == OHCI1394_evt_bus_reset) {
		printk(KERN_DEBUG "A%c evt_bus_reset, generation %d\n",
		fw_notify("A%c evt_bus_reset, generation %d\n",
		dir, (header[2] >> 16) & 0xff);
		return;
		}

		if (header[0] == ~header[1]) {
		printk(KERN_DEBUG "A%c %s, %s, %08x\n",
		dir, evts[evt], phys[header[0] >> 30 & 0x3],
		header[0]);
		fw_notify("A%c %s, %s, %08x\n",
		dir, evts[evt], phys[header[0] >> 30 & 0x3], header[0]);
		return;
		}

		@@ -400,11 +396,10 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt)

		switch (tcode) {
		case 0xe: case 0xa:
		printk(KERN_DEBUG "A%c %s, %s\n",
		dir, evts[evt], tcodes[tcode]);
		fw_notify("A%c %s, %s\n", dir, evts[evt], tcodes[tcode]);
		break;
		case 0x0: case 0x1: case 0x4: case 0x5: case 0x9:
		printk(KERN_DEBUG "A%c spd %x tl %02x, "
		fw_notify("A%c spd %x tl %02x, "
		"%04x -> %04x, %s, "
		"%s, %04x%08x%s\n",
		dir, speed, header[0] >> 10 & 0x3f,
		@@ -412,7 +407,7 @@ static void log_ar_at_event(char dir, int speed, u32 *header, int evt)
		tcodes[tcode], header[1] & 0xffff, header[2], specific);
		break;
		default:
		printk(KERN_DEBUG "A%c spd %x tl %02x, "
		fw_notify("A%c spd %x tl %02x, "
		"%04x -> %04x, %s, "
		"%s%s\n",
		dir, speed, header[0] >> 10 & 0x3f,
		@@ -548,6 +543,11 @@ static __le32 handle_ar_packet(struct ar_context ctx, __le32 *buffer)
		p.header_length = 12;
		p.payload_length = 0;
		break;

		default:
		/* FIXME: Stop context, discard everything, and restart? */
		p.header_length = 0;
		p.payload_length = 0;
		}

		p.payload = (void *) buffer + p.header_length;
		@@ -1468,6 +1468,9 @@ static int ohci_enable(struct fw_card card, u32 config_rom, size_t length)
		reg_write(ohci, OHCI1394_HCControlClear,
		OHCI1394_HCControl_noByteSwapData);

		reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus);
		reg_write(ohci, OHCI1394_LinkControlClear,
		OHCI1394_LinkControl_rcvPhyPkt);
		reg_write(ohci, OHCI1394_LinkControlSet,
		OHCI1394_LinkControl_rcvSelfID \|
		OHCI1394_LinkControl_cycleTimerEnable \|
		@@ -1481,7 +1484,6 @@ static int ohci_enable(struct fw_card card, u32 config_rom, size_t length)
		ar_context_run(&ohci->ar_request_ctx);
		ar_context_run(&ohci->ar_response_ctx);

		reg_write(ohci, OHCI1394_SelfIDBuffer, ohci->self_id_bus);
		reg_write(ohci, OHCI1394_PhyUpperBound, 0x00010000);
		reg_write(ohci, OHCI1394_IntEventClear, ~0);
		reg_write(ohci, OHCI1394_IntMaskClear, ~0);

drivers/firewire/fw-transaction.c

+36 −16

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@

		#include <linux/completion.h>
		#include <linux/kernel.h>
		#include <linux/kref.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/interrupt.h>
		@@ -297,37 +298,55 @@ EXPORT_SYMBOL(fw_send_request);
		struct fw_phy_packet {
		struct fw_packet packet;
		struct completion done;
		struct kref kref;
		};

		static void
		transmit_phy_packet_callback(struct fw_packet *packet,
		static void phy_packet_release(struct kref *kref)
		{
		struct fw_phy_packet *p =
		container_of(kref, struct fw_phy_packet, kref);
		kfree(p);
		}

		static void transmit_phy_packet_callback(struct fw_packet *packet,
		struct fw_card *card, int status)
		{
		struct fw_phy_packet *p =
		container_of(packet, struct fw_phy_packet, packet);

		complete(&p->done);
		kref_put(&p->kref, phy_packet_release);
		}

		void fw_send_phy_config(struct fw_card *card,
		int node_id, int generation, int gap_count)
		{
		struct fw_phy_packet p;
		struct fw_phy_packet *p;
		long timeout = DIV_ROUND_UP(HZ, 10);
		u32 data = PHY_IDENTIFIER(PHY_PACKET_CONFIG) \|
		PHY_CONFIG_ROOT_ID(node_id) \|
		PHY_CONFIG_GAP_COUNT(gap_count);

		p.packet.header[0] = data;
		p.packet.header[1] = ~data;
		p.packet.header_length = 8;
		p.packet.payload_length = 0;
		p.packet.speed = SCODE_100;
		p.packet.generation = generation;
		p.packet.callback = transmit_phy_packet_callback;
		init_completion(&p.done);
		p = kmalloc(sizeof(*p), GFP_KERNEL);
		if (p == NULL)
		return;

		p->packet.header[0] = data;
		p->packet.header[1] = ~data;
		p->packet.header_length = 8;
		p->packet.payload_length = 0;
		p->packet.speed = SCODE_100;
		p->packet.generation = generation;
		p->packet.callback = transmit_phy_packet_callback;
		init_completion(&p->done);
		kref_set(&p->kref, 2);

		card->driver->send_request(card, &p.packet);
		wait_for_completion(&p.done);
		card->driver->send_request(card, &p->packet);
		timeout = wait_for_completion_timeout(&p->done, timeout);
		kref_put(&p->kref, phy_packet_release);

		/* will leak p if the callback is never executed */
		WARN_ON(timeout == 0);
		}

		void fw_flush_transactions(struct fw_card *card)
		@@ -572,7 +591,8 @@ allocate_request(struct fw_packet *p)
		break;

		default:
		BUG();
		fw_error("ERROR - corrupt request received - %08x %08x %08x\n",
		p->header[0], p->header[1], p->header[2]);
		return NULL;
		}

drivers/ieee1394/Kconfig

+66 −52

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support"
		source "drivers/firewire/Kconfig"

		config IEEE1394
		tristate "IEEE 1394 (FireWire) support"
		tristate "Stable FireWire stack"
		depends on PCI \|\| BROKEN
		help
		IEEE 1394 describes a high performance serial bus, which is also
		@@ -19,30 +19,45 @@ config IEEE1394
		To compile this driver as a module, say M here: the
		module will be called ieee1394.

		comment "Subsystem Options"
		depends on IEEE1394

		config IEEE1394_VERBOSEDEBUG
		bool "Excessive debugging output"
		depends on IEEE1394
		config IEEE1394_OHCI1394
		tristate "OHCI-1394 controllers"
		depends on PCI && IEEE1394
		help
		If you say Y here, you will get very verbose debugging logs from
		the subsystem which includes a dump of the header of every sent
		and received packet. This can amount to a high amount of data
		collected in a very short time which is usually also saved to
		disk by the system logging daemons.
		Enable this driver if you have an IEEE 1394 controller based on the
		OHCI-1394 specification. The current driver is only tested with OHCI
		chipsets made by Texas Instruments and NEC. Most third-party vendors
		use one of these chipsets. It should work with any OHCI-1394
		compliant card, however.

		Say Y if you really want or need the debugging output, everyone
		else says N.
		To compile this driver as a module, say M here: the
		module will be called ohci1394.

		comment "Controllers"
		depends on IEEE1394
		NOTE:

		comment "Texas Instruments PCILynx requires I2C"
		You should only build either ohci1394 or the new firewire-ohci driver,
		but not both. If you nevertheless want to install both, you should
		configure them only as modules and blacklist the driver(s) which you
		don't want to have auto-loaded. Add either

		blacklist firewire-ohci
		or
		blacklist ohci1394
		blacklist video1394
		blacklist dv1394

		to /etc/modprobe.conf or /etc/modprobe.d/* and update modprobe.conf
		depending on your distribution. The latter two modules should be
		blacklisted together with ohci1394 because they depend on ohci1394.

		If you have an old modprobe which doesn't implement the blacklist
		directive, use "install modulename /bin/true" for the modules to be
		blacklisted.

		comment "PCILynx controller requires I2C"
		depends on IEEE1394 && I2C=n

		config IEEE1394_PCILYNX
		tristate "Texas Instruments PCILynx support"
		tristate "PCILynx controller"
		depends on PCI && IEEE1394 && I2C
		select I2C_ALGOBIT
		help
		@@ -57,35 +72,11 @@ config IEEE1394_PCILYNX
		PowerMacs G3 B&W contain the PCILynx controller. Therefore
		almost everybody can say N here.

		config IEEE1394_OHCI1394
		tristate "OHCI-1394 support"
		depends on PCI && IEEE1394
		help
		Enable this driver if you have an IEEE 1394 controller based on the
		OHCI-1394 specification. The current driver is only tested with OHCI
		chipsets made by Texas Instruments and NEC. Most third-party vendors
		use one of these chipsets. It should work with any OHCI-1394
		compliant card, however.

		To compile this driver as a module, say M here: the
		module will be called ohci1394.

		comment "Protocols"
		depends on IEEE1394

		config IEEE1394_VIDEO1394
		tristate "OHCI-1394 Video support"
		depends on IEEE1394 && IEEE1394_OHCI1394
		help
		This option enables video device usage for OHCI-1394 cards. Enable
		this option only if you have an IEEE 1394 video device connected to
		an OHCI-1394 card.

		comment "SBP-2 support (for storage devices) requires SCSI"
		depends on IEEE1394 && SCSI=n

		config IEEE1394_SBP2
		tristate "SBP-2 support (Harddisks etc.)"
		tristate "Storage devices (SBP-2 protocol)"
		depends on IEEE1394 && SCSI
		help
		This option enables you to use SBP-2 devices connected to an IEEE
		@@ -127,24 +118,47 @@ config IEEE1394_ETH1394

		The module is called eth1394 although it does not emulate Ethernet.

		config IEEE1394_RAWIO
		tristate "raw1394 userspace interface"
		depends on IEEE1394
		help
		This option adds support for the raw1394 device file which enables
		direct communication of user programs with IEEE 1394 devices
		(isochronous and asynchronous). Almost all application programs
		which access FireWire require this option.

		To compile this driver as a module, say M here: the module will be
		called raw1394.

		config IEEE1394_VIDEO1394
		tristate "video1394 userspace interface"
		depends on IEEE1394 && IEEE1394_OHCI1394
		help
		This option adds support for the video1394 device files which enable
		isochronous communication of user programs with IEEE 1394 devices,
		especially video capture or export. This interface is used by all
		libdc1394 based programs and by several other programs, in addition to
		the raw1394 interface. It is generally not required for DV capture.

		To compile this driver as a module, say M here: the module will be
		called video1394.

		config IEEE1394_DV1394
		tristate "OHCI-DV I/O support (deprecated)"
		tristate "dv1394 userspace interface (deprecated)"
		depends on IEEE1394 && IEEE1394_OHCI1394
		help
		The dv1394 driver is unsupported and may be removed from Linux in a
		future release. Its functionality is now provided by raw1394 together
		with libraries such as libiec61883.

		config IEEE1394_RAWIO
		tristate "Raw IEEE1394 I/O support"
		config IEEE1394_VERBOSEDEBUG
		bool "Excessive debugging output"
		depends on IEEE1394
		help
		This option adds support for the raw1394 device file which enables
		direct communication of user programs with the IEEE 1394 bus and thus
		with the attached peripherals. Almost all application programs which
		access FireWire require this option.
		If you say Y here, you will get very verbose debugging logs from the
		ieee1394 drivers, including sent and received packet headers. This
		will quickly result in large amounts of data sent to the system log.

		To compile this driver as a module, say M here: the module will be
		called raw1394.
		Say Y if you really need the debugging output. Everyone else says N.

		endmenu

Admin message