From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965357AbdLVJYO (ORCPT ); Fri, 22 Dec 2017 04:24:14 -0500 Received: from merlin.infradead.org ([205.233.59.134]:39374 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933950AbdLVJX6 (ORCPT ); Fri, 22 Dec 2017 04:23:58 -0500 Message-Id: <20171222092243.382623763@infradead.org> User-Agent: quilt/0.63-1 Date: Fri, 22 Dec 2017 10:20:12 +0100 From: Peter Zijlstra To: tglx@linutronix.de, linux-kernel@vger.kernel.org Cc: x86@kernel.org, peterz@infradead.org, rui.zhang@intel.com, len.brown@intel.com Subject: [PATCH 2/3] x86/time: Unconditionally register legacy timer interrupt References: <20171222092010.732743589@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-uncondition-legacy-timer.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Even without a PIC/PIT we need the legacy timer interrupt for HPET in legacy replacement mode. Cc: Zhang Rui Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/kernel/time.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/time.c +++ b/arch/x86/kernel/time.c @@ -69,9 +69,12 @@ static struct irqaction irq0 = { static void __init setup_default_timer_irq(void) { - if (!nr_legacy_irqs()) - return; - setup_irq(0, &irq0); + /* + * Unconditionally register the legacy timer; even without legacy + * PIC/PIT we need this for the HPET0 in legacy replacement mode. + */ + if (setup_irq(0, &irq0)) + pr_info("Failed to register legacy timer interrupt\n"); } /* Default timer init function */