From nobody Tue Feb 10 02:43:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+80794+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80794+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631794864; cv=none; d=zohomail.com; s=zohoarc; b=A07uuzlfEcyjJTvBpWgQkUDTZDZHJMkC6b2ANgKtX0DBmrYXg8ng2IShwEJ3j4ELBrtBG9wiNhkzWQVY0RUH+Yj0D6ROA3RQ5l6Fwf1ACgSoe8xQcuGtwUU3Wx8+JleWIQ6daWsPOZyEYgKZ3e+zX2JLHqObXruMD4xf2fE9MM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631794864; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=QsmfFPXjtdW1YiH6MluWCrzzJDImLwJQmaNTz4ZbkiA=; b=byLj9iH850zxId3f1GgwDnLuvh+QHcA/byJdT4pUmxWjjTn0FqdT3eKjs+2JXA5jrG+W6VhE5h0v1W6lwu7Yl2RWGDQ055MFs0FRmALKzGAMIPxI/X6qxyQP307L7oKQgfLWsKUKqGMnCy9b9dbMDKF4bQNU7Wi2WIKRZvSTFs4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+80794+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1631794864874539.8171913793981; Thu, 16 Sep 2021 05:21:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 4bbFYY1788612x8XQNRndVJB; Thu, 16 Sep 2021 05:21:04 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web09.167.1631794863351462318 for ; Thu, 16 Sep 2021 05:21:03 -0700 X-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-490-Rfe7mz0oMRK4ek0_GAmlYg-1; Thu, 16 Sep 2021 08:21:01 -0400 X-MC-Unique: Rfe7mz0oMRK4ek0_GAmlYg-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C9E7F824FA7; Thu, 16 Sep 2021 12:20:59 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8AB583AC0; Thu, 16 Sep 2021 12:20:59 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A948E18009D6; Thu, 16 Sep 2021 14:20:27 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jordan Justen , Gerd Hoffmann , Jiewen Yao , Julien Grall , Stefan Berger , Leif Lindholm , Ard Biesheuvel , Andrew Fish , Michael D Kinney , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony Perard , Jiewen Yao Subject: [edk2-devel] [PATCH v4 12/20] OvmfPkg/Microvm: PlatformPei/MemDetect tweaks Date: Thu, 16 Sep 2021 14:20:19 +0200 Message-Id: <20210916122027.2352393-13-kraxel@redhat.com> In-Reply-To: <20210916122027.2352393-1-kraxel@redhat.com> References: <20210916122027.2352393-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: vRdLGYRXVCdWe6JMgcTlYjixx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631794864; bh=Y1QKKnAgJ58DBqXxY+NwLNiYoS1kkQ+Q9DUyrHGKurA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Q9bd2HG9aW1XU9Epvjft0U4WiqRCr/NC//juJRXFdswbMvTdNBQ2b3QI9LR7USrzOO5 vRVpjHZwRZSXkqurjCgpDq4n2xxRbrnZl58VUSxcwZr0DXaWABJqRkauwyth1Ip1F4PqO N1OOPQF5eIGNsZAEHliyPNAi6xPn1gttvuY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631794865782100014 Content-Type: text/plain; charset="utf-8" Set mHostBridgeDevId to MICROVM_PSEUDO_DEVICE_ID using a compile time switch. Skip host bridge setup on microvm. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3599 Signed-off-by: Gerd Hoffmann Acked-by: Jiewen Yao --- OvmfPkg/Microvm/MicrovmX64.dsc | 3 +++ OvmfPkg/PlatformPei/MemDetect.c | 5 +++++ OvmfPkg/PlatformPei/Platform.c | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 019b50de7d8f..a000c195d866 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -73,6 +73,9 @@ [Defines] !endif =20 [BuildOptions] + GCC:*_*_*_CC_FLAGS =3D -DPLATFORM_IS_MICROVM + INTEL:*_*_*_CC_FLAGS =3D /D PLATFORM_IS_MICROVM + MSFT:*_*_*_CC_FLAGS =3D /D PLATFORM_IS_MICROVM GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG MSFT:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 2c2c4641ec8a..8125644bc91a 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -15,6 +15,7 @@ Module Name: // #include #include +#include #include #include #include @@ -135,6 +136,10 @@ QemuUc32BaseInitialization ( UINT32 LowerMemorySize; UINT32 Uc32Size; =20 + if (mHostBridgeDevId =3D=3D MICROVM_PSEUDO_DEVICE_ID) { + return; + } + if (mHostBridgeDevId =3D=3D INTEL_Q35_MCH_DEVICE_ID) { // // On q35, the 32-bit area that we'll mark as UC, through variable MTR= Rs, diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index d3a20122a2ea..ed93d11c8ac6 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -714,7 +715,11 @@ InitializePlatform ( // // Query Host Bridge DID // +#ifdef PLATFORM_IS_MICROVM + mHostBridgeDevId =3D MICROVM_PSEUDO_DEVICE_ID; +#else mHostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID); +#endif =20 MaxCpuCountInitialization (); =20 --=20 2.31.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80794): https://edk2.groups.io/g/devel/message/80794 Mute This Topic: https://groups.io/mt/85649943/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-