Use arm/arm32/stubs.c instead of hpcarm/hpcarm/stubs.c to reduce
duplicated code. PR/17346 from Kevin Lo. ok by ichiro@
This commit is contained in:
peter
parent
70500cd708
commit
83a03b3e58
@ -1,4 +1,4 @@
|
||||
# $NetBSD: files.hpcarm,v 1.51 2005/06/28 18:30:00 drochner Exp $
|
||||
# $NetBSD: files.hpcarm,v 1.52 2005/10/23 15:14:39 peter Exp $
|
||||
#
|
||||
# First try for arm-specific configuration info
|
||||
#
|
||||
@ -26,7 +26,6 @@ file arch/hpcarm/hpcarm/autoconf.c
|
||||
file arch/hpcarm/hpcarm/intr.c
|
||||
file arch/hpcarm/hpcarm/softintr.c
|
||||
file arch/hpcarm/hpcarm/spl.S
|
||||
file arch/hpcarm/hpcarm/stubs.c
|
||||
|
||||
# HPCARM specific files
|
||||
file arch/hpcarm/hpcarm/hpc_machdep.c
|
||||
|
||||
@ -1,306 +0,0 @@
|
||||
/* $NetBSD: stubs.c,v 1.18 2003/07/15 00:25:09 lukem Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
* Copyright (c) 1994 Brini.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software written for Brini by Mark Brinicombe
|
||||
*
|
||||
* 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 Mark Brinicombe
|
||||
* for the NetBSD Project.
|
||||
* 4. The name of the company nor the name of the author may be used to
|
||||
* endorse or promote products derived from this software without specific
|
||||
* prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
|
||||
*
|
||||
* Routines that are temporary or do not have a home yet.
|
||||
*
|
||||
* Created : 17/09/94
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: stubs.c,v 1.18 2003/07/15 00:25:09 lukem Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/msgbuf.h>
|
||||
#include <uvm/uvm_extern.h>
|
||||
#include <machine/cpu.h>
|
||||
#include <machine/intr.h>
|
||||
#include <machine/bootconfig.h>
|
||||
#include <machine/pcb.h>
|
||||
|
||||
void dumpsys(void);
|
||||
void set_spl_masks(void);
|
||||
int ipl_to_spl(int);
|
||||
|
||||
extern dev_t dumpdev;
|
||||
extern BootConfig bootconfig;
|
||||
|
||||
/*
|
||||
* These variables are needed by /sbin/savecore
|
||||
*/
|
||||
u_int32_t dumpmag = 0x8fca0101; /* magic number */
|
||||
int dumpsize = 0; /* pages */
|
||||
long dumplo = 0; /* blocks */
|
||||
|
||||
struct pcb dumppcb;
|
||||
|
||||
/*
|
||||
* This is called by main to set dumplo and dumpsize.
|
||||
* Dumps always skip the first CLBYTES of disk space
|
||||
* in case there might be a disk label stored there.
|
||||
* If there is extra space, put dump at the end to
|
||||
* reduce the chance that swapping trashes it.
|
||||
*/
|
||||
|
||||
void
|
||||
cpu_dumpconf()
|
||||
{
|
||||
const struct bdevsw *bdev;
|
||||
int nblks; /* size of dump area */
|
||||
|
||||
if (dumpdev == NODEV)
|
||||
return;
|
||||
bdev = bdevsw_lookup(dumpdev);
|
||||
if (bdev == NULL)
|
||||
panic("dumpconf: bad dumpdev=0x%x", dumpdev);
|
||||
if (bdev->d_psize == NULL)
|
||||
return;
|
||||
nblks = (*bdev->d_psize)(dumpdev);
|
||||
if (nblks <= ctod(1))
|
||||
return;
|
||||
|
||||
dumpsize = physmem;
|
||||
|
||||
/* Always skip the first CLBYTES, in case there is a label there. */
|
||||
if (dumplo < ctod(1))
|
||||
dumplo = ctod(1);
|
||||
|
||||
/* Put dump at end of partition, and make it fit. */
|
||||
if (dumpsize > dtoc(nblks - dumplo))
|
||||
dumpsize = dtoc(nblks - dumplo);
|
||||
if (dumplo < nblks - ctod(dumpsize))
|
||||
dumplo = nblks - ctod(dumpsize);
|
||||
}
|
||||
|
||||
/* This should be moved to machdep.c */
|
||||
|
||||
extern char *memhook; /* XXX */
|
||||
|
||||
/*
|
||||
* Doadump comes here after turning off memory management and
|
||||
* getting on the dump stack, either when called above, or by
|
||||
* the auto-restart code.
|
||||
*/
|
||||
|
||||
void
|
||||
dumpsys()
|
||||
{
|
||||
const struct bdevsw *bdev;
|
||||
daddr_t blkno;
|
||||
int psize;
|
||||
int error;
|
||||
int addr;
|
||||
int block;
|
||||
int len;
|
||||
vaddr_t dumpspace;
|
||||
|
||||
/* Save registers. */
|
||||
savectx(&dumppcb);
|
||||
/* flush everything out of caches */
|
||||
cpu_dcache_wbinv_all();
|
||||
|
||||
if (dumpdev == NODEV)
|
||||
return;
|
||||
if (dumpsize == 0) {
|
||||
cpu_dumpconf();
|
||||
if (dumpsize == 0)
|
||||
return;
|
||||
}
|
||||
if (dumplo <= 0) {
|
||||
printf("\ndump to dev %u,%u not possible\n", major(dumpdev),
|
||||
minor(dumpdev));
|
||||
return;
|
||||
}
|
||||
printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
|
||||
minor(dumpdev), dumplo);
|
||||
|
||||
blkno = dumplo;
|
||||
dumpspace = (vaddr_t) memhook;
|
||||
|
||||
bdev = bdevsw_lookup(dumpdev);
|
||||
if (bdev == NULL || bdev->d_psize == NULL)
|
||||
return;
|
||||
psize = (*bdev->d_psize)(dumpdev);
|
||||
printf("dump ");
|
||||
if (psize == -1) {
|
||||
printf("area unavailable\n");
|
||||
return;
|
||||
}
|
||||
|
||||
error = 0;
|
||||
len = 0;
|
||||
|
||||
for (block = 0; block < bootconfig.dramblocks && error == 0; ++block) {
|
||||
addr = bootconfig.dram[block].address;
|
||||
for (;addr < (bootconfig.dram[block].address
|
||||
+ (bootconfig.dram[block].pages * PAGE_SIZE)); addr += PAGE_SIZE) {
|
||||
if ((len % (1024*1024)) == 0)
|
||||
printf("%d ", len / (1024*1024));
|
||||
pmap_kenter_pa(dumpspace, addr, VM_PROT_READ);
|
||||
pmap_update(pmap_kernel());
|
||||
|
||||
error = (*bdev->d_dump)(dumpdev,
|
||||
blkno, (caddr_t) dumpspace, PAGE_SIZE);
|
||||
pmap_kremove(dumpspace, PAGE_SIZE);
|
||||
pmap_update(pmap_kernel());
|
||||
if (error) break;
|
||||
blkno += btodb(PAGE_SIZE);
|
||||
len += PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
|
||||
switch (error) {
|
||||
case ENXIO:
|
||||
printf("device bad\n");
|
||||
break;
|
||||
|
||||
case EFAULT:
|
||||
printf("device not ready\n");
|
||||
break;
|
||||
|
||||
case EINVAL:
|
||||
printf("area improper\n");
|
||||
break;
|
||||
|
||||
case EIO:
|
||||
printf("i/o error\n");
|
||||
break;
|
||||
|
||||
case EINTR:
|
||||
printf("aborted from console\n");
|
||||
break;
|
||||
|
||||
default:
|
||||
printf("succeeded\n");
|
||||
break;
|
||||
}
|
||||
printf("\n\n");
|
||||
delay(1000000);
|
||||
}
|
||||
|
||||
/* This is interrupt / SPL related */
|
||||
|
||||
int current_spl_level = _SPL_HIGH;
|
||||
u_int spl_masks[_SPL_LEVELS + 1];
|
||||
u_int spl_smasks[_SPL_LEVELS];
|
||||
int safepri = _SPL_0;
|
||||
|
||||
void
|
||||
set_spl_masks()
|
||||
{
|
||||
int loop;
|
||||
|
||||
for (loop = 0; loop < _SPL_LEVELS; ++loop)
|
||||
spl_smasks[loop] = 0;
|
||||
|
||||
for (loop = 0; loop <= _SPL_SOFTCLOCK; loop++)
|
||||
spl_masks[loop] = imask[IPL_SOFTCLOCK];
|
||||
|
||||
spl_masks[_SPL_SOFTNET] = imask[IPL_SOFTNET];
|
||||
spl_masks[_SPL_BIO] = imask[IPL_BIO];
|
||||
spl_masks[_SPL_NET] = imask[IPL_NET];
|
||||
spl_masks[_SPL_SOFTSERIAL] = imask[IPL_SOFTSERIAL];
|
||||
spl_masks[_SPL_TTY] = imask[IPL_TTY];
|
||||
spl_masks[_SPL_VM] = imask[IPL_VM];
|
||||
spl_masks[_SPL_AUDIO] = imask[IPL_AUDIO];
|
||||
spl_masks[_SPL_CLOCK] = imask[IPL_CLOCK];
|
||||
spl_masks[_SPL_HIGH] = imask[IPL_HIGH];
|
||||
spl_masks[_SPL_SERIAL] = imask[IPL_SERIAL];
|
||||
spl_masks[_SPL_LEVELS] = 0;
|
||||
|
||||
spl_smasks[_SPL_0] = 0xffffffff;
|
||||
for (loop = 0; loop < _SPL_SOFTSERIAL; ++loop)
|
||||
spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_SERIAL);
|
||||
for (loop = 0; loop < _SPL_SOFTNET; ++loop)
|
||||
spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_NET);
|
||||
for (loop = 0; loop < _SPL_SOFTCLOCK; ++loop)
|
||||
spl_smasks[loop] |= SOFTIRQ_BIT(SOFTIRQ_CLOCK);
|
||||
}
|
||||
|
||||
int
|
||||
ipl_to_spl(ipl)
|
||||
int ipl;
|
||||
{
|
||||
|
||||
switch(ipl) {
|
||||
case IPL_SOFTCLOCK:
|
||||
return _SPL_SOFTCLOCK;
|
||||
case IPL_SOFTNET:
|
||||
return _SPL_SOFTNET;
|
||||
case IPL_BIO:
|
||||
return _SPL_BIO;
|
||||
case IPL_NET:
|
||||
return _SPL_NET;
|
||||
case IPL_SOFTSERIAL:
|
||||
return _SPL_SOFTSERIAL;
|
||||
case IPL_TTY:
|
||||
return _SPL_TTY;
|
||||
case IPL_VM:
|
||||
return _SPL_VM;
|
||||
case IPL_AUDIO:
|
||||
return _SPL_AUDIO;
|
||||
case IPL_CLOCK:
|
||||
return _SPL_CLOCK;
|
||||
case IPL_HIGH:
|
||||
return _SPL_HIGH;
|
||||
case IPL_SERIAL:
|
||||
return _SPL_SERIAL;
|
||||
|
||||
default:
|
||||
panic("bogus ipl");
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
void dump_spl_masks(void);
|
||||
|
||||
void
|
||||
dump_spl_masks()
|
||||
{
|
||||
int loop;
|
||||
|
||||
for (loop = 0; loop < _SPL_LEVELS; ++loop) {
|
||||
printf("spl_mask[%d]=%08x splsmask[%d]=%08x\n", loop,
|
||||
spl_masks[loop], loop, spl_smasks[loop]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* End of stubs.c */
|
||||
Loading…
Reference in New Issue
Block a user