[GIT PULL] ieee1394 update

[GIT PULL] ieee1394 update

[Stefan Richter]

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 following patch...

Stefan Richter (1):
      ieee1394: ohci1394: revert fail on error in suspend

 drivers/ieee1394/ohci1394.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

...or just apply it from this mail.  This fixes a regression since -rc1:
Some machines, esp. PPC_PMAC, cannot suspend if ohci1394 is loaded.



Date: Sun, 29 Oct 2006 19:52:49 +0100 (CET)
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Subject: ieee1394: ohci1394: revert fail on error in suspend

Some errors during preparation for suspended state can be skipped with a
warning instead of a failure of the whole suspend transition, notably an
error in pci_set_power_state.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c
+++ linux/drivers/ieee1394/ohci1394.c
@@ -3552,12 +3552,21 @@ static int ohci1394_pci_suspend (struct
 {
 	int err;
 
+	printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
+	       OHCI1394_DRIVER_NAME);
+
 	err = pci_save_state(pdev);
-	if (err)
-		goto out;
+	if (err) {
+		printk(KERN_ERR "%s: pci_save_state failed with %d\n",
+		       OHCI1394_DRIVER_NAME, err);
+		return err;
+	}
 	err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+#ifdef OHCI1394_DEBUG
 	if (err)
-		goto out;
+		printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n",
+		       OHCI1394_DRIVER_NAME, err);
+#endif /* OHCI1394_DEBUG */
 
 /* PowerMac suspend code comes last */
 #ifdef CONFIG_PPC_PMAC
@@ -3570,8 +3579,8 @@ #ifdef CONFIG_PPC_PMAC
 			pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 0);
 	}
 #endif /* CONFIG_PPC_PMAC */
-out:
-	return err;
+
+	return 0;
 }
 #endif /* CONFIG_PM */
 

Re: [GIT PULL] ieee1394 update

[Linus Torvalds]

On Sun, 29 Oct 2006, Stefan Richter wrote:
>
> 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

	"Already up-to-date."

Did you forget to push?

		Linus

Re: [GIT PULL] ieee1394 update

[Stefan Richter]

Linus Torvalds wrote:
> On Sun, 29 Oct 2006, Stefan Richter wrote:
>> 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
> 
> 	"Already up-to-date."
> 
> Did you forget to push?

Sorry, I had a typo in my local .git/remotes/. I properly pushed to
master.kernel.org now. Thanks.
-- 
Stefan Richter
-=====-=-==- =-=- ===-=
http://arcgraph.de/sr/

[git pull] ieee1394 update

[Stefan Richter]

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 following update.

Stefan Richter (1):
      ieee1394: add quirk fix for Freecom HDD

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


commit 25a41b280083259d05d68f61633194344a1f8a9f
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Dec 13 01:43:59 2008 +0100

    ieee1394: add quirk fix for Freecom HDD
    
    According to http://bugzilla.kernel.org/show_bug.cgi?id=12206, Freecom
    FireWire Hard Drive 1TB reports max_rom=2 but returns garbage if block
    read requests are used to read the config ROM.  Force max_rom=0 to limit
    them to quadlet read requests.
    
    Reported-by: Christian Mueller <cm1@mumac.de>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index d333ae2..79ef5fd 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -115,8 +115,14 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
 	return error;
 }
 
+#define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db
+
 static int nodemgr_get_max_rom(quadlet_t *bus_info_data, void *__ci)
 {
+	/* Freecom FireWire Hard Drive firmware bug */
+	if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH)
+		return 0;
+
 	return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3;
 }
 

Thanks,
-- 
Stefan Richter
-=====-==--- ==-- =----
http://arcgraph.de/sr/

[GIT PULL] ieee1394 update

[Stefan Richter]

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 a regression fix for ieee1394 and a trivial bit for firewire.

Stefan Richter (2):
      ieee1394: fix NULL pointer dereference in sysfs access
      firewire: fw-sbp2: log scsi_target ID at release

 drivers/firewire/fw-sbp2.c |    2 +-
 drivers/ieee1394/nodemgr.c |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

Thanks.


commit f32ddaddf95d8a30be5a41cf681bc8792bc42ec7
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Thu Apr 24 23:17:47 2008 +0200

    firewire: fw-sbp2: log scsi_target ID at release
    
    Makes the good-by message more informative.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Jarod Wilson <jwilson@redhat.com>

diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c
index 2a99937..62e3c91 100644
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
@@ -784,7 +784,7 @@ static void sbp2_release_target(struct kref *kref)
 		kfree(lu);
 	}
 	scsi_remove_host(shost);
-	fw_notify("released %s\n", tgt->bus_id);
+	fw_notify("released %s, target %d:0:0\n", tgt->bus_id, shost->host_no);
 
 	fw_unit_put(tgt->unit);
 	scsi_host_put(shost);

commit 07c7224cf74c3977c69c7c9a0b0fba264f2df36a
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Thu May 1 10:43:04 2008 +0200

    ieee1394: fix NULL pointer dereference in sysfs access
    
    Regression since "ieee1394: prevent device binding of raw1394,
    video1394, dv1394", commit d2ace29fa44589da51fedc06a67b3f05301f3bfd:
    $ cat /sys/bus/ieee1394/drivers/raw1394/device_ids
    triggers a NULL pointer dereference in fw_show_drv_device_ids.
    Reported by Miles Lane.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Tested-by: Miles Lane <miles.lane@gmail.com>

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 70afa37..c6babe8 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -520,8 +520,11 @@ static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf)
 	char *scratch = buf;
 
 	driver = container_of(drv, struct hpsb_protocol_driver, driver);
+	id = driver->id_table;
+	if (!id)
+		return 0;
 
-	for (id = driver->id_table; id->match_flags != 0; id++) {
+	for (; id->match_flags != 0; id++) {
 		int need_coma = 0;
 
 		if (id->match_flags & IEEE1394_MATCH_VENDOR_ID) {
-- 
Stefan Richter
-=====-==--- -=-= ----=
http://arcgraph.de/sr/