Skip to contentSkip to conversation

ieee1394 updates post 2.6.20

GIT PULL Stefan Richter 1 participant 4 messages Feb 8, 2007 – Apr 9, 2007 Documentation

lore
Share & tools
lore
#0 lore raw

Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

to receive IEEE 1394 subsystem updates as listed further below. The upshot:

- another bit to get suspend/resume going (bug 7072)
- fix video1394 on systems with IO bounce buffers, i.e. typically on EMT64 with more than ca. 3GB RAM
- fix old issues with PCCard ejection while dv1394 is loaded (bug

    7121) and LLD unloading while raw1394 is in use (bug 7701)

- fix a regression in 2.6.20-rc1 in nodemgr (bug 7942, -stable will get their share)
- remove some fat (people who want to have OUIs translated to company names can use the ls1394 script)

The patches have been written in December and January and have been in -mm soon after they were submitted --- except for the three fixes in video1394, raw1394, and nodemgr which are fresh from February but are duly tested.

 Documentation/feature-removal-schedule.txt |   16 -
 drivers/ieee1394/.gitignore                |    1 -
 drivers/ieee1394/Kconfig                   |   21 -
 drivers/ieee1394/Makefile                  |   10 -
 drivers/ieee1394/csr1212.c                 |   15 +-
 drivers/ieee1394/dv1394.c                  |   46 +-
 drivers/ieee1394/hosts.c                   |   13 +-
 drivers/ieee1394/hosts.h                   |    7 +-
 drivers/ieee1394/ieee1394_core.c           |   23 +-
 drivers/ieee1394/nodemgr.c                 |   63 +-
 drivers/ieee1394/nodemgr.h                 |    3 -
 drivers/ieee1394/ohci1394.c                |   17 +-
 drivers/ieee1394/oui.db                    | 7048 ----------------------------
 drivers/ieee1394/oui2c.sh                  |   22 -
 drivers/ieee1394/raw1394.c                 |   48 +-
 drivers/ieee1394/sbp2.c                    |   23 +-
 drivers/ieee1394/video1394.c               |    8 +
 include/linux/pci_ids.h                    |    1 +
 18 files changed, 105 insertions(+), 7280 deletions(-)
 delete mode 100644 drivers/ieee1394/.gitignore
 delete mode 100644 drivers/ieee1394/oui.db
 delete mode 100644 drivers/ieee1394/oui2c.sh

Adrian Bunk (2):
the scheduled IEEE1394_EXPORT_FULL_API removal the scheduled IEEE1394_OUI_DB removal

Andrea Guzzo (1):
ieee1394: modified csr1212_key_id_type_map to support lisight

David Moore (1):

      ieee1394: video1394: DMA fix

Kristian Høgsberg (1):
Add PCI class ID for firewire OHCI controllers.

Stefan Richter (11):
ieee1394: sbp2: use a better wildcard for blacklist
ieee1394: nodemgr: check info_length in ROM header earlier
ieee1394: ohci1394: drop pcmcia-cs compatibility code
ieee1394: restore config ROM when resuming
ieee1394: save one word in struct hpsb_host
ieee1394: sbp2: remove bogus "emulated" host flag
ieee1394: sbp2: lower block queue alignment requirement
ieee1394: dv1394: fix CardBus card ejection
ieee1394: dv1394: tidy up card removal
ieee1394: raw1394: prevent unloading of low-level driver
ieee1394: fix host device registering when nodemgr disabled

Signature · 3 lines
Stefan Richter
-=====-=-=== --=- -=---
http://arcgraph.de/sr/
#1 lore raw

[GIT PULL] ieee1394 updates post 2.6.20, another round

Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
or
    git://master.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

to receive IEEE 1394 subsystem updates as listed further below. It's a small userspace API addition submitted two weeks ago and an unintrusive one week old bugfix. (The fixed code was and will be untangled further in linux1394-2.6.git's master branch and in -mm.)

 drivers/ieee1394/ieee1394-ioctl.h |    2 +
 drivers/ieee1394/ieee1394_core.c  |   43 +++++++++++++++++++++++++++++++++++++
 drivers/ieee1394/ieee1394_core.h  |    3 ++
 drivers/ieee1394/nodemgr.c        |    3 +-
 drivers/ieee1394/raw1394.c        |   20 +++++++++++++++++
 drivers/ieee1394/raw1394.h        |   10 ++++++++
 6 files changed, 80 insertions(+), 1 deletions(-)

Pieter Palmers (1):
ieee1394: cycle timer read extension for raw1394

Stefan Richter (1):
ieee1394: fix another deadlock in nodemgr

Signature · 3 lines
Stefan Richter
-=====-=-=== --=- =---=
http://arcgraph.de/sr/
#2 lore raw

[GIT PULL] ieee1394 fix

Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

to receive the appended fix for 2.6.21-rc4. Or apply from this mail. Thanks.

(The eth1394 issue will be revised as soon as ieee1394 core got rid of class_Device.)

 drivers/ieee1394/eth1394.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Stefan Richter (1):
ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion

Quoted 1 line

From 7a9eeb2fa1b3a3a83670b9ba08dd396beedb88f8 Mon Sep 17 00:00:00 2001

From: Stefan Richter <[email protected]>
Date: Tue, 20 Mar 2007 22:43:22 +0100
Subject: [PATCH] ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The networking subsystem has been converted from class_device to device but ieee1394 hasn't. This results in a 100% reproducible NULL pointer dereference if the ohci1394 driver module is unloaded while the eth1394 module is still loaded.
http://lkml.org/lkml/2006/11/16/147
http://lkml.org/lkml/2007/3/14/4

This is a regression in 2.6.21-rc1.

---
 drivers/ieee1394/eth1394.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/ieee1394/eth1394.c +3 -0
index a953135..03e44b3 100644
@@ -584,7 +584,10 @@ static void ether1394_add_host (struct hpsb_host *host)
         }
 
 	SET_MODULE_OWNER(dev);
+#if 0
+	/* FIXME - Is this the correct parent device anyway? */
 	SET_NETDEV_DEV(dev, &host->device);
+#endif
 
 	priv = netdev_priv(dev);
 
Signature · 1 line
1.4.4.4
#3 lore raw

[GIT PULL] ieee1394: change deprecation status of dv1394

Linus, please pull from the for-linus branch at

    git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus

to receive the appended clarification (?) about the dv1394 driver and ABI. It has been discussed on linux1394-devel and linux1394-user. Or apply from this mail. Thanks.

 Documentation/ABI/obsolete/dv1394          |    9 +++++++++
 Documentation/feature-removal-schedule.txt |   11 -----------
 drivers/ieee1394/Kconfig                   |    6 +++---
 drivers/ieee1394/dv1394.c                  |    4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)
 create mode 100644 Documentation/ABI/obsolete/dv1394

commit 199c1167f5e8123a9b0a9ab1e8b78a6aa4b2733f

Author: Stefan Richter <[email protected]>
Date:   Thu Mar 22 00:40:06 2007 +0100

ieee1394: change deprecation status of dv1394

Nobody ported ffmpeg from dv1394 to rawiso yet, and there is no justification to remove dv1394 right now.

Nevertheless, a strong deprecation of this ABI makes a lot of sense, especially as Kristian H's drivers shape up to be an attractive alternative to the existing ones. But we don't have a schedule at the moment.

---

Documentation/ABI/obsolete/dv1394 new file +9 -0
new file mode 100644
index 0000000..2ee3686
@@ -0,0 +1,9 @@
+What:		dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
+Contact:	[email protected]
+Description:
+	New application development should use raw1394 + userspace libraries
+	instead, notably libiec61883 which is functionally equivalent.
+
+Users:
+	ffmpeg/libavformat (used by a variety of media players)
+	dvgrab v1.x (replaced by dvgrab2 on top of raw1394 and resp. libraries)
Documentation/feature-removal-schedule.txt +0 -11
index 0bc8b0b..19b4c96 100644
@@ -39,17 +39,6 @@ Who:	Dan Dennedy <[email protected]>, Stefan Richter <[email protected]>
 
 ---------------------------
 
-What:	dv1394 driver (CONFIG_IEEE1394_DV1394)
-When:	June 2007
-Why:	Replaced by raw1394 + userspace libraries, notably libiec61883.  This
-	shift of application support has been indicated on www.linux1394.org
-	and developers' mailinglists for quite some time.  Major applications
-	have been converted, with the exception of ffmpeg and hence xine.
-	Piped output of dvgrab2 is a partial equivalent to dv1394.
-Who:	Dan Dennedy <[email protected]>, Stefan Richter <[email protected]>
-
----------------------------
-
 What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.
 When:	December 2006
 Why:	V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
drivers/ieee1394/Kconfig +3 -3
index b8a4734..cd84a55 100644
@@ -138,9 +138,9 @@ config IEEE1394_DV1394
 	tristate "OHCI-DV I/O support (deprecated)"
 	depends on IEEE1394 && IEEE1394_OHCI1394
 	help
-	  The dv1394 driver will be removed from Linux in a future release.
-	  Its functionality is now provided by raw1394 together with libraries
-	  such as libiec61883.
+	  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"
drivers/ieee1394/dv1394.c +2 -2
index dee9529..026e38f 100644
@@ -2564,8 +2564,8 @@ static int __init dv1394_init_module(void)
 	int ret;
 
 	printk(KERN_WARNING
-	       "WARNING: The dv1394 driver is unsupported and will be removed "
-	       "from Linux soon. Use raw1394 instead.\n");
+	       "NOTE: The dv1394 driver is unsupported and may be removed in a "
+	       "future Linux release. Use raw1394 instead.\n");
 
 	cdev_init(&dv1394_cdev, &dv1394_fops);
 	dv1394_cdev.owner = THIS_MODULE;
Signature · 3 lines
Stefan Richter
-=====-=-=== -=-- -=--=
http://arcgraph.de/sr/