From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH 2/3] x86/watchdog: Tweak implementation
 given new common code.
Date: Mon, 12 Aug 2013 14:54:38 +0100
Message-ID: <5208E91E.8050105@citrix.com>
References: <1376314680-12548-1-git-send-email-andrew.cooper3@citrix.com>
	<1376314680-12548-3-git-send-email-andrew.cooper3@citrix.com>
	<5209041902000078000EB394@nat28.tlf.novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Andrew.Cooper3@citrix.com>) id 1V8sa2-0003PS-69
	for xen-devel@lists.xenproject.org; Mon, 12 Aug 2013 13:54:42 +0000
In-Reply-To: <5209041902000078000EB394@nat28.tlf.novell.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Jan Beulich <JBeulich@suse.com>
Cc: xen-devel <xen-devel@lists.xenproject.org>, Keir Fraser <keir@xen.org>, Tim Deegan <tim@xen.org>
List-Id: xen-devel@lists.xenproject.org

On 12/08/13 14:49, Jan Beulich wrote:
>>>> On 12.08.13 at 15:37, Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>> --- a/xen/arch/x86/nmi.c
>> +++ b/xen/arch/x86/nmi.c
>> @@ -419,6 +419,9 @@ int __init watchdog_setup(void)
>>  {
>>      unsigned int cpu;
>>  
>> +    if ( !opt_watchdog )
>> +        return 0;
>> +
>>      /*
>>       * Activate periodic heartbeats. We cannot do this earlier during 
>>       * setup because the timer infrastructure is not available.
> This and the last hunk below look pretty pointless, i.e. in fact the
> patch could consist of just the middle one.
>
> Jan

I had intended to do more with it, but it turned out I couldn't

I shall drop it down to just the middle hunk.

~Andrew

>
>> @@ -435,8 +438,7 @@ void nmi_watchdog_tick(struct cpu_user_regs * regs)
>>  {
>>      unsigned int sum = this_cpu(nmi_timer_ticks);
>>  
>> -    if ( (this_cpu(last_irq_sums) == sum) &&
>> -         !atomic_read(&watchdog_disable_count) )
>> +    if ( (this_cpu(last_irq_sums) == sum) && watchdog_enabled() )
>>      {
>>          /*
>>           * Ayiee, looks like this CPU is stuck ... wait for the timeout
>> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
>> index c550e8e..2d1edb5 100644
>> --- a/xen/arch/x86/setup.c
>> +++ b/xen/arch/x86/setup.c
>> @@ -1310,8 +1310,7 @@ void __init __start_xen(unsigned long mbi_p)
>>  
>>      do_initcalls();
>>  
>> -    if ( opt_watchdog ) 
>> -        watchdog_setup();
>> +    watchdog_setup();
>>  
>>      if ( !tboot_protect_mem_regions() )
>>          panic("Could not protect TXT memory regions\n");
>> -- 
>> 1.7.10.4
>
>