From nobody Wed Feb 01 17:35:29 2023 X-Original-To: dev-commits-src-all@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 4P6Tb55B17z3bJbK; Wed, 1 Feb 2023 17:35:29 +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 4P6Tb54dXFz3QhL; Wed, 1 Feb 2023 17:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272929; 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=egmZZsZTdsiTdTjgAb18/QQdO9c5XVTMLEmQXd2NMSU=; b=gJu260C3BIEtSQNo4zO6ByMHSZLSaRjG+s/KqyN8tQIknWSmuI2TDhgKQGmTiZhVTCItKL kapvDTvkTyEqfqDIOmm2XZ9Q7VDRTAI1WbDsn697c/HkaN9rM4ql22Vhy2gjI/OqPeCiEp /svJXd+cgGsj/cQa8L4hK7+3KVK+4WF1SjpVflcffLx2GhBI3RMo2JJKK+16OUm6BX56vb xiYA5J5hHpk3ZOshqKVp0CSWMbo8ZMI9mwoxvxLL/FP2ouofnk/XydOuwn7w3QQlaCf+aa g4Z0LcGsk9Fo4Ri0bPDFddGRXQE0T4VS6IqqJOoz4vXf2Vz+X0A2/8u/Y5+nRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272929; 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=egmZZsZTdsiTdTjgAb18/QQdO9c5XVTMLEmQXd2NMSU=; b=GAj98znAxIHFarOwSwMyodQoI1CFTzjHNdeZFlkyvrWwR0AgsAWZQFU1kJms/GPhwNyYIu sNWNYHd/5816dPYzl6RPM3noZK5K2q1J28IOGHeMgW1Pj3pDKdwabJsyetbysQYksKUZPd V2RDBNeNf/fqSiKuUZHSWE8EbGPLBx2gkGfXQJGxs0sWQlk0xA06B04LMLZTd8dAaeOiVf lNGVmyLC7uwIg7Lt4XGOmfE9G0iMZUb7WKMB0kMu4MXjJyv6fSQw7xFFtjjPOUPg2iqnvd VDeP4LDy+Vc/OVH8PU+OwypWlaWowfRq8hgW6L1GBIFJXg6c+xVyN3Y/HfKFqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272929; a=rsa-sha256; cv=none; b=F6ij8NHfsHE31JBaeo6OkDbIkskzNAyVeSei3YtboYXYCOtY6MDdQMLvshkDz/wBAoi3Ab kvVEEiWIXeqSqc1r5uIv2D6btti1vajonXacmQGhouSbbzFjyPZWZTBiFyr0Tb1FVEUE6f Bfo6RsPwd1286nt9hhnxI3oeHczwx/2DDibn+6d0srVEeLVZl2YWFmdTVMrXkTMwqSqJ7Y zy16MruNRvGaWP9XtPWVwqsAwuJGE9X+lMXuD/E7cfLTSeEtC5v6FFnKWtsokV8HePVnmJ nOVg+CXCpXSSGGR9pRouUTzwNwa3IvCQoboHt6S/Yps8uczLEVhrRl09+d3YPw== 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 4P6Tb53fplzMhN; Wed, 1 Feb 2023 17:35:29 +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 311HZTtL058684; Wed, 1 Feb 2023 17:35:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HZTOh058683; Wed, 1 Feb 2023 17:35:29 GMT (envelope-from git) Date: Wed, 1 Feb 2023 17:35:29 GMT Message-Id: <202302011735.311HZTOh058683@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: c75ae5221677 - main - arm64: Hyper-V: vPCI: Fix typo and some indentations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c75ae52216771fe4de6ec8688107f5d6c20db5e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=c75ae52216771fe4de6ec8688107f5d6c20db5e8 commit c75ae52216771fe4de6ec8688107f5d6c20db5e8 Author: Wei Hu AuthorDate: 2023-02-01 17:21:12 +0000 Commit: Wei Hu CommitDate: 2023-02-01 17:34:19 +0000 arm64: Hyper-V: vPCI: Fix typo and some indentations Fix a typo and some indentation errors in the previous commits. Reported by: jrtc27 Fixes: db247798c5640 ("arm64: Hyper-V: vPCI: SPI MSI mapping for gic v3 acpi in arm64") Fixes: 6e5b082cab8d9 ("arm64: Hyper-V: vPCI: Adding Hyper-V PCI protocol 1.4") Sponsored by: Microsoft --- sys/arm64/arm64/gic_v3_acpi.c | 2 +- sys/dev/hyperv/pcib/vmbus_pcib.c | 43 ++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index e4a48ea32ca2..38f8b310e055 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -336,7 +336,7 @@ gic_v3_acpi_attach(device_t dev) goto error; } /* - * Registering for MSI with SPI rnage, as this is + * Registering for MSI with SPI range, as this is * required for Hyper-V GIC to work in ARM64. */ if (vm_guest == VM_GUEST_HV) { diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c index 4904423b3262..6d0601fd2d3f 100644 --- a/sys/dev/hyperv/pcib/vmbus_pcib.c +++ b/sys/dev/hyperv/pcib/vmbus_pcib.c @@ -259,11 +259,11 @@ struct pci_func_desc2 { uint8_t subclass; uint8_t base_class; uint32_t subsystem_id; - union win_slot_encoding wslot; + union win_slot_encoding wslot; uint32_t ser; /* serial number */ - uint32_t flags; - uint16_t virtual_numa_node; - uint16_t reserved; + uint32_t flags; + uint16_t virtual_numa_node; + uint16_t reserved; } __packed; @@ -341,9 +341,9 @@ struct pci_bus_relations { } __packed; struct pci_bus_relations2 { - struct pci_incoming_message incoming; - uint32_t device_count; - struct pci_func_desc2 func[0]; + struct pci_incoming_message incoming; + uint32_t device_count; + struct pci_func_desc2 func[0]; } __packed; #define MAX_NUM_BARS (PCIR_MAX_BAR_0 + 1) @@ -362,11 +362,11 @@ struct pci_resources_assigned { } __packed; struct pci_resources_assigned2 { - struct pci_message message_type; - union win_slot_encoding wslot; - uint8_t memory_range[0x14][6]; /* not used here */ - uint32_t msi_descriptor_count; - uint8_t reserved[70]; + struct pci_message message_type; + union win_slot_encoding wslot; + uint8_t memory_range[0x14][6]; /* not used here */ + uint32_t msi_descriptor_count; + uint8_t reserved[70]; } __packed; struct pci_create_interrupt { @@ -436,20 +436,19 @@ struct hv_pcibus { }; struct hv_pcidev_desc { - uint16_t v_id; /* vendor ID */ - uint16_t d_id; /* device ID */ - uint8_t rev; - uint8_t prog_intf; - uint8_t subclass; - uint8_t base_class; - uint32_t subsystem_id; + uint16_t v_id; /* vendor ID */ + uint16_t d_id; /* device ID */ + uint8_t rev; + uint8_t prog_intf; + uint8_t subclass; + uint8_t base_class; + uint32_t subsystem_id; union win_slot_encoding wslot; - uint32_t ser; /* serial number */ + uint32_t ser; /* serial number */ uint32_t flags; - uint16_t virtual_numa_node; + uint16_t virtual_numa_node; } __packed; - struct hv_pci_dev { TAILQ_ENTRY(hv_pci_dev) link;