Date: Wed, 1 Feb 2023 17:17:56 +0000 From: Wei Hu <weh@microsoft.com> To: Jessica Clarke <jrtc27@freebsd.org>, Wei Hu <whu@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: RE: git: 6e5b082cab8d - main - arm64: Hyper-V: vPCI: Adding Hyper-V PCI protocol 1.4 Message-ID: <SI2P153MB0441DE3A3A2D637834768144BBD19@SI2P153MB0441.APCP153.PROD.OUTLOOK.COM> In-Reply-To: <928C844E-EBB1-4AFF-968C-46D387E954BA@freebsd.org> References: <202302011601.311G1tQY026686@gitrepo.freebsd.org> <928C844E-EBB1-4AFF-968C-46D387E954BA@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thanks. Will fix them in next commit. Wei > -----Original Message----- > From: Jessica Clarke <jrtc27@freebsd.org> > Sent: Thursday, February 2, 2023 12:38 AM > To: Wei Hu <whu@FreeBSD.org> > Cc: src-committers@freebsd.org; dev-commits-src-all@freebsd.org; dev- > commits-src-main@freebsd.org > Subject: Re: git: 6e5b082cab8d - main - arm64: Hyper-V: vPCI: Adding Hype= r- > V PCI protocol 1.4 >=20 > On 1 Feb 2023, at 16:01, Wei Hu <whu@FreeBSD.org> wrote: > > > > The branch main has been updated by whu: > > > > URL: > > > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fcgit > > .freebsd.org%2Fsrc%2Fcommit%2F%3Fid%3D6e5b082cab8d9dd0eb0bce65c > f8cf268 > > > f11c7a25&data=3D05%7C01%7Cweh%40microsoft.com%7C5e862bbad0c64aacf > dda08db > > > 0472b73a%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C6381086630 > 000855 > > > 14%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luM > zIiLCJBTiI > > > 6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=3DnZ7DxHuR7YTM% > 2BDn5ScYzqI > > rgAg0TCe%2BSlVTDISCpyPw%3D&reserved=3D0 > > > > commit 6e5b082cab8d9dd0eb0bce65cf8cf268f11c7a25 > > Author: Wei Hu <whu@FreeBSD.org> > > AuthorDate: 2023-02-01 15:55:03 +0000 > > Commit: Wei Hu <whu@FreeBSD.org> > > CommitDate: 2023-02-01 16:00:10 +0000 > > > > arm64: Hyper-V: vPCI: Adding Hyper-V PCI protocol 1.4 > > > > This is enabling the PCI protocol 1.4 and corresponding structures > > in order to support arm64 Hyper-V. > > > > This is the 2nd of the three patches to enable Hyper-V vPCI support > > in arm64. > > > > Reviewed by: whu > > Tested by: Souradeep Chakrabarti <schakrabarti@microsoft.com> > > Obtained from: Souradeep Chakrabarti <schakrabarti@microsoft.com> > > Sponsored by: Microsoft > > Differential Revision: > > > https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Frevi > > > ews.freebsd.org%2FD37780&data=3D05%7C01%7Cweh%40microsoft.com%7C5 > e862bba > > > d0c64aacfdda08db0472b73a%7C72f988bf86f141af91ab2d7cd011db47%7C1%7 > C0%7C > > > 638108663000085514%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwM > DAiLCJQIjo > > > iV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=3DX > FPmBJGt > > joHQkFE%2Bh0OxZ8GKruZwcR%2FSgWeREsFnxoc%3D&reserved=3D0 > > --- > > sys/dev/hyperv/pcib/vmbus_pcib.c | 83 > > ++++++++++++++++++++++++++++++++++++++-- > > 1 file changed, 80 insertions(+), 3 deletions(-) > > > > diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c > > b/sys/dev/hyperv/pcib/vmbus_pcib.c > > index 98e1320e4379..ca495dab9516 100644 > > --- a/sys/dev/hyperv/pcib/vmbus_pcib.c > > +++ b/sys/dev/hyperv/pcib/vmbus_pcib.c > > @@ -28,6 +28,7 @@ > > __FBSDID("$FreeBSD$"); > > > > #ifdef NEW_PCIB > > +#include "opt_acpi.h" > > > > #include <sys/param.h> > > #include <sys/systm.h> > > @@ -50,6 +51,9 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_kern.h> > > #include <vm/pmap.h> > > > > +#if defined(__aarch64__) > > +#include <arm64/include/intr.h> > > +#endif > > #include <machine/atomic.h> > > #include <machine/bus.h> > > #include <machine/frame.h> > > @@ -62,10 +66,16 @@ __FBSDID("$FreeBSD$"); #include > > <dev/pci/pci_private.h> #include <dev/pci/pcib_private.h> #include > > "pcib_if.h" > > - > > +#if defined(__i386__) || defined(__amd64__) > > #include <machine/intr_machdep.h> > > #include <x86/apicreg.h> > > - > > +#endif > > +#if defined(__aarch64__) > > +#include <contrib/dev/acpica/include/acpi.h> > > +#include <contrib/dev/acpica/include/accommon.h> > > +#include <dev/acpica/acpivar.h> > > +#include <dev/acpica/acpi_pcibvar.h> > > +#endif > > #include <dev/hyperv/include/hyperv.h> #include > > <dev/hyperv/include/hyperv_busdma.h> > > #include <dev/hyperv/include/vmbus_xact.h> @@ -142,7 +152,7 @@ > > wait_for_completion_timeout(struct completion *c, int timeout) > > return (ret); > > } > > > > -#define PCI_MAKE_VERSION(major, minor) ((uint32_t)(((major) << 16) | > > (major))) > > +#define PCI_MAKE_VERSION(major, minor) ((uint32_t)(((major) << 16) | > > +(minor))) > > > > enum { > > PCI_PROTOCOL_VERSION_1_1 =3D PCI_MAKE_VERSION(1, 1), @@ - > 182,6 +192,12 > > @@ enum pci_message_type { > > PCI_QUERY_PROTOCOL_VERSION =3D PCI_MESSAGE_BASE + 0x13, > > PCI_CREATE_INTERRUPT_MESSAGE =3D PCI_MESSAGE_BASE + 0x14, > > PCI_DELETE_INTERRUPT_MESSAGE =3D PCI_MESSAGE_BASE + 0x15, > > + PCI_RESOURCES_ASSIGNED2 =3D PCI_MESSAGE_BASE + 0x16, > > + PCI_CREATE_INTERRUPT_MESSAGE2 =3D PCI_MESSAGE_BASE + 0x17, > > + PCI_DELETE_INTERRUPT_MESSAGE2 =3D PCI_MESSAGE_BASE + 0x18, > /* unused */ > > + PCI_BUS_RELATIONS2 =3D PCI_MESSAGE_BASE + 0x19, > > + PCI_RESOURCES_ASSIGNED3 =3D PCI_MESSAGE_BASE + 0x1A, > > + PCI_CREATE_INTERRUPT_MESSAGE3 =3D PCI_MESSAGE_BASE + 0x1B, > > PCI_MESSAGE_MAXIMUM > > }; > > > > @@ -223,6 +239,22 @@ struct pci_func_desc { > > uint32_t ser; /* serial number */ > > } __packed; > > > > +struct pci_func_desc2 { > > + 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 flags; > > + uint16_t virtual_numa_node; > > + uint16_t reserved; > > +} __packed; > > + > > + > > struct hv_msi_desc { > > uint8_t vector; > > uint8_t delivery_mode; > > @@ -231,6 +263,15 @@ struct hv_msi_desc { > > uint64_t cpu_mask; > > } __packed; > > > > +struct hv_msi_desc3 { > > + uint32_t vector; > > + uint8_t delivery_mode; > > + uint8_t reserved; > > + uint16_t vector_count; > > + uint16_t processor_count; > > + uint16_t processor_array[32]; > > +} __packed; > > + > > struct tran_int_desc { > > uint16_t reserved; > > uint16_t vector_count; > > @@ -288,6 +329,12 @@ struct pci_bus_relations { > > struct pci_func_desc func[0]; > > } __packed; > > > > +struct pci_bus_relations2 { > > + 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) > > struct pci_q_res_req_response { > > struct vmbus_chanpkt_hdr hdr; > > @@ -303,12 +350,26 @@ struct pci_resources_assigned { > > uint32_t reserved[4]; > > } __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]; > > +} __packed; > > + > > struct pci_create_interrupt { > > struct pci_message message_type; > > union win_slot_encoding wslot; > > struct hv_msi_desc int_desc; > > } __packed; > > > > +struct pci_create_interrupt3 { > > + struct pci_message message_type; > > + union win_slot_encoding wslot; > > + struct hv_msi_desc3 int_desc; > > +} __packed; > > + > > struct pci_create_int_response { > > struct pci_response response; > > uint32_t reserved; > > @@ -356,12 +417,28 @@ struct hv_pcibus { > > > > struct mtx config_lock; /* Avoid two threads writing index page */ > > struct mtx device_list_lock; /* Protect lists below */ > > + uint32_t protocol_version; > > TAILQ_HEAD(, hv_pci_dev) children; > > TAILQ_HEAD(, hv_dr_state) dr_list; > > > > volatile int detaching; > > }; > > > > +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; > > + union win_slot_encoding wslot; > > + uint32_t ser; /* serial number */ > > + uint32_t flags; > > + uint16_t virtual_numa_node; > > +} __packed; >=20 > The indentation for these structs is all over the place. >=20 > > + > > + >=20 > Extra blank line. >=20 > Jess >=20 > > struct hv_pci_dev { > > TAILQ_ENTRY(hv_pci_dev) link; > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?SI2P153MB0441DE3A3A2D637834768144BBD19>