On 16/05/13(Thu) 23:55, Jérémie Courrèges-Anglas wrote:
> Hi,
>
> I've been using msk(4) with MSI on my laptop since a few days, with no
> apparent problem.
>
> mskc0 at pci2 dev 0 function 0 "Marvell Yukon 88E8040" rev 0x13, Yukon-2 FE+
> rev. A0 (0x0): msi
> msk0 at mskc0 port A: address 00:24:54:xx:xx:xx
> eephy0 at msk0 phy 0: 88E3016 10/100 PHY, rev. 0
>
> Other systems all seem to use MSI, but it would be cool if people with
> different chips could test it.
>
> --
> Jérémie Courrèges-Anglas
> PGP Key Fingerprint: 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
>
> Index: if_msk.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/if_msk.c,v
> retrieving revision 1.98
> diff -u -p -r1.98 if_msk.c
> --- if_msk.c 17 Mar 2013 10:56:23 -0000 1.98
> +++ if_msk.c 13 May 2013 01:53:00 -0000
> @@ -1147,7 +1147,7 @@ mskc_attach(struct device *parent, struc
> DPRINTFN(2, ("mskc_attach: allocate interrupt\n"));
>
> /* Allocate interrupt */
> - if (pci_intr_map(pa, &ih)) {
> + if (pci_intr_map_msi(pa, &ih) && pci_intr_map(pa, &ih)) {
> printf(": couldn't map interrupt\n");
> goto fail_1;
> }
>
Works for me with:
mskc0 at pci3 dev 0 function 0 "Marvell Yukon 88E8036" rev 0x16, Yukon-2
FE rev. A1 (0x1): msi
msk0 at mskc0 port A: address 00:13:a9:fa:5a:52
eephy0 at msk0 phy 0: 88E3082 10/100 PHY, rev. 3
I'd like to commit it, any ok?
