3 files changed, 19 insertions, 53 deletions

diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 5e38a68b8af2..a6dfeb0b3372 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -1077,15 +1077,10 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
         int i;
         int ret;
 
-        /* IEEE 1212 says that the entire bus info block should be readable in
-         * a single transaction regardless of the max_rom value.
-         * Unfortunately, many IEEE 1394 devices do not abide by that, so the
-         * bus info block will be read 1 quadlet at a time.  The rest of the
-         * ConfigROM will be read according to the max_rom field. */
         for (i = 0; i < csr->bus_info_len; i += sizeof(u32)) {
                 ret = csr->ops->bus_read(csr, CSR1212_CONFIG_ROM_SPACE_BASE + i,
-                        sizeof(u32), &csr->cache_head->data[bytes_to_quads(i)],
-                        csr->private);
+                                &csr->cache_head->data[bytes_to_quads(i)],
+                                csr->private);
                 if (ret != CSR1212_SUCCESS)
                         return ret;
 
@@ -1104,8 +1099,8 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
          * a time. */
         for (i = csr->bus_info_len; i <= csr->crc_len; i += sizeof(u32)) {
                 ret = csr->ops->bus_read(csr, CSR1212_CONFIG_ROM_SPACE_BASE + i,
-                        sizeof(u32), &csr->cache_head->data[bytes_to_quads(i)],
-                        csr->private);
+                                &csr->cache_head->data[bytes_to_quads(i)],
+                                csr->private);
                 if (ret != CSR1212_SUCCESS)
                         return ret;
         }
@@ -1289,7 +1284,7 @@ csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
 
                 if (csr->ops->bus_read(csr,
                                        CSR1212_REGISTER_SPACE_BASE + kv->offset,
-                                       sizeof(u32), &q, csr->private))
+                                       &q, csr->private))
                         return -EIO;
 
                 kv->value.leaf.len = be32_to_cpu(q) >> 16;
@@ -1372,17 +1367,8 @@ csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
                 addr = (CSR1212_CSR_ARCH_REG_SPACE_BASE + cache->offset +
                         cr->offset_end) & ~(csr->max_rom - 1);
 
-                if (csr->ops->bus_read(csr, addr, csr->max_rom, cache_ptr,
-                                       csr->private)) {
-                        if (csr->max_rom == 4)
-                                /* We've got problems! */
-                                return -EIO;
-
-                        /* Apperently the max_rom value was a lie, set it to
-                         * do quadlet reads and try again. */
-                        csr->max_rom = 4;
-                        continue;
-                }
+                if (csr->ops->bus_read(csr, addr, cache_ptr, csr->private))
+                        return -EIO;
 
                 cr->offset_end += csr->max_rom - (cr->offset_end &
                                                   (csr->max_rom - 1));
@@ -1433,7 +1419,6 @@ csr1212_get_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
 
 int csr1212_parse_csr(struct csr1212_csr *csr)
 {
-        static const int mr_map[] = { 4, 64, 1024, 0 };
         struct csr1212_dentry *dentry;
         int ret;
 
@@ -1443,15 +1428,13 @@ int csr1212_parse_csr(struct csr1212_csr *csr)
         if (ret != CSR1212_SUCCESS)
                 return ret;
 
-        if (!csr->ops->get_max_rom) {
-                csr->max_rom = mr_map[0];       /* default value */
-        } else {
-                int i = csr->ops->get_max_rom(csr->bus_info_data,
-                                              csr->private);
-                if (i & ~0x3)
-                        return -EINVAL;
-                csr->max_rom = mr_map[i];
-        }
+        /*
+         * There has been a buggy firmware with bus_info_block.max_rom > 0
+         * spotted which actually only supported quadlet read requests to the
+         * config ROM.  Therefore read everything quadlet by quadlet regardless
+         * of what the bus info block says.
+         */
+        csr->max_rom = 4;
 
         csr->cache_head->layout_head = csr->root_kv;
         csr->cache_head->layout_tail = csr->root_kv;
diff --git a/drivers/ieee1394/csr1212.h b/drivers/ieee1394/csr1212.h
index 043039fc63ec..aced168f1be2 100644
--- a/drivers/ieee1394/csr1212.h
+++ b/drivers/ieee1394/csr1212.h
@@ -200,7 +200,7 @@ struct csr1212_bus_ops {
          * entries located in the Units Space.  Must return 0 on success
          * anything else indicates an error. */
         int (*bus_read) (struct csr1212_csr *csr, u64 addr,
-                         u16 length, void *buffer, void *private);
+                         void *buffer, void *private);
 
         /* This function is used by csr1212 to allocate a region in units space
          * in the event that Config ROM entries don't all fit in the predefined
@@ -211,11 +211,6 @@ struct csr1212_bus_ops {
         /* This function is used by csr1212 to release a region in units space
          * that is no longer needed. */
         void (*release_addr) (u64 addr, void *private);
-
-        /* This function is used by csr1212 to determine the max read request
-         * supported by a remote node when reading the ConfigROM space.  Must
-         * return 0, 1, or 2 per IEEE 1212.  */
-        int (*get_max_rom) (u32 *bus_info, void *private);
 };
 
 
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 79ef5fd928ae..906c5a98d814 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -67,7 +67,7 @@ static int nodemgr_check_speed(struct nodemgr_csr_info *ci, u64 addr,
         for (i = IEEE1394_SPEED_100; i <= old_speed; i++) {
                 *speed = i;
                 error = hpsb_read(ci->host, ci->nodeid, ci->generation, addr,
-                                  &q, sizeof(quadlet_t));
+                                  &q, 4);
                 if (error)
                         break;
                 *buffer = q;
@@ -85,7 +85,7 @@ static int nodemgr_check_speed(struct nodemgr_csr_info *ci, u64 addr,
         return error;
 }
 
-static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
+static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr,
                             void *buffer, void *__ci)
 {
         struct nodemgr_csr_info *ci = (struct nodemgr_csr_info*)__ci;
@@ -93,7 +93,7 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
 
         for (i = 1; ; i++) {
                 error = hpsb_read(ci->host, ci->nodeid, ci->generation, addr,
-                                  buffer, length);
+                                  buffer, 4);
                 if (!error) {
                         ci->speed_unverified = 0;
                         break;
@@ -104,7 +104,7 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
 
                 /* The ieee1394_core guessed the node's speed capability from
                  * the self ID.  Check whether a lower speed works. */
-                if (ci->speed_unverified && length == sizeof(quadlet_t)) {
+                if (ci->speed_unverified) {
                         error = nodemgr_check_speed(ci, addr, buffer);
                         if (!error)
                                 break;
@@ -115,20 +115,8 @@ 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;
-}
-
 static struct csr1212_bus_ops nodemgr_csr_ops = {
         .bus_read =     nodemgr_bus_read,
-        .get_max_rom =  nodemgr_get_max_rom
 };