Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the shutdown hook (pmf takes care about it already), as suggested by joerg@

Browse Source
This commit is contained in:
degroote 2007-12-13 19:58:42 +00:00
parent d41d2435df
commit aaf41b42d1
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/dev/ic/i82557.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82557.c,v 1.106 2007/12/10 16:15:02 degroote Exp $ */
/* $NetBSD: i82557.c,v 1.107 2007/12/13 19:58:42 degroote Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.106 2007/12/10 16:15:02 degroote Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.107 2007/12/13 19:58:42 degroote Exp $");
#include "bpfilter.h"
#include "rnd.h"
@ -207,8 +207,6 @@ void fxp_tick(void *);
void fxp_mc_setup(struct fxp_softc *);
void fxp_load_ucode(struct fxp_softc *);
void fxp_shutdown(void *);
int fxp_copy_small = 0;
/*
@ -437,16 +435,6 @@ fxp_attach(struct fxp_softc *sc)
}
#endif /* FXP_EVENT_COUNTERS */
/*
* Add shutdown hook so that DMA is disabled prior to reboot. Not
* doing do could allow DMA to corrupt kernel memory during the
* reboot before the driver initializes.
*/
sc->sc_sdhook = shutdownhook_establish(fxp_shutdown, sc);
if (sc->sc_sdhook == NULL)
aprint_error("%s: WARNING: unable to establish shutdown hook\n",
sc->sc_dev.dv_xname);
/* The attach is successful. */
sc->sc_flags |= FXPF_ATTACHED;
@ -526,23 +514,6 @@ fxp_80c24_initmedia(struct fxp_softc *sc)
ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL);
}
/*
* Device shutdown routine. Called at system shutdown after sync. The
* main purpose of this routine is to shut off receiver DMA so that
* kernel memory doesn't get clobbered during warmboot.
*/
void
fxp_shutdown(void *arg)
{
struct fxp_softc *sc = arg;
/*
* Since the system's going to halt shortly, don't bother
* freeing mbufs.
*/
fxp_stop(&sc->sc_ethercom.ec_if, 0);
}
/*
* Initialize the interface media.
*/
@ -2473,7 +2444,5 @@ fxp_detach(struct fxp_softc *sc)
sizeof(struct fxp_control_data));
bus_dmamem_free(sc->sc_dmat, &sc->sc_cdseg, sc->sc_cdnseg);
shutdownhook_disestablish(sc->sc_sdhook);
return (0);
}

3
sys/dev/ic/i82557var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82557var.h,v 1.37 2007/12/10 16:15:02 degroote Exp $ */
/* $NetBSD: i82557var.h,v 1.38 2007/12/13 19:58:43 degroote Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
@ -169,7 +169,6 @@ struct fxp_softc {
bus_space_handle_t sc_sh; /* bus space handle */
bus_dma_tag_t sc_dmat; /* bus dma tag */
struct ethercom sc_ethercom; /* ethernet common part */
void *sc_sdhook; /* shutdown hook */
void *sc_ih; /* interrupt handler cookie */
struct mii_data sc_mii; /* MII/media information */