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

New platforms: Mikasa and Mikasa/Pinnacle, aka Pinkasa.

Browse Source 
Like the 1000A, the AlphaServer 1000 has a daughtercard assembly that
integrates the CPU and core logic, so these can be ev4/apecs or ev5/cia.
New systype, and, sigh, another way of doing interrupts and another
mystery icu.

Kill off some EVCNT_COUNTERS calls, since [A] it has to be rewritten anyway
before it can be useful, and [B] #ifdefs do not belong at every call site,
a common API should be defined and the implementations conditionalized, not
all the calls. Duhh.
This commit is contained in:
ross 1998-06-26 21:45:56 +00:00
parent 26e2c08399
commit a0f70c580c
4 changed files with 358 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/alpha/pci/apecs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apecs.c,v 1.33 1998/06/24 01:32:06 ross Exp $ */
/* $NetBSD: apecs.c,v 1.34 1998/06/26 21:45:56 ross Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -29,10 +29,12 @@
#include "opt_dec_2100_a50.h"
#include "opt_dec_eb64plus.h"
#include "opt_dec_1000a.h"
#include "opt_dec_1000.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.33 1998/06/24 01:32:06 ross Exp $");
__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.34 1998/06/26 21:45:56 ross Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -60,6 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.33 1998/06/24 01:32:06 ross Exp $");
#ifdef DEC_1000A
#include <alpha/pci/pci_1000a.h>
#endif
#ifdef DEC_1000
#include <alpha/pci/pci_1000.h>
#endif
int apecsmatch __P((struct device *, struct cfdata *, void *));
void apecsattach __P((struct device *, struct device *, void *));
@ -176,6 +181,13 @@ apecsattach(parent, self, aux)
break;
#endif
#ifdef DEC_1000
case ST_DEC_1000:
pci_1000_pickintr(acp, &acp->ac_iot, &acp->ac_memt,
&acp->ac_pc);
break;
#endif
default:
panic("apecsattach: shouldn't be here, really...");
}

26
sys/arch/alpha/pci/cia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cia.c,v 1.44 1998/06/24 01:32:06 ross Exp $ */
/* $NetBSD: cia.c,v 1.45 1998/06/26 21:45:56 ross Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -68,10 +68,11 @@
#include "opt_dec_kn20aa.h"
#include "opt_dec_550.h"
#include "opt_dec_1000a.h"
#include "opt_dec_1000.h"
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.44 1998/06/24 01:32:06 ross Exp $");
__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.45 1998/06/26 21:45:56 ross Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -90,6 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.44 1998/06/24 01:32:06 ross Exp $");
#include <dev/pci/pcivar.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
#ifdef DEC_KN20AA
#include <alpha/pci/pci_kn20aa.h>
#endif
@ -102,6 +104,9 @@ __KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.44 1998/06/24 01:32:06 ross Exp $");
#ifdef DEC_1000A
#include <alpha/pci/pci_1000a.h>
#endif
#ifdef DEC_1000
#include <alpha/pci/pci_1000.h>
#endif
int ciamatch __P((struct device *, struct cfdata *, void *));
void ciaattach __P((struct device *, struct device *, void *));
@ -309,27 +314,18 @@ ciaattach(parent, self, aux)
#ifdef DEC_KN20AA
case ST_DEC_KN20AA:
pci_kn20aa_pickintr(ccp);
#ifdef EVCNT_COUNTERS
evcnt_attach(self, "intr", &kn20aa_intr_evcnt);
#endif
break;
#endif
#ifdef DEC_EB164
case ST_EB164:
pci_eb164_pickintr(ccp);
#ifdef EVCNT_COUNTERS
evcnt_attach(self, "intr", &eb164_intr_evcnt);
#endif
break;
#endif
#ifdef DEC_550
case ST_DEC_550:
pci_550_pickintr(ccp);
#ifdef EVCNT_COUNTERS
evcnt_attach(self, "intr", &dec_550_intr_evcnt);
#endif
break;
#endif
@ -337,9 +333,13 @@ ciaattach(parent, self, aux)
case ST_DEC_1000A:
pci_1000a_pickintr(ccp, &ccp->cc_iot, &ccp->cc_memt,
&ccp->cc_pc);
#ifdef EVCNT_COUNTERS
evcnt_attach(self, "intr", &dec_1000a_intr_evcnt);
break;
#endif
#ifdef DEC_1000
case ST_DEC_1000:
pci_1000_pickintr(ccp, &ccp->cc_iot, &ccp->cc_memt,
&ccp->cc_pc);
break;
#endif

291
sys/arch/alpha/pci/pci_1000.c Normal file
View File

@ -0,0 +1,291 @@
/* $NetBSD: pci_1000.c,v 1.1 1998/06/26 21:45:56 ross Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is based on pci_kn20aa.c, written by Chris G. Demetriou at
* Carnegie-Mellon University. Platform support for Mikasa and Mikasa/Pinnacle
* (Pinkasa) by Ross Harvey with copyright assignment by permission of Avalon
* Computer Systems, Inc.
*
* 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.
*/
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
*
* Author: Chris G. Demetriou
*
* Permission to use, copy, modify and distribute this software and
* its documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
*
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*
* Carnegie Mellon requests users of this software to return to
*
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
*
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.1 1998/06/26 21:45:56 ross Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/syslog.h>
#include <vm/vm.h>
#include <machine/autoconf.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <alpha/pci/pci_1000.h>
#include <machine/intrcnt.h>
#include "sio.h"
#if NSIO
#include <alpha/pci/siovar.h>
#endif
static bus_space_tag_t another_mystery_icu_iot;
static bus_space_handle_t another_mystery_icu_ioh;
int dec_1000_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *));
const char *dec_1000_intr_string __P((void *, pci_intr_handle_t));
void *dec_1000_intr_establish __P((void *, pci_intr_handle_t,
int, int (*func)(void *), void *));
void dec_1000_intr_disestablish __P((void *, void *));
#define PCI_STRAY_MAX 5
struct alpha_shared_intr *dec_1000_pci_intr;
static void dec_1000_iointr __P((void *framep, unsigned long vec));
static void dec_1000_enable_intr __P((int irq));
static void dec_1000_disable_intr __P((int irq));
static void pci_1000_imi __P((void));
static pci_chipset_tag_t pc_tag;
void
pci_1000_pickintr(core, iot, memt, pc)
void *core;
bus_space_tag_t iot, memt;
pci_chipset_tag_t pc;
{
int i;
another_mystery_icu_iot = iot;
pc_tag = pc;
if (bus_space_map(iot, 0x536, 2, 0, &another_mystery_icu_ioh))
panic("pci_1000_pickintr");
pc->pc_intr_v = core;
pc->pc_intr_map = dec_1000_intr_map;
pc->pc_intr_string = dec_1000_intr_string;
pc->pc_intr_establish = dec_1000_intr_establish;
pc->pc_intr_disestablish = dec_1000_intr_disestablish;
pc->pc_pciide_compat_intr_establish = NULL;
dec_1000_pci_intr = alpha_shared_intr_alloc(INTRCNT_DEC_1000_IRQ_LEN);
for (i = 0; i < INTRCNT_DEC_1000_IRQ_LEN; i++)
alpha_shared_intr_set_maxstrays(dec_1000_pci_intr, i,
PCI_STRAY_MAX);
pci_1000_imi();
#if NSIO
sio_intr_setup(pc, iot);
#endif
set_iointr(dec_1000_iointr);
}
int
dec_1000_intr_map(ccv, bustag, buspin, line, ihp)
void *ccv;
pcitag_t bustag;
int buspin, line;
pci_intr_handle_t *ihp;
{
int device;
if (buspin == 0) /* No IRQ used. */
return 1;
if (!(1 <= buspin && buspin <= 4))
goto bad;
alpha_pci_decompose_tag(pc_tag, bustag, NULL, &device, NULL);
switch(device) {
case 6:
if(buspin != 1)
break;
*ihp = 0xc; /* integrated ncr scsi */
return 0;
case 11:
case 12:
case 13:
*ihp = (device - 11) * 4 + buspin - 1;
return 0;
}
bad: printf("dec_1000_intr_map: can't map dev %d pin %d\n", device, buspin);
return 1;
}
const char *
dec_1000_intr_string(ccv, ih)
void *ccv;
pci_intr_handle_t ih;
{
static const char irqmsg_fmt[] = "dec_1000 irq %ld";
static char irqstr[sizeof irqmsg_fmt];
if (ih >= INTRCNT_DEC_1000_IRQ_LEN)
panic("dec_1000_intr_string: bogus dec_1000 IRQ 0x%x\n", ih);
sprintf(irqstr, irqmsg_fmt, ih);
return (irqstr);
}
void *
dec_1000_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
int (*func) __P((void *));
{
void *cookie;
if (ih >= INTRCNT_DEC_1000_IRQ_LEN)
panic("dec_1000_intr_establish: IRQ too high, 0x%x\n", ih);
cookie = alpha_shared_intr_establish(dec_1000_pci_intr, ih, IST_LEVEL,
level, func, arg, "dec_1000 irq");
if (cookie != NULL &&
alpha_shared_intr_isactive(dec_1000_pci_intr, ih))
dec_1000_enable_intr(ih);
return (cookie);
}
void
dec_1000_intr_disestablish(ccv, cookie)
void *ccv, *cookie;
{
panic("dec_1000_intr_disestablish not implemented"); /* XXX */
}
static void
dec_1000_iointr(framep, vec)
void *framep;
unsigned long vec;
{
int irq;
if (vec >= 0x900) {
if (vec >= 0x900 + (INTRCNT_DEC_1000_IRQ_LEN << 4))
panic("dec_1000_iointr: vec 0x%x out of range\n", vec);
irq = (vec - 0x900) >> 4;
intrcnt[INTRCNT_DEC_1000_IRQ + irq]++;
if (!alpha_shared_intr_dispatch(dec_1000_pci_intr, irq)) {
alpha_shared_intr_stray(dec_1000_pci_intr, irq,
"dec_1000 irq");
if (dec_1000_pci_intr[irq].intr_nstrays ==
dec_1000_pci_intr[irq].intr_maxstrays)
dec_1000_disable_intr(irq);
}
return;
}
#if NSIO
if (vec >= 0x800) {
sio_iointr(framep, vec);
return;
}
#endif
panic("dec_1000_iointr: weird vec 0x%x\n", vec);
}
/*
* Read and write the mystery ICU IMR registers
*/
#define IR() bus_space_read_2(another_mystery_icu_iot, \
another_mystery_icu_ioh, 0)
#define IW(v) bus_space_write_2(another_mystery_icu_iot, \
another_mystery_icu_ioh, 0, (v))
/*
* Enable and disable interrupts at the ICU level
*/
static void
dec_1000_enable_intr(irq)
int irq;
{
IW(IR() | 1 << irq);
}
static void
dec_1000_disable_intr(irq)
int irq;
{
IW(IR() & ~(1 << irq));
}
/*
* Initialize mystery ICU
*/
static void
pci_1000_imi()
{
IW(0); /* XXX ?? */
}

40
sys/arch/alpha/pci/pci_1000.h Normal file
View File

@ -0,0 +1,40 @@
/* $NetBSD: pci_1000.h,v 1.1 1998/06/26 21:45:56 ross Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Platform support for Mikasa and Mikasa/Pinnacle (Pinkasa) by Ross Harvey
* with copyright assignment by permission of Avalon Computer Systems, Inc.
*
* 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.
*/
void pci_1000_pickintr __P((void *, bus_space_tag_t, bus_space_tag_t,
pci_chipset_tag_t));