Re: wpi(4) MSI

2011-06-02 Thread Mark Kettenis
> Date: Thu, 2 Jun 2011 20:25:23 +0200
> From: Michael Knudsen 
> 
> I enabled MSI for the wpi(4) in my X60:
> 
> wpi0 at pci2 dev 0 function 0 "Intel PRO/Wireless 3945ABG" rev 0x02: msi, 
> MoW2, address 00:13:02:9b:f4:89
> 
> It didn't blow up right away.  Anyone else feel lucky?

Reasonably confident that will work on all hardware, go ahead and commit.

> Index: if_wpi.c
> ===
> RCS file: /cvs/src/sys/dev/pci/if_wpi.c,v
> retrieving revision 1.109
> diff -u -p -r1.109 if_wpi.c
> --- if_wpi.c  7 Sep 2010 16:21:45 -   1.109
> +++ if_wpi.c  2 Jun 2011 18:25:03 -
> @@ -215,7 +215,7 @@ wpi_attach(struct device *parent, struct
>   }
>  
>   /* Install interrupt handler. */
> - if (pci_intr_map(pa, &ih) != 0) {
> + if (pci_intr_map_msi(pa, &ih) != 0 && pci_intr_map(pa, &ih) != 0) {
>   printf(": can't map interrupt\n");
>   return;
>   }
> 
> 
> -- 
>  no, it's a recursive acronym. It means "gcc can't compile"



Re: wpi(4) MSI

2011-06-02 Thread Paul de Weerd
On Thu, Jun 02, 2011 at 08:25:23PM +0200, Michael Knudsen wrote:
| I enabled MSI for the wpi(4) in my X60:
| 
| wpi0 at pci2 dev 0 function 0 "Intel PRO/Wireless 3945ABG" rev 0x02: msi, 
MoW2, address 00:13:02:9b:f4:89
| 
| It didn't blow up right away.  Anyone else feel lucky?

Seems like my Z61m has the same components as your X60, mk:

wpi0 at pci2 dev 0 function 0 "Intel PRO/Wireless 3945ABG" rev 0x02: msi, MoW2, 
address 00:18:de:89:c8:1b

Suspends / resumes just fine.

Paul 'WEiRD' de Weerd

-- 
>[<++>-]<+++.>+++[<-->-]<.>+++[<+
+++>-]<.>++[<>-]<+.--.[-]
 http://www.weirdnet.nl/