From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by mx.groups.io with SMTP id smtpd.web10.20291.1629700418747929004 for ; Sun, 22 Aug 2021 23:33:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20161025 header.b=mq2jsoKg; spf=pass (domain: flex--chengchieh.bounces.google.com, ip: 209.85.215.202, mailfrom: 3quejyqokbwaafcleafgcfemmejc.amkbctcjcbia.epmsnq.gm@flex--chengchieh.bounces.google.com) Received: by mail-pg1-f202.google.com with SMTP id q23-20020a6562570000b029023cbfb4fd73so9789833pgv.14 for ; Sun, 22 Aug 2021 23:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=h8c3Wc+w5pebfk+zrxbYeZJfYlOpyShSeYLHHMTxykY=; b=mq2jsoKg0Se7WnxygC4aQ1xXYeLFvhgrx6u6Tfy462pXOWNupvGV2fdL9hfpEgRTup /RzYRmNRIcRTFhppQZQURHL0esu6ltZ10IyelFAcBEn2cWqPAZvbasKm5YDISrmxTRIJ PylFHAhmL9inK5l/Xdtj2mDYT//gbM3i7mB4oJUKKnySoSePFfqPHXGERkpP7UtsvCpv 0PDYX+fR9jdBnkZadtI2tvf7VSZ4vFkjfzEwilzkU3Z9a/PT2cmdVxPiO1WcTWgGxhBA 2c17enYxaEB2VnSxkJK0UoXORHiAU2lzcFX3+W1KrkSpUnXsc0F8Y3Nb55XioLbmPMmn LdHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=h8c3Wc+w5pebfk+zrxbYeZJfYlOpyShSeYLHHMTxykY=; b=DgX9PKGl7zkPqjfYrW/k/RNtXG/FdStiZXXJLbQqRWKhTMubriuKnv1u4Lu12c1BUV k2VvueCrHpT5/xGLGJZ1sw1UsD/58Q2OZPQnqNcv8Y+01mYUcu+T+N16U4xK7LlzsxrC C16IRJ6iyfbUA1YrvfkYH8KvWTkZuHZtQz5/x0ZR5NGnrGYG/aoA0ZQuS3xI+leCUP+5 rEhUl+1E6K5/2KnDNIhtmNIpkzFEbUuNuEStcGN/FUjRJCpN3o23T7GMjWatoVfEp4+u IsPn7aepzuAR50brJI1Dj0z/r2KDR/Inl3v5W0wSbDU2j8a3m3Ix0TaQLdPl4BmK61u9 0ngg== X-Gm-Message-State: AOAM530+LHU86dUlaVGD6D+CUmmjgwq3otMTVplKWcOB+Pl1KiPQnfEt blwQYro/VDak4GOyhkMdK0CQWxBYxIIRv90bIvjOAH5Q6uX07gRfSR9ZRpdXKX/XmLVaIcag0tF azRgUh/s9mrN0ZjA/zH/ysSwbCZ+PKMlPvLhFOWRUXtf4CzBo/Obth+Dg7xE8eubi2zHitg== X-Google-Smtp-Source: ABdhPJz4fx4ejp7/BVHTpyf6Z0yDjHUQkIuKNtmBsbPeYKlux8moKUFkn+kcA1JlPMqVGcCinCMXf0dofncjTq74 X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a17:90b:46c3:: with SMTP id jx3mr11322124pjb.137.1629700417535; Sun, 22 Aug 2021 23:33:37 -0700 (PDT) Date: Mon, 23 Aug 2021 06:33:10 +0000 In-Reply-To: <20210823063312.2323801-1-chengchieh@google.com> Message-Id: <20210823063312.2323801-3-chengchieh@google.com> Mime-Version: 1.0 References: <20210823063312.2323801-1-chengchieh@google.com> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog Subject: [PATCH v3 2/4] UefiPayloadPkg: Use legacy timer in Linuxboot payload From: Cheng-Chieh Huang To: devel@edk2.groups.io Cc: Cheng-Chieh Huang , Guo Dong , Daniel Schaefer , Trammell Hudson , Maurice Ma , Benjamin You , Ray Ni Content-Type: text/plain; charset="UTF-8" HPET timer may fail to init after prior linux taking over. Signed-off-by: Cheng-Chieh Huang Reviewed-by: Guo Dong Cc: Cheng-Chieh Huang Cc: Daniel Schaefer Cc: Trammell Hudson Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Cc: Ray Ni --- UefiPayloadPkg/UefiPayloadPkg.dsc | 6 ++++++ UefiPayloadPkg/UefiPayloadPkg.fdf | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 54576ba485b7..e56e6f4a5379 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -438,7 +438,13 @@ [Components.X64] NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf } +!if $(BOOTLOADER) == "LINUXBOOT" + OvmfPkg/8254TimerDxe/8254Timer.inf + OvmfPkg/8259InterruptControllerDxe/8259.inf +!else PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf +!endif + MdeModulePkg/Universal/Metronome/Metronome.inf MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 041fed842cd8..f57a8b4bf3d3 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -101,7 +101,12 @@ [FV.DXEFV] INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf +!if $(BOOTLOADER) != "LINUXBOOT" INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf +!else +INF OvmfPkg/8254TimerDxe/8254Timer.inf +INF OvmfPkg/8259InterruptControllerDxe/8259.inf +!endif INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -- 2.33.0.rc2.250.ged5fa647cd-goog