Skip to contentSkip to conversation

DVB: firedtv: port to new firewire driver stack

PATCH In review Stefan Richter 3 participants 8 messages Nov 8, 2009 – Nov 14, 2009 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

cover DVB: firedtv: port to new firewire driver stack

The following patch series adapts the firedtv driver for FireWire-attached DVB boxes and cards to the newer firewire-core kernel API. The driver will continue to work with the older ieee1394 kernel API as well. Which of the two IEEE 1394 stacks will be used depends on which one was configured at build time. If both were built, firedtv transparently uses the stack which is bound to the FireWire controller.

This patch series depends on changes to firewire-core which were merged into Linux 2.6.31.

There is some non-essential functionality yet to implement:
- Finish FCP support in firewire-core so that more than one AV/C device can be used on the same FireWire bus at the same time.
- Enhance firedtv to use firewire-core's channel and bandwidth allocation function for proper cooperation with non-FireDTV AV/C devices on the same bus.

Following as reply:
[PATCH 1/4] firedtv: move remote control workqueue handling into rc source file [PATCH 2/4] firedtv: reform lock transaction backend call
[PATCH 3/4] firedtv: add missing include, rename a constant
[PATCH 4/4] firedtv: port to new firewire core

 drivers/media/dvb/firewire/Kconfig        |    7
 drivers/media/dvb/firewire/Makefile       |    1
 drivers/media/dvb/firewire/firedtv-1394.c |   37 +-
 drivers/media/dvb/firewire/firedtv-avc.c  |   50 +-
 drivers/media/dvb/firewire/firedtv-dvb.c  |   15
 drivers/media/dvb/firewire/firedtv-fw.c   |  385 ++++++++++++++++++++++
 drivers/media/dvb/firewire/firedtv-rc.c   |    2
 drivers/media/dvb/firewire/firedtv.h      |   17
 8 files changed, 471 insertions(+), 43 deletions(-)
Signature · 3 lines
Stefan Richter
-=====-==--= =-== -=---
http://arcgraph.de/sr/
#1 lore raw

PATCH 1/4 firedtv: move remote control workqueue handling into rc source file

Preparation for the port of firedtv to the firewire-core kernel API:
Canceling of the remote control workqueue job is factored into firedtv-rc.c. Plus trivial whitespace change.

---
 drivers/media/dvb/firewire/firedtv-1394.c |    5 +++--
 drivers/media/dvb/firewire/firedtv-rc.c   |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/media/dvb/firewire/firedtv-1394.c +3 -2
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-1394.c
===================================================================
@@ -212,6 +212,7 @@ static int node_probe(struct device *dev
 		goto fail;
 
 	avc_register_remote_control(fdtv);
+
 	return 0;
 fail:
 	spin_lock_irq(&node_list_lock);
@@ -220,6 +221,7 @@ fail:
 	fdtv_unregister_rc(fdtv);
 fail_free:
 	kfree(fdtv);
+
 	return err;
 }
 
@@ -233,10 +235,9 @@ static int node_remove(struct device *de
 	list_del(&fdtv->list);
 	spin_unlock_irq(&node_list_lock);
 
-	cancel_work_sync(&fdtv->remote_ctrl_work);
 	fdtv_unregister_rc(fdtv);
-
 	kfree(fdtv);
+
 	return 0;
 }
 
drivers/media/dvb/firewire/firedtv-rc.c +2 -0
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-rc.c
===================================================================
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/workqueue.h>
 
 #include "firedtv.h"
 
@@ -163,6 +164,7 @@ fail:
 
 void fdtv_unregister_rc(struct firedtv *fdtv)
 {
+	cancel_work_sync(&fdtv->remote_ctrl_work);
 	kfree(fdtv->remote_ctrl_dev->keycode);
 	input_unregister_device(fdtv->remote_ctrl_dev);
 }
Signature · 3 lines
Stefan Richter
-=====-==--= =-== -=---
http://arcgraph.de/sr/
#2 lore raw

PATCH 2/4 firedtv: reform lock transaction backend call

In reply to Stefan Richter

Preparation for the port of firedtv to the firewire-core kernel API:
The fdtv->backend->lock() hook and thus the CMP code is slightly changed to better fit with the new API.

---
 drivers/media/dvb/firewire/firedtv-1394.c |   11 ++++-
 drivers/media/dvb/firewire/firedtv-avc.c  |   50 ++++++++++++----------
 drivers/media/dvb/firewire/firedtv.h      |    2 
 3 files changed, 37 insertions(+), 26 deletions(-)
drivers/media/dvb/firewire/firedtv-1394.c +8 -3
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-1394.c
===================================================================
@@ -87,10 +87,15 @@ static inline struct node_entry *node_of
 	return container_of(fdtv->device, struct unit_directory, device)->ne;
 }
 
-static int node_lock(struct firedtv *fdtv, u64 addr, void *data, __be32 arg)
+static int node_lock(struct firedtv *fdtv, u64 addr, __be32 data[])
 {
-	return hpsb_node_lock(node_of(fdtv), addr, EXTCODE_COMPARE_SWAP, data,
-			      (__force quadlet_t)arg);
+	int ret;
+
+	ret = hpsb_node_lock(node_of(fdtv), addr, EXTCODE_COMPARE_SWAP,
+		(__force quadlet_t *)&data[1], (__force quadlet_t)data[0]);
+	data[0] = data[1];
+
+	return ret;
 }
 
 static int node_read(struct firedtv *fdtv, u64 addr, void *data, size_t len)
drivers/media/dvb/firewire/firedtv-avc.c +28 -22

118 lines not on this page · raw message

drivers/media/dvb/firewire/firedtv.h +1 -1
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv.h
===================================================================
@@ -72,7 +72,7 @@ struct input_dev;
 struct firedtv;
 
 struct firedtv_backend {
-	int (*lock)(struct firedtv *fdtv, u64 addr, void *data, __be32 arg);
+	int (*lock)(struct firedtv *fdtv, u64 addr, __be32 data[]);
 	int (*read)(struct firedtv *fdtv, u64 addr, void *data, size_t len);
 	int (*write)(struct firedtv *fdtv, u64 addr, void *data, size_t len);
 	int (*start_iso)(struct firedtv *fdtv);
Signature · 3 lines
Stefan Richter
-=====-==--= =-== -=---
http://arcgraph.de/sr/
#3 lore raw

PATCH 3/4 firedtv: add missing include, rename a constant

In reply to Stefan Richter

Add #include <dvb_demux.h> for dvb_dmx_swfilter_packets(). This was already indirectly included via firedtv.h, but don't rely on it.

The 4 bytes which were referred to as FIREWIRE_HEADER_SIZE are actually the source packet header from IEC 61883-4 (MPEG2-TS data transmission over 1394), not e.g. the IEEE 1394 isochronous packet header. So choose a more precise name.

Also, express the payload size as a preprocessor constant too.

---
 drivers/media/dvb/firewire/firedtv-1394.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/media/dvb/firewire/firedtv-1394.c +9 -6
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-1394.c
===================================================================
@@ -26,13 +26,16 @@
 #include <iso.h>
 #include <nodemgr.h>
 
+#include <dvb_demux.h>
+
 #include "firedtv.h"
 
 static LIST_HEAD(node_list);
 static DEFINE_SPINLOCK(node_list_lock);
 
-#define FIREWIRE_HEADER_SIZE	4
-#define CIP_HEADER_SIZE		8
+#define CIP_HEADER_SIZE			8
+#define MPEG2_TS_HEADER_SIZE		4
+#define MPEG2_TS_SOURCE_PACKET_SIZE	(4 + 188)
 
 static void rawiso_activity_cb(struct hpsb_iso *iso)
 {
@@ -62,20 +65,20 @@ static void rawiso_activity_cb(struct hp
 		buf = dma_region_i(&iso->data_buf, unsigned char,
 			iso->infos[packet].offset + CIP_HEADER_SIZE);
 		count = (iso->infos[packet].len - CIP_HEADER_SIZE) /
-			(188 + FIREWIRE_HEADER_SIZE);
+			MPEG2_TS_SOURCE_PACKET_SIZE;
 
 		/* ignore empty packet */
 		if (iso->infos[packet].len <= CIP_HEADER_SIZE)
 			continue;
 
 		while (count--) {
-			if (buf[FIREWIRE_HEADER_SIZE] == 0x47)
+			if (buf[MPEG2_TS_HEADER_SIZE] == 0x47)
 				dvb_dmx_swfilter_packets(&fdtv->demux,
-						&buf[FIREWIRE_HEADER_SIZE], 1);
+						&buf[MPEG2_TS_HEADER_SIZE], 1);
 			else
 				dev_err(fdtv->device,
 					"skipping invalid packet\n");
-			buf += 188 + FIREWIRE_HEADER_SIZE;
+			buf += MPEG2_TS_SOURCE_PACKET_SIZE;
 		}
 	}
 out:
Signature · 3 lines
Stefan Richter
-=====-==--= =-== -=---
http://arcgraph.de/sr/
#4 lore raw

PATCH 4/4 firedtv: port to new firewire core

In reply to Stefan Richter

The firedtv DVB driver will now work not only on top of the old ieee1394 driver stack but also on the new firewire driver stack.

Alongside to the firedtv-1394.c backend for driver binding and I/O, the firedtv-fw.c backend is added. Depending on which of the two 1394 stacks is configured, one or the other or both backends will be built into the firedtv driver.

This has been tested with a DVB-T and a DVB-C box on x86-64 and x86-32 together with a few different controllers (Agere FW323, a NEC chip, TI TSB82AA2, TSB43AB22/A, VIA VT6306).

---
 drivers/media/dvb/firewire/Kconfig        |    7 +
 drivers/media/dvb/firewire/Makefile       |    1 +
 drivers/media/dvb/firewire/firedtv-1394.c |    6 
 drivers/media/dvb/firewire/firedtv-dvb.c  |   15 +
 drivers/media/dvb/firewire/firedtv-fw.c   |  385 ++++++++++++++++++++++
 drivers/media/dvb/firewire/firedtv.h      |   15 +
 6 files changed, 420 insertions(+), 9 deletions(-)
drivers/media/dvb/firewire/Kconfig +5 -2
Index: linux-2.6.31.4/drivers/media/dvb/firewire/Kconfig
===================================================================
@@ -1,6 +1,6 @@
 config DVB_FIREDTV
 	tristate "FireDTV and FloppyDTV"
-	depends on DVB_CORE && IEEE1394
+	depends on DVB_CORE && (FIREWIRE || IEEE1394)
 	help
 	  Support for DVB receivers from Digital Everywhere
 	  which are connected via IEEE 1394 (FireWire).
@@ -13,8 +13,11 @@ config DVB_FIREDTV
 
 if DVB_FIREDTV
 
+config DVB_FIREDTV_FIREWIRE
+	def_bool FIREWIRE = y || (FIREWIRE = m && DVB_FIREDTV = m)
+
 config DVB_FIREDTV_IEEE1394
-	def_bool IEEE1394
+	def_bool IEEE1394 = y || (IEEE1394 = m && DVB_FIREDTV = m)
 
 config DVB_FIREDTV_INPUT
 	def_bool INPUT = y || (INPUT = m && DVB_FIREDTV = m)
drivers/media/dvb/firewire/Makefile +1 -0
Index: linux-2.6.31.4/drivers/media/dvb/firewire/Makefile
===================================================================
@@ -1,6 +1,7 @@
 obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
 
 firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o
+firedtv-$(CONFIG_DVB_FIREDTV_FIREWIRE) += firedtv-fw.o
 firedtv-$(CONFIG_DVB_FIREDTV_IEEE1394) += firedtv-1394.o
 firedtv-$(CONFIG_DVB_FIREDTV_INPUT)    += firedtv-rc.o
 
drivers/media/dvb/firewire/firedtv-1394.c +3 -3
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-1394.c
===================================================================
@@ -1,5 +1,5 @@
 /*
- * FireDTV driver (formerly known as FireSAT)
+ * FireDTV driver -- ieee1394 I/O backend
  *
  * Copyright (C) 2004 Andreas Monitzer <[email protected]>
  * Copyright (C) 2007-2008 Ben Backx <[email protected]>
@@ -261,6 +261,7 @@ static int node_update(struct unit_direc
 
 static struct hpsb_protocol_driver fdtv_driver = {
 	.name		= "firedtv",
+	.id_table	= fdtv_id_table,
 	.update		= node_update,
 	.driver         = {
 		.probe  = node_probe,
@@ -273,12 +274,11 @@ static struct hpsb_highlevel fdtv_highle
 	.fcp_request	= fcp_request,
 };
 
-int __init fdtv_1394_init(struct ieee1394_device_id id_table[])
+int __init fdtv_1394_init(void)
 {
 	int ret;
 
 	hpsb_register_highlevel(&fdtv_highlevel);
-	fdtv_driver.id_table = id_table;
 	ret = hpsb_register_protocol(&fdtv_driver);
 	if (ret) {
 		printk(KERN_ERR "firedtv: failed to register protocol\n");
drivers/media/dvb/firewire/firedtv-dvb.c +13 -2
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-dvb.c
===================================================================
@@ -297,7 +297,7 @@ struct firedtv *fdtv_alloc(struct device
 #define AVC_UNIT_SPEC_ID_ENTRY	0x00a02d
 #define AVC_SW_VERSION_ENTRY	0x010001
 
-static struct ieee1394_device_id fdtv_id_table[] = {
+const struct ieee1394_device_id fdtv_id_table[] = {
 	{
 		/* FloppyDTV S/CI and FloppyDTV S2 */
 		.match_flags	= MATCH_FLAGS,
@@ -346,12 +346,23 @@ MODULE_DEVICE_TABLE(ieee1394, fdtv_id_ta
 
 static int __init fdtv_init(void)
 {
-	return fdtv_1394_init(fdtv_id_table);
+	int ret;
+
+	ret = fdtv_fw_init();
+	if (ret < 0)
+		return ret;
+
+	ret = fdtv_1394_init();
+	if (ret < 0)
+		fdtv_fw_exit();
+
+	return ret;
 }
 
 static void __exit fdtv_exit(void)
 {
 	fdtv_1394_exit();
+	fdtv_fw_exit();
 }
 
 module_init(fdtv_init);
drivers/media/dvb/firewire/firedtv-fw.c new file +385 -0

385 lines not on this page · raw message

drivers/media/dvb/firewire/firedtv.h +13 -2
Index: linux-2.6.31.4/drivers/media/dvb/firewire/firedtv.h
===================================================================
@@ -16,6 +16,7 @@
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/list.h>
+#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/spinlock_types.h>
 #include <linux/types.h>
@@ -119,10 +120,10 @@ struct firedtv {
 
 /* firedtv-1394.c */
 #ifdef CONFIG_DVB_FIREDTV_IEEE1394
-int fdtv_1394_init(struct ieee1394_device_id id_table[]);
+int fdtv_1394_init(void);
 void fdtv_1394_exit(void);
 #else
-static inline int fdtv_1394_init(struct ieee1394_device_id it[]) { return 0; }
+static inline int fdtv_1394_init(void) { return 0; }
 static inline void fdtv_1394_exit(void) {}
 #endif
 
@@ -163,10 +164,20 @@ struct firedtv *fdtv_alloc(struct device
 			   const struct firedtv_backend *backend,
 			   const char *name, size_t name_len);
 extern const char *fdtv_model_names[];
+extern const struct ieee1394_device_id fdtv_id_table[];
 
 /* firedtv-fe.c */
 void fdtv_frontend_init(struct firedtv *fdtv);
 
+/* firedtv-fw.c */
+#ifdef CONFIG_DVB_FIREDTV_FIREWIRE
+int fdtv_fw_init(void);
+void fdtv_fw_exit(void);
+#else
+static inline int fdtv_fw_init(void) { return 0; }
+static inline void fdtv_fw_exit(void) {}
+#endif
+
 /* firedtv-rc.c */
 #ifdef CONFIG_DVB_FIREDTV_INPUT
 int fdtv_register_rc(struct firedtv *fdtv, struct device *dev);
Signature · 3 lines
Stefan Richter
-=====-==--= =-== -=---
http://arcgraph.de/sr/
#5 lore raw
In reply to Stefan Richter
Quoted 5 lines · Stefan Richter

[PATCH 1/4] firedtv: move remote control workqueue handling into rc source file [PATCH 2/4] firedtv: reform lock transaction backend call
[PATCH 3/4] firedtv: add missing include, rename a constant
[PATCH 4/4] firedtv: port to new firewire core

Quoted 9 lines
 drivers/media/dvb/firewire/Kconfig        |    7
 drivers/media/dvb/firewire/Makefile       |    1
 drivers/media/dvb/firewire/firedtv-1394.c |   37 +-
 drivers/media/dvb/firewire/firedtv-avc.c  |   50 +-
 drivers/media/dvb/firewire/firedtv-dvb.c  |   15
 drivers/media/dvb/firewire/firedtv-fw.c   |  385 ++++++++++++++++++++++
 drivers/media/dvb/firewire/firedtv-rc.c   |    2
 drivers/media/dvb/firewire/firedtv.h      |   17
 8 files changed, 471 insertions(+), 43 deletions(-)

These patches are now also available in the v2.6.31 based "firedtv" branch at

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

This branch is also merged into linux1394-2.6.git for-next and thereby linux-next.git.

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

These patches are now also available in the v2.6.31 based "firedtv" branch at

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

This branch is also merged into linux1394-2.6.git for-next and thereby linux-next.git.

It works beautifully! Tested on a FireDTV C/CI.

/Benny

#7 lore raw
Quoted 9 lines
Quoted 7 lines

These patches are now also available in the v2.6.31 based "firedtv" branch at

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

This branch is also merged into linux1394-2.6.git for-next and thereby linux-next.git.

It works beautifully! Tested on a FireDTV C/CI.

what about of dvb-s2 support for FireDTV and FloppyDTV ? does it exist and work well ?

Goga