From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by mx.groups.io with SMTP id smtpd.web12.6886.1628347900460627075 for ; Sat, 07 Aug 2021 07:51:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20161025 header.b=vCtTxY5z; spf=pass (domain: flex--chengchieh.bounces.google.com, ip: 209.85.214.202, mailfrom: 3-50oyqokbyaglirkglmilksskpi.gsqhizipiho6.kvsytw.ms@flex--chengchieh.bounces.google.com) Received: by mail-pl1-f202.google.com with SMTP id s3-20020a1709029883b029012b41197000so6719145plp.16 for ; Sat, 07 Aug 2021 07:51:40 -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=5BiAW5Ydu+VxGYxn6Es1Gws3nMxD/2jLcSszhjfd6WI=; b=vCtTxY5z1gZ0fKQ4qzBnQkDOfha+8NcAxvxYBiV5VVRH9bPQ2hG4iHOHcBNqiNaDii ruMUC6YT5nz4PQZG6XtrCqDFG9Mx7Z8e8IsWluOITlY0q8pV7UtVWnEoHTTRmKvWj1kW lIUlvn8OmlNzErRJmeQijtzBBJbR2IGL6XCdTJ2Wo983o4oin83mmiHxqrNdVInMBVM7 5uzuj6+K55MAyambYcFS+RpQcEGLHHqgo5nw4P0Fce6uqvRekXHMtpe+JHdTz/YsHoLO CK2JHDnLm55hqdyRG5U1qVTj3RFlkefDSOGwOzBjkWeeqaQKdkIRvo5ckmNgyg4VKl+v 0OnA== 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=5BiAW5Ydu+VxGYxn6Es1Gws3nMxD/2jLcSszhjfd6WI=; b=C/WE3Y+AKwELflCsPyHiGDjDFp7sgd9aIAlLQinLdwUYmfwUT/p9RaazvCb83hwsKC WsdAHlnX00cO1cPuFIgsUSoLrgxXCds9yTOYKg3DjdlglkD5PJjfZVVTW4uGYo203JA/ j1Qj4u5pdChmhqBlrfNN1588xBxP9Xnagtcl7tSVJAuNWrW7stV8Bxwt2eLegx8cPl+6 TZ59d8tTOhIRN618L/G4cUnAW7+/cUeMtNaCpV3VBbS8uaiCdx4R9n6FAl4XzUglIniP sXBkHKAX0A6Xic7gwIsTKAeM+4XbHlvVmMNE29hE/WagIhGHF7NVRO54EZHKEV39uJ53 ovfA== X-Gm-Message-State: AOAM531/tm/QlhnoSxUQ/gqOTsMWtL4tkKTEFJoBE3OKZlJskV3IMh5e nskyJQiUs+sWn7uu94W3P1/5LrQScZygj2pVf231gZgdGHSxuEJdHWnyZ7O7kZZOI8I0SMZrPhk CdUxnx8crpnloPLC21eGeW40B/ljKFOuCnY3VsgEzHS8OECVFRsiA1fycrd9hkAFBrIX3eQ== X-Google-Smtp-Source: ABdhPJziATtFbVnbq8pkP/JMFB7MiQE+PTIaq8J5bGiM5PMSd0T9awLC62hQrltPXbTuXNdQJbXVfFSbY4bvKKD7 X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a17:902:bf46:b029:12c:75f6:f643 with SMTP id u6-20020a170902bf46b029012c75f6f643mr1866035pls.6.1628347899780; Sat, 07 Aug 2021 07:51:39 -0700 (PDT) Date: Sat, 7 Aug 2021 14:51:04 +0000 In-Reply-To: <20210807145106.2236803-1-chengchieh@google.com> Message-Id: <20210807145106.2236803-3-chengchieh@google.com> Mime-Version: 1.0 References: <20210807145106.2236803-1-chengchieh@google.com> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog Subject: [PATCH v2 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 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 --- 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.32.0.605.g8dce9f2422-goog