Module Name: src
Committed By: yamaguchi
Date: Fri Oct 22 02:57:23 UTC 2021
Modified Files:
src/sys/dev/acpi: virtio_acpi.c
src/sys/dev/fdt: virtio_mmio_fdt.c
src/sys/dev/virtio: virtio_mmio.c virtio_mmiovar.h
Log Message:
rename "setup_interrupts" to "alloc_interrupts"
in virtio_mmio and virtio_acpi
This should fix build failure on evbarm.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/fdt/virtio_mmio_fdt.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/virtio/virtio_mmio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/virtio/virtio_mmiovar.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/dev/acpi/virtio_acpi.c
diff -u src/sys/dev/acpi/virtio_acpi.c:1.9 src/sys/dev/acpi/virtio_acpi.c:1.10
--- src/sys/dev/acpi/virtio_acpi.c:1.9 Sat Aug 7 16:19:09 2021
+++ src/sys/dev/acpi/virtio_acpi.c Fri Oct 22 02:57:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.9 2021/08/07 16:19:09 thorpej Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.10 2021/10/22 02:57:23 yamaguchi Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.9 2021/08/07 16:19:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.10 2021/10/22 02:57:23 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -56,7 +56,7 @@ static void virtio_acpi_attach(device_t,
static int virtio_acpi_rescan(device_t, const char *, const int *);
static int virtio_acpi_detach(device_t, int);
-static int virtio_acpi_setup_interrupts(struct virtio_mmio_softc *);
+static int virtio_acpi_alloc_interrupts(struct virtio_mmio_softc *);
static void virtio_acpi_free_interrupts(struct virtio_mmio_softc *);
CFATTACH_DECL3_NEW(virtio_acpi, sizeof(struct virtio_acpi_softc),
@@ -127,7 +127,7 @@ virtio_acpi_attach(device_t parent, devi
}
msc->sc_iosize = mem->ar_length;
- msc->sc_setup_interrupts = virtio_acpi_setup_interrupts;
+ msc->sc_alloc_interrupts = virtio_acpi_alloc_interrupts;
msc->sc_free_interrupts = virtio_acpi_free_interrupts;
virtio_mmio_common_attach(msc);
@@ -169,7 +169,7 @@ virtio_acpi_rescan(device_t self, const
}
static int
-virtio_acpi_setup_interrupts(struct virtio_mmio_softc *msc)
+virtio_acpi_alloc_interrupts(struct virtio_mmio_softc *msc)
{
struct virtio_acpi_softc * const sc = (struct virtio_acpi_softc *)msc;
struct virtio_softc * const vsc = &msc->sc_sc;
Index: src/sys/dev/fdt/virtio_mmio_fdt.c
diff -u src/sys/dev/fdt/virtio_mmio_fdt.c:1.9 src/sys/dev/fdt/virtio_mmio_fdt.c:1.10
--- src/sys/dev/fdt/virtio_mmio_fdt.c:1.9 Sat Aug 7 16:19:10 2021
+++ src/sys/dev/fdt/virtio_mmio_fdt.c Fri Oct 22 02:57:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.9 2021/08/07 16:19:10 thorpej Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.10 2021/10/22 02:57:23 yamaguchi Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.9 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.10 2021/10/22 02:57:23 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@ static void virtio_mmio_fdt_attach(devic
static int virtio_mmio_fdt_rescan(device_t, const char *, const int *);
static int virtio_mmio_fdt_detach(device_t, int);
-static int virtio_mmio_fdt_setup_interrupts(struct virtio_mmio_softc *);
+static int virtio_mmio_fdt_alloc_interrupts(struct virtio_mmio_softc *);
static void virtio_mmio_fdt_free_interrupts(struct virtio_mmio_softc *);
struct virtio_mmio_fdt_softc {
@@ -101,7 +101,7 @@ virtio_mmio_fdt_attach(device_t parent,
}
msc->sc_iosize = size;
- msc->sc_setup_interrupts = virtio_mmio_fdt_setup_interrupts;
+ msc->sc_alloc_interrupts = virtio_mmio_fdt_alloc_interrupts;
msc->sc_free_interrupts = virtio_mmio_fdt_free_interrupts;
virtio_mmio_common_attach(msc);
@@ -141,7 +141,7 @@ virtio_mmio_fdt_detach(device_t self, in
}
static int
-virtio_mmio_fdt_setup_interrupts(struct virtio_mmio_softc *msc)
+virtio_mmio_fdt_alloc_interrupts(struct virtio_mmio_softc *msc)
{
struct virtio_mmio_fdt_softc * const fsc = (void *)msc;
struct virtio_softc * const vsc = &msc->sc_sc;
Index: src/sys/dev/virtio/virtio_mmio.c
diff -u src/sys/dev/virtio/virtio_mmio.c:1.6 src/sys/dev/virtio/virtio_mmio.c:1.7
--- src/sys/dev/virtio/virtio_mmio.c:1.6 Fri Feb 5 21:25:36 2021
+++ src/sys/dev/virtio/virtio_mmio.c Fri Oct 22 02:57:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio.c,v 1.6 2021/02/05 21:25:36 reinoud Exp $ */
+/* $NetBSD: virtio_mmio.c,v 1.7 2021/10/22 02:57:23 yamaguchi Exp $ */
/* $OpenBSD: virtio_mmio.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */
/*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.6 2021/02/05 21:25:36 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.7 2021/10/22 02:57:23 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,8 +90,9 @@ static uint16_t virtio_mmio_read_queue_s
static void virtio_mmio_setup_queue(struct virtio_softc *, uint16_t, uint64_t);
static void virtio_mmio_set_status(struct virtio_softc *, int);
static void virtio_mmio_negotiate_features(struct virtio_softc *, uint64_t);
-static int virtio_mmio_setup_interrupts(struct virtio_softc *);
+static int virtio_mmio_alloc_interrupts(struct virtio_softc *);
static void virtio_mmio_free_interrupts(struct virtio_softc *);
+static int virtio_mmio_setup_interrupts(struct virtio_softc *, int);
static const struct virtio_ops virtio_mmio_ops = {
.kick = virtio_mmio_kick,
@@ -99,8 +100,9 @@ static const struct virtio_ops virtio_mm
.setup_queue = virtio_mmio_setup_queue,
.set_status = virtio_mmio_set_status,
.neg_features = virtio_mmio_negotiate_features,
- .setup_interrupts = virtio_mmio_setup_interrupts,
+ .alloc_interrupts = virtio_mmio_alloc_interrupts,
.free_interrupts = virtio_mmio_free_interrupts,
+ .setup_interrupts = virtio_mmio_setup_interrupts,
};
static uint16_t
@@ -289,11 +291,11 @@ virtio_mmio_kick(struct virtio_softc *vs
}
static int
-virtio_mmio_setup_interrupts(struct virtio_softc *vsc)
+virtio_mmio_alloc_interrupts(struct virtio_softc *vsc)
{
struct virtio_mmio_softc * const sc = (struct virtio_mmio_softc *)vsc;
- return sc->sc_setup_interrupts(sc);
+ return sc->sc_alloc_interrupts(sc);
}
static void
@@ -303,3 +305,11 @@ virtio_mmio_free_interrupts(struct virti
sc->sc_free_interrupts(sc);
}
+
+static int
+virtio_mmio_setup_interrupts(struct virtio_softc *vsc __unused,
+ int reinit __unused)
+{
+
+ return 0;
+}
Index: src/sys/dev/virtio/virtio_mmiovar.h
diff -u src/sys/dev/virtio/virtio_mmiovar.h:1.4 src/sys/dev/virtio/virtio_mmiovar.h:1.5
--- src/sys/dev/virtio/virtio_mmiovar.h:1.4 Fri Feb 5 21:25:36 2021
+++ src/sys/dev/virtio/virtio_mmiovar.h Fri Oct 22 02:57:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmiovar.h,v 1.4 2021/02/05 21:25:36 reinoud Exp $ */
+/* $NetBSD: virtio_mmiovar.h,v 1.5 2021/10/22 02:57:23 yamaguchi Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
* All rights reserved.
@@ -39,7 +39,7 @@ struct virtio_mmio_softc {
void *sc_ih;
- int (*sc_setup_interrupts)(struct virtio_mmio_softc *);
+ int (*sc_alloc_interrupts)(struct virtio_mmio_softc *);
void (*sc_free_interrupts)(struct virtio_mmio_softc *);
};
