9ed346bab0
mtx_enter(lock, type) becomes:
mtx_lock(lock) for sleep locks (MTX_DEF-initialized locks)
mtx_lock_spin(lock) for spin locks (MTX_SPIN-initialized)
similarily, for releasing a lock, we now have:
mtx_unlock(lock) for MTX_DEF and mtx_unlock_spin(lock) for MTX_SPIN.
We change the caller interface for the two different types of locks
because the semantics are entirely different for each case, and this
makes it explicitly clear and, at the same time, it rids us of the
extra `type' argument.
The enter->lock and exit->unlock change has been made with the idea
that we're "locking data" and not "entering locked code" in mind.
Further, remove all additional "flags" previously passed to the
lock acquire/release routines with the exception of two:
MTX_QUIET and MTX_NOSWITCH
The functionality of these flags is preserved and they can be passed
to the lock/unlock routines by calling the corresponding wrappers:
mtx_{lock, unlock}_flags(lock, flag(s)) and
mtx_{lock, unlock}_spin_flags(lock, flag(s)) for MTX_DEF and MTX_SPIN
locks, respectively.
Re-inline some lock acq/rel code; in the sleep lock case, we only
inline the _obtain_lock()s in order to ensure that the inlined code
fits into a cache line. In the spin lock case, we inline recursion and
actually only perform a function call if we need to spin. This change
has been made with the idea that we generally tend to avoid spin locks
and that also the spin locks that we do have and are heavily used
(i.e. sched_lock) do recurse, and therefore in an effort to reduce
function call overhead for some architectures (such as alpha), we
inline recursion for this case.
Create a new malloc type for the witness code and retire from using
the M_DEV type. The new type is called M_WITNESS and is only declared
if WITNESS is enabled.
Begin cleaning up some machdep/mutex.h code - specifically updated the
"optimized" inlined code in alpha/mutex.h and wrote MTX_LOCK_SPIN
and MTX_UNLOCK_SPIN asm macros for the i386/mutex.h as we presently
need those.
Finally, caught up to the interface changes in all sys code.
Contributors: jake, jhb, jasone (in no particular order)
91 lines
3.9 KiB
C
91 lines
3.9 KiB
C
/*
|
|
* 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$
|
|
*/
|
|
|
|
/*
|
|
* Misc. defintions for the Intel EtherExpress Pro/100B PCI Fast
|
|
* Ethernet driver
|
|
*/
|
|
/*
|
|
* NOTE: Elements are ordered for optimal cacheline behavior, and NOT
|
|
* for functional grouping.
|
|
*/
|
|
struct fxp_softc {
|
|
struct arpcom arpcom; /* per-interface network data */
|
|
struct resource *mem; /* resource descriptor for registers */
|
|
int rtp; /* register resource type */
|
|
int rgd; /* register descriptor in use */
|
|
struct resource *irq; /* resource descriptor for interrupt */
|
|
void *ih; /* interrupt handler cookie */
|
|
struct mtx sc_mtx;
|
|
bus_space_tag_t sc_st; /* bus space tag */
|
|
bus_space_handle_t sc_sh; /* bus space handle */
|
|
struct mbuf *rfa_headm; /* first mbuf in receive frame area */
|
|
struct mbuf *rfa_tailm; /* last mbuf in receive frame area */
|
|
struct fxp_cb_tx *cbl_first; /* first active TxCB in list */
|
|
int tx_queued; /* # of active TxCB's */
|
|
int need_mcsetup; /* multicast filter needs programming */
|
|
struct fxp_cb_tx *cbl_last; /* last active TxCB in list */
|
|
struct fxp_stats *fxp_stats; /* Pointer to interface stats */
|
|
int rx_idle_secs; /* # of seconds RX has been idle */
|
|
struct callout_handle stat_ch; /* Handle for canceling our stat timeout */
|
|
struct fxp_cb_tx *cbl_base; /* base of TxCB list */
|
|
struct fxp_cb_mcs *mcsp; /* Pointer to mcast setup descriptor */
|
|
int all_mcasts; /* receive all multicasts */
|
|
struct ifmedia sc_media; /* media information */
|
|
int phy_primary_addr; /* address of primary PHY */
|
|
int phy_primary_device; /* device type of primary PHY */
|
|
int phy_10Mbps_only; /* PHY is 10Mbps-only device */
|
|
int eeprom_size; /* size of serial EEPROM */
|
|
int suspended; /* 0 = normal 1 = suspended (APM) */
|
|
u_int32_t saved_maps[5]; /* pci data */
|
|
u_int32_t saved_biosaddr;
|
|
u_int8_t saved_intline;
|
|
u_int8_t saved_cachelnsz;
|
|
u_int8_t saved_lattimer;
|
|
};
|
|
|
|
/* Macros to ease CSR access. */
|
|
#define CSR_READ_1(sc, reg) \
|
|
bus_space_read_1((sc)->sc_st, (sc)->sc_sh, (reg))
|
|
#define CSR_READ_2(sc, reg) \
|
|
bus_space_read_2((sc)->sc_st, (sc)->sc_sh, (reg))
|
|
#define CSR_READ_4(sc, reg) \
|
|
bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (reg))
|
|
#define CSR_WRITE_1(sc, reg, val) \
|
|
bus_space_write_1((sc)->sc_st, (sc)->sc_sh, (reg), (val))
|
|
#define CSR_WRITE_2(sc, reg, val) \
|
|
bus_space_write_2((sc)->sc_st, (sc)->sc_sh, (reg), (val))
|
|
#define CSR_WRITE_4(sc, reg, val) \
|
|
bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val))
|
|
|
|
#define sc_if arpcom.ac_if
|
|
#define FXP_UNIT(_sc) (_sc)->arpcom.ac_if.if_unit
|
|
#define FXP_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
|
|
#define FXP_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
|