 @@ -1,14 +1,14 @@
-/*	$NetBSD: iomd_irqhandler.c,v 1.23 2019/11/10 21:16:23 chs Exp $	*/
+/*	$NetBSD: iomd_irqhandler.c,v 1.24 2020/11/20 18:18:51 thorpej 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.
 @@ -30,34 +30,34 @@
  * 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.
+ *
  * IRQ/FIQ initialisation, claim, release and handler routines
+ *
  *	from: irqhandler.c,v 1.14 1997/04/02 21:52:19 christos Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.23 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomd_irqhandler.c,v 1.24 2020/11/20 18:18:51 thorpej Exp $");
 #include "opt_irqstats.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <arm/cpufunc.h>
 #include <arm/iomd/iomdreg.h>
 #include <arm/iomd/iomdvar.h>
 #include <machine/intr.h>
 #include <machine/cpu.h>
 irqhandler_t *irqhandlers[NIRQS];
 u_int current_mask;
 u_int actual_mask;
 u_int disabled_mask;
 @@ -336,48 +336,48 @@ irq_release(int irq, irqhandler_t *handl
 	set_spl_masks();
 	return 0;
+}
 void *
 intr_claim(int irq, int level, const char *name, int (*ih_func)(void *),
     void *ih_arg)
+{
 	irqhandler_t *ih;
-	ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK);
+	ih = kmem_alloc(sizeof(*ih), KM_SLEEP);
 	ih->ih_level = level;
 	ih->ih_name = name;
 	ih->ih_func = ih_func;
 	ih->ih_arg = ih_arg;
 	ih->ih_flags = 0;
 	if (irq_claim(irq, ih) != 0) {
-		free(ih, M_DEVBUF);
+		kmem_free(ih, sizeof(*ih));
 		return NULL;
+	}
 	return ih;
+}
 int
 intr_release(void *arg)
+{
 	irqhandler_t *ih = (irqhandler_t *)arg;
 	if (irq_release(ih->ih_num, ih) == 0) {
-		free(ih, M_DEVBUF);
+		kmem_free(ih, sizeof(*ih));
 		return 0 ;
+	}
 	return 1;
+}
 #if 0
 u_int
 disable_interrupts(u_int mask)
+{
 	u_int cpsr;
 	cpsr = SetCPSR(mask, mask);
 	return cpsr;

 @@ -1,14 +1,14 @@
-/* $NetBSD: iomdkbc.c,v 1.6 2019/11/10 21:16:23 chs Exp $ */
+/* $NetBSD: iomdkbc.c,v 1.7 2020/11/20 18:18:51 thorpej Exp $ */
 /*-
  * Copyright (c) 2004 Ben Harris
  * All rights reserved.
+ *
  * 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.
 @@ -18,31 +18,31 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.6 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v 1.7 2020/11/20 18:18:51 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/systm.h>
 #include <dev/pckbport/pckbportvar.h>
 #include <sys/bus.h>
 #include <machine/intr.h>
 #include <arch/arm/iomd/iomdreg.h>
 #include <arch/arm/iomd/iomdvar.h>
 #include <arch/arm/iomd/iomdkbcvar.h>
 /* XXX belongs in iomdreg.h */
 #define IOMDKBC_TXE	0x80
 @@ -123,46 +123,46 @@ iomdkbc_attach(device_t parent, device_t
 	struct iomdkbc_softc *sc = device_private(self);
 	struct iomdkbc_internal *t;
 	sc->sc_dev = self;
 	aprint_normal("\n");
 	t = NULL;
 	if (strcmp(ka->ka_name, "kbd") == 0) {
 		/* XXX not really right, but good enough. */
 		if (iomdkbc_cntag.t_haveport[PCKBPORT_KBD_SLOT]) {
 			/* Have an iomdkbc as console.  Assume it's this one.*/
 			t = &iomdkbc_cntag;
 		} else {
-			t = malloc(sizeof(struct iomdkbc_internal), M_DEVBUF,
+			t = kmem_zalloc(sizeof(struct iomdkbc_internal),
-			    M_WAITOK | M_ZERO);
+			    KM_SLEEP);
 			t->t_haveport[PCKBPORT_KBD_SLOT] = 1;
 			t->t_iot = ka->ka_iot;
 			t->t_ioh[PCKBPORT_KBD_SLOT] = ka->ka_ioh;
+		}
 		t->t_rxih[PCKBPORT_KBD_SLOT] = intr_claim(ka->ka_rxirq,
 		    IPL_TTY, device_xname(sc->sc_dev), iomdkbc_intr, t);
 		t->t_rxirq[PCKBPORT_KBD_SLOT] = ka->ka_rxirq;
 		disable_irq(t->t_rxirq[PCKBPORT_KBD_SLOT]);
 		sc->sc_id = t;
 		t->t_sc = sc;
 		t->t_pt = pckbport_attach(t, &iomdkbc_ops);
 		pckbport_attach_slot(sc->sc_dev, t->t_pt, PCKBPORT_KBD_SLOT);
+	}
 	if (strcmp(pa->pa_name, "opms") == 0) {
 		if (t == NULL) {
-			t = malloc(sizeof(struct iomdkbc_internal), M_DEVBUF,
+			t = kmem_zalloc(sizeof(struct iomdkbc_internal),
-			    M_WAITOK | M_ZERO);
+			    KM_SLEEP);
+		}
 		t->t_haveport[PCKBPORT_AUX_SLOT] = 1;
 		t->t_iot = pa->pa_iot;
 		t->t_ioh[PCKBPORT_AUX_SLOT] = pa->pa_ioh;
 		t->t_rxih[PCKBPORT_AUX_SLOT] = intr_claim(pa->pa_irq,
 		    IPL_TTY, device_xname(sc->sc_dev), iomdkbc_intr, t);
 		t->t_rxirq[PCKBPORT_AUX_SLOT] = pa->pa_irq;
 		disable_irq(t->t_rxirq[PCKBPORT_AUX_SLOT]);
 		sc->sc_id = t;
 		t->t_sc = sc;
 		if (t->t_pt == NULL)
 			t->t_pt = pckbport_attach(t, &iomdkbc_ops);
 		pckbport_attach_slot(sc->sc_dev, t->t_pt, PCKBPORT_AUX_SLOT);