* [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib
@ 2020-04-30 1:12 Rebecca Cran
2020-04-30 12:12 ` [edk2-devel] " Laszlo Ersek
2020-04-30 13:47 ` Laszlo Ersek
0 siblings, 2 replies; 3+ messages in thread
From: Rebecca Cran @ 2020-04-30 1:12 UTC (permalink / raw)
To: devel; +Cc: Rebecca Cran, Jordan Justen, Laszlo Ersek, Ard Biesheuvel
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>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
---
OvmfPkg/Include/IndustryStandard/Bhyve.h | 16 ++++++++++
OvmfPkg/Include/OvmfPlatforms.h | 1 +
.../AcpiTimerLib/BaseAcpiTimerLibBhyve.c | 32 +++++++++++++++++++
.../AcpiTimerLib/BaseAcpiTimerLibBhyve.inf | 30 +++++++++++++++++
4 files changed, 79 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..02ce5587ee
--- /dev/null
+++ b/OvmfPkg/Include/IndustryStandard/Bhyve.h
@@ -0,0 +1,16 @@
+/** @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__
+
+#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..f927e27188
--- /dev/null
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c
@@ -0,0 +1,32 @@
+/** @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/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.
+ //
+ 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..14b7479e67
--- /dev/null
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf
@@ -0,0 +1,30 @@
+## @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
+ AcpiTimerLib.h
+ BaseAcpiTimerLibBhyve.c
+
+[Packages]
+ MdePkg/MdePkg.dec
+ OvmfPkg/OvmfPkg.dec
+
+[LibraryClasses]
+ IoLib
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib
2020-04-30 1:12 [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib Rebecca Cran
@ 2020-04-30 12:12 ` Laszlo Ersek
2020-04-30 13:47 ` Laszlo Ersek
1 sibling, 0 replies; 3+ messages in thread
From: Laszlo Ersek @ 2020-04-30 12:12 UTC (permalink / raw)
To: devel, rebecca; +Cc: Jordan Justen, Ard Biesheuvel
On 04/30/20 03:12, 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>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> ---
> OvmfPkg/Include/IndustryStandard/Bhyve.h | 16 ++++++++++
> OvmfPkg/Include/OvmfPlatforms.h | 1 +
> .../AcpiTimerLib/BaseAcpiTimerLibBhyve.c | 32 +++++++++++++++++++
> .../AcpiTimerLib/BaseAcpiTimerLibBhyve.inf | 30 +++++++++++++++++
> 4 files changed, 79 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..02ce5587ee
> --- /dev/null
> +++ b/OvmfPkg/Include/IndustryStandard/Bhyve.h
> @@ -0,0 +1,16 @@
> +/** @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__
> +
> +#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..f927e27188
> --- /dev/null
> +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c
> @@ -0,0 +1,32 @@
> +/** @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/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.
> + //
> + 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..14b7479e67
> --- /dev/null
> +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf
> @@ -0,0 +1,30 @@
> +## @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
> + AcpiTimerLib.h
> + BaseAcpiTimerLibBhyve.c
> +
> +[Packages]
> + MdePkg/MdePkg.dec
> + OvmfPkg/OvmfPkg.dec
> +
> +[LibraryClasses]
> + IoLib
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib
2020-04-30 1:12 [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib Rebecca Cran
2020-04-30 12:12 ` [edk2-devel] " Laszlo Ersek
@ 2020-04-30 13:47 ` Laszlo Ersek
1 sibling, 0 replies; 3+ messages in thread
From: Laszlo Ersek @ 2020-04-30 13:47 UTC (permalink / raw)
To: devel, rebecca; +Cc: Jordan Justen, Ard Biesheuvel
On 04/30/20 03:12, 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>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> ---
> OvmfPkg/Include/IndustryStandard/Bhyve.h | 16 ++++++++++
> OvmfPkg/Include/OvmfPlatforms.h | 1 +
> .../AcpiTimerLib/BaseAcpiTimerLibBhyve.c | 32 +++++++++++++++++++
> .../AcpiTimerLib/BaseAcpiTimerLibBhyve.inf | 30 +++++++++++++++++
> 4 files changed, 79 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..02ce5587ee
> --- /dev/null
> +++ b/OvmfPkg/Include/IndustryStandard/Bhyve.h
> @@ -0,0 +1,16 @@
> +/** @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__
> +
> +#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..f927e27188
> --- /dev/null
> +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.c
> @@ -0,0 +1,32 @@
> +/** @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/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.
> + //
> + 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..14b7479e67
> --- /dev/null
> +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf
> @@ -0,0 +1,30 @@
> +## @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
> + AcpiTimerLib.h
> + BaseAcpiTimerLibBhyve.c
> +
> +[Packages]
> + MdePkg/MdePkg.dec
> + OvmfPkg/OvmfPkg.dec
> +
> +[LibraryClasses]
> + IoLib
>
Merged as commit 91dee771fc0d ("OvmfPkg: Add bhyve support into
AcpiTimerLib", 2020-04-30), via
<https://github.com/tianocore/edk2/pull/570>.
Thanks
Laszlo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-30 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-30 1:12 [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib Rebecca Cran
2020-04-30 12:12 ` [edk2-devel] " Laszlo Ersek
2020-04-30 13:47 ` Laszlo Ersek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox