From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> To: stefano@stabellini.net, johnstul@us.ibm.com Cc: linux-kernel@vger.kernel.org, xen-devel@lists.xensource.com, Stefano.Stabellini@eu.citrix.com, sheng@linux.intel.com, ddutile@redhat.com, jeremy@goop.org Subject: Re: [PATCH 10/13] Do not try to disable hpet if it hasn't been initialized before Date: Wed, 30 Jun 2010 13:53:43 -0400 [thread overview] Message-ID: <20100630175343.GA16488@phenom.dumpdata.com> (raw) In-Reply-To: <1277136847-13266-10-git-send-email-stefano@stabellini.net> On Mon, Jun 21, 2010 at 05:14:04PM +0100, stefano@stabellini.net wrote: > From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > hpet_disable is called unconditionally on machine reboot if hpet support > is compiled in the kernel. > hpet_disable only checks if the machine is hpet capable but doesn't make > sure that hpet has been initialized. CC-ing John Stultz who has had his head wrapped around this time-thingy. Hi John! What are your thoughts about this patch? > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > --- > arch/x86/kernel/hpet.c | 18 ++++++++++-------- > 1 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c > index 23b4ecd..2b299da 100644 > --- a/arch/x86/kernel/hpet.c > +++ b/arch/x86/kernel/hpet.c > @@ -959,16 +959,18 @@ fs_initcall(hpet_late_init); > > void hpet_disable(void) > { > - if (is_hpet_capable()) { > - unsigned int cfg = hpet_readl(HPET_CFG); > + unsigned int cfg; > > - if (hpet_legacy_int_enabled) { > - cfg &= ~HPET_CFG_LEGACY; > - hpet_legacy_int_enabled = 0; > - } > - cfg &= ~HPET_CFG_ENABLE; > - hpet_writel(cfg, HPET_CFG); > + if (!is_hpet_capable() || !hpet_address || !hpet_virt_address) > + return; > + > + cfg = hpet_readl(HPET_CFG); > + if (hpet_legacy_int_enabled) { > + cfg &= ~HPET_CFG_LEGACY; > + hpet_legacy_int_enabled = 0; > } > + cfg &= ~HPET_CFG_ENABLE; > + hpet_writel(cfg, HPET_CFG); > } > > #ifdef CONFIG_HPET_EMULATE_RTC > -- > 1.7.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
WARNING: multiple messages have this Message-ID (diff)
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> To: stefano@stabellini.net, johnstul@us.ibm.com Cc: jeremy@goop.org, xen-devel@lists.xensource.com, Stefano.Stabellini@eu.citrix.com, linux-kernel@vger.kernel.org, ddutile@redhat.com, sheng@linux.intel.com Subject: Re: [PATCH 10/13] Do not try to disable hpet if it hasn't been initialized before Date: Wed, 30 Jun 2010 13:53:43 -0400 [thread overview] Message-ID: <20100630175343.GA16488@phenom.dumpdata.com> (raw) In-Reply-To: <1277136847-13266-10-git-send-email-stefano@stabellini.net> On Mon, Jun 21, 2010 at 05:14:04PM +0100, stefano@stabellini.net wrote: > From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > > hpet_disable is called unconditionally on machine reboot if hpet support > is compiled in the kernel. > hpet_disable only checks if the machine is hpet capable but doesn't make > sure that hpet has been initialized. CC-ing John Stultz who has had his head wrapped around this time-thingy. Hi John! What are your thoughts about this patch? > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > --- > arch/x86/kernel/hpet.c | 18 ++++++++++-------- > 1 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c > index 23b4ecd..2b299da 100644 > --- a/arch/x86/kernel/hpet.c > +++ b/arch/x86/kernel/hpet.c > @@ -959,16 +959,18 @@ fs_initcall(hpet_late_init); > > void hpet_disable(void) > { > - if (is_hpet_capable()) { > - unsigned int cfg = hpet_readl(HPET_CFG); > + unsigned int cfg; > > - if (hpet_legacy_int_enabled) { > - cfg &= ~HPET_CFG_LEGACY; > - hpet_legacy_int_enabled = 0; > - } > - cfg &= ~HPET_CFG_ENABLE; > - hpet_writel(cfg, HPET_CFG); > + if (!is_hpet_capable() || !hpet_address || !hpet_virt_address) > + return; > + > + cfg = hpet_readl(HPET_CFG); > + if (hpet_legacy_int_enabled) { > + cfg &= ~HPET_CFG_LEGACY; > + hpet_legacy_int_enabled = 0; > } > + cfg &= ~HPET_CFG_ENABLE; > + hpet_writel(cfg, HPET_CFG); > } > > #ifdef CONFIG_HPET_EMULATE_RTC > -- > 1.7.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2010-06-30 17:55 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-06-21 16:12 [PATCH 0/12] PV on HVM Xen Stefano Stabellini 2010-06-21 16:12 ` Stefano Stabellini 2010-06-21 16:13 ` [PATCH 01/13] Add support for hvm_op stefano 2010-06-21 16:13 ` [PATCH 02/13] early PV on HVM stefano 2010-06-21 16:13 ` [PATCH 03/13] evtchn delivery " stefano 2010-06-21 16:13 ` [PATCH 04/13] Xen PCI platform device driver stefano 2010-06-30 17:55 ` Konrad Rzeszutek Wilk 2010-06-30 17:55 ` Konrad Rzeszutek Wilk 2010-07-01 11:38 ` Stefano Stabellini 2010-06-21 16:13 ` [PATCH 05/13] Add suspend\resume support for PV on HVM guests stefano 2010-06-21 16:14 ` [PATCH 06/13] Allow xen platform pci device to be compiled as a module stefano 2010-06-21 16:14 ` [PATCH 0/12] PV on HVM Xen Stefano Stabellini 2010-06-21 16:14 ` Stefano Stabellini 2010-06-21 16:14 ` [PATCH 07/13] Fix find_unbound_irq in presence of ioapic irqs stefano 2010-06-21 16:14 ` [PATCH 08/13] Fix possible NULL pointer dereference in print_IO_APIC stefano 2010-06-21 16:14 ` [PATCH 09/13] __setup_vector_irq: handle NULL chip_data stefano 2010-06-21 16:14 ` [PATCH 10/13] Do not try to disable hpet if it hasn't been initialized before stefano 2010-06-30 17:53 ` Konrad Rzeszutek Wilk [this message] 2010-06-30 17:53 ` Konrad Rzeszutek Wilk 2010-07-09 1:05 ` john stultz 2010-06-30 21:24 ` Venkatesh Pallipadi 2010-06-30 21:24 ` Venkatesh Pallipadi 2010-07-02 10:44 ` Paolo Bonzini 2010-07-02 10:44 ` Paolo Bonzini 2010-06-21 16:14 ` [PATCH 11/13] Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock stefano 2010-07-01 19:41 ` Don Dutile 2010-07-02 17:17 ` Stefano Stabellini 2010-07-02 17:17 ` Stefano Stabellini 2010-06-21 16:14 ` [PATCH 12/13] Unplug emulated disks and nics stefano 2010-07-01 19:41 ` Don Dutile 2010-07-01 19:41 ` Don Dutile 2010-07-05 11:58 ` Stefano Stabellini 2010-07-07 20:01 ` Don Dutile 2010-07-08 13:13 ` Stefano Stabellini 2010-07-08 13:13 ` Stefano Stabellini 2010-07-08 19:57 ` [Xen-devel] " Don Dutile 2010-07-08 21:29 ` Ian Campbell 2010-07-08 21:29 ` Ian Campbell 2010-07-08 21:59 ` [Xen-devel] " Don Dutile 2010-07-09 8:02 ` Ian Campbell 2010-07-09 8:02 ` Ian Campbell 2010-07-09 10:54 ` Stefano Stabellini 2010-07-09 10:54 ` Stefano Stabellini 2010-07-09 13:42 ` [Xen-devel] " Don Dutile 2010-06-21 16:14 ` [PATCH 13/13] Call HVMOP_pagetable_dying on exit_mmap stefano 2010-06-30 17:56 ` [PATCH 0/12] PV on HVM Xen Konrad Rzeszutek Wilk 2010-07-01 11:38 ` Stefano Stabellini 2010-07-01 19:43 ` [Xen-devel] " Dan Magenheimer 2010-07-02 10:43 ` Stefano Stabellini 2010-07-02 16:08 ` Dan Magenheimer 2010-07-02 17:14 ` Stefano Stabellini 2010-07-02 19:49 ` Dan Magenheimer 2010-07-02 19:49 ` Dan Magenheimer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100630175343.GA16488@phenom.dumpdata.com \ --to=konrad.wilk@oracle.com \ --cc=Stefano.Stabellini@eu.citrix.com \ --cc=ddutile@redhat.com \ --cc=jeremy@goop.org \ --cc=johnstul@us.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=sheng@linux.intel.com \ --cc=stefano@stabellini.net \ --cc=xen-devel@lists.xensource.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.