From: Elliot Berman <quic_eberman@quicinc.com>
To: Roman Kisel <romank@linux.microsoft.com>
Cc: <arnd@arndb.de>, <bhelgaas@google.com>, <bp@alien8.de>,
<catalin.marinas@arm.com>, <dave.hansen@linux.intel.com>,
<decui@microsoft.com>, <haiyangz@microsoft.com>, <hpa@zytor.com>,
<kw@linux.com>, <kys@microsoft.com>, <lenb@kernel.org>,
<lpieralisi@kernel.org>, <mingo@redhat.com>,
<mhklinux@outlook.com>, <rafael@kernel.org>, <robh@kernel.org>,
<tglx@linutronix.de>, <wei.liu@kernel.org>, <will@kernel.org>,
<linux-acpi@vger.kernel.org>, <linux-arch@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-hyperv@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-pci@vger.kernel.org>, <x86@kernel.org>,
<ssengar@microsoft.com>, <sunilmut@microsoft.com>,
<vdso@hexbites.dev>
Subject: Re: [PATCH v2 1/6] arm64/hyperv: Support DeviceTree
Date: Wed, 15 May 2024 15:02:54 -0700 [thread overview]
Message-ID: <20240515143359142-0700.eberman@hu-eberman-lv.qualcomm.com> (raw)
In-Reply-To: <20240514224508.212318-2-romank@linux.microsoft.com>
On Tue, May 14, 2024 at 03:43:48PM -0700, Roman Kisel wrote:
> The Virtual Trust Level platforms rely on DeviceTree, and the
> arm64/hyperv code supports ACPI only. Update the logic to
> support DeviceTree on boot as well as ACPI.
Could you use Call UID query from SMCCC? KVM [1] and Gunyah [2] have
been using this to identify if guest is running under those respective
hypervisors. This works in both DT and ACPI cases.
[1]: https://lore.kernel.org/all/20210330145430.996981-2-maz@kernel.org/
[2]: https://lore.kernel.org/all/20240222-gunyah-v17-4-1e9da6763d38@quicinc.com/
>
> Signed-off-by: Roman Kisel <romank@linux.microsoft.com>
> ---
> arch/arm64/hyperv/mshyperv.c | 34 +++++++++++++++++++++++++++++-----
> 1 file changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/hyperv/mshyperv.c b/arch/arm64/hyperv/mshyperv.c
> index b1a4de4eee29..208a3bcb9686 100644
> --- a/arch/arm64/hyperv/mshyperv.c
> +++ b/arch/arm64/hyperv/mshyperv.c
> @@ -15,6 +15,9 @@
> #include <linux/errno.h>
> #include <linux/version.h>
> #include <linux/cpuhotplug.h>
> +#include <linux/libfdt.h>
> +#include <linux/of.h>
> +#include <linux/of_fdt.h>
> #include <asm/mshyperv.h>
>
> static bool hyperv_initialized;
> @@ -27,6 +30,29 @@ int hv_get_hypervisor_version(union hv_hypervisor_version_info *info)
> return 0;
> }
>
> +static bool hyperv_detect_fdt(void)
> +{
> +#ifdef CONFIG_OF
> + const unsigned long hyp_node = of_get_flat_dt_subnode_by_name(
> + of_get_flat_dt_root(), "hypervisor");
> +
> + return (hyp_node != -FDT_ERR_NOTFOUND) &&
> + of_flat_dt_is_compatible(hyp_node, "microsoft,hyperv");
> +#else
> + return false;
> +#endif
> +}
> +
> +static bool hyperv_detect_acpi(void)
> +{
> +#ifdef CONFIG_ACPI
> + return !acpi_disabled &&
> + !strncmp((char *)&acpi_gbl_FADT.hypervisor_id, "MsHyperV", 8);
> +#else
> + return false;
> +#endif
> +}
> +
> static int __init hyperv_init(void)
> {
> struct hv_get_vp_registers_output result;
> @@ -35,13 +61,11 @@ static int __init hyperv_init(void)
>
> /*
> * Allow for a kernel built with CONFIG_HYPERV to be running in
> - * a non-Hyper-V environment, including on DT instead of ACPI.
> + * a non-Hyper-V environment.
> + *
> * In such cases, do nothing and return success.
> */
> - if (acpi_disabled)
> - return 0;
> -
> - if (strncmp((char *)&acpi_gbl_FADT.hypervisor_id, "MsHyperV", 8))
> + if (!hyperv_detect_fdt() && !hyperv_detect_acpi())
> return 0;
>
> /* Setup the guest ID */
> --
> 2.45.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-05-15 22:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-14 22:43 [PATCH v2 0/6] arm64/hyperv: Support Virtual Trust Level Boot Roman Kisel
2024-05-14 22:43 ` [PATCH v2 1/6] arm64/hyperv: Support DeviceTree Roman Kisel
2024-05-15 7:45 ` Krzysztof Kozlowski
2024-05-15 17:33 ` Roman Kisel
2024-05-20 6:45 ` Krzysztof Kozlowski
2024-05-20 20:36 ` Roman Kisel
2024-05-15 22:02 ` Elliot Berman [this message]
2024-05-16 15:27 ` Roman Kisel
2024-05-14 22:43 ` [PATCH v2 2/6] drivers/hv: Enable VTL mode for arm64 Roman Kisel
2024-05-15 13:37 ` Michael Kelley
2024-05-15 18:04 ` Roman Kisel
2024-05-14 22:43 ` [PATCH v2 3/6] drivers/hv: arch-neutral implementation of get_vtl() Roman Kisel
2024-05-15 13:38 ` Michael Kelley
2024-05-15 18:11 ` Roman Kisel
2024-05-14 22:43 ` [PATCH v2 4/6] arm64/hyperv: Boot in a Virtual Trust Level Roman Kisel
2024-05-15 13:39 ` Michael Kelley
2024-05-15 18:13 ` Roman Kisel
2024-05-14 22:43 ` [PATCH v2 5/6] drivers/hv/vmbus: Get the irq number from DeviceTree Roman Kisel
2024-05-15 7:47 ` Krzysztof Kozlowski
2024-05-15 17:05 ` Roman Kisel
2024-05-15 9:42 ` Saurabh Singh Sengar
2024-05-15 16:31 ` Roman Kisel
2024-05-15 13:44 ` Michael Kelley
2024-05-15 18:21 ` Roman Kisel
2024-05-16 2:40 ` kernel test robot
2024-05-17 17:14 ` Rob Herring
2024-05-20 19:25 ` Roman Kisel
2024-05-14 22:43 ` [PATCH v2 6/6] drivers/pci/hyperv/arm64: vPCI MSI IRQ domain from DT Roman Kisel
2024-05-15 9:48 ` Saurabh Singh Sengar
2024-05-15 16:34 ` Roman Kisel
2024-05-15 18:12 ` Bjorn Helgaas
2024-05-15 18:34 ` Roman Kisel
2024-05-15 13:47 ` Michael Kelley
2024-05-15 18:31 ` Roman Kisel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240515143359142-0700.eberman@hu-eberman-lv.qualcomm.com \
--to=quic_eberman@quicinc.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=kw@linux.com \
--cc=kys@microsoft.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mhklinux@outlook.com \
--cc=mingo@redhat.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=romank@linux.microsoft.com \
--cc=ssengar@microsoft.com \
--cc=sunilmut@microsoft.com \
--cc=tglx@linutronix.de \
--cc=vdso@hexbites.dev \
--cc=wei.liu@kernel.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).