Re: [PATCH v5 1/4] bcma: scan for extra address space

[Hauke Mehrtens <hauke@hauke-m.de>]

Hi Rafał,

could you give me an Acked-by line as the Maintainer of bcma for this
patch if you are ok with this patch please.

Hauke

On 03/15/2012 11:49 PM, Hauke Mehrtens 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 in the Broadcom SDK.
> 
> CC: Rafał Miłecki <zajec5@gmail.com>
> CC: linux-wireless@vger.kernel.org
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
>  drivers/bcma/scan.c       |   19 ++++++++++++++++++-
>  include/linux/bcma/bcma.h |    1 +
>  2 files changed, 19 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
> index 3a2f672..1fa10ed 100644
> --- a/drivers/bcma/scan.c
> +++ b/drivers/bcma/scan.c
> @@ -286,6 +286,23 @@ 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) {
> +			return -EILSEQ;
> +		} else {
> +			pr_info("Bridge found\n");
> +			return -ENXIO;
> +		}
> +	}
> +	core->addr = tmp;
> +
>  	/* get & parse slave ports */
>  	for (i = 0; i < ports[1]; i++) {
>  		for (j = 0; ; j++) {
> @@ -298,7 +315,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
>  				break;
>  			} else {
>  				if (i == 0 && j == 0)
> -					core->addr = tmp;
> +					core->addr1 = tmp;
>  			}
>  		}
>  	}
> diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
> index 83c209f..7fe41e1 100644
> --- a/include/linux/bcma/bcma.h
> +++ b/include/linux/bcma/bcma.h
> @@ -138,6 +138,7 @@ struct bcma_device {
>  	u8 core_index;
>  
>  	u32 addr;
> +	u32 addr1;
>  	u32 wrap;
>  
>  	void __iomem *io_addr;