From: Stefan Richter Host adapter hardware imposes certain restrictions and features on address ranges. Instead of hard-wiring such ranges into the ieee1394 core or even into protocol drivers, let lowlevel drivers specify these ranges via struct hpsb_host. Signed-off-by: Stefan Richter Cc: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton --- drivers/ieee1394/highlevel.c | 4 +++- drivers/ieee1394/hosts.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff -puN drivers/ieee1394/highlevel.c~ieee1394-ieee1394-extend-lowlevel-api-for drivers/ieee1394/highlevel.c --- 25/drivers/ieee1394/highlevel.c~ieee1394-ieee1394-extend-lowlevel-api-for Fri Jun 2 14:44:00 2006 +++ 25-akpm/drivers/ieee1394/highlevel.c Fri Jun 2 14:44:00 2006 @@ -312,8 +312,10 @@ u64 hpsb_allocate_and_register_addrspace 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 -puN drivers/ieee1394/hosts.h~ieee1394-ieee1394-extend-lowlevel-api-for drivers/ieee1394/hosts.h --- 25/drivers/ieee1394/hosts.h~ieee1394-ieee1394-extend-lowlevel-api-for Fri Jun 2 14:44:00 2006 +++ 25-akpm/drivers/ieee1394/hosts.h Fri Jun 2 14:44:00 2006 @@ -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 */ }; _