d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grrr! The PNIC II's multicast hash table is only 128 bits wide, not 512

Browse Source 
like the original PNIC and the MX98715A (from which the PNIC II is derived).
This requires special handling. Save the card type, and in mx_calchash(),
if we see that the card is a PNIC, return only the low 7 bits of the
hash instead of the low 9 bits.
This commit is contained in:
Bill Paul 1999-06-16 16:27:30 +00:00
parent cd3fe8d008
commit 05222a2c7d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=47949
1 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sys/pci/if_mx.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_mx.c,v 1.17 1999/05/09 17:06:56 peter Exp $
* $Id: if_mx.c,v 1.44 1999/06/16 16:17:22 wpaul Exp $
*/
/*
@ -94,7 +94,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_mx.c,v 1.17 1999/05/09 17:06:56 peter Exp $";
"$Id: if_mx.c,v 1.44 1999/06/16 16:17:22 wpaul Exp $";
#endif
/*
@ -137,7 +137,7 @@ static struct mx_type mx_phys[] = {
static unsigned long mx_count = 0;
static const char *mx_probe __P((pcici_t, pcidi_t));
static void mx_attach __P((pcici_t, int));
static struct mx_type *mx_devtype __P((pcici_t, pcidi_t));
static int mx_newbuf __P((struct mx_softc *,
struct mx_chain_onefrag *));
static int mx_encap __P((struct mx_softc *, struct mx_chain *,
@ -180,7 +180,7 @@ static void mx_setmode_mii __P((struct mx_softc *, int));
static void mx_setmode __P((struct mx_softc *, int, int));
static void mx_getmode_mii __P((struct mx_softc *));
static void mx_setcfg __P((struct mx_softc *, int));
static u_int32_t mx_calchash __P((caddr_t));
static u_int32_t mx_calchash __P((struct mx_softc *, caddr_t));
static void mx_setfilt __P((struct mx_softc *));
static void mx_reset __P((struct mx_softc *));
static int mx_list_rx_init __P((struct mx_softc *));
@ -569,8 +569,10 @@ static void mx_phy_writereg(sc, reg, data)
#define MX_POLY 0xEDB88320
#define MX_BITS 9
#define MX_BITS_PNIC_II 7
static u_int32_t mx_calchash(addr)
static u_int32_t mx_calchash(sc, addr)
struct mx_softc *sc;
caddr_t addr;
{
u_int32_t idx, bit, data, crc;
@ -583,6 +585,10 @@ static u_int32_t mx_calchash(addr)
crc = (crc >> 1) ^ (((crc ^ data) & 1) ? MX_POLY : 0);
}
/* The hash table on the PNIC II is only 128 bits wide. */
if (sc->mx_info->mx_vid == PN_VENDORID)
return (crc & ((1 << MX_BITS_PNIC_II) - 1));
return (crc & ((1 << MX_BITS) - 1));
}
@ -1133,12 +1139,13 @@ void mx_setfilt(sc)
ifma = ifma->ifma_link.le_next) {
if (ifma->ifma_addr->sa_family != AF_LINK)
continue;
h = mx_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
h = mx_calchash(sc,
LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
sp[h >> 4] |= 1 << (h & 0xF);
}
if (ifp->if_flags & IFF_BROADCAST) {
h = mx_calchash((caddr_t)&etherbroadcastaddr);
h = mx_calchash(sc, (caddr_t)&etherbroadcastaddr);
sp[h >> 4] |= 1 << (h & 0xF);
}
@ -1235,18 +1242,7 @@ static void mx_reset(sc)
return;
}
/*
* Probe for a Macronix PMAC chip. Check the PCI vendor and device
* IDs against our list and return a device name if we find a match.
* We do a little bit of extra work to identify the exact type of
* chip. The MX98713 and MX98713A have the same PCI vendor/device ID,
* but different revision IDs. The same is true for 98715/98715A
* chips and the 98725. This doesn't affect a whole lot, but it
* lets us tell the user exactly what type of device they have
* in the probe output.
*/
static const char *
mx_probe(config_id, device_id)
static struct mx_type *mx_devtype(config_id, device_id)
pcici_t config_id;
pcidi_t device_id;
{
@ -1269,7 +1265,7 @@ mx_probe(config_id, device_id)
if (t->mx_did == MX_DEVICEID_987x5 &&
rev >= MX_REVISION_98725)
t++;
return(t->mx_name);
return(t);
}
t++;
}
@ -1277,6 +1273,31 @@ mx_probe(config_id, device_id)
return(NULL);
}
/*
* Probe for a Macronix PMAC chip. Check the PCI vendor and device
* IDs against our list and return a device name if we find a match.
* We do a little bit of extra work to identify the exact type of
* chip. The MX98713 and MX98713A have the same PCI vendor/device ID,
* but different revision IDs. The same is true for 98715/98715A
* chips and the 98725. This doesn't affect a whole lot, but it
* lets us tell the user exactly what type of device they have
* in the probe output.
*/
static const char *
mx_probe(config_id, device_id)
pcici_t config_id;
pcidi_t device_id;
{
struct mx_type *t;
t = mx_devtype(config_id, device_id);
if (t != NULL)
return(t->mx_name);
return(NULL);
}
/*
* Attach the interface. Allocate softc structures, do ifmedia
* setup and ethernet/BPF attach.
@ -1406,6 +1427,10 @@ mx_attach(config_id, unit)
/* Save the cache line size. */
sc->mx_cachesize = pci_conf_read(config_id, MX_PCI_CACHELEN) & 0xFF;
/* Save the device info; the PNIC II requires special handling. */
pci_id = pci_conf_read(config_id,MX_PCI_VENDOR_ID);
sc->mx_info = mx_devtype(config_id, pci_id);
/* Reset the adapter. */
mx_reset(sc);