diff options
| -rw-r--r-- | sys/dev/fxp/if_fxp.c | 6 | ||||
| -rw-r--r-- | sys/dev/fxp/if_fxpreg.h | 5 | ||||
| -rw-r--r-- | sys/pci/if_fxp.c | 6 | ||||
| -rw-r--r-- | sys/pci/if_fxpreg.h | 5 |
4 files changed, 16 insertions, 6 deletions
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 156521360e25..257c3ef2fbc4 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -243,9 +243,9 @@ fxp_attach(config_id, unit) } /* - * Issue a software reset. + * Reset to a stable state. */ - sc->csr->port = 0; + sc->csr->port = FXP_PORT_SELECTIVE_RESET; DELAY(10); /* @@ -739,7 +739,7 @@ fxp_stop(sc) /* * Issue software reset */ - sc->csr->port = 0; + sc->csr->port = FXP_PORT_SELECTIVE_RESET; DELAY(10); /* diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h index 5a3e81240837..7e78c415ce21 100644 --- a/sys/dev/fxp/if_fxpreg.h +++ b/sys/dev/fxp/if_fxpreg.h @@ -47,6 +47,11 @@ struct fxp_csr { volatile u_int32_t mdi_control; }; +#define FXP_PORT_SOFTWARE_RESET 0 +#define FXP_PORT_SELFTEST 1 +#define FXP_PORT_SELECTIVE_RESET 2 +#define FXP_PORT_DUMP 3 + #define FXP_SCB_RUS_IDLE 0 #define FXP_SCB_RUS_SUSPENDED 1 #define FXP_SCB_RUS_NORESOURCES 2 diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index 156521360e25..257c3ef2fbc4 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/if_fxp.c @@ -243,9 +243,9 @@ fxp_attach(config_id, unit) } /* - * Issue a software reset. + * Reset to a stable state. */ - sc->csr->port = 0; + sc->csr->port = FXP_PORT_SELECTIVE_RESET; DELAY(10); /* @@ -739,7 +739,7 @@ fxp_stop(sc) /* * Issue software reset */ - sc->csr->port = 0; + sc->csr->port = FXP_PORT_SELECTIVE_RESET; DELAY(10); /* diff --git a/sys/pci/if_fxpreg.h b/sys/pci/if_fxpreg.h index 5a3e81240837..7e78c415ce21 100644 --- a/sys/pci/if_fxpreg.h +++ b/sys/pci/if_fxpreg.h @@ -47,6 +47,11 @@ struct fxp_csr { volatile u_int32_t mdi_control; }; +#define FXP_PORT_SOFTWARE_RESET 0 +#define FXP_PORT_SELFTEST 1 +#define FXP_PORT_SELECTIVE_RESET 2 +#define FXP_PORT_DUMP 3 + #define FXP_SCB_RUS_IDLE 0 #define FXP_SCB_RUS_SUSPENDED 1 #define FXP_SCB_RUS_NORESOURCES 2 |