mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-21 11:13:30 +00:00
Code Issues Releases Activity
dbda4d7734
freebsd/sys/dev/ed/if_ed_pccard.c

1107 lines
32 KiB
C
Raw Normal View History

Start each of the license/copyright comments with /*-, minor shuffle of lines
2005-01-06 01:43:34 +00:00
/*-
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
* Copyright (c) 2005, M. Warner Losh
Break out the bus front end code into separate files. Note that these haven't been turned on nor has the old code been removed from if_ed.c. The next commit will address that.
1999-10-15 01:28:04 +00:00
* Copyright (c) 1995, David Greenman
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice unmodified, this list of conditions, and the following
* disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
/*
* Notes for adding media support. Each chipset is somewhat different
* from the others. Linux has a table of OIDs that it uses to see what
* supports the misc register of the NS83903. But a sampling of datasheets
* I could dig up on cards I own paints a different picture.
*
* Chipset specific details:
* NS 83903/902A paired
* ccr base 0x1020
* id register at 0x1000: 7-3 = 0, 2-0 = 1.
* (maybe this test is too week)
* misc register at 0x018:
* 6 WAIT_TOUTENABLE enable watchdog timeout
* 3 AUI/TPI 1 AUX, 0 TPI
* 2 loopback
* 1 gdlink (tpi mode only) 1 tp good, 0 tp bad
* 0 0-no mam, 1 mam connected
* NS83926 appears to be a NS pcmcia glue chip used on the IBM Ethernet II
* and the NEC PC9801N-J12 ccr base 0x2000!
*
* winbond 289c926
* ccr base 0xfd0
* cfb (am 0xff2):
* 0-1 PHY01 00 TPI, 01 10B2, 10 10B5, 11 TPI (reduced squ)
* 2 LNKEN 0 - enable link and auto switch, 1 disable
* 3 LNKSTS TPI + LNKEN=0 + link good == 1, else 0
* sr (am 0xff4)
* 88 00 88 00 88 00, etc
*
* TMI tc3299a (cr PHY01 == 0)
* ccr base 0x3f8
* cra (io 0xa)
* crb (io 0xb)
* 0-1 PHY01 00 auto, 01 res, 10 10B5, 11 TPI
* 2 GDLINK 1 disable checking of link
* 6 LINK 0 bad link, 1 good link
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
* TMI tc5299 10/100 chip, has a different MII interaction than
* dl100xx and ax88x90.
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
*
* EN5017A, EN5020 no data, but very popular
* Other chips?
* NetBSD supports RTL8019, but none have surfaced that I can see
*/
Break out the bus front end code into separate files. Note that these haven't been turned on nor has the old code been removed from if_ed.c. The next commit will address that.
1999-10-15 01:28:04 +00:00
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
Add pccard attachment. This won't work with memory mapped ed devices yet, but that should be resolved shortly. Non memory mapped ed devices should work, but I cannot test this since my only ed card is memory mapped. Submitted by: Matt Dodd <mdodd@freebsd.org>
1999-10-25 02:55:14 +00:00
#include <sys/kernel.h>
MFPAO: Add support for AX88190, equipped in MELCO LPC3-TX.
2000-07-23 15:15:43 +00:00
#include <sys/conf.h>
#include <sys/uio.h>
Break out the bus front end code into separate files. Note that these haven't been turned on nor has the old code been removed from if_ed.c. The next commit will address that.
1999-10-15 01:28:04 +00:00
#include <sys/module.h>
Add pccard attachment. This won't work with memory mapped ed devices yet, but that should be resolved shortly. Non memory mapped ed devices should work, but I cannot test this since my only ed card is memory mapped. Submitted by: Matt Dodd <mdodd@freebsd.org>
1999-10-25 02:55:14 +00:00
#include <sys/bus.h>
#include <machine/bus.h>
Allocate memory resource to access the attribute memory of a card. Reviewed by: imp
2000-09-25 06:01:42 +00:00
#include <sys/rman.h>
#include <machine/resource.h>
Add pccard attachment. This won't work with memory mapped ed devices yet, but that should be resolved shortly. Non memory mapped ed devices should work, but I cannot test this since my only ed card is memory mapped. Submitted by: Matt Dodd <mdodd@freebsd.org>
1999-10-25 02:55:14 +00:00
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_mib.h>
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
#include <net/if_media.h>
Add pccard attachment. This won't work with memory mapped ed devices yet, but that should be resolved shortly. Non memory mapped ed devices should work, but I cannot test this since my only ed card is memory mapped. Submitted by: Matt Dodd <mdodd@freebsd.org>
1999-10-25 02:55:14 +00:00
MFPAO: Add support for AX88190, equipped in MELCO LPC3-TX.
2000-07-23 15:15:43 +00:00
#include <dev/ed/if_edreg.h>
Break out the bus front end code into separate files. Note that these haven't been turned on nor has the old code been removed from if_ed.c. The next commit will address that.
1999-10-15 01:28:04 +00:00
#include <dev/ed/if_edvar.h>
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
#include <dev/ed/ax88x90reg.h>
#include <dev/ed/dl100xxreg.h>
#include <dev/ed/tc5299jreg.h>
Propagate MAC address in CIS tupple to dev/ed/ driver. Many ed-based Ethernet PC-cards can't get correct MAC address without this patch. Submitted by: Takanori Watanabe <takawata@shidahara1.planet.sci.kobe-u.ac.jp> Reviewed by: Warner Losh <imp@village.org>
2000-01-21 03:08:46 +00:00
#include <dev/pccard/pccardvar.h>
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
#include <dev/pccard/pccardreg.h>
Only attach to network functions.
2005-01-20 19:37:22 +00:00
#include <dev/pccard/pccard_cis.h>
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
Allocate memory resource to access the attribute memory of a card. Reviewed by: imp
2000-09-25 06:01:42 +00:00
#include "card_if.h"
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
/* "device miibus" required. See GENERIC if you get errors here. */
#include "miibus_if.h"
Fix disordering of pccarddevs.h noticed by bde. Also remove a few redundant includes and fix some of the include disordering. Submitted by: bde
2004-05-27 03:49:45 +00:00
#include "pccarddevs.h"
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
/*
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
* NE-2000 based PC Cards have a number of ways to get the MAC address.
* Some cards encode this as a FUNCE. Others have this in the ROMs the
* same way that ISA cards do. Some have it encoded in the attribute
* memory somewhere that isn't in the CIS. Some new chipsets have it
* in special registers in the ASIC part of the chip.
Add note about what ED_DEFAULT_MAC_OFFSET applies to
2005-09-08 17:16:23 +00:00
*
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
* For those cards that have the MAC adress stored in attribute memory,
* nearly all of them have it at a fixed offset (0xff0). We use that
* offset as a source of last resource if other offsets have failed.
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
*/
#define ED_DEFAULT_MAC_OFFSET 0xff0
Add a bunch of entries from NetBSD's if_ne_pcmcia.c v1.67. We still need to verify that all the entries in pccard.conf are present in this table.
2001-01-21 08:20:23 +00:00
static const struct ed_product {
struct pccard_product prod;
int flags;
Fix the support for the ax88[17]90 to print the right type, rather than the generic ne-2000 string. This should have no effect on the actual support of the parts, just reporting what the part was. Also, rename a few functins and symbols to reflect a more generic part support that grew out of the early specific support.
2005-02-17 18:15:13 +00:00
#define NE2000DVF_DL100XX 0x0001 /* chip is D-Link DL10019/22 */
#define NE2000DVF_AX88X90 0x0002 /* chip is ASIX AX88[17]90 */
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
#define NE2000DVF_TC5299J 0x0004 /* chip is Tamarack TC5299J */
#define NE2000DVF_ENADDR 0x0100 /* Get MAC from attr mem */
#define NE2000DVF_ANYFUNC 0x0200 /* Allow any function type */
#define NE2000DVF_MODEM 0x0400 /* Has a modem/serial */
Really old PCMCIA cards stored the MAC address in the attribute memory at some offset. Unlike newer cards, the MAC address wasn't part of the CIS as a specific FUNCE. These older cards were having their MAC address show up as 0:2:4:6:8:a because that's what's in the ROM locations that would be there in a real ne2000. This patch allows one to specify the offset for the MAC address for these cards. Specify one for the IBM Ethernet II card, as it is one that has this problem. One shouldn't specify this unless the MAC address really isn't in the CIS at all. Side note: The novell probe likely shouldn't read the MAC address, and that should be moved to the bus specific attach routine(s), maybe as a convenience function in if_ed_novell.c. My IBM Ethernet II (aka Info Mover) now has a believable MAC address.
2005-02-12 00:45:22 +00:00
int enoff;
Add a bunch of entries from NetBSD's if_ne_pcmcia.c v1.67. We still need to verify that all the entries in pccard.conf are present in this table.
2001-01-21 08:20:23 +00:00
} ed_pccard_products[] = {
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(ACCTON, EN2212), 0},
{ PCMCIA_CARD(ACCTON, EN2216), 0},
{ PCMCIA_CARD(ALLIEDTELESIS, LA_PCM), 0},
{ PCMCIA_CARD(AMBICOM, AMB8002T), 0},
{ PCMCIA_CARD(BILLIONTON, CFLT10N), 0},
Add Billionton LNA-100B variation that Alan reported in arch. [1] Also add Global Village lan modem, even though I'm unsure if it works. Reported by: Alan newsletter at acsoftware dot org
2005-10-29 03:49:44 +00:00
{ PCMCIA_CARD(BILLIONTON, LNA100B), NE2000DVF_AX88X90},
{ PCMCIA_CARD(BILLIONTON, LNT10TN), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(BROMAX, IPORT), 0},
{ PCMCIA_CARD(BROMAX, IPORT2), 0},
{ PCMCIA_CARD(BUFFALO, LPC2_CLT), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(BUFFALO, LPC3_CLT), 0},
{ PCMCIA_CARD(BUFFALO, LPC3_CLX), NE2000DVF_AX88X90},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(BUFFALO, LPC4_TX), NE2000DVF_AX88X90},
Buffalo LPC4/CLX ID
2005-10-11 01:04:16 +00:00
{ PCMCIA_CARD(BUFFALO, LPC4_CLX), NE2000DVF_AX88X90},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(BUFFALO, LPC_CF_CLT), 0},
{ PCMCIA_CARD(CNET, NE2000), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(COMPEX, AX88190), NE2000DVF_AX88X90},
{ PCMCIA_CARD(COMPEX, LANMODEM), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(COMPEX, LINKPORT_ENET_B), 0},
{ PCMCIA_CARD(COREGA, ETHER_II_PCC_T), 0},
{ PCMCIA_CARD(COREGA, ETHER_II_PCC_TD), 0},
{ PCMCIA_CARD(COREGA, ETHER_PCC_T), 0},
{ PCMCIA_CARD(COREGA, ETHER_PCC_TD), 0},
MFp4: Minor formatting nits in pccard table.
2005-09-13 19:09:57 +00:00
{ PCMCIA_CARD(COREGA, FAST_ETHER_PCC_TX), NE2000DVF_DL100XX},
{ PCMCIA_CARD(COREGA, FETHER_PCC_TXD), NE2000DVF_AX88X90},
{ PCMCIA_CARD(COREGA, FETHER_PCC_TXF), NE2000DVF_DL100XX},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_1), 0},
{ PCMCIA_CARD(DAYNA, COMMUNICARD_E_2), 0},
Add (back) the D-Link DE-650. Not sure why it was deleted.
2006-05-08 22:23:45 +00:00
{ PCMCIA_CARD(DLINK, DE650), 0 },
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(DLINK, DE660), 0 },
{ PCMCIA_CARD(DLINK, DE660PLUS), 0},
{ PCMCIA_CARD(DYNALINK, L10C), 0},
{ PCMCIA_CARD(EDIMAX, EP4000A), 0},
I have confirmed with my Epson EEN10B that it needs to look at the attribute memory at 0xff0 to find its MAC address. This is another instance of the IBM ethercard II from all apperances (short of popping the lid). Update the entry to document which cards we support actually need this functionality.
2005-09-24 17:36:43 +00:00
{ PCMCIA_CARD(EPSON, EEN10B), NE2000DVF_ENADDR, 0xff0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(EXP, THINLANCOMBO), 0},
Add Billionton LNA-100B variation that Alan reported in arch. [1] Also add Global Village lan modem, even though I'm unsure if it works. Reported by: Alan newsletter at acsoftware dot org
2005-10-29 03:49:44 +00:00
{ PCMCIA_CARD(GLOBALVILLAGE, LANMODEM), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(GREY_CELL, TDK3000), 0},
Add support for the DLink DMF650TX Ethernet+56k modem PC Card. This gets the ethernet part of the card working, while putting appropriate hooks in place for the modem code. Other ed based lan/modem combo cards should be easy to add. Please send me info on any you'd like to see support added. Note: The 650 isn't a strictly conforming multi-function card, so special support is needed. :-(
2005-07-15 01:54:59 +00:00
{ PCMCIA_CARD(GREY_CELL, DMF650TX),
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
NE2000DVF_ANYFUNC | NE2000DVF_DL100XX | NE2000DVF_MODEM},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(IBM, HOME_AND_AWAY), 0},
{ PCMCIA_CARD(IBM, INFOMOVER), NE2000DVF_ENADDR, 0xff0},
{ PCMCIA_CARD(IODATA3, PCLAT), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(KINGSTON, CIO10T), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(KINGSTON, KNE2), 0},
MFp4: Minor formatting nits in pccard table.
2005-09-13 19:09:57 +00:00
{ PCMCIA_CARD(LANTECH, FASTNETTX), NE2000DVF_AX88X90},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(LINKSYS, COMBO_ECARD),
MFp4: Minor formatting nits in pccard table.
2005-09-13 19:09:57 +00:00
NE2000DVF_DL100XX | NE2000DVF_AX88X90},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(LINKSYS, ECARD_1), 0},
{ PCMCIA_CARD(LINKSYS, ECARD_2), 0},
MFp4: Minor formatting nits in pccard table.
2005-09-13 19:09:57 +00:00
{ PCMCIA_CARD(LINKSYS, ETHERFAST), NE2000DVF_DL100XX},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(LINKSYS, TRUST_COMBO_ECARD), 0},
{ PCMCIA_CARD(MACNICA, ME1_JEIDA), 0},
{ PCMCIA_CARD(MAGICRAM, ETHER), 0},
MFp4: Minor formatting nits in pccard table.
2005-09-13 19:09:57 +00:00
{ PCMCIA_CARD(MELCO, LPC3_CLX), NE2000DVF_AX88X90},
{ PCMCIA_CARD(MELCO, LPC3_TX), NE2000DVF_AX88X90},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(NDC, ND5100_E), 0},
{ PCMCIA_CARD(NETGEAR, FA410TXC), NE2000DVF_DL100XX},
MFp4: Reduce the size of ed a little by removing some CIS based entries (others likely can be removed too): o The D-Link DFE-670TXD doesn't need its own entry based on strings. o The Xircom CompactCard appears to be a TDK design, so list it there by ID and remove the strings. Increase the size of ed a little: o Add support for the Addtron AE-660CT and Addtron AE-660. This is a very generic NE-2000 clone (so generic that its CIS tags say NE-2000 generic card!).
2005-09-10 00:17:55 +00:00
/* Same ID as DLINK DFE-670TXD. 670 has DL10022, fa411 has ax88790 */
{ PCMCIA_CARD(NETGEAR, FA411), NE2000DVF_AX88X90 | NE2000DVF_DL100XX},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(NEXTCOM, NEXTHAWK), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(NEWMEDIA, LANSURFER), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(OEM2, ETHERNET), 0},
New OEM generic card. "10/100 Fast Ethernet PC Card". It has a generic sounding CIS "PCMCIA", "FAST ETHERENT CARD" and a bogus MANFID code (0xffff and 0x1090). However, since I'm not aware of 'generic' cards that aren't NE-2000oids, go with that and hope for the best.
2005-10-11 01:02:16 +00:00
{ PCMCIA_CARD(OEM2, FAST_ETHERNET), NE2000DVF_AX88X90 },
MFp4: Reduce the size of ed a little by removing some CIS based entries (others likely can be removed too): o The D-Link DFE-670TXD doesn't need its own entry based on strings. o The Xircom CompactCard appears to be a TDK design, so list it there by ID and remove the strings. Increase the size of ed a little: o Add support for the Addtron AE-660CT and Addtron AE-660. This is a very generic NE-2000 clone (so generic that its CIS tags say NE-2000 generic card!).
2005-09-10 00:17:55 +00:00
{ PCMCIA_CARD(OEM2, NE2000), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(PLANET, SMARTCOM2000), 0 },
{ PCMCIA_CARD(PREMAX, PE200), 0},
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
{ PCMCIA_CARD(PSION, LANGLOBAL),
NE2000DVF_ANYFUNC | NE2000DVF_AX88X90 | NE2000DVF_MODEM},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(RACORE, ETHERNET), 0},
{ PCMCIA_CARD(RACORE, FASTENET), NE2000DVF_AX88X90},
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
{ PCMCIA_CARD(RACORE, 8041TX), NE2000DVF_AX88X90 | NE2000DVF_TC5299J},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(RELIA, COMBO), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(RPTI, EP400), 0},
{ PCMCIA_CARD(RPTI, EP401), 0},
{ PCMCIA_CARD(SMC, EZCARD), 0},
{ PCMCIA_CARD(SOCKET, EA_ETHER), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(SOCKET, ES_1000), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(SOCKET, LP_ETHER), 0},
{ PCMCIA_CARD(SOCKET, LP_ETHER_CF), 0},
{ PCMCIA_CARD(SOCKET, LP_ETH_10_100_CF), NE2000DVF_DL100XX},
{ PCMCIA_CARD(SVEC, COMBOCARD), 0},
{ PCMCIA_CARD(SVEC, LANCARD), 0},
{ PCMCIA_CARD(TAMARACK, ETHERNET), 0},
MFp4: Reduce the size of ed a little by removing some CIS based entries (others likely can be removed too): o The D-Link DFE-670TXD doesn't need its own entry based on strings. o The Xircom CompactCard appears to be a TDK design, so list it there by ID and remove the strings. Increase the size of ed a little: o Add support for the Addtron AE-660CT and Addtron AE-660. This is a very generic NE-2000 clone (so generic that its CIS tags say NE-2000 generic card!).
2005-09-10 00:17:55 +00:00
{ PCMCIA_CARD(TDK, CFE_10), 0},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(TDK, LAK_CD031), 0},
Add a boatload of new device ids, gleaned from the pcmcia-cs-3.2.8 distribution. Add the appropriate devices to the man pages. Obtained from: pcmcia-cs Approved by: re (scottl)
2005-07-10 02:00:35 +00:00
{ PCMCIA_CARD(TDK, DFL5610WS), 0},
{ PCMCIA_CARD(TELECOMDEVICE, LM5LT), 0 },
MFp4: Minor formatting nits in pccard table.
2005-09-13 19:09:57 +00:00
{ PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100), NE2000DVF_AX88X90},
Eliminate unused argument in PCMCIA_CARD macro. Provide a backwards compatible way to have the extra macro by defining PCCARD_API_LEVEL 5 before including pccarddevs for driver writers that want/need to have the same driver on 5 and 6 with pccard attachments. Approved by: re (dwhite)
2005-06-24 14:36:54 +00:00
{ PCMCIA_CARD(ZONET, ZEN), 0},
Migrate to PCMCIA_CARD() macros
2001-11-15 07:52:49 +00:00
{ { NULL } }
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
};
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
/*
* PC Card (PCMCIA) specific code.
*/
static int ed_pccard_probe(device_t);
static int ed_pccard_attach(device_t);
static int ed_pccard_dl100xx(device_t dev, const struct ed_product *);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
static void ed_pccard_dl100xx_mii_reset(struct ed_softc *sc);
static u_int ed_pccard_dl100xx_mii_readbits(struct ed_softc *sc, int nbits);
static void ed_pccard_dl100xx_mii_writebits(struct ed_softc *sc, u_int val,
int nbits);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
static int ed_pccard_ax88x90(device_t dev, const struct ed_product *);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
static void ed_pccard_ax88x90_mii_reset(struct ed_softc *sc);
static u_int ed_pccard_ax88x90_mii_readbits(struct ed_softc *sc, int nbits);
static void ed_pccard_ax88x90_mii_writebits(struct ed_softc *sc, u_int val,
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
int nbits);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
static int ed_miibus_readreg(device_t dev, int phy, int reg);
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
static int ed_ifmedia_upd(struct ifnet *);
static void ed_ifmedia_sts(struct ifnet *, struct ifmediareq *);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
static int ed_pccard_tc5299j(device_t dev, const struct ed_product *);
static void ed_pccard_tc5299j_mii_reset(struct ed_softc *sc);
static u_int ed_pccard_tc5299j_mii_readbits(struct ed_softc *sc, int nbits);
static void ed_pccard_tc5299j_mii_writebits(struct ed_softc *sc, u_int val,
int nbits);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
Emit a warning when a card matches multiple entries in our table. A number of cards have been discovered to be matching on the strings of the cis rather than manufacturer/product id for cards we already had a prod id for. This is a result of getting the list from the NetBSD driver which also includes the OID for the cards where such a distinction mattered (since it was tested against the MAC address we got from the card). Since we do not try to match OIDs, we do not need the extra entries and they just waste space. I'm guessing that some of the dlink entires (DE-660, DE-660+) and many of the corega cards may fall into this boat and can safely be removed.
2005-09-26 18:27:13 +00:00
static void
ed_pccard_print_entry(const struct ed_product *pp)
{
int i;
printf("Product entry: ");
if (pp->prod.pp_name)
printf("name='%s',", pp->prod.pp_name);
printf("vendor=%#x,product=%#x", pp->prod.pp_vendor,
pp->prod.pp_product);
for (i = 0; i < 4; i++)
if (pp->prod.pp_cis[i])
printf(",CIS%d='%s'", i, pp->prod.pp_cis[i]);
printf("\n");
}
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
static int
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
ed_pccard_probe(device_t dev)
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
{
Emit a warning when a card matches multiple entries in our table. A number of cards have been discovered to be matching on the strings of the cis rather than manufacturer/product id for cards we already had a prod id for. This is a result of getting the list from the NetBSD driver which also includes the OID for the cards where such a distinction mattered (since it was tested against the MAC address we got from the card). Since we do not try to match OIDs, we do not need the extra entries and they just waste space. I'm guessing that some of the dlink entires (DE-660, DE-660+) and many of the corega cards may fall into this boat and can safely be removed.
2005-09-26 18:27:13 +00:00
const struct ed_product *pp, *pp2;
int error, first = 1;
Only attach to network functions.
2005-01-20 19:37:22 +00:00
uint32_t fcn = PCCARD_FUNCTION_UNSPEC;
/* Make sure we're a network function */
error = pccard_get_function(dev, &fcn);
if (error != 0)
return (error);
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
integrate from p4 repo: o Honor NE2000DVF_{AX88190,DL10019} flags by setting the ED_FLAGS_xxxx flag. o Mark linksys combo_ecard as ax88190 o Set the type_str to AX88190 for the ax88190 cards. This fixes ax88190 based cards, for the most part, but doesn't seem to fix the mii based dl10019 cards (aka linksys cards).
2002-07-22 21:28:46 +00:00
if ((pp = (const struct ed_product *) pccard_product_lookup(dev,
Add a bunch of entries from NetBSD's if_ne_pcmcia.c v1.67. We still need to verify that all the entries in pccard.conf are present in this table.
2001-01-21 08:20:23 +00:00
(const struct pccard_product *) ed_pccard_products,
Argh, I have fixed this cut/paste error twice before. I must have committed the wrong patch. :-( sn_pccard_products[] should have been static anyway.
2000-11-25 07:25:08 +00:00
sizeof(ed_pccard_products[0]), NULL)) != NULL) {
Don't set the description if NULL.
2003-04-10 06:08:27 +00:00
if (pp->prod.pp_name != NULL)
device_set_desc(dev, pp->prod.pp_name);
Add support for the DLink DMF650TX Ethernet+56k modem PC Card. This gets the ethernet part of the card working, while putting appropriate hooks in place for the modem code. Other ed based lan/modem combo cards should be easy to add. Please send me info on any you'd like to see support added. Note: The 650 isn't a strictly conforming multi-function card, so special support is needed. :-(
2005-07-15 01:54:59 +00:00
/*
* Some devices don't ID themselves as network, but
* that's OK if the flags say so.
*/
if (!(pp->flags & NE2000DVF_ANYFUNC) &&
fcn != PCCARD_FUNCTION_NETWORK)
return (ENXIO);
Emit a warning when a card matches multiple entries in our table. A number of cards have been discovered to be matching on the strings of the cis rather than manufacturer/product id for cards we already had a prod id for. This is a result of getting the list from the NetBSD driver which also includes the OID for the cards where such a distinction mattered (since it was tested against the MAC address we got from the card). Since we do not try to match OIDs, we do not need the extra entries and they just waste space. I'm guessing that some of the dlink entires (DE-660, DE-660+) and many of the corega cards may fall into this boat and can safely be removed.
2005-09-26 18:27:13 +00:00
/*
* Some devices match multiple entries. Report that
* as a warning to help cull the table
*/
pp2 = pp;
while ((pp2 = (const struct ed_product *)pccard_product_lookup(
dev, (const struct pccard_product *)(pp2 + 1),
sizeof(ed_pccard_products[0]), NULL)) != NULL) {
if (first) {
device_printf(dev,
"Warning: card matches multiple entries. Report to imp@freebsd.org\n");
ed_pccard_print_entry(pp);
first = 0;
}
ed_pccard_print_entry(pp2);
}
integrate from p4 repo: o Honor NE2000DVF_{AX88190,DL10019} flags by setting the ED_FLAGS_xxxx flag. o Mark linksys combo_ecard as ax88190 o Set the type_str to AX88190 for the ax88190 cards. This fixes ax88190 based cards, for the most part, but doesn't seem to fix the mii based dl10019 cards (aka linksys cards).
2002-07-22 21:28:46 +00:00
return (0);
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
}
It is a little better to return ENXIO from probe/match routine than EIO.
2004-07-21 20:38:12 +00:00
return (ENXIO);
Update the ed driver to probe and attach under a NEWCARD kernel (I was using a cardbus based system with pccbb providing the pcic interface). Something isn't quite right.. when the driver allocates and activates its resources, the IO space that was requested reads as all zeros (versus the original 0xff's as it normally is when there is no device responding). Also, deactivate the resources before releasing them. OLDCARD doesn't seem to care but NEWCARD/CARDBUS get rather unhappy if you release a resource that hasn't been deactivated yet. Make pcic_p.c only compile with oldcard kernels.
2000-11-25 03:36:09 +00:00
}
Break out the bus front end code into separate files. Note that these haven't been turned on nor has the old code been removed from if_ed.c. The next commit will address that.
1999-10-15 01:28:04 +00:00
static int
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
ed_pccard_rom_mac(device_t dev, uint8_t *enaddr)
Break out the bus front end code into separate files. Note that these haven't been turned on nor has the old code been removed from if_ed.c. The next commit will address that.
1999-10-15 01:28:04 +00:00
{
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
struct ed_softc *sc = device_get_softc(dev);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
uint8_t romdata[32];
Propagate MAC address in CIS tupple to dev/ed/ driver. Many ed-based Ethernet PC-cards can't get correct MAC address without this patch. Submitted by: Takanori Watanabe <takawata@shidahara1.planet.sci.kobe-u.ac.jp> Reviewed by: Warner Losh <imp@village.org>
2000-01-21 03:08:46 +00:00
int i;
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
/*
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
* Read in the rom data at location 0. Since there are no
* NE-1000 based PC Card devices, we'll assume we're 16-bit.
*
* In researching what format this takes, I've found that the
* following appears to be true for multiple cards based on
* observation as well as datasheet digging.
*
* Data is stored in some ROM and is copied out 8 bits at a time
* into 16-bit wide locations. This means that the odd locations
* of the ROM are not used (and can be either 0 or ff).
*
* The contents appears to be as follows:
* PROM RAM
* Offset Offset What
* 0 0 ENETADDR 0
* 1 2 ENETADDR 1
* 2 4 ENETADDR 2
* 3 6 ENETADDR 3
* 4 8 ENETADDR 4
* 5 10 ENETADDR 5
* 6-13 12-26 Reserved (varies by manufacturer)
* 14 28 0x57
* 15 30 0x57
*
* Some manufacturers have another image of enetaddr from
* PROM offset 0x10 to 0x15 with 0x42 in 0x1e and 0x1f, but
* this doesn't appear to be universally documented in the
* datasheets. Some manufactuers have a card type, card config
* checksums, etc encoded into PROM offset 6-13, but deciphering it
* requires more knowledge about the exact underlying chipset than
* we possess (and maybe can possess).
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
*/
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_pio_readmem(sc, 0, romdata, 32);
if (bootverbose)
printf("ROM DATA: %32D\n", romdata, " ");
if (romdata[28] != 0x57 || romdata[30] != 0x57)
return (0);
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
for (i = 0; i < ETHER_ADDR_LEN; i++)
enaddr[i] = romdata[i * 2];
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
return (1);
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
}
Add support for the DLink DMF650TX Ethernet+56k modem PC Card. This gets the ethernet part of the card working, while putting appropriate hooks in place for the modem code. Other ed based lan/modem combo cards should be easy to add. Please send me info on any you'd like to see support added. Note: The 650 isn't a strictly conforming multi-function card, so special support is needed. :-(
2005-07-15 01:54:59 +00:00
static int
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
ed_pccard_add_modem(device_t dev)
Add support for the DLink DMF650TX Ethernet+56k modem PC Card. This gets the ethernet part of the card working, while putting appropriate hooks in place for the modem code. Other ed based lan/modem combo cards should be easy to add. Please send me info on any you'd like to see support added. Note: The 650 isn't a strictly conforming multi-function card, so special support is needed. :-(
2005-07-15 01:54:59 +00:00
{
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
struct ed_softc *sc = device_get_softc(dev);
device_printf(dev, "Need to write this code: modem rid is %d\n",
sc->modem_rid);
Add support for the DLink DMF650TX Ethernet+56k modem PC Card. This gets the ethernet part of the card working, while putting appropriate hooks in place for the modem code. Other ed based lan/modem combo cards should be easy to add. Please send me info on any you'd like to see support added. Note: The 650 isn't a strictly conforming multi-function card, so special support is needed. :-(
2005-07-15 01:54:59 +00:00
return 0;
}
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
static int
ed_pccard_media_ioctl(struct ed_softc *sc, struct ifreq *ifr, u_long command)
{
struct mii_data *mii;
if (sc->miibus == NULL)
return (EINVAL);
mii = device_get_softc(sc->miibus);
return (ifmedia_ioctl(sc->ifp, ifr, &mii->mii_media, command));
}
static void
ed_pccard_mediachg(struct ed_softc *sc)
{
struct mii_data *mii;
if (sc->miibus == NULL)
return;
mii = device_get_softc(sc->miibus);
mii_mediachg(mii);
}
static void
ed_pccard_tick(void *arg)
{
struct ed_softc *sc = arg;
struct mii_data *mii;
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
int media = 0;
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
ED_ASSERT_LOCKED(sc);
if (sc->miibus != NULL) {
mii = device_get_softc(sc->miibus);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
media = mii->mii_media_status;
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
mii_tick(mii);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
if (mii->mii_media_status & IFM_ACTIVE &&
media != mii->mii_media_status && 0 &&
sc->chip_type == ED_CHIP_TYPE_DL10022) {
ed_asic_outb(sc, ED_DL100XX_DIAG,
(mii->mii_media_active & IFM_FDX) ?
ED_DL100XX_COLLISON_DIS : 0);
}
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
}
callout_reset(&sc->tick_ch, hz, ed_pccard_tick, sc);
}
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
static int
ed_pccard_attach(device_t dev)
{
Propagate MAC address in CIS tupple to dev/ed/ driver. Many ed-based Ethernet PC-cards can't get correct MAC address without this patch. Submitted by: Takanori Watanabe <takawata@shidahara1.planet.sci.kobe-u.ac.jp> Reviewed by: Warner Losh <imp@village.org>
2000-01-21 03:08:46 +00:00
u_char sum;
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
u_char enaddr[ETHER_ADDR_LEN];
Really old PCMCIA cards stored the MAC address in the attribute memory at some offset. Unlike newer cards, the MAC address wasn't part of the CIS as a specific FUNCE. These older cards were having their MAC address show up as 0:2:4:6:8:a because that's what's in the ROM locations that would be there in a real ne2000. This patch allows one to specify the offset for the MAC address for these cards. Specify one for the IBM Ethernet II card, as it is one that has this problem. One shouldn't specify this unless the MAC address really isn't in the CIS at all. Side note: The novell probe likely shouldn't read the MAC address, and that should be moved to the bus specific attach routine(s), maybe as a convenience function in if_ed_novell.c. My IBM Ethernet II (aka Info Mover) now has a believable MAC address.
2005-02-12 00:45:22 +00:00
const struct ed_product *pp;
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
int error, i;
struct ed_softc *sc = device_get_softc(dev);
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
u_long size;
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
Really old PCMCIA cards stored the MAC address in the attribute memory at some offset. Unlike newer cards, the MAC address wasn't part of the CIS as a specific FUNCE. These older cards were having their MAC address show up as 0:2:4:6:8:a because that's what's in the ROM locations that would be there in a real ne2000. This patch allows one to specify the offset for the MAC address for these cards. Specify one for the IBM Ethernet II card, as it is one that has this problem. One shouldn't specify this unless the MAC address really isn't in the CIS at all. Side note: The novell probe likely shouldn't read the MAC address, and that should be moved to the bus specific attach routine(s), maybe as a convenience function in if_ed_novell.c. My IBM Ethernet II (aka Info Mover) now has a believable MAC address.
2005-02-12 00:45:22 +00:00
if ((pp = (const struct ed_product *) pccard_product_lookup(dev,
(const struct pccard_product *) ed_pccard_products,
sizeof(ed_pccard_products[0]), NULL)) == NULL)
return (ENXIO);
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
sc->modem_rid = -1;
if (pp->flags & NE2000DVF_MODEM) {
sc->port_rid = -1;
for (i = 0; i < 4; i++) {
size = bus_get_resource_count(dev, SYS_RES_IOPORT, i);
if (size == ED_NOVELL_IO_PORTS)
sc->port_rid = i;
else if (size == 8)
sc->modem_rid = i;
}
if (sc->port_rid == -1) {
device_printf(dev, "Cannot locate my ports!\n");
return (ENXIO);
}
} else {
sc->port_rid = 0;
}
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
/* Allocate the port resource during setup. */
error = ed_alloc_port(dev, sc->port_rid, ED_NOVELL_IO_PORTS);
if (error)
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
return (error);
error = ed_alloc_irq(dev, 0, 0);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
if (error)
goto bad;
/*
* Determine which chipset we are. All the PC Card chipsets have the
* ASIC and NIC offsets in the same place.
*/
sc->asic_offset = ED_NOVELL_ASIC_OFFSET;
sc->nic_offset = ED_NOVELL_NIC_OFFSET;
error = ENXIO;
if (error != 0)
error = ed_pccard_dl100xx(dev, pp);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (error != 0)
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
error = ed_pccard_ax88x90(dev, pp);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
if (error != 0)
error = ed_pccard_tc5299j(dev, pp);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
if (error != 0)
error = ed_probe_Novell_generic(dev, device_get_flags(dev));
if (error)
goto bad;
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
o break newbus api: add a new argument of type driver_filter_t to bus_setup_intr() o add an int return code to all fast handlers o retire INTR_FAST/IH_FAST For more info: http://docs.freebsd.org/cgi/getmsg.cgi?fetch=465712+0+current/freebsd-current Reviewed by: many Approved by: re@
2007-02-23 12:19:07 +00:00
NULL, edintr, sc, &sc->irq_handle);
Add pccard attachment. This won't work with memory mapped ed devices yet, but that should be resolved shortly. Non memory mapped ed devices should work, but I cannot test this since my only ed card is memory mapped. Submitted by: Matt Dodd <mdodd@freebsd.org>
1999-10-25 02:55:14 +00:00
if (error) {
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
device_printf(dev, "setup intr failed %d \n", error);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
goto bad;
Add pccard attachment. This won't work with memory mapped ed devices yet, but that should be resolved shortly. Non memory mapped ed devices should work, but I cannot test this since my only ed card is memory mapped. Submitted by: Matt Dodd <mdodd@freebsd.org>
1999-10-25 02:55:14 +00:00
}
Add comment about MAC mining
2005-02-12 08:27:46 +00:00
/*
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
* For the older cards, we have to get the MAC address from
* the card in some way. Let's try the standard PCMCIA way
* first. If that fails, then check to see if we have valid
* data from the standard NE-2000 data roms. If that fails,
* check to see if the card has a hint about where to look in
* its CIS. If that fails, maybe we should look at some
* default value. In all fails, we should fail the attach,
* but don't right now.
Add comment about MAC mining
2005-02-12 08:27:46 +00:00
*/
Eliminate the ED_VENDOR_{PCCARD,LINKSYS} types. These cards really are NOVELL NE2000 with just a tiny quirk that's non vendor specific. Instead, use the chip_type of DL100XX instead. This is more inline with how the AX88190 support was added, and seems a little cleaner.
2005-02-11 06:02:27 +00:00
if (sc->chip_type == ED_CHIP_TYPE_DP8390) {
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
pccard_get_ether(dev, enaddr);
if (bootverbose)
device_printf(dev, "CIS MAC %6D\n", enaddr, ":");
Only try to detect Linksys PCMCIA cards when we are in a pccard environment. This fixes the breakage to ISA ethernet cards. Reviewed by: peter
2000-06-29 07:31:37 +00:00
for (i = 0, sum = 0; i < ETHER_ADDR_LEN; i++)
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
sum |= enaddr[i];
o It turns out that most of the ne-2000 cards that I have got real unhappy with the latest changes. They actually have valid ROM data at location 0 of memory, just like a real NE-2000 ISA card. Use this data, if the ROM passes a few basic tests, as an additional source for the MAC address. Prefer the CIS over this source, but have it take precidence over falling back to reading the attribtue memory. o Minor cleanup of a few devices that we match on based on CIS string.
2005-02-14 22:27:03 +00:00
if (sum == 0 && ed_pccard_rom_mac(dev, enaddr)) {
if (bootverbose)
device_printf(dev, "ROM mac %6D\n", enaddr,
":");
sum++;
}
Really old PCMCIA cards stored the MAC address in the attribute memory at some offset. Unlike newer cards, the MAC address wasn't part of the CIS as a specific FUNCE. These older cards were having their MAC address show up as 0:2:4:6:8:a because that's what's in the ROM locations that would be there in a real ne2000. This patch allows one to specify the offset for the MAC address for these cards. Specify one for the IBM Ethernet II card, as it is one that has this problem. One shouldn't specify this unless the MAC address really isn't in the CIS at all. Side note: The novell probe likely shouldn't read the MAC address, and that should be moved to the bus specific attach routine(s), maybe as a convenience function in if_ed_novell.c. My IBM Ethernet II (aka Info Mover) now has a believable MAC address.
2005-02-12 00:45:22 +00:00
if (sum == 0 && pp->flags & NE2000DVF_ENADDR) {
for (i = 0; i < ETHER_ADDR_LEN; i++) {
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
pccard_attr_read_1(dev, pp->enoff + i * 2,
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
enaddr + i);
sum |= enaddr[i];
Really old PCMCIA cards stored the MAC address in the attribute memory at some offset. Unlike newer cards, the MAC address wasn't part of the CIS as a specific FUNCE. These older cards were having their MAC address show up as 0:2:4:6:8:a because that's what's in the ROM locations that would be there in a real ne2000. This patch allows one to specify the offset for the MAC address for these cards. Specify one for the IBM Ethernet II card, as it is one that has this problem. One shouldn't specify this unless the MAC address really isn't in the CIS at all. Side note: The novell probe likely shouldn't read the MAC address, and that should be moved to the bus specific attach routine(s), maybe as a convenience function in if_ed_novell.c. My IBM Ethernet II (aka Info Mover) now has a believable MAC address.
2005-02-12 00:45:22 +00:00
}
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
if (bootverbose)
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
device_printf(dev, "Hint %x MAC %6D\n",
pp->enoff, enaddr, ":");
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
}
if (sum == 0) {
for (i = 0; i < ETHER_ADDR_LEN; i++) {
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
pccard_attr_read_1(dev, ED_DEFAULT_MAC_OFFSET +
Improve the mining of MAC address from the card: o Add a fallback location for the MAC address. Most of the early ne2000 PC Cards were built from the same parts, so most of them have the same address in the CIS to grab the MAC from. Use this address as our fallback if we don't find anything better. o Add printf, in bootverbose, noting the MAC addresses that we find along the way. # Better sanity checking of the MAC address is needed. Will have to # investigate using/creating a centralized function to do this as a number # of other PC Card drivers each have their own ad-hoc tests.
2005-02-12 16:44:15 +00:00
i * 2, enaddr + i);
sum |= enaddr[i];
}
if (bootverbose)
device_printf(dev, "Fallback MAC %6D\n",
enaddr, ":");
}
if (sum == 0) {
device_printf(dev, "Cannot extract MAC address.\n");
ed_release_resources(dev);
return (ENXIO);
Really old PCMCIA cards stored the MAC address in the attribute memory at some offset. Unlike newer cards, the MAC address wasn't part of the CIS as a specific FUNCE. These older cards were having their MAC address show up as 0:2:4:6:8:a because that's what's in the ROM locations that would be there in a real ne2000. This patch allows one to specify the offset for the MAC address for these cards. Specify one for the IBM Ethernet II card, as it is one that has this problem. One shouldn't specify this unless the MAC address really isn't in the CIS at all. Side note: The novell probe likely shouldn't read the MAC address, and that should be moved to the bus specific attach routine(s), maybe as a convenience function in if_ed_novell.c. My IBM Ethernet II (aka Info Mover) now has a believable MAC address.
2005-02-12 00:45:22 +00:00
}
Stop embedding struct ifnet at the top of driver softcs. Instead the struct ifnet or the layer 2 common structure it was embedded in have been replaced with a struct ifnet pointer to be filled by a call to the new function, if_alloc(). The layer 2 common structure is also allocated via if_alloc() based on the interface type. It is hung off the new struct ifnet member, if_l2com. This change removes the size of these structures from the kernel ABI and will allow us to better manage them as interfaces come and go. Other changes of note: - Struct arpcom is no longer referenced in normal interface code. Instead the Ethernet address is accessed via the IFP2ENADDR() macro. To enforce this ac_enaddr has been renamed to _ac_enaddr. - The second argument to ether_ifattach is now always the mac address from driver private storage rather than sometimes being ac_enaddr. Reviewed by: sobomax, sam
2005-06-10 16:49:24 +00:00
bcopy(enaddr, sc->enaddr, ETHER_ADDR_LEN);
Only try to detect Linksys PCMCIA cards when we are in a pccard environment. This fixes the breakage to ISA ethernet cards. Reviewed by: peter
2000-06-29 07:31:37 +00:00
}
Propagate MAC address in CIS tupple to dev/ed/ driver. Many ed-based Ethernet PC-cards can't get correct MAC address without this patch. Submitted by: Takanori Watanabe <takawata@shidahara1.planet.sci.kobe-u.ac.jp> Reviewed by: Warner Losh <imp@village.org>
2000-01-21 03:08:46 +00:00
Replace the if_name and if_unit members of struct ifnet with new members if_xname, if_dname, and if_dunit. if_xname is the name of the interface and if_dname/unit are the driver name and instance. This change paves the way for interface renaming and enhanced pseudo device creation and configuration symantics. Approved By: re (in principle) Reviewed By: njl, imp Tested On: i386, amd64, sparc64 Obtained From: NetBSD (if_xname)
2003-10-31 18:32:15 +00:00
error = ed_attach(dev);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
if (error)
goto bad;
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
if (sc->chip_type == ED_CHIP_TYPE_DL10019 ||
sc->chip_type == ED_CHIP_TYPE_DL10022) {
Attach the miibus for Linksys/Dlink cards from the attach routine, not from the probe routine. This was an oversight when I originally ported the miibus support to -current, though it was mostly harmless. We now set the vendor code to the new value ED_VENDOR_LINKSYS in ed_pccard_Linksys() at probe time. Then ed_pccard_attach() checks the vendor code, and sets up the miibus if appropriate. Reviewed by: imp
2001-07-22 18:58:44 +00:00
/* Probe for an MII bus, but ignore errors. */
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_pccard_dl100xx_mii_reset(sc);
Tell a statistic checker that not checking the return value of the probing of the mii phy is intended for this chip. Found by: Coverity Prevent (tm) CID: 43
2007-04-01 14:15:26 +00:00
(void)mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd,
Attach the miibus for Linksys/Dlink cards from the attach routine, not from the probe routine. This was an oversight when I originally ported the miibus support to -current, though it was mostly harmless. We now set the vendor code to the new value ED_VENDOR_LINKSYS in ed_pccard_Linksys() at probe time. Then ed_pccard_attach() checks the vendor code, and sets up the miibus if appropriate. Reviewed by: imp
2001-07-22 18:58:44 +00:00
ed_ifmedia_sts);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
} else if (sc->chip_type == ED_CHIP_TYPE_AX88190) {
ed_pccard_ax88x90_mii_reset(sc);
if ((error = mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd,
ed_ifmedia_sts)) != 0) {
device_printf(dev, "Missing mii!\n");
goto bad;
}
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
} else if (sc->chip_type == ED_CHIP_TYPE_TC5299J) {
ed_pccard_tc5299j_mii_reset(sc);
if ((error = mii_phy_probe(dev, &sc->miibus, ed_ifmedia_upd,
ed_ifmedia_sts)) != 0) {
device_printf(dev, "Missing mii!\n");
goto bad;
}
Attach the miibus for Linksys/Dlink cards from the attach routine, not from the probe routine. This was an oversight when I originally ported the miibus support to -current, though it was mostly harmless. We now set the vendor code to the new value ED_VENDOR_LINKSYS in ed_pccard_Linksys() at probe time. Then ed_pccard_attach() checks the vendor code, and sets up the miibus if appropriate. Reviewed by: imp
2001-07-22 18:58:44 +00:00
}
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
if (sc->miibus != NULL) {
sc->sc_tick = ed_pccard_tick;
sc->sc_mediachg = ed_pccard_mediachg;
sc->sc_media_ioctl = ed_pccard_media_ioctl;
}
It turns out that many of the ambicom cards have their CIS resources listed in different orders. Since it is easy to identify the Modem resources vs the Ethernet resources by looking at the size, use that rather than hard coded rids. For such parts, go ahead and guess which rid we should use based on the size. This guess appears reliable for the two example cards that I have with different CIS info.
2005-09-06 22:44:26 +00:00
if (sc->modem_rid != -1)
ed_pccard_add_modem(dev);
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
return (0);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
bad:
ed_release_resources(dev);
return (error);
- Fixed the conversion to bus_space interface. - Added PC-98 Cbus devices support. The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata) - Removed old ed driver.
2000-08-17 12:15:45 +00:00
}
MFPAO: Add support for AX88190, equipped in MELCO LPC3-TX.
2000-07-23 15:15:43 +00:00
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
/*
* Probe the Ethernet MAC addrees for PCMCIA Linksys EtherFast 10/100
* and compatible cards (DL10019C Ethernet controller).
*
* Note: The PAO patches try to use more memory for the card, but that
* seems to fail for my card. A future optimization would add this back
* conditionally.
*/
static int
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
ed_pccard_dl100xx(device_t dev, const struct ed_product *pp)
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
{
struct ed_softc *sc = device_get_softc(dev);
u_char sum;
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
uint8_t id;
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
int i, error;
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (!(pp->flags & NE2000DVF_DL100XX))
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
return (ENXIO);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (bootverbose)
device_printf(dev, "Trying DL100xx probing\n");
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
error = ed_probe_Novell_generic(dev, device_get_flags(dev));
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (bootverbose && error)
device_printf(dev, "Novell generic probe failed: %d\n", error);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
if (error != 0)
return (error);
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
/*
* Linksys registers(offset from ASIC base)
*
* 0x04-0x09 : Physical Address Register 0-5 (PAR0-PAR5)
* 0x0A : Card ID Register (CIR)
* 0x0B : Check Sum Register (SR)
*/
for (sum = 0, i = 0x04; i < 0x0c; i++)
sum += ed_asic_inb(sc, i);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (sum != 0xff) {
if (bootverbose)
device_printf(dev, "Bad checksum %#x\n", sum);
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
return (ENXIO); /* invalid DL10019C */
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
}
if (bootverbose)
device_printf(dev, "CIR is %d\n", ed_asic_inb(sc, 0xa));
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
for (i = 0; i < ETHER_ADDR_LEN; i++)
Stop embedding struct ifnet at the top of driver softcs. Instead the struct ifnet or the layer 2 common structure it was embedded in have been replaced with a struct ifnet pointer to be filled by a call to the new function, if_alloc(). The layer 2 common structure is also allocated via if_alloc() based on the interface type. It is hung off the new struct ifnet member, if_l2com. This change removes the size of these structures from the kernel ABI and will allow us to better manage them as interfaces come and go. Other changes of note: - Struct arpcom is no longer referenced in normal interface code. Instead the Ethernet address is accessed via the IFP2ENADDR() macro. To enforce this ac_enaddr has been renamed to _ac_enaddr. - The second argument to ether_ifattach is now always the mac address from driver private storage rather than sometimes being ac_enaddr. Reviewed by: sobomax, sam
2005-06-10 16:49:24 +00:00
sc->enaddr[i] = ed_asic_inb(sc, 0x04 + i);
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
ed_nic_outb(sc, ED_P0_DCR, ED_DCR_WTS | ED_DCR_FT1 | ED_DCR_LS);
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
id = ed_asic_inb(sc, 0xf);
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
sc->isa16bit = 1;
Eliminate the ED_VENDOR_{PCCARD,LINKSYS} types. These cards really are NOVELL NE2000 with just a tiny quirk that's non vendor specific. Instead, use the chip_type of DL100XX instead. This is more inline with how the AX88190 support was added, and seems a little cleaner.
2005-02-11 06:02:27 +00:00
sc->vendor = ED_VENDOR_NOVELL;
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
sc->type = ED_TYPE_NE2000;
Rework DL10019/DL10022 support. This tries to reset things in a more proper way, or at least the same way that NetBSD and Linux do things (I've been unable to obtain datasheets for these parts to know for sure). This has some marginal improvement in the DL10022 and DL10019 cards that I have. Also, report which type, exactly. # There's one or two ed cards that I have which still don't work, but I think # that's due to MII losage on the card that's not presently compensated # for in the MII drivers.
2005-02-14 06:54:06 +00:00
sc->chip_type = (id & 0x90) == 0x90 ?
ED_CHIP_TYPE_DL10022 : ED_CHIP_TYPE_DL10019;
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
sc->type_str = ((id & 0x90) == 0x90) ? "DL10022" : "DL10019";
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
sc->mii_readbits = ed_pccard_dl100xx_mii_readbits;
sc->mii_writebits = ed_pccard_dl100xx_mii_writebits;
Rework how we deal with the DL10019 and DL10022 cards (as well as the AX88190 ones, but that one only minorly): o don't set flags in the match routine. They appear to be cleared when probe/attach is called. Before this change, they were always treated as a simple ne2000, which would fail to get the right NIC address. o Lookup device again in the probe routine and probe based on the cards that you see. o Detect and report the DL10022 seprately from the DL10019 cards. While I'm here: o remove a bad printf o change another bad printf to device_printf. o minor style(9) formatting tweaks. # note: a lot of OEM entries are in the ed_pccard_products such that we can # likely remove, or collapse, many of them. This makes all of my DL100xx cards at least probe the ethernet address correctly, which it wasn't doing before. I can't seem to locate my AX88xxx based cards, so those haven't been tested, but they were busted before the change so they can't be any worse now...
2005-01-26 05:21:12 +00:00
return (0);
Linksys Fast Ethernet PCCARD cards supported by the ed driver now require the addition of flag 0x80000 to their config line in pccard.conf(5). This flag is not optional. These Linksys cards will not be recognized without it. Reviewed by: imp, iwasaki
2000-12-18 15:28:53 +00:00
}
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
/* MII bit-twiddling routines for cards using Dlink chipset */
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
#define DL100XX_MIISET(sc, x) ed_asic_outb(sc, ED_DL100XX_MIIBUS, \
ed_asic_inb(sc, ED_DL100XX_MIIBUS) | (x))
#define DL100XX_MIICLR(sc, x) ed_asic_outb(sc, ED_DL100XX_MIIBUS, \
ed_asic_inb(sc, ED_DL100XX_MIIBUS) & ~(x))
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
static void
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_pccard_dl100xx_mii_reset(struct ed_softc *sc)
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
{
Rework DL10019/DL10022 support. This tries to reset things in a more proper way, or at least the same way that NetBSD and Linux do things (I've been unable to obtain datasheets for these parts to know for sure). This has some marginal improvement in the DL10022 and DL10019 cards that I have. Also, report which type, exactly. # There's one or two ed cards that I have which still don't work, but I think # that's due to MII losage on the card that's not presently compensated # for in the MII drivers.
2005-02-14 06:54:06 +00:00
if (sc->chip_type != ED_CHIP_TYPE_DL10022)
return;
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_asic_outb(sc, ED_DL100XX_MIIBUS, ED_DL100XX_MII_RESET2);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_asic_outb(sc, ED_DL100XX_MIIBUS,
ED_DL100XX_MII_RESET2 | ED_DL100XX_MII_RESET1);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_asic_outb(sc, ED_DL100XX_MIIBUS, ED_DL100XX_MII_RESET2);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_asic_outb(sc, ED_DL100XX_MIIBUS,
ED_DL100XX_MII_RESET2 | ED_DL100XX_MII_RESET1);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_asic_outb(sc, ED_DL100XX_MIIBUS, 0);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
}
static void
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_pccard_dl100xx_mii_writebits(struct ed_softc *sc, u_int val, int nbits)
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
{
int i;
Rework DL10019/DL10022 support. This tries to reset things in a more proper way, or at least the same way that NetBSD and Linux do things (I've been unable to obtain datasheets for these parts to know for sure). This has some marginal improvement in the DL10022 and DL10019 cards that I have. Also, report which type, exactly. # There's one or two ed cards that I have which still don't work, but I think # that's due to MII losage on the card that's not presently compensated # for in the MII drivers.
2005-02-14 06:54:06 +00:00
if (sc->chip_type == ED_CHIP_TYPE_DL10022)
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIISET(sc, ED_DL100XX_MII_DIROUT_22);
Rework DL10019/DL10022 support. This tries to reset things in a more proper way, or at least the same way that NetBSD and Linux do things (I've been unable to obtain datasheets for these parts to know for sure). This has some marginal improvement in the DL10022 and DL10019 cards that I have. Also, report which type, exactly. # There's one or two ed cards that I have which still don't work, but I think # that's due to MII losage on the card that's not presently compensated # for in the MII drivers.
2005-02-14 06:54:06 +00:00
else
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIISET(sc, ED_DL100XX_MII_DIROUT_19);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
for (i = nbits - 1; i >= 0; i--) {
if ((val >> i) & 1)
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIISET(sc, ED_DL100XX_MII_DATAOUT);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
else
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIICLR(sc, ED_DL100XX_MII_DATAOUT);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIISET(sc, ED_DL100XX_MII_CLK);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIICLR(sc, ED_DL100XX_MII_CLK);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
}
}
static u_int
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
ed_pccard_dl100xx_mii_readbits(struct ed_softc *sc, int nbits)
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
{
int i;
u_int val = 0;
Rework DL10019/DL10022 support. This tries to reset things in a more proper way, or at least the same way that NetBSD and Linux do things (I've been unable to obtain datasheets for these parts to know for sure). This has some marginal improvement in the DL10022 and DL10019 cards that I have. Also, report which type, exactly. # There's one or two ed cards that I have which still don't work, but I think # that's due to MII losage on the card that's not presently compensated # for in the MII drivers.
2005-02-14 06:54:06 +00:00
if (sc->chip_type == ED_CHIP_TYPE_DL10022)
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIICLR(sc, ED_DL100XX_MII_DIROUT_22);
Rework DL10019/DL10022 support. This tries to reset things in a more proper way, or at least the same way that NetBSD and Linux do things (I've been unable to obtain datasheets for these parts to know for sure). This has some marginal improvement in the DL10022 and DL10019 cards that I have. Also, report which type, exactly. # There's one or two ed cards that I have which still don't work, but I think # that's due to MII losage on the card that's not presently compensated # for in the MII drivers.
2005-02-14 06:54:06 +00:00
else
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIICLR(sc, ED_DL100XX_MII_DIROUT_19);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
for (i = nbits - 1; i >= 0; i--) {
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIISET(sc, ED_DL100XX_MII_CLK);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
val <<= 1;
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
if (ed_asic_inb(sc, ED_DL100XX_MIIBUS) & ED_DL100XX_MII_DATAIN)
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
val++;
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
DL100XX_MIICLR(sc, ED_DL100XX_MII_CLK);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DELAY(10);
}
return val;
}
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
static int
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
ed_pccard_ax88x90_geteprom(struct ed_softc *sc)
{
int prom[16],i;
u_char tmp;
struct {
unsigned char offset, value;
} pg_seq[] = {
/* Select Page0 */
{ED_P0_CR, ED_CR_RD2 | ED_CR_STP | ED_CR_PAGE_0},
{ED_P0_DCR, 0x01},
{ED_P0_RBCR0, 0x00}, /* Clear the count regs. */
{ED_P0_RBCR1, 0x00},
{ED_P0_IMR, 0x00}, /* Mask completion irq. */
{ED_P0_ISR, 0xff},
{ED_P0_RCR, ED_RCR_MON | ED_RCR_INTT}, /* Set To Monitor */
{ED_P0_TCR, ED_TCR_LB0}, /* loopback mode. */
{ED_P0_RBCR0, 32},
{ED_P0_RBCR1, 0x00},
{ED_P0_RSAR0, 0x00},
{ED_P0_RSAR1, 0x04},
{ED_P0_CR, ED_CR_RD0 | ED_CR_STA | ED_CR_PAGE_0},
};
/* Reset Card */
tmp = ed_asic_inb(sc, ED_NOVELL_RESET);
ed_asic_outb(sc, ED_NOVELL_RESET, tmp);
DELAY(5000);
When stopping the card, and returning to page 0, it is best if you do that with the NIC set of registers rather than the ASIC registers. I believe this was a harmless oversight, since we set ED_P0_CR to the same value 5ms later, but just to be safe...
2005-09-15 04:05:09 +00:00
ed_nic_outb(sc, ED_P0_CR, ED_CR_RD2 | ED_CR_STP | ED_CR_PAGE_0);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
DELAY(5000);
/* Card Settings */
for (i = 0; i < sizeof(pg_seq) / sizeof(pg_seq[0]); i++)
ed_nic_outb(sc, pg_seq[i].offset, pg_seq[i].value);
/* Get Data */
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
for (i = 0; i < ETHER_ADDR_LEN / 2; i++)
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
prom[i] = ed_asic_inw(sc, 0);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
for (i = 0; i < ETHER_ADDR_LEN; i += 2) {
sc->enaddr[i] = prom[i / 2] & 0xff;
sc->enaddr[i + 1] = (prom[i / 2] >> 8) & 0xff;
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
}
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
return (0);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
}
/*
* Special setup for AX88[17]90
*/
static int
ed_pccard_ax88x90(device_t dev, const struct ed_product *pp)
{
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
int error, iobase, i, id;
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
char *ts;
struct ed_softc *sc = device_get_softc(dev);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (!(pp->flags & NE2000DVF_AX88X90))
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
return (ENXIO);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (bootverbose)
device_printf(dev, "Checking AX88x90\n");
/*
* Set the IOBASE Register. The AX88x90 cards are potentially
* multifunction cards, and thus requires a slight workaround.
* We write the address the card is at.
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
*/
iobase = rman_get_start(sc->port_res);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
pccard_ccr_write_1(dev, PCCARD_CCR_IOBASE0, iobase & 0xff);
pccard_ccr_write_1(dev, PCCARD_CCR_IOBASE1, (iobase >> 8) & 0xff);
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
ts = "AX88190";
if (ed_asic_inb(sc, ED_AX88X90_TEST) != 0) {
/*
* AX88790 (and I think AX88190A) chips need to be
* powered down. There's an erratum that says we should
* power down the PHY for 2.5s, but this seems to power
* down the whole card. I'm unsure why this was done, but
* appears to be required for proper operation.
*/
pccard_ccr_write_1(dev, PCCARD_CCR_STATUS,
PCCARD_CCR_STATUS_PWRDWN);
/*
* Linux axnet driver selects the internal phy for the ax88790
*/
ed_asic_outb(sc, ED_AX88X90_GPIO, ED_AX88X90_GPIO_INT_PHY);
ts = "AX88790";
}
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
/*
* Check to see if we have a MII PHY ID at any of the first 17
* locations. All AX88x90 devices have MII and a PHY, so we use
* this to weed out chips that would otherwise make it through
* the tests we have after this point.
*/
sc->mii_readbits = ed_pccard_ax88x90_mii_readbits;
sc->mii_writebits = ed_pccard_ax88x90_mii_writebits;
for (i = 0; i < 17; i++) {
id = ed_miibus_readreg(dev, i, MII_PHYIDR1);
if (id != 0 && id != 0xffff)
break;
}
if (i == 17) {
sc->mii_readbits = 0;
sc->mii_writebits = 0;
return (ENXIO);
}
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
sc->chip_type = ED_CHIP_TYPE_AX88190;
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
error = ed_pccard_ax88x90_geteprom(sc);
if (error)
return (error);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
error = ed_probe_Novell_generic(dev, device_get_flags(dev));
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
if (bootverbose)
device_printf(dev, "probe novel returns %d\n", error);
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
if (error == 0) {
sc->vendor = ED_VENDOR_NOVELL;
sc->type = ED_TYPE_NE2000;
sc->chip_type = ED_CHIP_TYPE_AX88190;
sc->type_str = ts;
}
return (error);
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
}
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
/* MII bit-twiddling routines for cards using AX88x90 chipset */
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
#define AX88X90_MIISET(sc, x) ed_asic_outb(sc, ED_AX88X90_MIIBUS, \
ed_asic_inb(sc, ED_AX88X90_MIIBUS) | (x))
#define AX88X90_MIICLR(sc, x) ed_asic_outb(sc, ED_AX88X90_MIIBUS, \
ed_asic_inb(sc, ED_AX88X90_MIIBUS) & ~(x))
static void
ed_pccard_ax88x90_mii_reset(struct ed_softc *sc)
{
/* Do nothing! */
}
static void
ed_pccard_ax88x90_mii_writebits(struct ed_softc *sc, u_int val, int nbits)
{
int i;
AX88X90_MIICLR(sc, ED_AX88X90_MII_DIROUT);
for (i = nbits - 1; i >= 0; i--) {
if ((val >> i) & 1)
AX88X90_MIISET(sc, ED_AX88X90_MII_DATAOUT);
else
AX88X90_MIICLR(sc, ED_AX88X90_MII_DATAOUT);
DELAY(10);
AX88X90_MIISET(sc, ED_AX88X90_MII_CLK);
DELAY(10);
AX88X90_MIICLR(sc, ED_AX88X90_MII_CLK);
DELAY(10);
}
}
static u_int
ed_pccard_ax88x90_mii_readbits(struct ed_softc *sc, int nbits)
{
int i;
u_int val = 0;
AX88X90_MIISET(sc, ED_AX88X90_MII_DIROUT);
for (i = nbits - 1; i >= 0; i--) {
AX88X90_MIISET(sc, ED_AX88X90_MII_CLK);
DELAY(10);
val <<= 1;
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
if (ed_asic_inb(sc, ED_AX88X90_MIIBUS) & ED_AX88X90_MII_DATAIN)
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
val++;
AX88X90_MIICLR(sc, ED_AX88X90_MII_CLK);
DELAY(10);
}
return val;
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
}
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
MFp4: o Add support for Tamarack TC5299J + MII found on SMC 8041TX V.2 and corega PCCCCTXD o Add support for ISA/PCI RTL80[12]9 chips o Improve support for the ax88790 based o minor code movement Submitted by: (#2) David Madole
2005-10-05 05:21:07 +00:00
/*
* Special setup for TC5299J
*/
static int
ed_pccard_tc5299j(device_t dev, const struct ed_product *pp)
{
int error, i, id;
char *ts;
struct ed_softc *sc = device_get_softc(dev);
if (!(pp->flags & NE2000DVF_TC5299J))
return (ENXIO);
if (bootverbose)
device_printf(dev, "Checking Tc5299j\n");
/*
* Check to see if we have a MII PHY ID at any of the first 32
* locations. All TC5299J devices have MII and a PHY, so we use
* this to weed out chips that would otherwise make it through
* the tests we have after this point.
*/
sc->mii_readbits = ed_pccard_tc5299j_mii_readbits;
sc->mii_writebits = ed_pccard_tc5299j_mii_writebits;
for (i = 0; i < 32; i++) {
id = ed_miibus_readreg(dev, i, MII_PHYIDR1);
if (id != 0 && id != 0xffff)
break;
}
if (i == 32) {
sc->mii_readbits = 0;
sc->mii_writebits = 0;
return (ENXIO);
}
ts = "TC5299J";
error = ed_probe_Novell_generic(dev, device_get_flags(dev));
if (bootverbose)
device_printf(dev, "probe novel returns %d\n", error);
if (error != 0) {
sc->mii_readbits = 0;
sc->mii_writebits = 0;
return (error);
}
if (ed_pccard_rom_mac(dev, sc->enaddr) == 0) {
sc->mii_readbits = 0;
sc->mii_writebits = 0;
return (ENXIO);
}
sc->vendor = ED_VENDOR_NOVELL;
sc->type = ED_TYPE_NE2000;
sc->chip_type = ED_CHIP_TYPE_TC5299J;
sc->type_str = ts;
return (0);
}
/* MII bit-twiddling routines for cards using TC5299J chipset */
#define TC5299J_MIISET(sc, x) ed_nic_outb(sc, ED_TC5299J_MIIBUS, \
ed_nic_inb(sc, ED_TC5299J_MIIBUS) | (x))
#define TC5299J_MIICLR(sc, x) ed_nic_outb(sc, ED_TC5299J_MIIBUS, \
ed_nic_inb(sc, ED_TC5299J_MIIBUS) & ~(x))
static void
ed_pccard_tc5299j_mii_reset(struct ed_softc *sc)
{
/* Do nothing! */
}
static void
ed_pccard_tc5299j_mii_writebits(struct ed_softc *sc, u_int val, int nbits)
{
int i;
uint8_t cr;
cr = ed_nic_inb(sc, ED_P0_CR);
ed_nic_outb(sc, ED_P0_CR, cr | ED_CR_PAGE_3);
TC5299J_MIICLR(sc, ED_TC5299J_MII_DIROUT);
for (i = nbits - 1; i >= 0; i--) {
if ((val >> i) & 1)
TC5299J_MIISET(sc, ED_TC5299J_MII_DATAOUT);
else
TC5299J_MIICLR(sc, ED_TC5299J_MII_DATAOUT);
TC5299J_MIISET(sc, ED_TC5299J_MII_CLK);
TC5299J_MIICLR(sc, ED_TC5299J_MII_CLK);
}
ed_nic_outb(sc, ED_P0_CR, cr);
}
static u_int
ed_pccard_tc5299j_mii_readbits(struct ed_softc *sc, int nbits)
{
int i;
u_int val = 0;
uint8_t cr;
cr = ed_nic_inb(sc, ED_P0_CR);
ed_nic_outb(sc, ED_P0_CR, cr | ED_CR_PAGE_3);
TC5299J_MIISET(sc, ED_TC5299J_MII_DIROUT);
for (i = nbits - 1; i >= 0; i--) {
TC5299J_MIISET(sc, ED_TC5299J_MII_CLK);
val <<= 1;
if (ed_nic_inb(sc, ED_TC5299J_MIIBUS) & ED_TC5299J_MII_DATAIN)
val++;
TC5299J_MIICLR(sc, ED_TC5299J_MII_CLK);
}
ed_nic_outb(sc, ED_P0_CR, cr);
return val;
}
MFp4: Omnibus ed changes o Attach AX88x90's MII bus to system, and require its presence. o Reorg the mii code a little, and move more of it into pccard attachment. o Eliminate ed_pccard_{read,write}_attrmem in favor of a more appropriate function in the pccard layer. o Update comments to reflect knowledge gained. o Update how re recognize a NE-2000 ROM. I found a couple of different datasheets that define the structure of the PROM data, so the code's old heuristics have been removed, and comments updated to reflect the structure. o Eliminate work around for EC2T. It is no longer needed, and was wrong headed since the EC2T has a Winbound 82C926C in it, not a AX88x90. o Add copyright to if_ed_pccard.c, since I believe I've re-written more than 3/4 of it. # With these changes, all of my 20-odd ed based cards work, except for the # NetGear FA-410, and I'm pretty sure that's a MII/PHY problem.
2005-09-13 19:47:44 +00:00
/*
* MII bus support routines.
*/
static int
ed_miibus_readreg(device_t dev, int phy, int reg)
{
struct ed_softc *sc;
int failed, val;
/*
* The AX88790 seem to have phy 0..f external, and 0x10 internal.
* but they also seem to have a bogus one that shows up at phy
* 0x11 through 0x1f.
*/
if (phy >= 0x11)
return (0);
sc = device_get_softc(dev);
(*sc->mii_writebits)(sc, 0xffffffff, 32);
(*sc->mii_writebits)(sc, ED_MII_STARTDELIM, ED_MII_STARTDELIM_BITS);
(*sc->mii_writebits)(sc, ED_MII_READOP, ED_MII_OP_BITS);
(*sc->mii_writebits)(sc, phy, ED_MII_PHY_BITS);
(*sc->mii_writebits)(sc, reg, ED_MII_REG_BITS);
failed = (*sc->mii_readbits)(sc, ED_MII_ACK_BITS);
val = (*sc->mii_readbits)(sc, ED_MII_DATA_BITS);
(*sc->mii_writebits)(sc, ED_MII_IDLE, ED_MII_IDLE_BITS);
return (failed ? 0 : val);
}
static void
ed_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct ed_softc *sc;
/*
* The AX88790 seem to have phy 0..f external, and 0x10 internal.
* but they also seem to have a bogus one that shows up at phy
* 0x11 through 0x1f.
*/
if (phy >= 0x11)
return;
sc = device_get_softc(dev);
(*sc->mii_writebits)(sc, 0xffffffff, 32);
(*sc->mii_writebits)(sc, ED_MII_STARTDELIM, ED_MII_STARTDELIM_BITS);
(*sc->mii_writebits)(sc, ED_MII_WRITEOP, ED_MII_OP_BITS);
(*sc->mii_writebits)(sc, phy, ED_MII_PHY_BITS);
(*sc->mii_writebits)(sc, reg, ED_MII_REG_BITS);
(*sc->mii_writebits)(sc, ED_MII_TURNAROUND, ED_MII_TURNAROUND_BITS);
(*sc->mii_writebits)(sc, data, ED_MII_DATA_BITS);
(*sc->mii_writebits)(sc, ED_MII_IDLE, ED_MII_IDLE_BITS);
}
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
static int
ed_ifmedia_upd(struct ifnet *ifp)
{
struct ed_softc *sc;
struct mii_data *mii;
sc = ifp->if_softc;
if (sc->miibus == NULL)
return (ENXIO);
mii = device_get_softc(sc->miibus);
return mii_mediachg(mii);
}
static void
ed_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct ed_softc *sc;
struct mii_data *mii;
sc = ifp->if_softc;
if (sc->miibus == NULL)
return;
mii = device_get_softc(sc->miibus);
mii_pollstat(mii);
ifmr->ifm_active = mii->mii_media_active;
ifmr->ifm_status = mii->mii_media_status;
}
static void
ed_child_detached(device_t dev, device_t child)
{
struct ed_softc *sc;
sc = device_get_softc(dev);
if (child == sc->miibus)
sc->miibus = NULL;
}
Minor reorg of pccard attach code to fix ax88x90 case broken after fixing dl100xx case. o We no longer acquire and release resources during attach many times. We now do it once at the beginning. o Move setting the resource offsets to just after acquiring the ports in attach. o Move ax88x90 code to the end of the file, just after the dl100xx specific code. o Rename ed_pccard_Linksys to ed_pccard_dl100xx to reflect the underlying chipset. o Pass the ed_product structure into ed_pccard_{dl100xx,ax88x90} and have those routines test the flags to see if this card should be probed in that way. o transition from ed_probe_Novell to ed_probe_Novell_generic since we already have the resources setup. o Move use of ed_probe_Novell_generic into ed_pccard_dl100xx to be more consistant with ax88x90 case. o simplify the code where we probe for the chipsets
2005-09-07 03:30:58 +00:00
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
static device_method_t ed_pccard_methods[] = {
/* Device interface */
Finish conversion to bus space and make ed MP safe. o Lock ed o Fix extra newline in probe messages o Eliminate gone. o Make detach less-racy. o Eliminate spl* o Switch from timeout/untimeout to callout interface. o Read/write card memory using bus_space calls. o generalize readmem so that we don't need ifs in the code. o Fix memory stuff to be consistant. o Remove OLDCARD compat stuff. o Mark interrupt as MPSAFE. # sic, hpp not tested at all # ISA and PCI attachments lightly tested
2005-08-28 23:56:25 +00:00
DEVMETHOD(device_probe, ed_pccard_probe),
DEVMETHOD(device_attach, ed_pccard_attach),
Make it possible to unload ed. Move the ed_pccard_detach routine to if_ed and rename it to ed_detach(). Tell other busses to use this routine for detach. Since I don't actually have any non-pccard ed hardware I can test with, I've only tested with my pccards. More improvements in this area likely are possible. Prodded by: rwatson
2005-02-08 05:45:35 +00:00
DEVMETHOD(device_detach, ed_detach),
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
/* Bus interface */
DEVMETHOD(bus_child_detached, ed_child_detached),
/* MII interface */
DEVMETHOD(miibus_readreg, ed_miibus_readreg),
DEVMETHOD(miibus_writereg, ed_miibus_writereg),
Minor newbus/style(9) cleanups. o Move the ax88190 code to its own function. o Move all device_method_t, driver_t and DRIVER_MODULE definitions to the end of files. o Wrap a few lines > 80 characters. o Use the same devclass for all ed drivers. This allows machines with multiple types of cards to have their cards numbered correctly. Before, you could wind up with two ed0's. o Protect if_edvar.h from multiple includes because I was there.
2000-12-26 06:38:04 +00:00
{ 0, 0 }
};
static driver_t ed_pccard_driver = {
"ed",
ed_pccard_methods,
sizeof(struct ed_softc)
};
- Express hard dependencies on bus (pci, isa, pccard) and network layer (ether). - Don't abuse module names to facilitate ifconfig module loading; such abuse isn't really needed. (And if we do need type information associated with a module then we should make it explicit and not use hacks.)
2003-04-15 06:37:30 +00:00
DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_devclass, 0, 0);
Add support for Dlink DL10022 to the ed driver. This is a mii part bolted to a ne-2000 chip. This is necessary for the NetGear FA-410TX and other cards. This also requires you add mii to your kernel if you have an ed driver configured. This code will result in a couple of timeout messages for ed on the impacted cards. Additional work will be needed, but this does work right now, and many people need these cards. Submitted by: Ian Dowse <iedowse@maths.tcd.ie>
2001-03-03 08:31:37 +00:00
DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, 0);
MFp4: o eliminate the ED_NO_MIIBUS option. Now, you need miibus to use ed with pccard. If you have an old ISA or PCI card w/o a miibus, then you'll still be able to use the ed driver w/o miibus in the kernel. If you have pccard you'll need mii now. Most pccards these days have miibus, and many cards have ISSUES if you don't attach miibus. issues I don't want to constantly rediagnose. - Add new media_ioctl, mediachg and tick function pointers. The core driver will call these if they aren't NULL, or return an error if they are. - migrate remaining mii code into if_ed_pccard. o include some notes from my datasheet fishing. this may allow us to get media status from some pccards. o Fix one bug that's common to many drivers. call if_free(ifp) after we tear down the interrupt. ed_intr() depends on ifp being there and freeing it while interrupts can still happen is, ummm, bad.
2005-09-18 20:51:34 +00:00
MODULE_DEPEND(ed, miibus, 1, 1, 1);
MODULE_DEPEND(ed, ether, 1, 1, 1);
Reference in New Issue Copy Permalink