Re: dmfe/tulip device id overlap

[Grant Grundler <grundler@google.com>]

On Tue, Nov 24, 2009 at 8:49 PM, Brandon Philips <brandon@ifup.org> wrote:
> Adding Tobias and Grant under (hopefully) working email addresses.
>
> Can you please submit patches to update MAINTAINERS with your
> preferred email?

grundler@parisc-linux.org is my preferred email for tulip driver
issues. Is that bouncing? :(


> On 20:36 Tue 24 Nov 2009, Brandon Philips wrote:
>> Hello All-
>>
>> dmfe and tulip have an overlap of device IDs and it has been discussed
>> before without resolution[1][2].
>>
>> The device ID in particular is:
>>
>>       { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
>>       { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
>>
>> Users of Fedora[3] and openSUSE[4] are feeling pain from this but
>> Ubuntu users are avoiding the issue do to the patch below.
>>
>> This patch comes almost directly from the discussion on the
>> linux-sparc thread[2]. So, can we merge that patch? Or can one of the
>> maintainers come up with a less hacky solution (e.g. fix tulip)?

I'm totally ok with "clipping" the DMFE ids so tulip and dmfe drivers
have no overlap. I just can't test it since I don't have those cards.
It sounds like people know which driver works on sparc.


>>
>> Cheers,
>>
>>       Brandon
>>
>> [1] http://www.mail-archive.com/debian-sparc@lists.debian.org/msg21647.html
>> [2] http://marc.info/?l=linux-sparc&m=123698905214250&w=2
>> [3] https://bugzilla.redhat.com/show_bug.cgi?id=277731
>> [4] https://bugzilla.novell.com/show_bug.cgi?id=537016
>>
>> From: Ben Collins <bcollins@ubuntu.com>
>> Date: Wed, 18 Jul 2007 17:48:25 +0000 (-0400)
>> Subject: UBUNTU: SAUCE: tulip: Let dmfe handle davicom on non-sparc
>> X-Git-Tag: Ubuntu-2.6.31-10.31~680
>> X-Git-Url: http://kernel.ubuntu.com/git?p=ubuntu%2Fubuntu-karmic.git;a=commitdiff_plain;h=886595ab493b5c5fcf23b55b3ebf46bfe219a5d0
>>
>> UBUNTU: SAUCE: tulip: Let dmfe handle davicom on non-sparc
>>
>> Signed-off-by: Ben Collins <ben.collins@canonical.com>

I'm ok with this patch except the mention of Ubuntu in the comment is
superfluous. All the distro's will share this problem. I trust davem
to rewrite the comment and plase add my:
    Signed-off-by: Grant Grundler <grundler@parisc-linux.org>

cheers,
grant

>> ---
>>
>> diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
>> index 4cf9a65..b75f65c 100644
>> --- a/drivers/net/tulip/tulip_core.c
>> +++ b/drivers/net/tulip/tulip_core.c
>> @@ -228,8 +228,12 @@ static struct pci_device_id tulip_pci_tbl[] = {
>>       { 0x1259, 0xa120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
>>       { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 },
>>       { 0x8086, 0x0039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, I21145 },
>> +     /* Ubuntu: On non-sparc, this seems to be handled better by the
>> +      * dmfe driver. */
>> +#ifdef __sparc__
>>       { 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
>>       { 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
>> +#endif
>>       { 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
>>       { 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
>>       { 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
>