From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by mx.groups.io with SMTP id smtpd.web08.3872.1626873866966155154 for ; Wed, 21 Jul 2021 06:24:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@google.com header.s=20161025 header.b=Wb6Y0BKX; spf=pass (domain: flex--chengchieh.bounces.google.com, ip: 209.85.210.201, mailfrom: 3cid4yaokbtkxczibxcdzcbjjbgz.xjhyzqzgzyfx.bmjpkn.dj@flex--chengchieh.bounces.google.com) Received: by mail-pf1-f201.google.com with SMTP id x35-20020a056a0018a3b029032d069176ceso1761347pfh.20 for ; Wed, 21 Jul 2021 06:24:26 -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=x0T66OjCn/5mjqVLu6DOlRQJD114GkLnUQHIVtJDCpE=; b=Wb6Y0BKXVrOQRiZCsxAqnDut17UI4H6eWnnjjaSfInytcCnT0Q/zvXHFJPKhsW8jdt 5iNFufwef1AJ35sO1EZCns56Ia/ogeSoeGCR22vg604l5OUHfYojWGo1HPXVg6+nyEoc 8No9iBPyI1sZs3ZPqncGHeNuUwxbjAJVt+eiXnC3Mh4vsMbWKmV5jI/HgHAOrkuQLHg/ vNHcYmHWngv+7UI0EnDqH6oPPkZkBaMnll8qQSJCWKMK6jMNvUl3mFlKPjemWdyC4i5W dkPSCiBB0b703ZnVeJ+FJqgm9x/RxyVl1WndCd80aBSIgh8hqHoKFSm7CEAQpZrxbnKK qyng== 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=x0T66OjCn/5mjqVLu6DOlRQJD114GkLnUQHIVtJDCpE=; b=o3C+thXiTYBrouFS1kAxrVavEhVIwzWfGEZ4QPoDxydR32NnPkSahHyQnjnvuQ7sFU fjIqhQryE9iiSS/jb7Qdrcmc+bheCZUyaeLLaJwqNOASApAOpOTAOQFGhTQjDPaL6rB2 b5hswTjUvY2Rij0sUbrqYpnvfpiU3eWdDkQv6tpB9nVZF5j7Ud+sm+rtbJ2/isq9faii MDxGR3zSbUPpxjutkFpa4SyqO445DG9csjpftTMHU3IA1fxHujwqoN1k0T1+hGhCS2iP qGBIpsl/Zef+iezl9VYpYH4WboQ81t6Y6WXSiTS+JmdD6MceW9slmqUbDoK1Forx+1mp qOQg== X-Gm-Message-State: AOAM530Ap0gqU76lr9bRIUhpScRnbz2Zfuc7Rbr74hY2y7pqn7UF6ZjA lEy2fC33mRnQblNx6IhyaUjoaFZDx4qsQmmuEtvuXfItjNkq7+El2bi9HgxJpmLyLZZsKF9VmSU ZPTa+5Q4VgRpJSz7eu5fjV9+l3c0MjPUuz2zmLcNIIxz8QS8fe27jtyKW7pgbfCkheY6vTg== X-Google-Smtp-Source: ABdhPJyFgk0PNZ5yyswH/T7u1qZ0MfqB7xL031irKAfouvLe48BJX9P0dGva1e4taehXNdGyFOsjIqyscUX8tXQ0 X-Received: from ratho96.c.googlers.com ([fda3:e722:ac3:cc00:3:22c1:c0a8:aae]) (user=chengchieh job=sendgmr) by 2002:a62:1a4b:0:b029:328:da0b:d83b with SMTP id a72-20020a621a4b0000b0290328da0bd83bmr36183467pfa.59.1626873866005; Wed, 21 Jul 2021 06:24:26 -0700 (PDT) Date: Wed, 21 Jul 2021 13:23:24 +0000 In-Reply-To: <20210721132328.1415485-1-chengchieh@google.com> Message-Id: <20210721132328.1415485-3-chengchieh@google.com> Mime-Version: 1.0 References: <20210721132328.1415485-1-chengchieh@google.com> X-Mailer: git-send-email 2.32.0.402.g57bb445576-goog Subject: [PATCH v1 2/6] UefiPayloadPkg: Use legacy timer in Linuxboot payload From: Cheng-Chieh Huang To: devel@edk2.groups.io Cc: Cheng-Chieh Huang Content-Type: text/plain; charset="UTF-8" HPET timer may fail to init after prior linux taking over. Signed-off-by: Cheng-Chieh Huang --- 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.402.g57bb445576-goog