Re: [PATCH] ssb: fix init regression with SoCs

[Larry Finger <Larry.Finger@lwfinger.net>]

On 12/05/2011 04:19 PM, Hauke Mehrtens wrote:
> This fixes a Data bus error on some SoCs. The first fix for this
> problem did not solve it on all devices.
>      commit 6ae8ec27868bfdbb815287bee8146acbefaee867
>      Author: Rafał Miłecki<zajec5@gmail.com>
>      Date:   Tue Jul 5 17:25:32 2011 +0200
>          ssb: fix init regression of hostmode PCI core
>
> In ssb_pcicore_fix_sprom_core_index() the sprom on the PCI core is
> accessed, but the sprom only exists when the ssb bus is connected over
> a PCI bus to the rest of the system and not when the SSB Bus is the
> main system bus. SoCs sometimes have a PCI host controller and there
> this code will not be executed, but there are some old SoCs with an PCI
> controller in client mode around and ssb_pcicore_fix_sprom_core_index()
> should not be called on these devices too. The PCI controller on these
> devices are unused, but without this fix it results in an Data bus
> error when it gets initialized.
>
> CC: Michael Buesch<m@bues.ch>
> CC: Rafał Miłecki<zajec5@gmail.com>
> Signed-off-by: Hauke Mehrtens<hauke@hauke-m.de>
> ---
>   drivers/ssb/driver_pcicore.c |    8 ++++++--
>   1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
> index 84c934c..520e828 100644
> --- a/drivers/ssb/driver_pcicore.c
> +++ b/drivers/ssb/driver_pcicore.c
> @@ -517,10 +517,14 @@ static void ssb_pcicore_pcie_setup_workarounds(struct ssb_pcicore *pc)
>
>   static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
>   {
> -	ssb_pcicore_fix_sprom_core_index(pc);
> +	struct ssb_device *pdev = pc->dev;
> +	struct ssb_bus *bus = pdev->bus;
> +
> +	if (bus->bustype == SSB_BUSTYPE_PCI)
> +		ssb_pcicore_fix_sprom_core_index(pc);
>
>   	/* Disable PCI interrupts. */
> -	ssb_write32(pc->dev, SSB_INTVEC, 0);
> +	ssb_write32(pdev, SSB_INTVEC, 0);

As bus == pc->dev->bus is only used once, why bother to create it? If you were 
to change that, then pdev == pc->dev is only used once. Any real reason to 
change the lines above?

Larry