From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by mx.groups.io with SMTP id smtpd.web11.22042.1585166722394345216 for ; Wed, 25 Mar 2020 13:05:22 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: bsdio.com, ip: 166.70.13.232, mailfrom: rebecca@bsdio.com) Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jHCHA-0003dA-7T; Wed, 25 Mar 2020 14:05:20 -0600 Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1jHCH8-0003P8-08; Wed, 25 Mar 2020 14:05:18 -0600 Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id C24D91280869; Wed, 25 Mar 2020 14:05:17 -0600 (MDT) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id DqiiuQUv0IHR; Wed, 25 Mar 2020 14:05:17 -0600 (MDT) Received: from cube.int.bluestop.org (muon.bluestop.org [65.103.231.193]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id 696211280349; Wed, 25 Mar 2020 14:05:17 -0600 (MDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Rebecca Cran Date: Wed, 25 Mar 2020 14:05:00 -0600 Message-Id: <20200325200500.81526-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 X-XM-SPF: eid=1jHCH8-0003P8-08;;;mid=<20200325200500.81526-1-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=pass X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa03.xmission.com X-Spam-Level: * X-Spam-Status: No, score=1.0 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,LotsOfNums_01 autolearn=disabled version=3.4.2 X-Spam-Virus: No X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 1.2 LotsOfNums_01 BODY: Lots of long strings of numbers * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa03 1397; IP=ok Body=1 Fuz1=1] X-Spam-DCC: XMission; sa03 1397; IP=ok Body=1 Fuz1=1 X-Spam-Combo: *;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 351 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 3.2 (0.9%), b_tie_ro: 2.2 (0.6%), parse: 0.72 (0.2%), extract_message_metadata: 3.6 (1.0%), get_uri_detail_list: 1.00 (0.3%), tests_pri_-1000: 2.1 (0.6%), tests_pri_-950: 1.07 (0.3%), tests_pri_-900: 0.86 (0.2%), tests_pri_-90: 59 (16.8%), check_bayes: 58 (16.5%), b_tokenize: 7 (1.9%), b_tok_get_all: 3.9 (1.1%), b_comp_prob: 1.11 (0.3%), b_tok_touch_all: 44 (12.6%), b_finish: 0.67 (0.2%), tests_pri_0: 272 (77.6%), check_dkim_signature: 0.53 (0.2%), check_dkim_adsp: 49 (14.0%), poll_dns_idle: 44 (12.4%), tests_pri_10: 1.66 (0.5%), tests_pri_500: 4.6 (1.3%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH] OvmfPkg: Add bhyve support into AcpiTimerLib X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Content-Transfer-Encoding: quoted-printable --- OvmfPkg/Include/OvmfPlatforms.h | 7 +++++++ OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c | 3 +++ OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c | 4 ++++ OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c | 3 +++ 4 files changed, 17 insertions(+) diff --git a/OvmfPkg/Include/OvmfPlatforms.h b/OvmfPkg/Include/OvmfPlatform= s.h index 59459231e8..3d1a8fd8fa 100644 --- a/OvmfPkg/Include/OvmfPlatforms.h +++ b/OvmfPkg/Include/OvmfPlatforms.h @@ -37,4 +37,11 @@ //=0D #define ACPI_TIMER_OFFSET 0x8=0D =0D +//=0D +// bhyve definitions=0D +//=0D +#define BHYVE_PCI_DEVICE_ID 0x1275 // NetApp vendor ID=0D +=0D +#define BHYVE_ACPI_TIMER_IO_ADDR 0x408=0D +=0D #endif=0D diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Libr= ary/AcpiTimerLib/BaseAcpiTimerLib.c index aa2b5faf1c..e32260b134 100644 --- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c @@ -41,6 +41,9 @@ AcpiTimerLibConstructor ( //=0D HostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID);=0D switch (HostBridgeDevId) {=0D + case BHYVE_PCI_DEVICE_ID:=0D + mAcpiTimerIoAddr =3D BHYVE_ACPI_TIMER_IO_ADDR;=0D + return RETURN_SUCCESS;=0D case INTEL_82441_DEVICE_ID:=0D Pmba =3D POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);=0D PmbaAndVal =3D ~(UINT32)PIIX4_PMBA_MASK;=0D diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c b/OvmfPkg/L= ibrary/AcpiTimerLib/BaseRomAcpiTimerLib.c index dd022aceed..2fec105dea 100644 --- a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c @@ -39,6 +39,8 @@ AcpiTimerLibConstructor ( //=0D HostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID);=0D switch (HostBridgeDevId) {=0D + case BHYVE_PCI_DEVICE_ID:=0D + return RETURN_SUCCESS;=0D case INTEL_82441_DEVICE_ID:=0D Pmba =3D POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);=0D PmbaAndVal =3D ~(UINT32)PIIX4_PMBA_MASK;=0D @@ -101,6 +103,8 @@ InternalAcpiGetTimerTick ( //=0D HostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID);=0D switch (HostBridgeDevId) {=0D + case BHYVE_PCI_DEVICE_ID:=0D + return IoRead32(BHYVE_ACPI_TIMER_IO_ADDR);=0D case INTEL_82441_DEVICE_ID:=0D Pmba =3D POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);=0D break;=0D diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Libra= ry/AcpiTimerLib/DxeAcpiTimerLib.c index ae976cbe9e..10c41ff7ed 100644 --- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c @@ -44,6 +44,9 @@ AcpiTimerLibConstructor ( //=0D HostBridgeDevId =3D PcdGet16 (PcdOvmfHostBridgePciDevId);=0D switch (HostBridgeDevId) {=0D + case BHYVE_PCI_DEVICE_ID:=0D + mAcpiTimerIoAddr =3D BHYVE_ACPI_TIMER_IO_ADDR;=0D + return RETURN_SUCCESS;=0D case INTEL_82441_DEVICE_ID:=0D Pmba =3D POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);=0D break;=0D --=20 2.25.2