On Friday 12 January 2007 19:08, Larry Finger wrote:
> The PCI-E modifications to bcm43xx do not set up the interrupt vector
> correctly. Tested with BCM4311 (PCI-E) on x86_64 and BCM4306 (PCI) on i386.
>
> Signed-off-by: Larry Finger <[EMAIL PROTECTED]>
ACK.
> ---
>
> John,
>
> This fix should be applied to wireless-2.6 _AND_ pushed upstream to
> 2.6.20-rcX. Without this patch, none of the PCI-E interfaces will work.
> This version incorporates Michael Buesch's comments, and forgoes some
> code clean-ups that were in the first version/
>
> Larry
>
>
> Index: linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> +++ linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> @@ -2704,8 +2704,8 @@ static int bcm43xx_probe_cores(struct bc
> sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
>
> /* extract core_id, core_rev, core_vendor */
> - core_id = (sb_id_hi & 0xFFF0) >> 4;
> - core_rev = (sb_id_hi & 0xF);
> + core_id = (sb_id_hi & 0x8FF0) >> 4;
> + core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8));
> core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
>
> dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor
> 0x%x\n",
> @@ -2876,7 +2876,10 @@ static int bcm43xx_wireless_core_init(st
> sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
> sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
> sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
> - sbimconfiglow |= 0x32;
> + if (bcm->bustype == BCM43xx_BUSTYPE_PCI)
> + sbimconfiglow |= 0x32;
> + else
> + sbimconfiglow |= 0x53;
This hunk is OK, but I just want to point out that bustype is
always equal to BCM43xx_BUSTYPE_PCI ;)
The 0x53 timeouts are for an SSB-BUS.
So strictly said this hunk is a NOP.
The other hunks are OK, too. They fix real bugs.
Thanks for spotting them, Larry!
> bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow);
> }
>
> @@ -3080,7 +3083,7 @@ static int bcm43xx_setup_backplane_pci_c
> if (err)
> goto out;
>
> - if (bcm->current_core->rev < 6 ||
> + if (bcm->current_core->rev < 6 &&
> bcm->current_core->id == BCM43xx_COREID_PCI) {
> value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC);
> value |= (1 << backplane_flag_nr);
>
> ---
>
>
--
Greetings Michael.
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
