CVS commit: src/sys/arch/arc
Module Name:src Committed By: thorpej Date: Thu Dec 7 03:46:10 UTC 2023 Modified Files: src/sys/arch/arc/arc: bus_space.c machdep.c wired_map_machdep.c src/sys/arch/arc/include: bus_defs.h bus_funcs.h src/sys/arch/arc/isa: isabus.c src/sys/arch/arc/pci: necpb.c Log Message: extent(9) -> vmem(9) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/arc/bus_space.c cvs rdiff -u -r1.131 -r1.132 src/sys/arch/arc/arc/machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/wired_map_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arc/include/bus_defs.h \ src/sys/arch/arc/include/bus_funcs.h cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arc/isa/isabus.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arc/pci/necpb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc
Module Name:src
Committed By: thorpej
Date: Thu Dec 7 03:46:10 UTC 2023
Modified Files:
src/sys/arch/arc/arc: bus_space.c machdep.c wired_map_machdep.c
src/sys/arch/arc/include: bus_defs.h bus_funcs.h
src/sys/arch/arc/isa: isabus.c
src/sys/arch/arc/pci: necpb.c
Log Message:
extent(9) -> vmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/arc/bus_space.c
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/wired_map_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arc/include/bus_defs.h \
src/sys/arch/arc/include/bus_funcs.h
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arc/isa/isabus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arc/pci/necpb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/arc/bus_space.c
diff -u src/sys/arch/arc/arc/bus_space.c:1.12 src/sys/arch/arc/arc/bus_space.c:1.13
--- src/sys/arch/arc/arc/bus_space.c:1.12 Fri Jan 27 18:52:49 2012
+++ src/sys/arch/arc/arc/bus_space.c Thu Dec 7 03:46:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:49 para Exp $ */
+/* $NetBSD: bus_space.c,v 1.13 2023/12/07 03:46:10 thorpej Exp $ */
/* NetBSD: bus_machdep.c,v 1.1 2000/01/26 18:48:00 drochner Exp */
/*-
@@ -32,12 +32,12 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.12 2012/01/27 18:52:49 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.13 2023/12/07 03:46:10 thorpej Exp $");
#include
#include
#include
-#include
+#include
#include
@@ -316,7 +316,7 @@ arc_bus_space_init(bus_space_tag_t bst,
{
bst->bs_name = name;
- bst->bs_extent = NULL;
+ bst->bs_arena = NULL;
bst->bs_start = start;
bst->bs_size = size;
bst->bs_pbase = paddr;
@@ -338,16 +338,28 @@ arc_bus_space_init(bus_space_tag_t bst,
}
void
-arc_bus_space_init_extent(bus_space_tag_t bst, void *storage,
-size_t storagesize)
+arc_bus_space_init_arena(bus_space_tag_t bst, struct vmem *arena_store,
+struct vmem_btag *btag_store, unsigned int btag_count)
{
+ int error __diagused;
- bst->bs_extent = extent_create(bst->bs_name,
- bst->bs_start, bst->bs_start + bst->bs_size,
- storage, storagesize, EX_NOWAIT);
- if (bst->bs_extent == NULL)
- panic("arc_bus_space_init_extent: cannot create extent map %s",
- bst->bs_name);
+ bst->bs_arena = vmem_init(arena_store,
+ bst->bs_name, /* name */
+ 0, /* addr */
+ 0, /* size */
+ 1, /* quantum */
+ NULL, /* importfn */
+ NULL, /* releasefn */
+ NULL, /* source */
+ 0, /* qcache_max */
+ VM_NOSLEEP | VM_PRIVTAGS,
+ IPL_NONE);
+ KASSERT(bst->bs_arena != NULL);
+
+ vmem_add_bts(bst->bs_arena, btag_store, btag_count);
+ error = vmem_add(bst->bs_arena, bst->bs_start, bst->bs_size,
+ VM_NOSLEEP);
+ KASSERT(error == 0);
}
void
@@ -367,22 +379,6 @@ arc_bus_space_set_aligned_stride(bus_spa
bst->bs_stride_8 = alignment_shift;
}
-static int malloc_safe = 0;
-
-void
-arc_bus_space_malloc_set_safe(void)
-{
-
- malloc_safe = EX_MALLOCOK;
-}
-
-int
-arc_bus_space_extent_malloc_flag(void)
-{
-
- return malloc_safe;
-}
-
int
arc_bus_space_compose_handle(bus_space_tag_t bst, bus_addr_t addr,
bus_size_t size, int flags, bus_space_handle_t *bshp)
@@ -457,9 +453,8 @@ arc_bus_space_map(bus_space_tag_t bst, b
if (addr < bst->bs_start || addr + size > bst->bs_start + bst->bs_size)
return EINVAL;
- if (bst->bs_extent != NULL) {
- err = extent_alloc_region(bst->bs_extent, addr, size,
- EX_NOWAIT | malloc_safe);
+ if (bst->bs_arena != NULL) {
+ err = vmem_xalloc_addr(bst->bs_arena, addr, size, VM_NOSLEEP);
if (err)
return err;
}
@@ -472,7 +467,7 @@ arc_bus_space_unmap(bus_space_tag_t bst,
bus_size_t size)
{
- if (bst->bs_extent != NULL) {
+ if (bst->bs_arena != NULL) {
paddr_t pa;
bus_addr_t addr;
int err;
@@ -483,8 +478,7 @@ arc_bus_space_unmap(bus_space_tag_t bst,
panic("arc_bus_space_unmap: %s va 0x%qx: error %d",
bst->bs_name, (unsigned long long) bsh, err);
addr = (bus_size_t)(pa - bst->bs_pbase) + bst->bs_start;
- extent_free(bst->bs_extent, addr, size,
- EX_NOWAIT | malloc_safe);
+ vmem_xfree(bst->bs_arena, addr, size);
}
bus_space_dispose_handle(bst, bsh, size);
}
@@ -520,19 +514,25 @@ arc_bus_space_alloc(bus_space_tag_t bst,
bus_size_t size, bus_size_t align, bus_size_t boundary, int flags,
bus_addr_t *addrp, bus_space_handle_t *bshp)
{
- u_long addr;
+ vmem_addr_t addr;
int err;
- if (bst->bs_extent == NULL)
- panic("arc_bus_space_alloc: extent map %s not available",
+ if (bst->bs_arena == NULL)
+ panic("arc_bus_space_alloc: vmem arena %s not available",
bst->bs_name);
if (start < bst->bs_start ||
start + size > bst->bs_start + bst->bs_size)
return EINVAL;
- err =
CVS commit: src/sys/arch/arc/arc
Module Name:src
Committed By: tsutsui
Date: Wed Aug 30 17:10:17 UTC 2023
Modified Files:
src/sys/arch/arc/arc: autoconf.c interrupt.c timer.c timervar.h
Log Message:
Remove ENABLE_INT5_STATCLOCK broken since matt-nb5-mips64 merge.
Noticed by andvar@.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arc/arc/autoconf.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/arc/interrupt.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/arc/timer.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/timervar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/arc/autoconf.c
diff -u src/sys/arch/arc/arc/autoconf.c:1.35 src/sys/arch/arc/arc/autoconf.c:1.36
--- src/sys/arch/arc/arc/autoconf.c:1.35 Sat Oct 27 17:17:35 2012
+++ src/sys/arch/arc/arc/autoconf.c Wed Aug 30 17:10:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.35 2012/10/27 17:17:35 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.36 2023/08/30 17:10:17 tsutsui Exp $ */
/* $OpenBSD: autoconf.c,v 1.9 1997/05/18 13:45:20 pefo Exp $ */
/*
@@ -88,7 +88,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.35 2012/10/27 17:17:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.36 2023/08/30 17:10:17 tsutsui Exp $");
#include
#include
@@ -131,28 +131,14 @@ void
cpu_configure(void)
{
-#ifdef ENABLE_INT5_STATCLOCK
- evcnt_attach_static(_ev);
-#endif
-
(void)splhigh(); /* To be really sure.. */
if (config_rootfound("mainbus", NULL) == NULL)
panic("no mainbus found");
/* Configuration is finished, turn on interrupts. */
-#ifdef ENABLE_INT5_STATCLOCK
- /*
- * Enable interrupt sources.
- * We can't enable CPU INT5 which is used by statclock(9) here
- * until cpu_initclocks(9) is called because there is no way
- * to disable it other than setting status register by spl(9).
- */
- _spllower(MIPS_INT_MASK_5);
-#error need fix
-#else
+
/* enable all source forcing SOFT_INTs cleared */
spl0();
-#endif
}
#if defined(NFS_BOOT_BOOTP) || defined(NFS_BOOT_DHCP)
Index: src/sys/arch/arc/arc/interrupt.c
diff -u src/sys/arch/arc/arc/interrupt.c:1.9 src/sys/arch/arc/arc/interrupt.c:1.10
--- src/sys/arch/arc/arc/interrupt.c:1.9 Wed Mar 2 10:51:04 2011
+++ src/sys/arch/arc/arc/interrupt.c Wed Aug 30 17:10:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.9 2011/03/02 10:51:04 tsutsui Exp $ */
+/* $NetBSD: interrupt.c,v 1.10 2023/08/30 17:10:17 tsutsui Exp $ */
/* $OpenBSD: trap.c,v 1.22 1999/05/24 23:08:59 jason Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.9 2011/03/02 10:51:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.10 2023/08/30 17:10:17 tsutsui Exp $");
#include
#include
@@ -65,11 +65,6 @@ static struct cpu_inttab cpu_int_tab[ARC
uint32_t cpu_int_mask; /* External cpu interrupt mask */
-#ifdef ENABLE_INT5_STATCLOCK
-struct evcnt statclock_ev =
-EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "cpu", "statclock");
-#endif
-
/*
* Set up handler for external interrupt events.
* Events are checked in priority order.
@@ -114,17 +109,11 @@ cpu_intr(int ppl, vaddr_t pc, uint32_t s
while (ppl < (ipl = splintr())) {
/* check MIPS3 internal clock interrupt */
if (ipending & MIPS_INT_MASK_5) {
-#ifdef ENABLE_INT5_STATCLOCK
- /* call statclock(9) handler */
- statclockintr();
- statclock_ev.ev_count++;
-#else
/*
* Writing a value to the Compare register, as a side
* effect, clears the timer interrupt request.
*/
mips3_cp0_compare_write(0);
-#endif
}
/*
Index: src/sys/arch/arc/arc/timer.c
diff -u src/sys/arch/arc/arc/timer.c:1.11 src/sys/arch/arc/arc/timer.c:1.12
--- src/sys/arch/arc/arc/timer.c:1.11 Sat Oct 27 17:17:35 2012
+++ src/sys/arch/arc/arc/timer.c Wed Aug 30 17:10:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.11 2012/10/27 17:17:35 chs Exp $ */
+/* $NetBSD: timer.c,v 1.12 2023/08/30 17:10:17 tsutsui Exp $ */
/* NetBSD: clock.c,v 1.31 2001/05/27 13:53:24 sommerfeld Exp */
/*
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.11 2012/10/27 17:17:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.12 2023/08/30 17:10:17 tsutsui Exp $");
#include
#include
@@ -56,22 +56,6 @@ const struct timerfns *timerfns;
int timerinitted;
uint32_t last_cp0_count;
-#ifdef ENABLE_INT5_STATCLOCK
-/*
- * Statistics clock variance, in usec. Variance must be a
- * power of two. Since this gives us an even number, not an odd number,
- * we discard one case and compensate. That is, a variance of 1024 would
- * give us offsets in [0..1023]. Instead, we take offsets in [1..1023].
- * This is symmetric about the point 512, or statvar/2, and thus averages
- * to that value (assuming uniform random numbers).
- */
-static const uint32_t statvar = 1024;
-static uint32_t statint; /* number of clock ticks for stathz */
-static uint32_t
CVS commit: src/sys/arch/arc/arc
Module Name:src Committed By: tsutsui Date: Wed Aug 30 17:10:17 UTC 2023 Modified Files: src/sys/arch/arc/arc: autoconf.c interrupt.c timer.c timervar.h Log Message: Remove ENABLE_INT5_STATCLOCK broken since matt-nb5-mips64 merge. Noticed by andvar@. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arc/arc/autoconf.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/arc/interrupt.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/arc/timer.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/timervar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/isa
Module Name:src Committed By: andvar Date: Wed Aug 30 09:17:46 UTC 2023 Modified Files: src/sys/arch/arc/isa: opms_isa.c Log Message: fix build for arc PCCONS/RPC44 kernel configs by replacing *pccons_isa_conf definition with pccons_isavar.h include, which has extern declaration for it. Discussed fix with phone@ via irc. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/isa/opms_isa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/isa
Module Name:src
Committed By: andvar
Date: Wed Aug 30 09:17:46 UTC 2023
Modified Files:
src/sys/arch/arc/isa: opms_isa.c
Log Message:
fix build for arc PCCONS/RPC44 kernel configs by replacing *pccons_isa_conf
definition with pccons_isavar.h include, which has extern declaration for it.
Discussed fix with phone@ via irc.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/isa/opms_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/isa/opms_isa.c
diff -u src/sys/arch/arc/isa/opms_isa.c:1.12 src/sys/arch/arc/isa/opms_isa.c:1.13
--- src/sys/arch/arc/isa/opms_isa.c:1.12 Fri Jul 1 19:25:41 2011
+++ src/sys/arch/arc/isa/opms_isa.c Wed Aug 30 09:17:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: opms_isa.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $ */
+/* $NetBSD: opms_isa.c,v 1.13 2023/08/30 09:17:46 andvar Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v 1.12 2011/07/01 19:25:41 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v 1.13 2023/08/30 09:17:46 andvar Exp $");
#include
#include
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v
#include
#include
+#include
static int opms_isa_match(device_t, cfdata_t, void *);
static void opms_isa_attach(device_t, device_t, void *);
@@ -49,8 +50,6 @@ static void opms_isa_attach(device_t, de
CFATTACH_DECL_NEW(opms_isa, sizeof(struct opms_softc),
opms_isa_match, opms_isa_attach, NULL, NULL);
-struct pccons_config *pccons_isa_conf; /* share stroage with pccons_isa.c */
-
static int
opms_isa_match(device_t parent, cfdata_t cf, void *aux)
{
CVS commit: src/sys/arch/arc/jazz
Module Name:src Committed By: andvar Date: Tue Aug 29 21:55:11 UTC 2023 Modified Files: src/sys/arch/arc/jazz: fd.c Log Message: arc/fdc(4): fix printf specifiers for FD_DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arc/jazz/fd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/jazz
Module Name:src
Committed By: andvar
Date: Tue Aug 29 21:55:11 UTC 2023
Modified Files:
src/sys/arch/arc/jazz: fd.c
Log Message:
arc/fdc(4): fix printf specifiers for FD_DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arc/jazz/fd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.51 src/sys/arch/arc/jazz/fd.c:1.52
--- src/sys/arch/arc/jazz/fd.c:1.51 Sat Aug 7 16:18:42 2021
+++ src/sys/arch/arc/jazz/fd.c Tue Aug 29 21:55:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.51 2021/08/07 16:18:42 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.52 2023/08/29 21:55:11 andvar Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.52 2023/08/29 21:55:11 andvar Exp $");
#include
#include
@@ -470,8 +470,8 @@ fdstrategy(struct buf *bp)
bp->b_blkno / (FDC_BSIZE / DEV_BSIZE) / fd->sc_type->seccyl;
#ifdef FD_DEBUG
- printf("%s: b_blkno %" PRId64 " b_bcount %ld blkno %" PRId64
- " cylin %ld sz %d\n", __func__,
+ printf("%s: b_blkno %" PRId64 " b_bcount %d blkno %" PRId64
+ " cylin %d sz %d\n", __func__,
bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder, sz);
#endif
CVS commit: src/sys/arch/arc/arc
Module Name:src Committed By: andvar Date: Tue Aug 29 21:34:51 UTC 2023 Modified Files: src/sys/arch/arc/arc: machdep.c Log Message: fix typo NKSYM -> NKSYMS in one of #if directive conditions. It may cause build failure, e.g. with DDB option disabled. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/arch/arc/arc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/arc
Module Name:src Committed By: andvar Date: Tue Aug 29 21:34:51 UTC 2023 Modified Files: src/sys/arch/arc/arc: machdep.c Log Message: fix typo NKSYM -> NKSYMS in one of #if directive conditions. It may cause build failure, e.g. with DDB option disabled. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/arch/arc/arc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arc/arc/machdep.c diff -u src/sys/arch/arc/arc/machdep.c:1.130 src/sys/arch/arc/arc/machdep.c:1.131 --- src/sys/arch/arc/arc/machdep.c:1.130 Thu Dec 22 14:47:54 2016 +++ src/sys/arch/arc/arc/machdep.c Tue Aug 29 21:34:50 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.130 2016/12/22 14:47:54 cherry Exp $ */ +/* $NetBSD: machdep.c,v 1.131 2023/08/29 21:34:50 andvar Exp $ */ /* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */ /* @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 2016/12/22 14:47:54 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.131 2023/08/29 21:34:50 andvar Exp $"); #include "opt_ddb.h" #include "opt_ddbparam.h" @@ -200,7 +200,7 @@ mach_init(int argc, char *argv[], u_int bootinfo_msg = "no bootinfo found. (old bootblocks?)\n"; /* clear the BSS segment in kernel code */ -#if NKSYM > 0 || defined(DDB) || defined(MODULAR) +#if NKSYMS > 0 || defined(DDB) || defined(MODULAR) bi_syms = lookup_bootinfo(BTINFO_SYMTAB); /* check whether there is valid bootinfo symtab info */
CVS commit: src/sys/arch/arc/jazz
Module Name:src Committed By: andvar Date: Sun Jun 25 15:36:12 UTC 2023 Modified Files: src/sys/arch/arc/jazz: jazzdmatlbreg.h Log Message: s/responible/responsible/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/jazz/jazzdmatlbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arc/jazz/jazzdmatlbreg.h diff -u src/sys/arch/arc/jazz/jazzdmatlbreg.h:1.4 src/sys/arch/arc/jazz/jazzdmatlbreg.h:1.5 --- src/sys/arch/arc/jazz/jazzdmatlbreg.h:1.4 Sun Dec 11 12:16:39 2005 +++ src/sys/arch/arc/jazz/jazzdmatlbreg.h Sun Jun 25 15:36:11 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: jazzdmatlbreg.h,v 1.4 2005/12/11 12:16:39 christos Exp $ */ +/* $NetBSD: jazzdmatlbreg.h,v 1.5 2023/06/25 15:36:11 andvar Exp $ */ /* $OpenBSD: dma.h,v 1.3 1997/04/19 17:19:51 pefo Exp $ */ /* @@ -35,7 +35,7 @@ * The R4030 system has four DMA channels capable of scatter/gather * and full memory addressing. The maximum transfer length is 1Mb. * DMA snopes the L2 cache so no precaution is required. However - * if L1 cache is cached 'write back' the processor is responible + * if L1 cache is cached 'write back' the processor is responsible * for flushing/invalidating it. * * The DMA mapper has up to 4096 page descriptors.
CVS commit: src/sys/arch/arc/jazz
Module Name:src Committed By: andvar Date: Sun Jun 25 15:36:12 UTC 2023 Modified Files: src/sys/arch/arc/jazz: jazzdmatlbreg.h Log Message: s/responible/responsible/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/jazz/jazzdmatlbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 14:00:03 UTC 2022
Modified Files:
src/sys/arch/arc/include: pci_machdep.h
Log Message:
PRovide pci_intr_setattr
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/include/pci_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.14 src/sys/arch/arc/include/pci_machdep.h:1.15
--- src/sys/arch/arc/include/pci_machdep.h:1.14 Tue Aug 16 13:59:18 2022
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 14:00:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.14 2022/08/16 13:59:18 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.15 2022/08/16 14:00:03 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -66,6 +66,8 @@ struct arc_pci_chipset {
pci_intr_handle_t *);
const char *(*pc_intr_string)(pci_chipset_tag_t,
pci_intr_handle_t, char *, size_t);
+ int (*pc_intr_setattr)(void *, pci_intr_handle_t *,
+ int, uint64_t);
void *(*pc_intr_establish)(pci_chipset_tag_t,
pci_intr_handle_t, int, int (*)(void *), void *);
void (*pc_intr_disestablish)(pci_chipset_tag_t, void *);
@@ -103,4 +105,13 @@ struct arc_pci_chipset {
#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
+static inline int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ihp,
+int attr, uint64_t data)
+{
+ if (!pc->pc_intr_setattr)
+ return ENODEV;
+ return pc->pc_intr_setattr(pc, ihp, attr, data);
+}
+
#endif /* _MACHINE_PCI_MACHDEP_H_ */
CVS commit: src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 14:00:03 UTC 2022 Modified Files: src/sys/arch/arc/include: pci_machdep.h Log Message: PRovide pci_intr_setattr To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:59:18 UTC 2022
Modified Files:
src/sys/arch/arc/include: pci_machdep.h
Log Message:
Multiple inclusion protection.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/include/pci_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.13 src/sys/arch/arc/include/pci_machdep.h:1.14
--- src/sys/arch/arc/include/pci_machdep.h:1.13 Tue Aug 16 13:57:29 2022
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 13:59:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.13 2022/08/16 13:57:29 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.14 2022/08/16 13:59:18 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -28,6 +28,9 @@
* rights to redistribute these changes.
*/
+#ifndef _MACHINE_PCI_MACHDEP_H_
+#define _MACHINE_PCI_MACHDEP_H_
+
/*
* Machine-specific definitions for PCI autoconfiguration.
*/
@@ -99,3 +102,5 @@ struct arc_pci_chipset {
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
+
+#endif /* _MACHINE_PCI_MACHDEP_H_ */
CVS commit: src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:59:18 UTC 2022 Modified Files: src/sys/arch/arc/include: pci_machdep.h Log Message: Multiple inclusion protection. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:57:29 UTC 2022
Modified Files:
src/sys/arch/arc/include: pci_machdep.h
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/include/pci_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.12 src/sys/arch/arc/include/pci_machdep.h:1.13
--- src/sys/arch/arc/include/pci_machdep.h:1.12 Tue Jul 7 03:38:45 2020
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 13:57:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.12 2020/07/07 03:38:45 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.13 2022/08/16 13:57:29 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -97,5 +97,5 @@ struct arc_pci_chipset {
(*(c)->pc_intr_disestablish)((c), (iv))
#define pci_conf_interrupt(c, b, d, f, s, i)\
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
-#define pci_conf_hook(c, b, d, f, i)\
+#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
CVS commit: src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:57:29 UTC 2022 Modified Files: src/sys/arch/arc/include: pci_machdep.h Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/arc
Module Name:src
Committed By: riastradh
Date: Thu Mar 3 06:26:14 UTC 2022
Modified Files:
src/sys/arch/arc/arc: cpu.c
Log Message:
arc: Use device_set_private for cpuN.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arc/arc/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arc/arc/cpu.c
diff -u src/sys/arch/arc/arc/cpu.c:1.20 src/sys/arch/arc/arc/cpu.c:1.21
--- src/sys/arch/arc/arc/cpu.c:1.20 Wed Jun 24 06:19:52 2015
+++ src/sys/arch/arc/arc/cpu.c Thu Mar 3 06:26:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.20 2015/06/24 06:19:52 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.21 2022/03/03 06:26:14 riastradh Exp $ */
/* $OpenBSD: cpu.c,v 1.8 1997/04/19 17:19:41 pefo Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.20 2015/06/24 06:19:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.21 2022/03/03 06:26:14 riastradh Exp $");
#include
#include
@@ -71,11 +71,10 @@ cpumatch(device_t parent, cfdata_t cf, v
static void
cpuattach(device_t parent, device_t self, void *aux)
{
-
struct cpu_info * const ci = curcpu();
ci->ci_dev = self;
- self->dv_private = ci;
+ device_set_private(self, ci);
aprint_normal(": ");
CVS commit: src/sys/arch/arc/arc
Module Name:src Committed By: riastradh Date: Thu Mar 3 06:26:14 UTC 2022 Modified Files: src/sys/arch/arc/arc: cpu.c Log Message: arc: Use device_set_private for cpuN. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arc/arc/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
