aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Hu <whu@FreeBSD.org>2023-02-01 17:21:12 +0000
committerWei Hu <whu@FreeBSD.org>2023-02-01 17:34:19 +0000
commitc75ae52216771fe4de6ec8688107f5d6c20db5e8 (patch)
tree42577521321acd8449adb89790370e58e2434e02
parentf051d72314f8eb174fe69e62a997c9ed23ff84a1 (diff)
downloadsrc-c75ae52216771fe4de6ec8688107f5d6c20db5e8.tar.gz
src-c75ae52216771fe4de6ec8688107f5d6c20db5e8.zip
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
-rw-r--r--sys/arm64/arm64/gic_v3_acpi.c2
-rw-r--r--sys/dev/hyperv/pcib/vmbus_pcib.c43
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;