Date: Fri, 28 Oct 2022 01:21:27 +0000 From: Wei Hu <weh@microsoft.com> To: Souradeep Chakrabarti <schakrabarti@microsoft.com> 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>, Andrew Turner <andrew@fubar.geek.nz> Subject: RE: git: 9729f076e4d9 - main - arm64: Hyper-V: enablement for ARM64 in Hyper-V (Part 3, final) Message-ID: <SI2P153MB0441AB89A0CE6A99681A3615BB329@SI2P153MB0441.APCP153.PROD.OUTLOOK.COM> In-Reply-To: <D4BD2409-8E71-4D98-9474-8AD396817C94@fubar.geek.nz> References: <202210271354.29RDsUoH077155@gitrepo.freebsd.org> <D4BD2409-8E71-4D98-9474-8AD396817C94@fubar.geek.nz>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Thanks for testing it, Andrew. @Souradeep Chakrabarti<mailto:schakrabarti@microsoft.com>, would you help check the hang and take care of Andrew's comments? Thanks, Wei > -----Original Message----- > From: Andrew Turner <andrew@fubar.geek.nz> > Sent: Thursday, October 27, 2022 10:56 PM > 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: 9729f076e4d9 - main - arm64: Hyper-V: enablement for > ARM64 in Hyper-V (Part 3, final) > > I was planning on testing this as I now have appropriate hardware to run > arm64 Hyper-V. I have left some comments below. > > I am seeing FreeBSD/arm64 hang at the following point under Hyper-V on a > Microsoft Dev Kit 2023 box: > > vmbus0: decoding 3 range 0xe0000000-0xfed3ffff > vmbus0: fb: fb_addr: 0xe0000000, size: 0x800000, actual size needed: 0xc0000 > vmbus0: allocated type 3 (0xe0000000-0xe07fffff) for rid 0 of vmbus0 > vmbus0: successfully reserved memory for framebuffer starting at > 0xe0000000, size 0x800000 > vmbus0: irq 0x2, vector 0 end 0x2 > vmbus0: the irq 18 > vmbus0: smp_started = 0 > > > On 27 Oct 2022, at 14:54, Wei Hu <whu@FreeBSD.org<mailto:whu@FreeBSD.org>> wrote: > > > > The branch main has been updated by whu: > > > > URL: > > > https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcgit > > .freebsd.org%2Fsrc%2Fcommit%2F%3Fid%3D9729f076e4d93c5a37e78d427 > bfe0f1a > > > b99bbcc6&data=05%7C01%7Cweh%40microsoft.com%7C790d4f1a88b64 > 8383c71 > > > 08dab82b6403%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C638024 > 793789 > > > 172734%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2 > luMzIiLCJ > > > BTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Iip7d3n > WBdUrFSlW > > g9vIj73RniwVHZAGpjSIeo417Iw%3D&reserved=0 > > > > commit 9729f076e4d93c5a37e78d427bfe0f1ab99bbcc6 > > Author: Souradeep Chakrabarti <schakrabarti@microsoft.com<mailto:schakrabarti@microsoft.com>> > > AuthorDate: 2022-10-27 13:46:08 +0000 > > Commit: Wei Hu <whu@FreeBSD.org<mailto:whu@FreeBSD.org>> > > CommitDate: 2022-10-27 13:53:22 +0000 > > > > arm64: Hyper-V: enablement for ARM64 in Hyper-V (Part 3, final) > > > > This is the last part for ARM64 Hyper-V enablement. This includes > > commone files and make file changes to enable the ARM64 FreeBSD > > guest on Hyper-V. With this patch, it should be able to build > > the ARM64 image and install it on Hyper-V. > > > > Reviewed by: emaste, andrew, whu > > Tested by: Souradeep Chakrabarti <schakrabarti@microsoft.com<mailto:schakrabarti@microsoft.com>> > > Sponsored by: Microsoft > > Differential Revision: > > > https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Frevi > > > ews.freebsd.org%2FD36744&data=05%7C01%7Cweh%40microsoft.com > %7C790d > > > 4f1a88b648383c7108dab82b6403%7C72f988bf86f141af91ab2d7cd011db47%7C > 1%7C > > > 0%7C638024793789172734%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLj > AwMDAiLCJ > > > QIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C& > ;sdata= > > > UhrPhMBYStaRvwtp%2FD5PI%2B6d34MVJ3SFK9ez%2FRNA%2BZ4%3D& > reserved=0 > > --- > > share/mk/src.opts.mk | 3 +- > > sys/arm64/conf/GENERIC | 1 + > > sys/arm64/conf/std.dev | 3 + > > sys/arm64/conf/std.hyperv | 6 + > > sys/conf/files.arm64 | 22 ++++ > > sys/conf/files.x86 | 2 + > > sys/dev/hyperv/include/hyperv.h | 5 + > > sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c | 5 +- > > sys/dev/hyperv/vmbus/hyperv.c | 194 +++------------------------ > > sys/dev/hyperv/vmbus/hyperv_machdep.h | 37 ------ > > sys/dev/hyperv/vmbus/hyperv_reg.h | 193 --------------------------- > > sys/dev/hyperv/vmbus/hyperv_var.h | 4 + > > sys/dev/hyperv/vmbus/i386/hyperv_machdep.c | 2 +- > > sys/dev/hyperv/vmbus/vmbus.c | 197 +++++++++------------------- > > sys/dev/hyperv/vmbus/vmbus_et.c | 7 +- > > sys/dev/hyperv/vmbus/vmbus_reg.h | 7 +- > > sys/dev/hyperv/vmbus/vmbus_var.h | 15 +++ > > sys/modules/Makefile | 1 + > > sys/modules/hyperv/utilities/Makefile | 1 - > > sys/modules/hyperv/vmbus/Makefile | 11 +- > > 20 files changed, 164 insertions(+), 552 deletions(-) > > > > diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index > > a03b8147ecbb..4c0913474ef7 100644 > > --- a/share/mk/src.opts.mk > > +++ b/share/mk/src.opts.mk > > @@ -332,8 +332,7 @@ BROKEN_OPTIONS+=CXGBETOOL > BROKEN_OPTIONS+=MLX5TOOL > > .endif > > > > -# HyperV is currently x86-only > > -.if ${__T} != "amd64" && ${__T} != "i386" > > +.if ${__T} != "amd64" && ${__T} != "i386" && ${__T} != "aarch64" > > BROKEN_OPTIONS+=HYPERV > > .endif > > > > diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index > > c716183aae61..60772893cdbb 100644 > > --- a/sys/arm64/conf/GENERIC > > +++ b/sys/arm64/conf/GENERIC > > @@ -31,6 +31,7 @@ include "std.amd" > > include "std.arm" > > include "std.broadcom" > > include "std.cavium" > > +include "std.hyperv" > > include "std.hisilicon" > > include "std.imx" > > include "std.marvell" > > diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev index > > 6ef7358e5e85..8cdd35e2fd21 100644 > > --- a/sys/arm64/conf/std.dev > > +++ b/sys/arm64/conf/std.dev > > @@ -107,3 +107,6 @@ device mmcsd # > mmc/sd flash cards > > # HID support > > options HID_DEBUG # enable debug msgs > > device hid # Generic HID support > > + > > +#hyper-v support > > +device hyperv > This should only be in std.hyperv > > > diff --git a/sys/arm64/conf/std.hyperv b/sys/arm64/conf/std.hyperv new > > file mode 100644 index 000000000000..f87082f15c96 > > --- /dev/null > > +++ b/sys/arm64/conf/std.hyperv > > @@ -0,0 +1,6 @@ > > +# > > +# Hyper-V support (Hyper-v Gen 2) > > +# > > + > > +#hyper-v support > > +device hyperv > > This file is missing a few devices needed by hyper-v, e.g. the uart and acpi. It > should be complete enough so the following kernel config will boot: > > cpu ARM64 > ident HYPERV > include "std.arm64" > include "std.dev" > include "std.hyperv" > > > diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index > > 5178048cb0af..8b6ba43d2a3d 100644 > > --- a/sys/conf/files.arm64 > > +++ b/sys/conf/files.arm64 > > @@ -624,3 +624,25 @@ arm64/rockchip/clk/rk3399_pmucru.c > optional fdt soc_rockchip_rk3399 > > > > # Xilinx > > arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq > > + > > +# Microsoft Hyper-V > > This should probably be in the Device driver section, and be in alphabetical > order. > > > +dev/hyperv/vmbus/hyperv.c optional hyperv > > +dev/hyperv/vmbus/aarch64/hyperv_aarch64.c optional > hyperv > > +dev/hyperv/vmbus/vmbus.c optional > hyperv pci > > +dev/hyperv/vmbus/aarch64/vmbus_aarch64.c optional > hyperv > > +dev/hyperv/vmbus/vmbus_if.m optional > hyperv > > +dev/hyperv/vmbus/vmbus_res.c optional > hyperv > > +dev/hyperv/vmbus/vmbus_xact.c optional > hyperv > > +dev/hyperv/vmbus/aarch64/hyperv_machdep.c > optional hyperv > > +dev/hyperv/vmbus/vmbus_chan.c optional > hyperv > > +dev/hyperv/vmbus/hyperv_busdma.c > optional hyperv > > +dev/hyperv/vmbus/vmbus_br.c optional > hyperv > > +dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c > optional hyperv > > +dev/hyperv/utilities/vmbus_timesync.c > optional hyperv > > +dev/hyperv/utilities/vmbus_heartbeat.c > optional hyperv > > +dev/hyperv/utilities/vmbus_ic.c optional > hyperv > > +dev/hyperv/utilities/vmbus_shutdown.c > optional hyperv > > +dev/hyperv/utilities/hv_kvp.c optional hyperv > > +dev/hyperv/netvsc/hn_nvs.c optional > hyperv > > +dev/hyperv/netvsc/hn_rndis.c optional > hyperv > > +dev/hyperv/netvsc/if_hn.c optional > hyperv > > The indentation for all the above should be cleaned up. > > Andrew [-- Attachment #2 --] <html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">; <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style><!-- /* Font Definitions */ @font-face {font-family:"Cambria Math"; panose-1:2 4 5 3 5 4 6 3 2 4;} @font-face {font-family:DengXian; panose-1:2 1 6 0 3 1 1 1 1 1;} @font-face {font-family:Calibri; panose-1:2 15 5 2 2 2 4 3 2 4;} @font-face {font-family:DengXian; panose-1:2 1 6 0 3 1 1 1 1 1;} /* Style Definitions */ p.MsoPlainText, li.MsoPlainText, div.MsoPlainText {mso-style-priority:99; mso-style-link:"Plain Text Char"; margin:0in; font-size:11.0pt; font-family:"Calibri",sans-serif;} span.PlainTextChar {mso-style-name:"Plain Text Char"; mso-style-priority:99; mso-style-link:"Plain Text"; font-family:"Calibri",sans-serif;} .MsoChpDefault {mso-style-type:export-only; font-family:"Calibri",sans-serif;} @page WordSection1 {size:8.5in 11.0in; margin:1.0in 129.75pt 1.0in 129.7pt;} div.WordSection1 {page:WordSection1;} --></style><!--[if gte mso 9]><xml> <o:shapedefaults v:ext="edit" spidmax="1026" /> </xml><![endif]--><!--[if gte mso 9]><xml> <o:shapelayout v:ext="edit"> <o:idmap v:ext="edit" data="1" /> </o:shapelayout></xml><![endif]--> </head> <body lang="EN-US" link="#0563C1" vlink="#954F72" style="word-wrap:break-word"> <div class="WordSection1"> <p class="MsoPlainText">Thanks for testing it, Andrew. <o:p></o:p></p> <p class="MsoPlainText"><o:p> </o:p></p> <p class="MsoPlainText"><a id="OWAAM4EC32D9DD64646208E356427C12791D8" href="mailto:schakrabarti@microsoft.com"><span style="font-family:"Calibri",sans-serif;text-decoration:none">@Souradeep Chakrabarti</span></a>, would you help check the hang and take care of <o:p></o:p></p> <p class="MsoPlainText">Andrew's comments?<o:p></o:p></p> <p class="MsoPlainText"><o:p> </o:p></p> <p class="MsoPlainText">Thanks,<o:p></o:p></p> <p class="MsoPlainText">Wei<o:p></o:p></p> <p class="MsoPlainText"><o:p> </o:p></p> <p class="MsoPlainText"><o:p> </o:p></p> <p class="MsoPlainText"><o:p> </o:p></p> <p class="MsoPlainText">> -----Original Message-----</p> <p class="MsoPlainText">> From: Andrew Turner <andrew@fubar.geek.nz></p> <p class="MsoPlainText">> Sent: Thursday, October 27, 2022 10:56 PM</p> <p class="MsoPlainText">> To: Wei Hu <whu@FreeBSD.org></p> <p class="MsoPlainText">> Cc: src-committers@freebsd.org; dev-commits-src-all@freebsd.org; dev-</p> <p class="MsoPlainText">> commits-src-main@freebsd.org</p> <p class="MsoPlainText">> Subject: Re: git: 9729f076e4d9 - main - arm64: Hyper-V: enablement for</p> <p class="MsoPlainText">> ARM64 in Hyper-V (Part 3, final)</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> I was planning on testing this as I now have appropriate hardware to run</p> <p class="MsoPlainText">> arm64 Hyper-V. I have left some comments below.</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> I am seeing FreeBSD/arm64 hang at the following point under Hyper-V on a</p> <p class="MsoPlainText">> Microsoft Dev Kit 2023 box:</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> vmbus0: decoding 3 range 0xe0000000-0xfed3ffff</p> <p class="MsoPlainText">> vmbus0: fb: fb_addr: 0xe0000000, size: 0x800000, actual size needed: 0xc0000</p> <p class="MsoPlainText">> vmbus0: allocated type 3 (0xe0000000-0xe07fffff) for rid 0 of vmbus0</p> <p class="MsoPlainText">> vmbus0: successfully reserved memory for framebuffer starting at</p> <p class="MsoPlainText">> 0xe0000000, size 0x800000</p> <p class="MsoPlainText">> vmbus0: irq 0x2, vector 0 end 0x2</p> <p class="MsoPlainText">> vmbus0: the irq 18</p> <p class="MsoPlainText">> vmbus0: smp_started = 0</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> > On 27 Oct 2022, at 14:54, Wei Hu <<a href="mailto:whu@FreeBSD.org"><span style="color:windowtext;text-decoration:none">whu@FreeBSD.org</span></a>> wrote:</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > The branch main has been updated by whu:</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > URL:</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> <a href="https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcgit">; <span style="color:windowtext;text-decoration:none">https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcgit</span></a></p>; <p class="MsoPlainText">> > .freebsd.org%2Fsrc%2Fcommit%2F%3Fid%3D9729f076e4d93c5a37e78d427</p> <p class="MsoPlainText">> bfe0f1a</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> b99bbcc6&amp;data=05%7C01%7Cweh%40microsoft.com%7C790d4f1a88b64</p> <p class="MsoPlainText">> 8383c71</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> 08dab82b6403%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C638024</p> <p class="MsoPlainText">> 793789</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> 172734%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2</p> <p class="MsoPlainText">> luMzIiLCJ</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> BTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Iip7d3n</p> <p class="MsoPlainText">> WBdUrFSlW</p> <p class="MsoPlainText">> > g9vIj73RniwVHZAGpjSIeo417Iw%3D&amp;reserved=0</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > commit 9729f076e4d93c5a37e78d427bfe0f1ab99bbcc6</p> <p class="MsoPlainText">> > Author: Souradeep Chakrabarti <<a href="mailto:schakrabarti@microsoft.com"><span style="color:windowtext;text-decoration:none">schakrabarti@microsoft.com</span></a>></p> <p class="MsoPlainText">> > AuthorDate: 2022-10-27 13:46:08 +0000</p> <p class="MsoPlainText">> > Commit: Wei Hu <<a href="mailto:whu@FreeBSD.org"><span style="color:windowtext;text-decoration:none">whu@FreeBSD.org</span></a>></p> <p class="MsoPlainText">> > CommitDate: 2022-10-27 13:53:22 +0000</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > arm64: Hyper-V: enablement for ARM64 in Hyper-V (Part 3, final)</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > This is the last part for ARM64 Hyper-V enablement. This includes</p> <p class="MsoPlainText">> > commone files and make file changes to enable the ARM64 FreeBSD</p> <p class="MsoPlainText">> > guest on Hyper-V. With this patch, it should be able to build</p> <p class="MsoPlainText">> > the ARM64 image and install it on Hyper-V.</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > Reviewed by: emaste, andrew, whu</p> <p class="MsoPlainText">> > Tested by: Souradeep Chakrabarti <<a href="mailto:schakrabarti@microsoft.com"><span style="color:windowtext;text-decoration:none">schakrabarti@microsoft.com</span></a>></p> <p class="MsoPlainText">> > Sponsored by: Microsoft</p> <p class="MsoPlainText">> > Differential Revision:</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> <a href="https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Frevi">; <span style="color:windowtext;text-decoration:none">https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Frevi</span></a></p>; <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> ews.freebsd.org%2FD36744&amp;data=05%7C01%7Cweh%40microsoft.com</p> <p class="MsoPlainText">> %7C790d</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> 4f1a88b648383c7108dab82b6403%7C72f988bf86f141af91ab2d7cd011db47%7C</p> <p class="MsoPlainText">> 1%7C</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> 0%7C638024793789172734%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLj</p> <p class="MsoPlainText">> AwMDAiLCJ</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> QIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&amp</p> <p class="MsoPlainText">> ;sdata=</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> UhrPhMBYStaRvwtp%2FD5PI%2B6d34MVJ3SFK9ez%2FRNA%2BZ4%3D&amp;</p> <p class="MsoPlainText">> reserved=0</p> <p class="MsoPlainText">> > ---</p> <p class="MsoPlainText">> > share/mk/src.opts.mk | 3 +-</p> <p class="MsoPlainText">> > sys/arm64/conf/GENERIC | 1 +</p> <p class="MsoPlainText">> > sys/arm64/conf/std.dev | 3 +</p> <p class="MsoPlainText">> > sys/arm64/conf/std.hyperv | 6 +</p> <p class="MsoPlainText">> > sys/conf/files.arm64 | 22 ++++</p> <p class="MsoPlainText">> > sys/conf/files.x86 | 2 +</p> <p class="MsoPlainText">> > sys/dev/hyperv/include/hyperv.h | 5 +</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c | 5 +-</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/hyperv.c | 194 +++------------------------</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/hyperv_machdep.h | 37 ------</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/hyperv_reg.h | 193 ---------------------------</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/hyperv_var.h | 4 +</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/i386/hyperv_machdep.c | 2 +-</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/vmbus.c | 197 +++++++++-------------------</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/vmbus_et.c | 7 +-</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/vmbus_reg.h | 7 +-</p> <p class="MsoPlainText">> > sys/dev/hyperv/vmbus/vmbus_var.h | 15 +++</p> <p class="MsoPlainText">> > sys/modules/Makefile | 1 +</p> <p class="MsoPlainText">> > sys/modules/hyperv/utilities/Makefile | 1 -</p> <p class="MsoPlainText">> > sys/modules/hyperv/vmbus/Makefile | 11 +-</p> <p class="MsoPlainText">> > 20 files changed, 164 insertions(+), 552 deletions(-)</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index</p> <p class="MsoPlainText">> > a03b8147ecbb..4c0913474ef7 100644</p> <p class="MsoPlainText">> > --- a/share/mk/src.opts.mk</p> <p class="MsoPlainText">> > +++ b/share/mk/src.opts.mk</p> <p class="MsoPlainText">> > @@ -332,8 +332,7 @@ BROKEN_OPTIONS+=CXGBETOOL</p> <p class="MsoPlainText">> BROKEN_OPTIONS+=MLX5TOOL</p> <p class="MsoPlainText">> > .endif</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > -# HyperV is currently x86-only</p> <p class="MsoPlainText">> > -.if ${__T} != "amd64" && ${__T} != "i386"</p> <p class="MsoPlainText">> > +.if ${__T} != "amd64" && ${__T} != "i386" && ${__T} != "aarch64"</p> <p class="MsoPlainText">> > BROKEN_OPTIONS+=HYPERV</p> <p class="MsoPlainText">> > .endif</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index</p> <p class="MsoPlainText">> > c716183aae61..60772893cdbb 100644</p> <p class="MsoPlainText">> > --- a/sys/arm64/conf/GENERIC</p> <p class="MsoPlainText">> > +++ b/sys/arm64/conf/GENERIC</p> <p class="MsoPlainText">> > @@ -31,6 +31,7 @@ include "std.amd"</p> <p class="MsoPlainText">> > include "std.arm"</p> <p class="MsoPlainText">> > include "std.broadcom"</p> <p class="MsoPlainText">> > include "std.cavium"</p> <p class="MsoPlainText">> > +include "std.hyperv"</p> <p class="MsoPlainText">> > include "std.hisilicon"</p> <p class="MsoPlainText">> > include "std.imx"</p> <p class="MsoPlainText">> > include "std.marvell"</p> <p class="MsoPlainText">> > diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev index</p> <p class="MsoPlainText">> > 6ef7358e5e85..8cdd35e2fd21 100644</p> <p class="MsoPlainText">> > --- a/sys/arm64/conf/std.dev</p> <p class="MsoPlainText">> > +++ b/sys/arm64/conf/std.dev</p> <p class="MsoPlainText">> > @@ -107,3 +107,6 @@ device mmcsd #</p> <p class="MsoPlainText">> mmc/sd flash cards</p> <p class="MsoPlainText">> > # HID support</p> <p class="MsoPlainText">> > options HID_DEBUG # enable debug msgs</p> <p class="MsoPlainText">> > device hid # Generic HID support</p> <p class="MsoPlainText">> > +</p> <p class="MsoPlainText">> > +#hyper-v support</p> <p class="MsoPlainText">> > +device hyperv</p> <p class="MsoPlainText">> This should only be in std.hyperv</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> > diff --git a/sys/arm64/conf/std.hyperv b/sys/arm64/conf/std.hyperv new</p> <p class="MsoPlainText">> > file mode 100644 index 000000000000..f87082f15c96</p> <p class="MsoPlainText">> > --- /dev/null</p> <p class="MsoPlainText">> > +++ b/sys/arm64/conf/std.hyperv</p> <p class="MsoPlainText">> > @@ -0,0 +1,6 @@</p> <p class="MsoPlainText">> > +#</p> <p class="MsoPlainText">> > +# Hyper-V support (Hyper-v Gen 2)</p> <p class="MsoPlainText">> > +#</p> <p class="MsoPlainText">> > +</p> <p class="MsoPlainText">> > +#hyper-v support</p> <p class="MsoPlainText">> > +device hyperv</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> This file is missing a few devices needed by hyper-v, e.g. the uart and acpi. It</p> <p class="MsoPlainText">> should be complete enough so the following kernel config will boot:</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> cpu ARM64</p> <p class="MsoPlainText">> ident HYPERV</p> <p class="MsoPlainText">> include "std.arm64"</p> <p class="MsoPlainText">> include “std.dev"</p> <p class="MsoPlainText">> include “std.hyperv"</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> > diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index</p> <p class="MsoPlainText">> > 5178048cb0af..8b6ba43d2a3d 100644</p> <p class="MsoPlainText">> > --- a/sys/conf/files.arm64</p> <p class="MsoPlainText">> > +++ b/sys/conf/files.arm64</p> <p class="MsoPlainText">> > @@ -624,3 +624,25 @@ arm64/rockchip/clk/rk3399_pmucru.c</p> <p class="MsoPlainText">> optional fdt soc_rockchip_rk3399</p> <p class="MsoPlainText">> ></p> <p class="MsoPlainText">> > # Xilinx</p> <p class="MsoPlainText">> > arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq</p> <p class="MsoPlainText">> > +</p> <p class="MsoPlainText">> > +# Microsoft Hyper-V</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> This should probably be in the Device driver section, and be in alphabetical</p> <p class="MsoPlainText">> order.</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/hyperv.c optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/aarch64/hyperv_aarch64.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/vmbus.c optional</p> <p class="MsoPlainText">> hyperv pci</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/aarch64/vmbus_aarch64.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/vmbus_if.m optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/vmbus_res.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/vmbus_xact.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/aarch64/hyperv_machdep.c</p> <p class="MsoPlainText">> optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/vmbus_chan.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/hyperv_busdma.c</p> <p class="MsoPlainText">> optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/vmbus/vmbus_br.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c</p> <p class="MsoPlainText">> optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/utilities/vmbus_timesync.c</p> <p class="MsoPlainText">> optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/utilities/vmbus_heartbeat.c</p> <p class="MsoPlainText">> optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/utilities/vmbus_ic.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/utilities/vmbus_shutdown.c</p> <p class="MsoPlainText">> optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/utilities/hv_kvp.c optional hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/netvsc/hn_nvs.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/netvsc/hn_rndis.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> > +dev/hyperv/netvsc/if_hn.c optional</p> <p class="MsoPlainText">> hyperv</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> The indentation for all the above should be cleaned up.</p> <p class="MsoPlainText">> </p> <p class="MsoPlainText">> Andrew</p> <p class="MsoPlainText"><o:p> </o:p></p> </div> </body> </html>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?SI2P153MB0441AB89A0CE6A99681A3615BB329>