Attach sm(4) at superio, instead of the previous isa bus attachment.
The latter's probe doesn't pick up the ethernet controller, and the attach function needs to set MIIF_NOISOLATE. We attach it at superio mainly because they share the same region of address space, and the ethernet controller's interrupt is routed through the superio.
This commit is contained in:
scw
parent
fe7de4db3f
commit
9bcd736b9d
@ -1,4 +1,4 @@
|
||||
# $NetBSD: files.evbsh5,v 1.1 2002/07/05 13:31:38 scw Exp $
|
||||
# $NetBSD: files.evbsh5,v 1.2 2002/08/26 11:04:44 scw Exp $
|
||||
|
||||
# Config file for SuperH CAYMAN SH5 Evaluation Board
|
||||
|
||||
@ -16,6 +16,9 @@ device sysfpga { }
|
||||
attach sysfpga at femi
|
||||
file arch/evbsh5/dev/sysfpga.c sysfpga
|
||||
|
||||
device superio: isabus
|
||||
device superio {[offset=-1], [irq=-1]}: isabus
|
||||
attach superio at sysfpga
|
||||
file arch/evbsh5/dev/superio.c superio
|
||||
|
||||
attach sm at superio with sm_superio
|
||||
file arch/evbsh5/dev/if_sm_superio.c sm_superio needs-flag
|
||||
|
||||
182
sys/arch/evbsh5/dev/if_sm_superio.c
Normal file
182
sys/arch/evbsh5/dev/if_sm_superio.c
Normal file
@ -0,0 +1,182 @@
|
||||
/* $NetBSD: if_sm_superio.c,v 1.1 2002/08/26 11:04:45 scw Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
|
||||
* NASA Ames Research Center.
|
||||
*
|
||||
* 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, 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.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Based almost entirely on dev/isa/if_sm_isa.c
|
||||
*
|
||||
* There are just enough differences to make this copy worthwhile.
|
||||
* Note that this call isa_intr_establish() because most of the Super IO
|
||||
* device is abstracted through an isa bus. The sm(4) device happens
|
||||
* to use one of the Super IO device's interrupt pins for itself...
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_sm_superio.c,v 1.1 2002/08/26 11:04:45 scw Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/mbuf.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/device.h>
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/if_dl.h>
|
||||
#include <net/if_ether.h>
|
||||
#include <net/if_media.h>
|
||||
|
||||
#include <machine/intr.h>
|
||||
#include <machine/bus.h>
|
||||
|
||||
#include <dev/mii/mii.h>
|
||||
#include <dev/mii/miivar.h>
|
||||
|
||||
#include <dev/ic/smc91cxxreg.h>
|
||||
#include <dev/ic/smc91cxxvar.h>
|
||||
|
||||
#include <dev/isa/isavar.h>
|
||||
|
||||
#include <evbsh5/dev/superiovar.h>
|
||||
|
||||
static int sm_superio_match(struct device *, struct cfdata *, void *);
|
||||
static void sm_superio_attach(struct device *, struct device *, void *);
|
||||
|
||||
struct sm_superio_softc {
|
||||
struct smc91cxx_softc sc_smc; /* real "smc" softc */
|
||||
void *sc_ih; /* interrupt cookie */
|
||||
};
|
||||
|
||||
struct cfattach sm_superio_ca = {
|
||||
sizeof(struct sm_superio_softc), sm_superio_match, sm_superio_attach
|
||||
};
|
||||
extern struct cfdriver sm_cd;
|
||||
|
||||
static int
|
||||
sm_superio_match(struct device *parent, struct cfdata *cf, void *aux)
|
||||
{
|
||||
struct superio_attach_args *saa = aux;
|
||||
bus_space_tag_t iot = saa->saa_bust;
|
||||
bus_space_handle_t ioh;
|
||||
u_int16_t tmp;
|
||||
int rv = 0;
|
||||
extern const char *smc91cxx_idstrs[];
|
||||
|
||||
if (strcmp(saa->saa_name, sm_cd.cd_name) != 0)
|
||||
return (0);
|
||||
|
||||
/* Disallow wildcarded values. */
|
||||
if (cf->cf_loc[SUPERIOCF_OFFSET] == SUPERIOCF_OFFSET_DEFAULT)
|
||||
return (0);
|
||||
if (cf->cf_loc[SUPERIOCF_IRQ] == SUPERIOCF_IRQ_DEFAULT)
|
||||
return (0);
|
||||
|
||||
saa->saa_offset = cf->cf_loc[SUPERIOCF_OFFSET];
|
||||
saa->saa_irq = cf->cf_loc[SUPERIOCF_IRQ];
|
||||
|
||||
/* Map the device. */
|
||||
if (bus_space_map(iot, saa->saa_offset, SMC_IOSIZE, 0, &ioh))
|
||||
return (0);
|
||||
|
||||
/* Check that high byte of BANK_SELECT is what we expect. */
|
||||
tmp = bus_space_read_2(iot, ioh, BANK_SELECT_REG_W);
|
||||
if ((tmp & BSR_DETECT_MASK) != BSR_DETECT_VALUE)
|
||||
goto out;
|
||||
|
||||
/*
|
||||
* Switch to bank 0 and perform the test again.
|
||||
* XXX INVASIVE!
|
||||
*/
|
||||
bus_space_write_2(iot, ioh, BANK_SELECT_REG_W, 0);
|
||||
tmp = bus_space_read_2(iot, ioh, BANK_SELECT_REG_W);
|
||||
if ((tmp & BSR_DETECT_MASK) != BSR_DETECT_VALUE)
|
||||
goto out;
|
||||
|
||||
/*
|
||||
* Check for a recognized chip id.
|
||||
* XXX INVASIVE!
|
||||
*/
|
||||
bus_space_write_2(iot, ioh, BANK_SELECT_REG_W, 3);
|
||||
tmp = bus_space_read_2(iot, ioh, REVISION_REG_W);
|
||||
if (smc91cxx_idstrs[RR_ID(tmp)] == NULL)
|
||||
goto out;
|
||||
|
||||
rv = 1;
|
||||
|
||||
out:
|
||||
bus_space_unmap(iot, ioh, SMC_IOSIZE);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
static void
|
||||
sm_superio_attach(struct device *parent, struct device *self, void *aux)
|
||||
{
|
||||
struct sm_superio_softc *isc = (struct sm_superio_softc *)self;
|
||||
struct smc91cxx_softc *sc = &isc->sc_smc;
|
||||
struct superio_attach_args *saa = aux;
|
||||
bus_space_tag_t iot = saa->saa_bust;
|
||||
bus_space_handle_t ioh;
|
||||
|
||||
printf("\n");
|
||||
|
||||
/* Map the device. */
|
||||
if (bus_space_map(iot, saa->saa_offset, SMC_IOSIZE, 0, &ioh))
|
||||
panic("sm_superio_attach: can't map device registers");
|
||||
|
||||
sc->sc_bst = iot;
|
||||
sc->sc_bsh = ioh;
|
||||
|
||||
/* should always be enabled */
|
||||
sc->sc_flags |= SMC_FLAGS_ENABLED;
|
||||
|
||||
/* The PHY does not need to be isolated */
|
||||
sc->sc_mii.mii_flags |= MIIF_NOISOLATE;
|
||||
|
||||
/* Perform generic intialization. */
|
||||
smc91cxx_attach(sc, NULL);
|
||||
|
||||
/* Establish the interrupt handler. */
|
||||
isc->sc_ih = isa_intr_establish(NULL, saa->saa_irq,
|
||||
IST_EDGE, IPL_NET, smc91cxx_intr, sc);
|
||||
if (isc->sc_ih == NULL)
|
||||
printf("%s: couldn't establish interrupt handler\n",
|
||||
sc->sc_dev.dv_xname);
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: superio.c,v 1.1 2002/07/05 13:31:38 scw Exp $ */
|
||||
/* $NetBSD: superio.c,v 1.2 2002/08/26 11:04:45 scw Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Wasabi Systems, Inc.
|
||||
@ -40,13 +40,16 @@
|
||||
* we're finished with it.
|
||||
*/
|
||||
|
||||
#include "locators.h"
|
||||
#include "com.h"
|
||||
#include "sm_superio.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/extent.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/bus.h>
|
||||
@ -72,6 +75,7 @@ struct superio_softc {
|
||||
|
||||
static int superiomatch(struct device *, struct cfdata *, void *);
|
||||
static void superioattach(struct device *, struct device *, void *);
|
||||
static int superiosubmatch(struct device *, struct cfdata *, void *);
|
||||
static int superioprint(void *, const char *);
|
||||
|
||||
struct cfattach superio_ca = {
|
||||
@ -198,6 +202,21 @@ superiomatch(struct device *parent, struct cfdata *cf, void *args)
|
||||
return (strcmp(sa->sa_name, superio_cd.cd_name) == 0);
|
||||
}
|
||||
|
||||
static int
|
||||
superiosubmatch(struct device *parent, struct cfdata *cf, void *args)
|
||||
{
|
||||
struct superio_attach_args *saa = args;
|
||||
|
||||
/*
|
||||
* This works for the isabus_attach_args, as it also has
|
||||
* a "char *name" as the first member.
|
||||
*/
|
||||
if (strcmp(cf->cf_driver->cd_name, saa->saa_name) == 0)
|
||||
return ((*cf->cf_attach->ca_match)(parent, cf, args));
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
superioattach(struct device *parent, struct device *self, void *args)
|
||||
@ -205,6 +224,9 @@ superioattach(struct device *parent, struct device *self, void *args)
|
||||
struct superio_softc *sc = (struct superio_softc *)self;
|
||||
struct sysfpga_attach_args *sa = args;
|
||||
struct isabus_attach_args iba;
|
||||
#if NSM_SUPERIO > 0
|
||||
struct superio_attach_args saa;
|
||||
#endif
|
||||
int i;
|
||||
|
||||
superio_bus_space_tag.bs_cookie = sc;
|
||||
@ -214,6 +236,8 @@ superioattach(struct device *parent, struct device *self, void *args)
|
||||
bus_space_map(sc->sc_bust, sa->sa_offset,
|
||||
SUPERIO_REG_SZ, 0, &sc->sc_bush);
|
||||
|
||||
printf("\nsuperioattach: superio at 0x%08x\n", sc->sc_bush);
|
||||
|
||||
superio_cfgmode_enable(sc);
|
||||
|
||||
printf(": FDC37C935 Super IO Controller, Id 0x%02x, Revision %d\n",
|
||||
@ -266,21 +290,44 @@ superioattach(struct device *parent, struct device *self, void *args)
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* Attach the isa bus
|
||||
*/
|
||||
iba.iba_busname = "isa";
|
||||
iba.iba_iot = &superio_bus_space_tag;
|
||||
iba.iba_memt = NULL;
|
||||
iba.iba_dmat = NULL; /* XXX: Should be able to do DMA thru dmac */
|
||||
iba.iba_dmat = NULL;/* XXX Should be able to do DMA thru dmac */
|
||||
iba.iba_ic = (void *)sc;
|
||||
config_found_sm(self, &iba, superioprint, superiosubmatch);
|
||||
|
||||
config_found(self, &iba, superioprint);
|
||||
#if NSM_SUPERIO > 0
|
||||
/*
|
||||
* Attach the onboard network interface
|
||||
*/
|
||||
saa.saa_name = "sm";
|
||||
saa.saa_offset = SUPERIOCF_OFFSET_DEFAULT;
|
||||
saa.saa_irq = SUPERIOCF_IRQ_DEFAULT;
|
||||
saa.saa_bust = &superio_bus_space_tag;
|
||||
config_found_sm(self, &saa, superioprint, superiosubmatch);
|
||||
#endif
|
||||
}
|
||||
|
||||
static int
|
||||
superioprint(void *arg, const char *cp)
|
||||
{
|
||||
struct superio_attach_args *saa = arg;
|
||||
|
||||
if (cp)
|
||||
printf("isa at %s", cp);
|
||||
printf("%s at %s", saa->saa_name, cp);
|
||||
|
||||
#if NSM_SUPERIO > 0
|
||||
if (strcmp(saa->saa_name, "isa") != 0) {
|
||||
if (saa->saa_offset != SUPERIOCF_OFFSET_DEFAULT)
|
||||
printf(" offset 0x%x", saa->saa_offset);
|
||||
if (saa->saa_irq != SUPERIOCF_IRQ_DEFAULT)
|
||||
printf(" irq %d", saa->saa_irq);
|
||||
}
|
||||
#endif
|
||||
|
||||
return (UNCONF);
|
||||
}
|
||||
@ -302,7 +349,7 @@ static void
|
||||
superio_cfgmode_disable(struct superio_softc *sc)
|
||||
{
|
||||
|
||||
superio_reg_write(sc, SUPERIO_REG_INDEX, 0x55);
|
||||
superio_reg_write(sc, SUPERIO_REG_INDEX, 0xaa);
|
||||
bus_space_barrier(sc->sc_bust, sc->sc_bush,
|
||||
SUPERIO_REG_INDEX, 4, BUS_SPACE_BARRIER_WRITE);
|
||||
}
|
||||
@ -347,19 +394,19 @@ superio_bs_map(void *arg, bus_addr_t addr, bus_size_t size,
|
||||
addr *= 4;
|
||||
size *= 4;
|
||||
|
||||
if (sc->sc_isaext)
|
||||
if (sc->sc_isaext) {
|
||||
rv = extent_alloc_region(sc->sc_isaext,
|
||||
addr, size, EX_NOWAIT);
|
||||
if (rv != 0)
|
||||
return (rv);
|
||||
}
|
||||
else
|
||||
} else
|
||||
if (addr > (SYSFPGA_OFFSET_LAN + SMC_IOSIZE))
|
||||
return (EINVAL);
|
||||
|
||||
*hp = (bus_space_handle_t) addr;
|
||||
|
||||
return (rv);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
@ -370,7 +417,7 @@ superio_bs_unmap(void *arg, bus_space_handle_t bh, bus_size_t size)
|
||||
bus_addr_t addr = (bus_addr_t)bh;
|
||||
|
||||
if (sc->sc_isaext && addr < SYSFPGA_OFFSET_LAN)
|
||||
extent_free(sc->sc_isaext, (u_long)bh / 4, size * 4, EX_NOWAIT);
|
||||
extent_free(sc->sc_isaext, addr, size * 4, EX_NOWAIT);
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
@ -400,7 +447,11 @@ superio_bs_read_1(void *arg, bus_space_handle_t bh, bus_size_t off)
|
||||
|
||||
rv = (u_int8_t)bus_space_read_4(sc->sc_bust, sc->sc_bush, off);
|
||||
} else {
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
off = (bus_size_t)bh + (off ^ 0x3);
|
||||
#else
|
||||
off += (bus_size_t)bh;
|
||||
#endif
|
||||
|
||||
rv = bus_space_read_1(sc->sc_bust, sc->sc_bush, off);
|
||||
}
|
||||
@ -423,8 +474,11 @@ superio_bs_read_2(void *arg, bus_space_handle_t bh, bus_size_t off)
|
||||
reg = bus_space_read_4(sc->sc_bust, sc->sc_bush, off + 4);
|
||||
rv |= (reg & 0xff) << 8;
|
||||
} else {
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
off = (bus_size_t)bh + (off ^ 0x2);
|
||||
|
||||
#else
|
||||
off += (bus_size_t)bh;
|
||||
#endif
|
||||
rv = bus_space_read_2(sc->sc_bust, sc->sc_bush, off);
|
||||
}
|
||||
|
||||
@ -443,7 +497,11 @@ superio_bs_write_1(void *arg, bus_space_handle_t bh, bus_size_t off,
|
||||
bus_space_write_4(sc->sc_bust, sc->sc_bush, off,
|
||||
(u_int32_t)val & 0xff);
|
||||
} else {
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
off = (bus_size_t)bh + (off ^ 0x3);
|
||||
#else
|
||||
off += (bus_size_t)bh;
|
||||
#endif
|
||||
|
||||
bus_space_write_1(sc->sc_bust, sc->sc_bush, off, val);
|
||||
}
|
||||
@ -463,8 +521,11 @@ superio_bs_write_2(void *arg, bus_space_handle_t bh, bus_size_t off,
|
||||
bus_space_write_4(sc->sc_bust, sc->sc_bush, off + 4,
|
||||
(u_int32_t)(val >> 8) & 0xff);
|
||||
} else {
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
off = (bus_size_t)bh + (off ^ 0x2);
|
||||
|
||||
#else
|
||||
off += (bus_size_t)bh;
|
||||
#endif
|
||||
bus_space_write_2(sc->sc_bust, sc->sc_bush, off, val);
|
||||
}
|
||||
}
|
||||
@ -484,7 +545,7 @@ superio_bs_read_stream_2(void *arg, bus_space_handle_t bh, bus_size_t off)
|
||||
reg = bus_space_read_4(sc->sc_bust, sc->sc_bush, off + 4);
|
||||
rv = (rv << 8) | (reg & 0xff);
|
||||
} else {
|
||||
off = (bus_size_t)bh + (off ^ 0x2);
|
||||
off += (bus_size_t)bh;
|
||||
|
||||
rv = bus_space_read_stream_2(sc->sc_bust, sc->sc_bush, off);
|
||||
}
|
||||
@ -506,7 +567,7 @@ superio_bs_write_stream_2(void *arg, bus_space_handle_t bh, bus_size_t off,
|
||||
bus_space_write_4(sc->sc_bust, sc->sc_bush, off + 4,
|
||||
(u_int32_t)val & 0xff);
|
||||
} else {
|
||||
off = (bus_size_t)bh + (off ^ 0x2);
|
||||
off += (bus_size_t)bh;
|
||||
|
||||
bus_space_write_stream_4(sc->sc_bust, sc->sc_bush, off, val);
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: superiovar.h,v 1.1 2002/07/05 13:31:39 scw Exp $ */
|
||||
/* $NetBSD: superiovar.h,v 1.2 2002/08/26 11:04:45 scw Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Wasabi Systems, Inc.
|
||||
@ -51,4 +51,14 @@
|
||||
extern int superio_console_tag(bus_space_tag_t, int,
|
||||
bus_space_tag_t *, bus_addr_t *);
|
||||
|
||||
/*
|
||||
* The following is only used to enable the wm(4) driver to be attached.
|
||||
*/
|
||||
struct superio_attach_args {
|
||||
const char *saa_name;
|
||||
bus_space_tag_t saa_bust;
|
||||
bus_addr_t saa_offset;
|
||||
int saa_irq;
|
||||
};
|
||||
|
||||
#endif /* _EVBSH5_SUPERIOVAR_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user