Hi Hauke, On Mon, Mar 12, 2012 at 10:34, Hauke Mehrtens <hauke@xxxxxxxxxx> wrote: > On 03/11/2012 10:59 PM, Julian Calaby wrote: >> Hi Hauke, >> >> On Mon, Mar 12, 2012 at 07:08, Hauke Mehrtens <hauke@xxxxxxxxxx> wrote: >>> Some cores like the USB core have two address spaces. In the USB host >>> controller one address space is used for the OHCI and the other for the >>> EHCI controller interface. The USB controller is the only core I found >>> with two address spaces. This code is based on the AI scan function >>> ai_scan() in shared/aiutils.c i the Broadcom SDK. >>> >>> CC: Rafał Miłecki <zajec5@xxxxxxxxx> >>> CC: linux-wireless@xxxxxxxxxxxxxxx >>> Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> >>> --- >>> drivers/bcma/scan.c | 18 +++++++++++++++++- >>> include/linux/bcma/bcma.h | 1 + >>> 2 files changed, 18 insertions(+), 1 deletions(-) >>> >>> diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c >>> index 3a2f672..3c2eeed 100644 >>> --- a/drivers/bcma/scan.c >>> +++ b/drivers/bcma/scan.c >>> @@ -286,6 +286,22 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, >>> return -EILSEQ; >>> } >>> >>> + >>> + /* First Slave Address Descriptor should be port 0: >>> + * the main register space for the core >>> + */ >>> + tmp = bcma_erom_get_addr_desc(bus, eromptr, SCAN_ADDR_TYPE_SLAVE, 0); >>> + if (tmp <= 0) { >>> + /* Try again to see if it is a bridge */ >>> + tmp = bcma_erom_get_addr_desc(bus, eromptr, >>> + SCAN_ADDR_TYPE_BRIDGE, 0); >>> + if (tmp > 0) { >>> + pr_info("found bridge"); >>> + return -ENXIO; >>> + } >> >> Should this do something if the second bcma_erom_get_addr_desc() call >> returns an error? We seem to be putting any errors from that call into >> the addr member of the core structure below. > Yes that's true, we should handle that error. If tmp <= 0 the > description entry was malformed and something went wrong and we should > handle it, a correctly found bridge should just be ignored. > > I will fix this, should I resend the hole series or just this patch? I'm not sure the rest of the series made it to linux-wireless, so maybe you should resend everything. Thanks, -- Julian Calaby Email: julian.calaby@xxxxxxxxx Profile: http://www.google.com/profiles/julian.calaby/ .Plan: http://sites.google.com/site/juliancalaby/