From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web12.7141.1588254468091134298 for ; Thu, 30 Apr 2020 06:47:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fTuLARc8; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588254467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ul7JJSjHE6wKozHfAKzsAKizz9H2k+SpvVRXyPiCPtU=; b=fTuLARc8wQ8UuR72ffiPr+2ZXkDe7o11UMgyVxhwnGhzVygtpBiEfZuv9moCAXYB042h9W ZtItaE0QKtZKZ9LqqYUawzIVEMAXc3s/hKLSODKeNUOIsjcjVlC8FPPa/sEwgNr/QFWuUW UyyhK/WdJ6QOWQb4UjvWpvrEkNoYGOI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-147-QVQrbJkXOhKYCwd9DiR1Zw-1; Thu, 30 Apr 2020 09:47:41 -0400 X-MC-Unique: QVQrbJkXOhKYCwd9DiR1Zw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2CFA5800D24; Thu, 30 Apr 2020 13:47:40 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-115-57.ams2.redhat.com [10.36.115.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4F6838A; Thu, 30 Apr 2020 13:47:38 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib To: devel@edk2.groups.io, rebecca@bsdio.com Cc: Jordan Justen , Ard Biesheuvel References: <20200430011212.612386-1-rebecca@bsdio.com> From: "Laszlo Ersek" Message-ID: <98efcff3-7084-36fd-5460-ef466ce02ad4@redhat.com> Date: Thu, 30 Apr 2020 15:47:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200430011212.612386-1-rebecca@bsdio.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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 > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > --- > 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 > + > + 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 > #include > #include > +#include > > // > // 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 > + Copyright (C) 2014, Gabriel L. Somlo > + > + SPDX-License-Identifier: BSD-2-Clause-Patent > +**/ > + > +#include > +#include > + > +/** > + 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 > +# Copyright (C) 2014, Gabriel L. Somlo > +# 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 . Thanks Laszlo