ieee1394: extend lowlevel API for address range properties

Host adapter hardware imposes certain restrictions and features on
address ranges.  Instead of hard-wire such ranges into the ieee1394
core or even into protocol drivers, let lowlevel drivers specify
these ranges via struct hpsb_host.

Patch "ohci1394: set address range properties" must be applied too,
else hpsb_allocate_and_register_addrspace() won't work properly.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>

diff --git a/drivers/ieee1394/highlevel.c b/drivers/ieee1394/highlevel.c
index 491e6032bdec911f3887b4cc34feb3eb99c9ee26..29c5255b933ce34547037fd2e61325cabc34bad5 100644 (file)
--- a/drivers/ieee1394/highlevel.c
+++ b/drivers/ieee1394/highlevel.c
@@ -312,8 +312,10 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl,
                return retval;
        }
 
+       /* default range,
+        * avoids controller's posted write area (see OHCI 1.1 clause 1.5) */
        if (start == ~0ULL && end == ~0ULL) {
-               start = CSR1212_ALL_SPACE_BASE + 0xffff00000000ULL;  /* ohci1394.c limit */
+               start = host->middle_addr_space;
                end = CSR1212_ALL_SPACE_END;
        }
 

diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h
index 9ddc6628e71024381162f7db6135eb7a0a9e48c0..9ad4b2463077656ff166a752b6fd89e462b59163 100644 (file)
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -73,6 +73,8 @@ struct hpsb_host {
        unsigned int config_roms;
 
        struct list_head addr_space;
+       u64 low_addr_space;     /* upper bound of physical DMA area */
+       u64 middle_addr_space;  /* upper bound of posted write area */
 };