From patchwork Mon Apr 23 15:00:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 134018 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1099520lji; Mon, 23 Apr 2018 08:01:24 -0700 (PDT) X-Google-Smtp-Source: AIpwx49ke8o8QVteJ+/Z3E7Z+PUqhLzyNqNdw7zaQO+vbIkJah8ZsYEVhe8UXjv08mfzMoKnHIWy X-Received: by 10.99.131.72 with SMTP id h69mr16951500pge.378.1524495684409; Mon, 23 Apr 2018 08:01:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524495684; cv=none; d=google.com; s=arc-20160816; b=SnLbjZQY7Fd4aTFxfgb2N5xNb8vf8Tzl88mTht0hxHAGr0k57xwzitv6Ei3ZaF2+Pk 5ALnryADgqSlXpGI3ha0WKk6JBo07bNwdByZNilxBbVPY5XcKvscHlDUt9YwTxud/74s 2ExOnAyRSUiaz15o5mRKsDoyz8OYP6H2ZcTFX9k0RU8KU+jXZv9zRwHDZlGCUjfmLuUv am7RT2bAKcB+GEsLADw2ZKbhXN9bCILuR+Wn1UnjnshM3s6PLFDFabRG9fP/0xk0c2tD azMFi0kF96jzpsOHjfdy94MGsgAU5FbB5cYq62a8Pdsjcwp7M6dtjqQZ1/R7AMjURDEq axzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XvVSrBCHnDiLhVFIHmDjHUmtb4l17OXbi6S7Av0JUs8=; b=fNc75LG2fcOega9gZ5rW5vRMjGXEf8kwiwrYgMEz/KG6mynOle4/8I+wd7QvyP2QIO kmVu00ixj7UrD3UbcTaqwTaOfgxaSsCDskmkljrX5/22nYEg0bI0ydwsM08YxklNRov5 XmJJV5pbN2fBgOer6meLUqT3MWwPuJnGdi2RZefd4UxkJxs7bEOp/Glk/7MShImHjGdA IMkEIZ7vEJiGIijPf2+QLRmpTdq6rq1wnEkX+BSq5o6LhS+3VORG1kRk4eTv6rPi+PmD zswWN1MClQ8AmgfEZZfgwFa1UTnABUxTDquS2BPdloo9mlEjzF6F426Nx3gawipufXM3 tO7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ry7Jyznx; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id w9si11569245pfk.14.2018.04.23.08.01.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 08:01:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Ry7Jyznx; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B5C192279CEFC; Mon, 23 Apr 2018 08:01:17 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0D16E2277AF25 for ; Mon, 23 Apr 2018 08:01:15 -0700 (PDT) Received: by mail-wr0-x242.google.com with SMTP id d1-v6so42166227wrj.13 for ; Mon, 23 Apr 2018 08:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=b0oFL5YN9HW4BXB99FRl/c5l2gTuiHO5bU/hAjrAAVk=; b=Ry7JyznxUKkxjfPeLBP5Hq1E8ATa5zZiKO7+eWwbhMLHSAvgBMQClGrLWUygYFQWJj w0lgFkKhqvk4LvqaK7KeH0qsULWlN6AYquJJ46Kn9HqMAT9U023wOMaXMX8U2ZbRSfh+ zrpm1Ky+sG1W2gB4ciymzgz1eubQip3hi+lGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b0oFL5YN9HW4BXB99FRl/c5l2gTuiHO5bU/hAjrAAVk=; b=Y4rTsaPietyPscTxN3Jwgo680YjwKgJRFY6wtgHfFMTNh6f9UfI9R3vj6c6QlCiuTA ZhyAJVrnHV4EnSBfn67OqbumiQ15TVXNaTamCoLBtHwOAckQcLVJAIu5UiApFiiSBfQb VBNIP97tcfNw2YsRmaEdthoMEHOiHCAyiHNN20Xa7fCjdX7JIEy048plDPlw6/Cpj/1D LoVdWbXnxs+qY9KtXbAq+nhpwYGSgvzuMbrA/dvzzExYjT/wSb5uEdtptR0ApB1j31OU 2IK0Qxm28tTV4I1ZTJdQ4tfdwywLlqCZlLvWwqi7rv3wiLvoFA0BTmHqIecoWYB28YB7 /09w== X-Gm-Message-State: ALQs6tDQN8Y818m0qLu8ruIpaLOK9iHccp9gIFJSktiYdJdYkCXP+FbL RWK5Jll6J1Pe6i4CQm3IE+q0ahy5aPA= X-Received: by 10.28.238.149 with SMTP id j21mr7467749wmi.16.1524495674243; Mon, 23 Apr 2018 08:01:14 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:3995:5470:200:1aff:fe1b:b328]) by smtp.gmail.com with ESMTPSA id y101sm8955460wmh.10.2018.04.23.08.01.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 08:01:13 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 23 Apr 2018 17:00:56 +0200 Message-Id: <20180423150057.13515-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423150057.13515-1-ard.biesheuvel@linaro.org> References: <20180423150057.13515-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 1/2] ArmPkg: add reenable hook to ArmGenericTimerCounterLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: julien.grall@arm.com, lersek@redhat.com, leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" In preparation of selectively reinstating the timer enable quirk for Xen that we removed in commit 411a373ed642 ("ArmPkg/TimerDxe: remove workaround for KVM timer handling"), add a ArmGenericTimerReenableTimer() library function to ArmGenericTimerCounterLib that we will populate for Xen only. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Drivers/TimerDxe/TimerDxe.c | 1 + ArmPkg/Include/Library/ArmGenericTimerCounterLib.h | 6 ++++++ ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c | 8 ++++++++ ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c | 8 ++++++++ 4 files changed, 23 insertions(+) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c index bd616d2efc73..478f1bece565 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c @@ -337,6 +337,7 @@ TimerInterruptHandler ( // Set next compare value ArmGenericTimerSetCompareVal (CompareValue); + ArmGenericTimerReenableTimer (); ArmInstructionSynchronizationBarrier (); } diff --git a/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h b/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h index 805025baa14b..47e28b79c033 100644 --- a/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h +++ b/ArmPkg/Include/Library/ArmGenericTimerCounterLib.h @@ -22,6 +22,12 @@ ArmGenericTimerEnableTimer ( VOID ); +VOID +EFIAPI +ArmGenericTimerReenableTimer ( + VOID + ); + VOID EFIAPI ArmGenericTimerDisableTimer ( diff --git a/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c b/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c index d04e04fb334d..03519f50e79a 100644 --- a/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c +++ b/ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.c @@ -29,6 +29,14 @@ ArmGenericTimerEnableTimer ( ArmWriteCntpCtl (TimerCtrlReg); } +VOID +EFIAPI +ArmGenericTimerReenableTimer ( + VOID + ) +{ +} + VOID EFIAPI ArmGenericTimerDisableTimer ( diff --git a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c index c941895a3574..4bb1e1cde538 100644 --- a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c +++ b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c @@ -29,6 +29,14 @@ ArmGenericTimerEnableTimer ( ArmWriteCntvCtl (TimerCtrlReg); } +VOID +EFIAPI +ArmGenericTimerReenableTimer ( + VOID + ) +{ +} + VOID EFIAPI ArmGenericTimerDisableTimer (