diff options
| -rw-r--r-- | sys/pci/if_pcn.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c index 21202765bdc2..fdab53dbb112 100644 --- a/sys/pci/if_pcn.c +++ b/sys/pci/if_pcn.c @@ -109,6 +109,7 @@ static struct pcn_type pcn_devs[] = { }; static u_int32_t pcn_csr_read __P((struct pcn_softc *, int)); +static u_int16_t pcn_csr_read16 __P((struct pcn_softc *, int)); static void pcn_csr_write __P((struct pcn_softc *, int, int)); static u_int32_t pcn_bcr_read __P((struct pcn_softc *, int)); static void pcn_bcr_write __P((struct pcn_softc *, int, int)); @@ -202,6 +203,14 @@ static u_int32_t pcn_csr_read(sc, reg) return(CSR_READ_4(sc, PCN_IO32_RDP)); } +static u_int16_t pcn_csr_read16(sc, reg) + struct pcn_softc *sc; + int reg; +{ + CSR_WRITE_2(sc, PCN_IO16_RAP, reg); + return(CSR_READ_2(sc, PCN_IO16_RDP)); +} + static void pcn_csr_write(sc, reg, val) struct pcn_softc *sc; int reg; @@ -397,10 +406,20 @@ static int pcn_probe(dev) } sc->pcn_btag = rman_get_bustag(sc->pcn_res); sc->pcn_bhandle = rman_get_bushandle(sc->pcn_res); - pcn_reset(sc); - chip_id = pcn_csr_read(sc, PCN_CSR_CHIPID1); + /* + * Note: we can *NOT* put the chip into + * 32-bit mode yet. The lnc driver will only + * work in 16-bit mode, and once the chip + * goes into 32-bit mode, the only way to + * get it out again is with a hardware reset. + * So if pcn_probe() is called before the + * lnc driver's probe routine, the chip will + * be locked into 32-bit operation and the lnc + * driver will be unable to attach to it. + */ + chip_id = pcn_csr_read16(sc, PCN_CSR_CHIPID1); chip_id <<= 16; - chip_id |= pcn_csr_read(sc, PCN_CSR_CHIPID0); + chip_id |= pcn_csr_read16(sc, PCN_CSR_CHIPID0); bus_release_resource(dev, PCN_RES, PCN_RID, sc->pcn_res); chip_id >>= 12; |