The branch main has been updated by whu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=443e6eccbd8f46ee60ef48db85d4bb909529efac
commit 443e6eccbd8f46ee60ef48db85d4bb909529efac
Author: Wei Hu <w...@freebsd.org>
AuthorDate: 2022-10-21 11:09:17 +0000
Commit: Wei Hu <w...@freebsd.org>
CommitDate: 2022-10-21 11:09:17 +0000
arm64: Hyper-V: fix a commit error caused duplicated lines in
vmbus_aarch64.c
Remove those duplicated lines.
Reported by: Souradeep Chakrabarti <schakraba...@microsoft.com>
Fixes: 6cf00ef80c20148
Sponsored by: Microsoft
---
sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c | 157 ---------------------------
1 file changed, 157 deletions(-)
diff --git a/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
b/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
index 66e605b94094..861443c4a6ed 100644
--- a/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
+++ b/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
@@ -157,160 +157,3 @@ vmbus_intr_teardown1(struct vmbus_softc *sc)
}
}
}
-/*- SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- * Copyright (c) 2009-2012,2016-2017, 2022 Microsoft Corp.
- * Copyright (c) 2012 NetApp Inc.
- * Copyright (c) 2012 Citrix Inc.
- * 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 unmodified, 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.
- *
- * 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.
- */
-
-/*
- * VM Bus Driver Implementation
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/linker.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/sbuf.h>
-#include <sys/smp.h>
-#include <sys/sysctl.h>
-#include <sys/systm.h>
-#include <sys/taskqueue.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
-#include <machine/bus.h>
-#include <machine/metadata.h>
-#include <machine/md_var.h>
-#include <machine/resource.h>
-#include <contrib/dev/acpica/include/acpi.h>
-#include <dev/acpica/acpivar.h>
-
-#include <dev/hyperv/include/hyperv.h>
-#include <dev/hyperv/include/vmbus_xact.h>
-#include <dev/hyperv/vmbus/hyperv_var.h>
-#include <dev/hyperv/vmbus/vmbus_reg.h>
-#include <dev/hyperv/vmbus/vmbus_var.h>
-#include <dev/hyperv/vmbus/vmbus_chanvar.h>
-#include <dev/hyperv/vmbus/aarch64/hyperv_machdep.h>
-#include <dev/hyperv/vmbus/aarch64/hyperv_reg.h>
-#include "acpi_if.h"
-#include "pcib_if.h"
-#include "vmbus_if.h"
-
-static int vmbus_handle_intr_new(void *);
-
-void vmbus_handle_timer_intr1(struct vmbus_message *msg_base,
- struct trapframe *frame);
-void vmbus_synic_setup1(void *xsc);
-void vmbus_synic_teardown1(void);
-int vmbus_setup_intr1(struct vmbus_softc *sc);
-void vmbus_intr_teardown1(struct vmbus_softc *sc);
-
-void
-vmbus_handle_timer_intr1(struct vmbus_message *msg_base,
- struct trapframe *frame)
-{
- // do nothing for arm64, as we are using generic timer
- return;
-}
-
-static int
-vmbus_handle_intr_new(void *arg)
-{
- vmbus_handle_intr(NULL);
- return (FILTER_HANDLED);
-}
-
-void
-vmbus_synic_setup1(void *xsc)
-{
- return;
-}
-
-void
-vmbus_synic_teardown1(void)
-{
- return;
-}
-
-int
-vmbus_setup_intr1(struct vmbus_softc *sc)
-{
- int err;
- struct intr_map_data_acpi *irq_data;
-
- sc->ires = bus_alloc_resource_any(device_get_parent(sc->vmbus_dev),
- SYS_RES_IRQ, &sc->vector, RF_ACTIVE | RF_SHAREABLE);
- if (sc->ires == NULL) {
- device_printf(sc->vmbus_dev, "bus_alloc_resouce_any failed\n");
- return (ENXIO);
- } else {
- device_printf(sc->vmbus_dev, "irq 0x%lx, vector %d end 0x%lx\n",
- (uint64_t)rman_get_start(sc->ires), sc->vector,
- (uint64_t)rman_get_end(sc->ires));
- }
- err = bus_setup_intr(sc->vmbus_dev, sc->ires, INTR_TYPE_MISC,
- vmbus_handle_intr_new, NULL, sc, &sc->icookie);
- if (err) {
- device_printf(sc->vmbus_dev, "failed to setup IRQ %d\n", err);
- return (err);
- }
- irq_data = (struct intr_map_data_acpi *)rman_get_virtual(sc->ires);
- device_printf(sc->vmbus_dev, "the irq %u\n", irq_data->irq);
- sc->vmbus_idtvec = irq_data->irq;
- return 0;
-}
-
-void
-vmbus_intr_teardown1(struct vmbus_softc *sc)
-{
- int cpu;
-
- sc->vmbus_idtvec = -1;
- bus_teardown_intr(sc->vmbus_dev, sc->ires, sc->icookie);
-
- CPU_FOREACH(cpu) {
- if (VMBUS_PCPU_GET(sc, event_tq, cpu) != NULL) {
- taskqueue_free(VMBUS_PCPU_GET(sc, event_tq, cpu));
- VMBUS_PCPU_GET(sc, event_tq, cpu) = NULL;
- }
- if (VMBUS_PCPU_GET(sc, message_tq, cpu) != NULL) {
- taskqueue_drain(VMBUS_PCPU_GET(sc, message_tq, cpu),
- VMBUS_PCPU_PTR(sc, message_task, cpu));
- taskqueue_free(VMBUS_PCPU_GET(sc, message_tq, cpu));
- VMBUS_PCPU_GET(sc, message_tq, cpu) = NULL;
- }
- }
-}
