CVS commit: src/sys/arch/evbarm/ixm1200

2020-06-17 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Jun 17 06:59:45 UTC 2020

Modified Files:
src/sys/arch/evbarm/ixm1200: nappi_nppb.c

Log Message:
-  not needed here.
- Fix interrupt string buffer name.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/ixm1200/nappi_nppb.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/evbarm/ixm1200

2020-06-17 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Jun 17 06:59:45 UTC 2020

Modified Files:
src/sys/arch/evbarm/ixm1200: nappi_nppb.c

Log Message:
-  not needed here.
- Fix interrupt string buffer name.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/ixm1200/nappi_nppb.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/evbarm/ixm1200/nappi_nppb.c
diff -u src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.13 src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.14
--- src/sys/arch/evbarm/ixm1200/nappi_nppb.c:1.13	Sat Mar 29 19:28:27 2014
+++ src/sys/arch/evbarm/ixm1200/nappi_nppb.c	Wed Jun 17 06:59:45 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nappi_nppb.c,v 1.13 2014/03/29 19:28:27 christos Exp $ */
+/*	$NetBSD: nappi_nppb.c,v 1.14 2020/06/17 06:59:45 thorpej Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA .
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.13 2014/03/29 19:28:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c,v 1.14 2020/06/17 06:59:45 thorpej Exp $");
 
 #include "pci.h"
 #include "opt_pci.h"
@@ -36,8 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 
@@ -163,7 +161,7 @@ nppbattach(device_t parent, device_t sel
 		printf("%s: couldn't map interrupt\n", device_xname(self));
 		return;
 	}
-	intrstr = pci_intr_string(pc, ih, buf, sizeof(buf));
+	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
 	sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, nppb_intr, sc);
 	if (sc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt",



CVS commit: src/sys/arch/evbarm/ixm1200

2014-02-22 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Feb 22 19:03:57 UTC 2014

Modified Files:
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c

Log Message:
Deal with non-4KB page sizes


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/ixm1200/ixm1200_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/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.54 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.55
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.54	Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c	Sat Feb 22 19:03:57 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixm1200_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $ */
+/*	$NetBSD: ixm1200_machdep.c,v 1.55 2014/02/22 19:03:57 matt Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ixm1200_machdep.c,v 1.54 2013/08/18 15:58:20 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ixm1200_machdep.c,v 1.55 2014/02/22 19:03:57 matt Exp $);
 
 #include opt_ddb.h
 #include opt_modular.h
@@ -761,14 +761,14 @@ ixdp_ixp12x0_cc_setup(void)
 {
 	int loop;
 	paddr_t kaddr;
-	pt_entry_t *pte;
 
 	(void) pmap_extract(pmap_kernel(), KERNEL_TEXT_BASE, kaddr);
 	for (loop = 0; loop  CPU_IXP12X0_CACHE_CLEAN_SIZE; loop += PAGE_SIZE) {
-pte = vtopte(ixp12x0_cc_base + loop);
-*pte = L2_S_PROTO | kaddr |
+		pt_entry_t * const ptep = vtopte(ixp12x0_cc_base + loop);
+		const pt_entry_t npte = L2_S_PROTO | kaddr |
 L2_S_PROT(PTE_KERNEL, VM_PROT_READ) | pte_l2_s_cache_mode;
-		PTE_SYNC(pte);
+		l2pte_set(ptep, npte, 0);
+		PTE_SYNC(ptep);
 }
 	ixp12x0_cache_clean_addr = ixp12x0_cc_base;
 	ixp12x0_cache_clean_size = CPU_IXP12X0_CACHE_CLEAN_SIZE / 2;



CVS commit: src/sys/arch/evbarm/ixm1200

2014-02-22 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Feb 22 19:03:57 UTC 2014

Modified Files:
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c

Log Message:
Deal with non-4KB page sizes


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/ixm1200/ixm1200_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/evbarm/ixm1200

2012-07-30 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Jul 30 23:35:05 UTC 2012

Modified Files:
src/sys/arch/evbarm/ixm1200: nappi_nr.c

Log Message:
Make this compile again.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ixm1200/nappi_nr.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/evbarm/ixm1200/nappi_nr.c
diff -u src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.9 src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.10
--- src/sys/arch/evbarm/ixm1200/nappi_nr.c:1.9	Fri Jul  1 20:42:37 2011
+++ src/sys/arch/evbarm/ixm1200/nappi_nr.c	Mon Jul 30 23:35:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $ */
+/* $NetBSD: nappi_nr.c,v 1.10 2012/07/30 23:35:05 matt Exp $ */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nappi_nr.c,v 1.9 2011/07/01 20:42:37 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: nappi_nr.c,v 1.10 2012/07/30 23:35:05 matt Exp $);
 
 /*
  * LED support for NAPPI.
@@ -107,8 +107,10 @@ nappinr_callout(void *arg)
 {
 	static const int	ptn[] = { 1, 2, 4, 8, 4, 2 };
 	struct nappinr_softc*	sc = arg;
+	uint32_t v;
 
-	bus_space_write_4(sc-sc_iot, sc-sc_ioh, 0,
-			  ptn[sc-sc_pos++ % 6] | ptn[sc-sc_pos++ % 6] 4);
+	v = ptn[sc-sc_pos++ % 6];
+	v |= ptn[sc-sc_pos++ % 6]  4;
+	bus_space_write_4(sc-sc_iot, sc-sc_ioh, 0, v);
 	callout_reset(sc-sc_co, hz / 10, nappinr_callout, sc);
 }



CVS commit: src/sys/arch/evbarm/ixm1200

2012-07-30 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Jul 30 23:35:05 UTC 2012

Modified Files:
src/sys/arch/evbarm/ixm1200: nappi_nr.c

Log Message:
Make this compile again.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/ixm1200/nappi_nr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.