From nobody Fri Oct 21 11:15:44 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mv22S547Yz4gFQG; Fri, 21 Oct 2022 11:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mv22S4SY1z3XfW; Fri, 21 Oct 2022 11:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666350944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dg4f1pAeXNJYK9dZI8AihausSgFHWorCAqMtNctc2ek=; b=GVa8Z0nfxTruzWaf4WuGfnyrof3nflcDJZvUEJMH/LmNc6ai+e+/E3a8QuMtIHk+q6eU/z xyZivn+6ZMr49OrqxVfzYowG6NGiM54HImN5CNVu5YSrAhs2sZJK7RZQa12RDE4Hi7roYh ImPEQ8EyVQpjHXqF5VXX7W1nn/5nZqBmvAxrOukMSFzA7uecn7PSvkTpWAMrlnNxSnkz4p mMKnMzX5n7rVB5X7M4PDaYfDcN4SEqZl5MjNL0lHE8LBJpIN7rrO/Q41Pi4sqLnLUEGHB1 kZpPC6duMAWHVvx9dFXhQ5NPi5UKRcrAPzXQon5QGRlSrBdG5quPnmX9cNm3FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mv22S3Bp3z1BL8; Fri, 21 Oct 2022 11:15:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29LBFi3w095040; Fri, 21 Oct 2022 11:15:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LBFi4X095039; Fri, 21 Oct 2022 11:15:44 GMT (envelope-from git) Date: Fri, 21 Oct 2022 11:15:44 GMT Message-Id: <202210211115.29LBFi4X095039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 443e6eccbd8f - main - arm64: Hyper-V: fix a commit error caused duplicated lines in vmbus_aarch64.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 443e6eccbd8f46ee60ef48db85d4bb909529efac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666350944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dg4f1pAeXNJYK9dZI8AihausSgFHWorCAqMtNctc2ek=; b=hgFDJTKkwwdUe+dgAeMpThIRaa0H1dbRji8zvA5oB7YOkdAQTI0YR07LlzXAyQTWt55bSC nDRdkoNaIHrG0JlZ07+y4YnEimSiY930a5NP7+GSjoq6/rg+EYAo0FNH9Fq252qVl1Kknn WW8Q4v9CRonIzEkCt6m8PLcss1WcKz7TlfpjxfEK5gTP5yQWlUNVJORVx5noS97sS+HyMO 8hq4Y0PmoYaD1JlglGvBUXujyNIkXrgc/VuPNgeTEiMDHvOptgDIF0/W2knzCkvtqQp9+9 mT1OFJvTaYNescTJLX5PMY0A4ZcdO8v64CavHQlnu6zYqtewNDfOWHDx2tGM6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666350944; a=rsa-sha256; cv=none; b=BgdxipnH9NZOXtGLHJunykEjBpQ1iSnhZmyNF9uxKIQCi4jGC5f/hlYL8/AeZ25sJuLp0A jxlIe18NSkK94SUwNmDhAyps/lAnrrJbEscwPnlVhrzdoWJHGm9FoT0AOIvFvSnxPGv2il hVV2xGI3cmpG+xWLDsNomubCf5p5ITcDqhPjscmCiYTFGhvdiuMtZ0fiuZOTVpFgavU19X z5iSpIstN9W6gGJcu2ag+R1AodHJqgkRWQCS7mcy1gsIzbibc9dnzzn+O/SwrGs+vIrZ1v jTC5QUemWKJZxu7kS13OyU444VcfAB0skU1khYzRaIeQJJsCXj+Z6wwOBuNKjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=443e6eccbd8f46ee60ef48db85d4bb909529efac commit 443e6eccbd8f46ee60ef48db85d4bb909529efac Author: Wei Hu AuthorDate: 2022-10-21 11:09:17 +0000 Commit: Wei Hu 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 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 -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#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; - } - } -}