From: "Laszlo Ersek" <lersek@redhat.com>
To: devel@edk2.groups.io, rebecca@bsdio.com
Cc: Jordan Justen <jordan.l.justen@intel.com>,
Ard Biesheuvel <ard.biesheuvel@arm.com>
Subject: Re: [edk2-devel] [PATCH 01/13] OvmfPkg: Add bhyve support into AcpiTimerLib
Date: Fri, 17 Apr 2020 10:07:27 +0200 [thread overview]
Message-ID: <27750956-3b7d-5ef1-5a90-5f294bcb3cf8@redhat.com> (raw)
In-Reply-To: <0b1d5644e175225839828e9a919152aff89491ba.1586991816.git.rebecca@bsdio.com>
On 04/16/20 01:09, Rebecca Cran wrote:
> On bhyve, the ACPI timer is located at a fixed IO address; it need
> not be programmed into, nor fetched from, the PMBA -- power
> management base address -- register of the PCI host bridge.
>
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
> OvmfPkg/Include/IndustryStandard/Bhyve.h | 21 ++++++++++++
> OvmfPkg/Include/OvmfPlatforms.h | 1 +
> .../AcpiTimerLib/BaseAcpiTimerLibBhyve.c | 33 +++++++++++++++++++
> .../AcpiTimerLib/BaseAcpiTimerLibBhyve.inf | 29 ++++++++++++++++
> 4 files changed, 84 insertions(+)
> create mode 100644 OvmfPkg/Include/IndustryStandard/Bhyve.h
> create mode 100644 OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c
> create mode 100644 OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf
>
> diff --git a/OvmfPkg/Include/IndustryStandard/Bhyve.h b/OvmfPkg/Include/IndustryStandard/Bhyve.h
> new file mode 100644
> index 0000000000..950f87048b
> --- /dev/null
> +++ b/OvmfPkg/Include/IndustryStandard/Bhyve.h
> @@ -0,0 +1,21 @@
> +/** @file
> + Various register numbers and value bits based on FreeBSD's bhyve
> + at r359530.
> + - https://svnweb.freebsd.org/base?view=revision&revision=359530
> +
> + Copyright (C) 2020, Rebecca Cran <rebecca@bsdio.com>
> +
> + SPDX-License-Identifier: BSD-2-Clause-Patent
> +**/
> +
> +#ifndef __BHYVE_H__
> +#define __BHYVE_H__
> +
> +#include <Library/PciLib.h>
> +#include <Uefi/UefiBaseType.h>
> +#include <Uefi/UefiSpec.h>
> +#include <Protocol/PciRootBridgeIo.h>
(1) These #include directives look unnecessary.
> +
> +#define BHYVE_ACPI_TIMER_IO_ADDR 0x408
> +
> +#endif // __BHYVE_H__
> diff --git a/OvmfPkg/Include/OvmfPlatforms.h b/OvmfPkg/Include/OvmfPlatforms.h
> index 59459231e8..77dd818e30 100644
> --- a/OvmfPkg/Include/OvmfPlatforms.h
> +++ b/OvmfPkg/Include/OvmfPlatforms.h
> @@ -14,6 +14,7 @@
> #include <IndustryStandard/Pci22.h>
> #include <IndustryStandard/Q35MchIch9.h>
> #include <IndustryStandard/I440FxPiix4.h>
> +#include <IndustryStandard/Bhyve.h>
>
> //
> // OVMF Host Bridge DID Address
> diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c
> new file mode 100644
> index 0000000000..58ebffac86
> --- /dev/null
> +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c
> @@ -0,0 +1,33 @@
> +/** @file
> + Provide InternalAcpiGetTimerTick for the bhyve instance of the
> + Base ACPI Timer Library
> +
> + Copyright (C) 2020, Rebecca Cran <rebecca@bsdio.com>
> + Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>
> +
> + SPDX-License-Identifier: BSD-2-Clause-Patent
> +**/
> +
> +#include <Library/DebugLib.h>
(2) We don't use DebugLib here, so please remove this #include.
(... in retrospect, I think the same #include should be removed from the
preexistent C source too, in this directory, but that's for another day.)
> +#include <Library/IoLib.h>
> +#include <OvmfPlatforms.h>
> +
> +/**
> + Internal function to read the current tick counter of ACPI.
> +
> + Read the current ACPI tick counter using the counter address cached
> + by this instance's constructor.
> +
> + @return The tick counter read.
> +
> +**/
> +UINT32
> +InternalAcpiGetTimerTick (
> + VOID
> + )
> +{
> + //
> + // Return the current ACPI timer value.
(3) Please replace "// Return" with "// Return".
> + //
> + return IoRead32 (BHYVE_ACPI_TIMER_IO_ADDR);
> +}
> diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf
> new file mode 100644
> index 0000000000..1e48718f3d
> --- /dev/null
> +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf
> @@ -0,0 +1,29 @@
> +## @file
> +# Base ACPI Timer Library Instance for Bhyve.
> +#
> +# Copyright (C) 2020, Rebecca Cran <rebecca@bsdio.com>
> +# Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>
> +# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.
> +#
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +##
> +
> +[Defines]
> + INF_VERSION = 0x00010005
> + BASE_NAME = BaseAcpiTimerLibBhyve
> + FILE_GUID = A5E3B247-7302-11EA-9C04-3CECEF0C1C08
> + MODULE_TYPE = BASE
> + VERSION_STRING = 1.0
> + LIBRARY_CLASS = TimerLib
> +
> +[Sources]
> + AcpiTimerLib.c
> + BaseAcpiTimerLibBhyve.c
(4) "AcpiTimerLib.h" should be listed here, as that is the file that
declares the InternalAcpiGetTimerTick() function.
> +
> +[Packages]
> + MdePkg/MdePkg.dec
> + OvmfPkg/OvmfPkg.dec
(5) I think you can drop "OvmfPkg/OvmfPkg.dec", as you don't seem to be
consuming any interface (such as guid, protocol, pcd, lib class, ...)
that's declared in "OvmfPkg.dec".
> +
> +[LibraryClasses]
> + IoLib
>
With (1)-(5) fixed/considered:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
next prev parent reply other threads:[~2020-04-17 8:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 23:09 [PATCH 00/13] BhyvePkg - initial patch series for review Rebecca Cran
2020-04-15 23:09 ` [PATCH 01/13] OvmfPkg: Add bhyve support into AcpiTimerLib Rebecca Cran
2020-04-17 8:07 ` Laszlo Ersek [this message]
2020-04-15 23:09 ` [PATCH 02/13] OvmfPkg: support powering off bhyve guests Rebecca Cran
2020-04-17 8:55 ` [edk2-devel] " Laszlo Ersek
2020-04-17 18:56 ` Rebecca Cran
2020-04-21 22:14 ` Rebecca Cran
2020-04-22 15:49 ` Laszlo Ersek
2020-04-15 23:09 ` [PATCH 03/13] BhyvePkg: Add BhyveFwCtlLibNull Rebecca Cran
2020-04-15 23:09 ` [PATCH 04/13] OvmfPkg: Add QemuFwCfgS3LibNull Rebecca Cran
2020-04-17 16:37 ` [edk2-devel] " Laszlo Ersek
2020-04-15 23:09 ` [PATCH 05/13] OvmfPkg: Add VBE2 mode info structure to LegacyVgaBios.h Rebecca Cran
2020-04-17 16:43 ` [edk2-devel] " Laszlo Ersek
2020-04-15 23:09 ` [PATCH 06/13] OvmfPkg: add QemuFwCfgPeiLibNull Rebecca Cran
2020-04-17 16:57 ` [edk2-devel] " Laszlo Ersek
2020-04-15 23:09 ` [PATCH 07/13] OvmfPkg: add QemuFwCfgS3LibNull Rebecca Cran
2020-04-17 17:01 ` [edk2-devel] " Laszlo Ersek
2020-04-15 23:09 ` [PATCH 08/13] Add BhyvePkg, to support the bhyve hypervisor Rebecca Cran
2020-04-15 23:09 ` [PATCH 09/13] OvmfPkg: Add bhyve support to PlatformPei Rebecca Cran
2020-04-15 23:09 ` [PATCH 10/13] OvmfPkg: Add bhyve support to AcpiPlatformDxe Rebecca Cran
2020-04-15 23:09 ` [PATCH 11/13] BhyvePkg: Add InstrincsLib to BhyveFwCtlLib Rebecca Cran
2020-04-15 23:09 ` [PATCH 12/13] BhyvePkg: __attribute__ doesn't exist on MSVC toolchains Rebecca Cran
2020-04-15 23:09 ` [PATCH 13/13] BhyvePkg: fix BhyveSetGraphicsMode call for VS2019 build Rebecca Cran
2020-04-16 20:47 ` [edk2-devel] [PATCH 00/13] BhyvePkg - initial patch series for review Laszlo Ersek
2020-04-16 22:43 ` Laszlo Ersek
2020-04-17 6:46 ` Rebecca Cran
2020-04-17 6:55 ` Rebecca Cran
2020-04-20 9:51 ` Laszlo Ersek
2020-04-20 9:57 ` Laszlo Ersek
2020-04-21 17:12 ` Rebecca Cran
2020-04-17 7:55 ` Laszlo Ersek
2020-04-17 15:31 ` Rebecca Cran
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-list 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=27750956-3b7d-5ef1-5a90-5f294bcb3cf8@redhat.com \
--to=devel@edk2.groups.io \
/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