svn commit: r187752 - user/thompsa/usb/sys/dev/usb2/ethernet
Andrew Thompson
thompsa at FreeBSD.org
Mon Jan 26 17:27:29 PST 2009
Author: thompsa
Date: Tue Jan 27 01:27:28 2009
New Revision: 187752
URL: http://svn.freebsd.org/changeset/base/187752
Log:
Revert back to the sys/dev/usb copy of the ethernet drivers in preparation of
removing the config thread.
Modified:
user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_auereg.h
user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_axereg.h
user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_cdcereg.h
user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_cuereg.h
user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_kuereg.h
user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_ruereg.h
user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c
user/thompsa/usb/sys/dev/usb2/ethernet/if_udavreg.h
Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c
==============================================================================
--- user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Tue Jan 27 01:23:25 2009 (r187751)
+++ user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Tue Jan 27 01:27:28 2009 (r187752)
@@ -2,6 +2,9 @@
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul at ee.columbia.edu>. All rights reserved.
*
+ * Copyright (c) 2006
+ * Alfred Perlstein <alfred at freebsd.org>. All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -40,6 +43,9 @@ __FBSDID("$FreeBSD$");
* Written by Bill Paul <wpaul at ee.columbia.edu>
* Electrical Engineering Department
* Columbia University, New York City
+ *
+ * SMP locking by Alfred Perlstein <alfred at freebsd.org>.
+ * RED Inc.
*/
/*
@@ -58,305 +64,224 @@ __FBSDID("$FreeBSD$");
* the controller uses an external PHY chip, it's possible that board
* designers might simply choose a 10Mbps PHY.
*
- * Registers are accessed using usb2_do_request(). Packet transfers are
- * done using usb2_transfer() and friends.
+ * Registers are accessed using usbd_do_request(). Packet transfers are
+ * done using usbd_transfer() and friends.
*/
-/*
- * NOTE: all function names beginning like "aue_cfg_" can only
- * be called from within the config thread function !
- */
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/kdb.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/sx.h>
+#include <sys/taskqueue.h>
+
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <net/bpf.h>
+
+#include <sys/bus.h>
+#include <machine/bus.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
+#include "usbdevs.h"
+#include <dev/usb/usb_ethersubr.h>
-#include <dev/usb2/include/usb2_devid.h>
-#include <dev/usb2/include/usb2_standard.h>
-#include <dev/usb2/include/usb2_mfunc.h>
-#include <dev/usb2/include/usb2_error.h>
-
-#define usb2_config_td_cc usb2_ether_cc
-#define usb2_config_td_softc aue_softc
-
-#define USB_DEBUG_VAR aue_debug
-
-#include <dev/usb2/core/usb2_core.h>
-#include <dev/usb2/core/usb2_lookup.h>
-#include <dev/usb2/core/usb2_process.h>
-#include <dev/usb2/core/usb2_config_td.h>
-#include <dev/usb2/core/usb2_debug.h>
-#include <dev/usb2/core/usb2_request.h>
-#include <dev/usb2/core/usb2_busdma.h>
-#include <dev/usb2/core/usb2_util.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
-#include <dev/usb2/ethernet/usb2_ethernet.h>
-#include <dev/usb2/ethernet/if_auereg.h>
+#include <dev/usb/if_auereg.h>
-MODULE_DEPEND(aue, usb2_ethernet, 1, 1, 1);
-MODULE_DEPEND(aue, usb2_core, 1, 1, 1);
+MODULE_DEPEND(aue, usb, 1, 1, 1);
MODULE_DEPEND(aue, ether, 1, 1, 1);
MODULE_DEPEND(aue, miibus, 1, 1, 1);
-#if USB_DEBUG
-static int aue_debug = 0;
-
-SYSCTL_NODE(_hw_usb2, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue");
-SYSCTL_INT(_hw_usb2_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
- "Debug level");
-#endif
+/* "device miibus" required. See GENERIC if you get errors here. */
+#include "miibus_if.h"
/*
* Various supported device vendors/products.
*/
-static const struct usb2_device_id aue_devs[] = {
- {USB_VPI(USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA, 0)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10, 0)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1, AUE_FLAG_PNA | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC, 0)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS, AUE_FLAG_PNA | AUE_FLAG_DUAL_PHY)},
- {USB_VPI(USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100, 0)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX, 0)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN, AUE_FLAG_PNA | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0, 0)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2, 0)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET, 0)},
- {USB_VPI(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W, 0)},
- {USB_VPI(USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HN210E, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX, 0)},
- {USB_VPI(USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX, 0)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1, AUE_FLAG_LSYS | AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1, 0)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5, 0)},
- {USB_VPI(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB, 0)},
- {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100, 0)},
- {USB_VPI(USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110, AUE_FLAG_PII)},
+struct aue_type {
+ struct usb_devno aue_dev;
+ u_int16_t aue_flags;
+#define LSYS 0x0001 /* use Linksys reset */
+#define PNA 0x0002 /* has Home PNA */
+#define PII 0x0004 /* Pegasus II chip */
};
-/* prototypes */
+static const struct aue_type aue_devs[] = {
+ {{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, PII },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, PNA|PII },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, PII },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000}, LSYS },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4}, PNA },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5}, PNA },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6}, PII },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7}, PII },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8}, PII },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9}, PNA },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10}, 0 },
+ {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA}, 0 },
+ {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC}, 0 },
+ {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001}, PII },
+ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS}, PNA },
+ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII },
+ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2}, PII },
+ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3}, PII },
+ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4}, PII },
+ {{ USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET}, PII },
+ {{ USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100}, PII },
+ {{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T}, PII },
+ {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII },
+ {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 },
+ {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA },
+ {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100}, 0 },
+ {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100}, PII },
+ {{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX}, 0 },
+ {{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS},PII },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4}, LSYS|PII },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1}, LSYS },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX}, LSYS },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA}, PNA },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3}, LSYS|PII },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2}, LSYS|PII },
+ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650}, LSYS },
+ {{ USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN}, PNA|PII },
+ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20}, PII },
+ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0}, 0 },
+ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1}, LSYS },
+ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2}, 0 },
+ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, LSYS },
+ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, PII },
+ {{ USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0 },
+ {{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W}, 0 },
+ {{ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, PII },
+ {{ USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, PII },
+ {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 },
+ {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS}, PII },
+ {{ USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX}, 0 },
+ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1}, LSYS|PII },
+ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T}, LSYS },
+ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX}, LSYS },
+ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1}, LSYS|PNA },
+ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA}, LSYS },
+ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2}, LSYS|PII },
+ {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0 },
+ {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0 },
+ {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, PII },
+ {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII },
+ {{ USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101}, PII },
+ {{ USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, PII },
+ {{ USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER}, PII },
+ {{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC},PII },
+ {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0 },
+ {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB}, PII },
+ {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0 },
+ {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110}, PII },
+};
+#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
-static device_probe_t aue_probe;
+static device_probe_t aue_match;
static device_attach_t aue_attach;
static device_detach_t aue_detach;
static device_shutdown_t aue_shutdown;
-
-static usb2_callback_t aue_intr_clear_stall_callback;
-static usb2_callback_t aue_intr_callback;
-static usb2_callback_t aue_bulk_read_clear_stall_callback;
-static usb2_callback_t aue_bulk_read_callback;
-static usb2_callback_t aue_bulk_write_clear_stall_callback;
-static usb2_callback_t aue_bulk_write_callback;
-
-static void aue_cfg_do_request(struct aue_softc *,
- struct usb2_device_request *, void *);
-static uint8_t aue_cfg_csr_read_1(struct aue_softc *, uint16_t);
-static uint16_t aue_cfg_csr_read_2(struct aue_softc *, uint16_t);
-static void aue_cfg_csr_write_1(struct aue_softc *, uint16_t, uint8_t);
-static void aue_cfg_csr_write_2(struct aue_softc *, uint16_t, uint16_t);
-static void aue_cfg_eeprom_getword(struct aue_softc *, uint8_t, uint8_t *);
-static void aue_cfg_read_eeprom(struct aue_softc *, uint8_t *, uint16_t,
- uint16_t);
-
-static miibus_readreg_t aue_cfg_miibus_readreg;
-static miibus_writereg_t aue_cfg_miibus_writereg;
-static miibus_statchg_t aue_cfg_miibus_statchg;
-
-static usb2_config_td_command_t aue_cfg_setmulti;
-static usb2_config_td_command_t aue_cfg_first_time_setup;
-static usb2_config_td_command_t aue_config_copy;
-static usb2_config_td_command_t aue_cfg_tick;
-static usb2_config_td_command_t aue_cfg_pre_init;
-static usb2_config_td_command_t aue_cfg_init;
-static usb2_config_td_command_t aue_cfg_promisc_upd;
-static usb2_config_td_command_t aue_cfg_ifmedia_upd;
-static usb2_config_td_command_t aue_cfg_pre_stop;
-static usb2_config_td_command_t aue_cfg_stop;
-
-static void aue_cfg_reset_pegasus_II(struct aue_softc *);
-static void aue_cfg_reset(struct aue_softc *);
-static void aue_start_cb(struct ifnet *);
-static void aue_init_cb(void *);
-static void aue_start_transfers(struct aue_softc *);
-static int aue_ifmedia_upd_cb(struct ifnet *);
-static void aue_ifmedia_sts_cb(struct ifnet *, struct ifmediareq *);
-static int aue_ioctl_cb(struct ifnet *, u_long, caddr_t);
-static void aue_watchdog(void *);
-
-static const struct usb2_config aue_config[AUE_N_TRANSFER] = {
-
- [AUE_BULK_DT_WR] = {
- .type = UE_BULK,
- .endpoint = UE_ADDR_ANY,
- .direction = UE_DIR_OUT,
- .mh.bufsize = (MCLBYTES + 2),
- .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
- .mh.callback = &aue_bulk_write_callback,
- .mh.timeout = 10000, /* 10 seconds */
- },
-
- [AUE_BULK_DT_RD] = {
- .type = UE_BULK,
- .endpoint = UE_ADDR_ANY,
- .direction = UE_DIR_IN,
- .mh.bufsize = (MCLBYTES + 4 + ETHER_CRC_LEN),
- .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .mh.callback = &aue_bulk_read_callback,
- },
-
- [AUE_BULK_CS_WR] = {
- .type = UE_CONTROL,
- .endpoint = 0x00, /* Control pipe */
- .direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
- .mh.callback = &aue_bulk_write_clear_stall_callback,
- .mh.timeout = 1000, /* 1 second */
- .mh.interval = 50, /* 50ms */
- },
-
- [AUE_BULK_CS_RD] = {
- .type = UE_CONTROL,
- .endpoint = 0x00, /* Control pipe */
- .direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
- .mh.callback = &aue_bulk_read_clear_stall_callback,
- .mh.timeout = 1000, /* 1 second */
- .mh.interval = 50, /* 50ms */
- },
-
- [AUE_INTR_DT_RD] = {
- .type = UE_INTERRUPT,
- .endpoint = UE_ADDR_ANY,
- .direction = UE_DIR_IN,
- .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
- .mh.bufsize = 0, /* use wMaxPacketSize */
- .mh.callback = &aue_intr_callback,
- },
-
- [AUE_INTR_CS_RD] = {
- .type = UE_CONTROL,
- .endpoint = 0x00, /* Control pipe */
- .direction = UE_DIR_ANY,
- .mh.bufsize = sizeof(struct usb2_device_request),
- .mh.flags = {},
- .mh.callback = &aue_intr_clear_stall_callback,
- .mh.timeout = 1000, /* 1 second */
- .mh.interval = 50, /* 50ms */
- },
-};
+static miibus_readreg_t aue_miibus_readreg;
+static miibus_writereg_t aue_miibus_writereg;
+static miibus_statchg_t aue_miibus_statchg;
+
+static void aue_reset_pegasus_II(struct aue_softc *sc);
+static int aue_encap(struct aue_softc *, struct mbuf *, int);
+#ifdef AUE_INTR_PIPE
+static void aue_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
+#endif
+static void aue_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+static void aue_rxeof_thread(struct aue_softc *sc);
+static void aue_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
+static void aue_txeof_thread(struct aue_softc *);
+static void aue_task_sched(struct aue_softc *, int);
+static void aue_task(void *xsc, int pending);
+static void aue_tick(void *);
+static void aue_rxstart(struct ifnet *);
+static void aue_rxstart_thread(struct aue_softc *);
+static void aue_start(struct ifnet *);
+static void aue_start_thread(struct aue_softc *);
+static int aue_ioctl(struct ifnet *, u_long, caddr_t);
+static void aue_init(void *);
+static void aue_init_body(struct aue_softc *);
+static void aue_stop(struct aue_softc *);
+static void aue_watchdog(struct aue_softc *);
+static int aue_ifmedia_upd(struct ifnet *);
+static void aue_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+
+static void aue_eeprom_getword(struct aue_softc *, int, u_int16_t *);
+static void aue_read_eeprom(struct aue_softc *, caddr_t, int, int, int);
+
+static void aue_setmulti(struct aue_softc *);
+static void aue_reset(struct aue_softc *);
+
+static int aue_csr_read_1(struct aue_softc *, int);
+static int aue_csr_write_1(struct aue_softc *, int, int);
+static int aue_csr_read_2(struct aue_softc *, int);
+static int aue_csr_write_2(struct aue_softc *, int, int);
static device_method_t aue_methods[] = {
/* Device interface */
- DEVMETHOD(device_probe, aue_probe),
- DEVMETHOD(device_attach, aue_attach),
- DEVMETHOD(device_detach, aue_detach),
- DEVMETHOD(device_shutdown, aue_shutdown),
+ DEVMETHOD(device_probe, aue_match),
+ DEVMETHOD(device_attach, aue_attach),
+ DEVMETHOD(device_detach, aue_detach),
+ DEVMETHOD(device_shutdown, aue_shutdown),
/* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
+ DEVMETHOD(bus_print_child, bus_generic_print_child),
+ DEVMETHOD(bus_driver_added, bus_generic_driver_added),
/* MII interface */
- DEVMETHOD(miibus_readreg, aue_cfg_miibus_readreg),
- DEVMETHOD(miibus_writereg, aue_cfg_miibus_writereg),
- DEVMETHOD(miibus_statchg, aue_cfg_miibus_statchg),
+ DEVMETHOD(miibus_readreg, aue_miibus_readreg),
+ DEVMETHOD(miibus_writereg, aue_miibus_writereg),
+ DEVMETHOD(miibus_statchg, aue_miibus_statchg),
- {0, 0}
+ { 0, 0 }
};
static driver_t aue_driver = {
- .name = "aue",
- .methods = aue_methods,
- .size = sizeof(struct aue_softc)
+ "aue",
+ aue_methods,
+ sizeof(struct aue_softc)
};
static devclass_t aue_devclass;
-DRIVER_MODULE(aue, ushub, aue_driver, aue_devclass, NULL, 0);
+DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
-static void
-aue_cfg_do_request(struct aue_softc *sc, struct usb2_device_request *req,
- void *data)
-{
- uint16_t length;
- usb2_error_t err;
+#define AUE_SETBIT(sc, reg, x) \
+ aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) | (x))
- if (usb2_config_td_is_gone(&sc->sc_config_td)) {
- goto error;
- }
- err = usb2_do_request_flags
- (sc->sc_udev, &sc->sc_mtx, req, data, 0, NULL, 1000);
+#define AUE_CLRBIT(sc, reg, x) \
+ aue_csr_write_1(sc, reg, aue_csr_read_1(sc, reg) & ~(x))
- if (err) {
-
- DPRINTF("device request failed, err=%s "
- "(ignored)\n", usb2_errstr(err));
-
-error:
- length = UGETW(req->wLength);
-
- if ((req->bmRequestType & UT_READ) && length) {
- bzero(data, length);
- }
- }
-}
-
-#define AUE_CFG_SETBIT(sc, reg, x) \
- aue_cfg_csr_write_1(sc, reg, aue_cfg_csr_read_1(sc, reg) | (x))
-
-#define AUE_CFG_CLRBIT(sc, reg, x) \
- aue_cfg_csr_write_1(sc, reg, aue_cfg_csr_read_1(sc, reg) & ~(x))
-
-static uint8_t
-aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg)
+static int
+aue_csr_read_1(struct aue_softc *sc, int reg)
{
- struct usb2_device_request req;
- uint8_t val;
+ usb_device_request_t req;
+ usbd_status err;
+ u_int8_t val = 0;
+
+ AUE_SXASSERTLOCKED(sc);
req.bmRequestType = UT_READ_VENDOR_DEVICE;
req.bRequest = AUE_UR_READREG;
@@ -364,15 +289,23 @@ aue_cfg_csr_read_1(struct aue_softc *sc,
USETW(req.wIndex, reg);
USETW(req.wLength, 1);
- aue_cfg_do_request(sc, &req, &val);
+ err = usbd_do_request(sc->aue_udev, &req, &val);
+
+ if (err) {
+ return (0);
+ }
+
return (val);
}
-static uint16_t
-aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg)
+static int
+aue_csr_read_2(struct aue_softc *sc, int reg)
{
- struct usb2_device_request req;
- uint16_t val;
+ usb_device_request_t req;
+ usbd_status err;
+ u_int16_t val = 0;
+
+ AUE_SXASSERTLOCKED(sc);
req.bmRequestType = UT_READ_VENDOR_DEVICE;
req.bRequest = AUE_UR_READREG;
@@ -380,29 +313,45 @@ aue_cfg_csr_read_2(struct aue_softc *sc,
USETW(req.wIndex, reg);
USETW(req.wLength, 2);
- aue_cfg_do_request(sc, &req, &val);
- return (le16toh(val));
+ err = usbd_do_request(sc->aue_udev, &req, &val);
+
+ if (err) {
+ return (0);
+ }
+
+ return (val);
}
-static void
-aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val)
+static int
+aue_csr_write_1(struct aue_softc *sc, int reg, int val)
{
- struct usb2_device_request req;
+ usb_device_request_t req;
+ usbd_status err;
+
+ AUE_SXASSERTLOCKED(sc);
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = AUE_UR_WRITEREG;
- req.wValue[0] = val;
- req.wValue[1] = 0;
+ USETW(req.wValue, val);
USETW(req.wIndex, reg);
USETW(req.wLength, 1);
- aue_cfg_do_request(sc, &req, &val);
+ err = usbd_do_request(sc->aue_udev, &req, &val);
+
+ if (err) {
+ return (-1);
+ }
+
+ return (0);
}
-static void
-aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val)
+static int
+aue_csr_write_2(struct aue_softc *sc, int reg, int val)
{
- struct usb2_device_request req;
+ usb_device_request_t req;
+ usbd_status err;
+
+ AUE_SXASSERTLOCKED(sc);
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = AUE_UR_WRITEREG;
@@ -410,73 +359,70 @@ aue_cfg_csr_write_2(struct aue_softc *sc
USETW(req.wIndex, reg);
USETW(req.wLength, 2);
- val = htole16(val);
+ err = usbd_do_request(sc->aue_udev, &req, &val);
+
+ if (err) {
+ return (-1);
+ }
- aue_cfg_do_request(sc, &req, &val);
+ return (0);
}
/*
* Read a word of data stored in the EEPROM at address 'addr.'
*/
static void
-aue_cfg_eeprom_getword(struct aue_softc *sc, uint8_t addr,
- uint8_t *dest)
+aue_eeprom_getword(struct aue_softc *sc, int addr, u_int16_t *dest)
{
- uint16_t i;
-
- aue_cfg_csr_write_1(sc, AUE_EE_REG, addr);
- aue_cfg_csr_write_1(sc, AUE_EE_CTL, AUE_EECTL_READ);
-
- for (i = 0;; i++) {
+ int i;
+ u_int16_t word = 0;
- if (i < AUE_TIMEOUT) {
+ aue_csr_write_1(sc, AUE_EE_REG, addr);
+ aue_csr_write_1(sc, AUE_EE_CTL, AUE_EECTL_READ);
- if (aue_cfg_csr_read_1(sc, AUE_EE_CTL) & AUE_EECTL_DONE) {
- break;
- }
- if (usb2_config_td_sleep(&sc->sc_config_td, hz / 100)) {
- break;
- }
- } else {
- DPRINTF("EEPROM read timed out!\n");
+ for (i = 0; i < AUE_TIMEOUT; i++) {
+ if (aue_csr_read_1(sc, AUE_EE_CTL) & AUE_EECTL_DONE)
break;
- }
}
- i = aue_cfg_csr_read_2(sc, AUE_EE_DATA);
+ if (i == AUE_TIMEOUT) {
+ printf("aue%d: EEPROM read timed out\n",
+ sc->aue_unit);
+ }
+
+ word = aue_csr_read_2(sc, AUE_EE_DATA);
+ *dest = word;
- dest[0] = (i & 0xFF);
- dest[1] = (i >> 8);
+ return;
}
/*
* Read a sequence of words from the EEPROM.
*/
static void
-aue_cfg_read_eeprom(struct aue_softc *sc, uint8_t *dest,
- uint16_t off, uint16_t len)
+aue_read_eeprom(struct aue_softc *sc, caddr_t dest, int off, int cnt, int swap)
{
- uint16_t i;
+ int i;
+ u_int16_t word = 0, *ptr;
- for (i = 0; i < len; i++) {
- aue_cfg_eeprom_getword(sc, off + i, dest + (i * 2));
+ for (i = 0; i < cnt; i++) {
+ aue_eeprom_getword(sc, off + i, &word);
+ ptr = (u_int16_t *)(dest + (i * 2));
+ if (swap)
+ *ptr = ntohs(word);
+ else
+ *ptr = word;
}
+
+ return;
}
static int
-aue_cfg_miibus_readreg(device_t dev, int phy, int reg)
+aue_miibus_readreg(device_t dev, int phy, int reg)
{
- struct aue_softc *sc = device_get_softc(dev);
- uint16_t i;
- uint8_t do_unlock;
-
- /* avoid recursive locking */
- if (mtx_owned(&sc->sc_mtx)) {
- do_unlock = 0;
- } else {
- mtx_lock(&sc->sc_mtx);
- do_unlock = 1;
- }
+ struct aue_softc *sc = device_get_softc(dev);
+ int i;
+ u_int16_t val = 0;
/*
* The Am79C901 HomePNA PHY actually contains
@@ -488,198 +434,162 @@ aue_cfg_miibus_readreg(device_t dev, int
* happens to be configured for MII address 3,
* so we filter that out.
*/
- if (sc->sc_flags & AUE_FLAG_DUAL_PHY) {
-
- if (phy == 3) {
- i = 0;
- goto done;
- }
-#if 0
- if (phy != 1) {
- i = 0;
- goto done;
- }
+ if (sc->aue_vendor == USB_VENDOR_ADMTEK &&
+ sc->aue_product == USB_PRODUCT_ADMTEK_PEGASUS) {
+ if (phy == 3)
+ return (0);
+#ifdef notdef
+ if (phy != 1)
+ return (0);
#endif
}
- aue_cfg_csr_write_1(sc, AUE_PHY_ADDR, phy);
- aue_cfg_csr_write_1(sc, AUE_PHY_CTL, reg | AUE_PHYCTL_READ);
- for (i = 0;; i++) {
+ aue_csr_write_1(sc, AUE_PHY_ADDR, phy);
+ aue_csr_write_1(sc, AUE_PHY_CTL, reg | AUE_PHYCTL_READ);
- if (i < AUE_TIMEOUT) {
-
- if (aue_cfg_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE) {
- break;
- }
- if (usb2_config_td_sleep(&sc->sc_config_td, hz / 100)) {
- break;
- }
- } else {
- DPRINTF("MII read timed out\n");
+ for (i = 0; i < AUE_TIMEOUT; i++) {
+ if (aue_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE)
break;
- }
}
- i = aue_cfg_csr_read_2(sc, AUE_PHY_DATA);
-
-done:
- if (do_unlock) {
- mtx_unlock(&sc->sc_mtx);
+ if (i == AUE_TIMEOUT) {
+ printf("aue%d: MII read timed out\n", sc->aue_unit);
}
- return (i);
+
+ val = aue_csr_read_2(sc, AUE_PHY_DATA);
+
+ return (val);
}
static int
-aue_cfg_miibus_writereg(device_t dev, int phy, int reg, int data)
+aue_miibus_writereg(device_t dev, int phy, int reg, int data)
{
- struct aue_softc *sc = device_get_softc(dev);
- uint16_t i;
- uint8_t do_unlock;
+ struct aue_softc *sc = device_get_softc(dev);
+ int i;
- if (phy == 3) {
+ if (phy == 3)
return (0);
- }
- /* avoid recursive locking */
- if (mtx_owned(&sc->sc_mtx)) {
- do_unlock = 0;
- } else {
- mtx_lock(&sc->sc_mtx);
- do_unlock = 1;
- }
-
- aue_cfg_csr_write_2(sc, AUE_PHY_DATA, data);
- aue_cfg_csr_write_1(sc, AUE_PHY_ADDR, phy);
- aue_cfg_csr_write_1(sc, AUE_PHY_CTL, reg | AUE_PHYCTL_WRITE);
- for (i = 0;; i++) {
+ aue_csr_write_2(sc, AUE_PHY_DATA, data);
+ aue_csr_write_1(sc, AUE_PHY_ADDR, phy);
+ aue_csr_write_1(sc, AUE_PHY_CTL, reg | AUE_PHYCTL_WRITE);
- if (i < AUE_TIMEOUT) {
- if (aue_cfg_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE) {
- break;
- }
- if (usb2_config_td_sleep(&sc->sc_config_td, hz / 100)) {
- break;
- }
- } else {
- DPRINTF("MII write timed out\n");
+ for (i = 0; i < AUE_TIMEOUT; i++) {
+ if (aue_csr_read_1(sc, AUE_PHY_CTL) & AUE_PHYCTL_DONE)
break;
- }
}
- if (do_unlock) {
- mtx_unlock(&sc->sc_mtx);
+ if (i == AUE_TIMEOUT) {
+ printf("aue%d: MII read timed out\n",
+ sc->aue_unit);
}
- return (0);
+
+ return(0);
}
static void
-aue_cfg_miibus_statchg(device_t dev)
+aue_miibus_statchg(device_t dev)
{
- struct aue_softc *sc = device_get_softc(dev);
- struct mii_data *mii = GET_MII(sc);
- uint8_t do_unlock;
-
- /* avoid recursive locking */
- if (mtx_owned(&sc->sc_mtx)) {
- do_unlock = 0;
- } else {
- mtx_lock(&sc->sc_mtx);
- do_unlock = 1;
- }
-
- AUE_CFG_CLRBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB);
+ struct aue_softc *sc = device_get_softc(dev);
+ struct mii_data *mii = GET_MII(sc);
+ AUE_CLRBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB);
if (IFM_SUBTYPE(mii->mii_media_active) == IFM_100_TX) {
- AUE_CFG_SETBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL);
+ AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL);
} else {
- AUE_CFG_CLRBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL);
+ AUE_CLRBIT(sc, AUE_CTL1, AUE_CTL1_SPEEDSEL);
}
- if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) {
- AUE_CFG_SETBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX);
- } else {
- AUE_CFG_CLRBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX);
- }
+ if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX)
+ AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX);
+ else
+ AUE_CLRBIT(sc, AUE_CTL1, AUE_CTL1_DUPLEX);
- AUE_CFG_SETBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB);
+ AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB);
/*
* Set the LED modes on the LinkSys adapter.
* This turns on the 'dual link LED' bin in the auxmode
* register of the Broadcom PHY.
*/
- if (sc->sc_flags & AUE_FLAG_LSYS) {
- uint16_t auxmode;
-
- auxmode = aue_cfg_miibus_readreg(dev, 0, 0x1b);
- aue_cfg_miibus_writereg(dev, 0, 0x1b, auxmode | 0x04);
- }
- if (do_unlock) {
- mtx_unlock(&sc->sc_mtx);
+ if (sc->aue_flags & LSYS) {
+ u_int16_t auxmode;
+ auxmode = aue_miibus_readreg(dev, 0, 0x1b);
+ aue_miibus_writereg(dev, 0, 0x1b, auxmode | 0x04);
}
+
+ return;
}
+#define AUE_BITS 6
+
static void
-aue_cfg_setmulti(struct aue_softc *sc,
- struct usb2_config_td_cc *cc, uint16_t refcount)
+aue_setmulti(struct aue_softc *sc)
{
- uint16_t i;
+ struct ifnet *ifp;
+ struct ifmultiaddr *ifma;
+ u_int32_t h = 0, i;
+ u_int8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
- if ((cc->if_flags & IFF_ALLMULTI) ||
- (cc->if_flags & IFF_PROMISC)) {
- AUE_CFG_SETBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI);
+ AUE_SXASSERTLOCKED(sc);
+ ifp = sc->aue_ifp;
+
+ if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {
+ AUE_SETBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI);
return;
}
- AUE_CFG_CLRBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI);
- /* clear existing ones */
- for (i = 0; i < 8; i++) {
- aue_cfg_csr_write_1(sc, AUE_MAR0 + i, 0);
- }
+ AUE_CLRBIT(sc, AUE_CTL0, AUE_CTL0_ALLMULTI);
/* now program new ones */
- for (i = 0; i < 8; i++) {
- aue_cfg_csr_write_1(sc, AUE_MAR0 + i, cc->if_hash[i]);
- }
+ IF_ADDR_LOCK(ifp);
+ TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link)
+ {
+ if (ifma->ifma_addr->sa_family != AF_LINK)
+ continue;
+ h = ether_crc32_le(LLADDR((struct sockaddr_dl *)
+ ifma->ifma_addr), ETHER_ADDR_LEN) & ((1 << AUE_BITS) - 1);
+ hashtbl[(h >> 3)] |= 1 << (h & 0x7);
+ }
+ IF_ADDR_UNLOCK(ifp);
+
+ /* write the hashtable */
+ for (i = 0; i < 8; i++)
+ aue_csr_write_1(sc, AUE_MAR0 + i, hashtbl[i]);
+
+ return;
}
static void
-aue_cfg_reset_pegasus_II(struct aue_softc *sc)
+aue_reset_pegasus_II(struct aue_softc *sc)
{
/* Magic constants taken from Linux driver. */
- aue_cfg_csr_write_1(sc, AUE_REG_1D, 0);
- aue_cfg_csr_write_1(sc, AUE_REG_7B, 2);
+ aue_csr_write_1(sc, AUE_REG_1D, 0);
+ aue_csr_write_1(sc, AUE_REG_7B, 2);
#if 0
- if ((sc->sc_flags & HAS_HOME_PNA) && mii_mode)
- aue_cfg_csr_write_1(sc, AUE_REG_81, 6);
+ if ((sc->aue_flags & HAS_HOME_PNA) && mii_mode)
+ aue_csr_write_1(sc, AUE_REG_81, 6);
else
#endif
- aue_cfg_csr_write_1(sc, AUE_REG_81, 2);
+ aue_csr_write_1(sc, AUE_REG_81, 2);
}
static void
-aue_cfg_reset(struct aue_softc *sc)
+aue_reset(struct aue_softc *sc)
{
- uint16_t i;
-
- AUE_CFG_SETBIT(sc, AUE_CTL1, AUE_CTL1_RESETMAC);
+ int i;
- for (i = 0;; i++) {
+ AUE_SXASSERTLOCKED(sc);
+ AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_RESETMAC);
- if (i < AUE_TIMEOUT) {
-
- if (!(aue_cfg_csr_read_1(sc, AUE_CTL1) & AUE_CTL1_RESETMAC)) {
- break;
- }
- if (usb2_config_td_sleep(&sc->sc_config_td, hz / 100)) {
- break;
- }
- } else {
- DPRINTF("reset timed out\n");
+ for (i = 0; i < AUE_TIMEOUT; i++) {
+ if (!(aue_csr_read_1(sc, AUE_CTL1) & AUE_CTL1_RESETMAC))
break;
- }
}
+ if (i == AUE_TIMEOUT)
+ printf("aue%d: reset failed\n", sc->aue_unit);
+
/*
* The PHY(s) attached to the Pegasus chip may be held
* in reset until we flip on the GPIO outputs. Make sure
@@ -689,55 +599,48 @@ aue_cfg_reset(struct aue_softc *sc)
* Note: We force all of the GPIO pins low first, *then*
* enable the ones we want.
*/
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list