From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7194BC433DF for ; Tue, 16 Jun 2020 13:26:18 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4BC432098B for ; Tue, 16 Jun 2020 13:26:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BC432098B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jlBb2-00072s-A9; Tue, 16 Jun 2020 13:25:48 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jlBb1-00072n-5c for xen-devel@lists.xenproject.org; Tue, 16 Jun 2020 13:25:47 +0000 X-Inumbo-ID: e25c7580-afd4-11ea-bb8b-bc764e2007e4 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e25c7580-afd4-11ea-bb8b-bc764e2007e4; Tue, 16 Jun 2020 13:25:45 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 47880AEF9; Tue, 16 Jun 2020 13:25:48 +0000 (UTC) Subject: Re: [PATCH 1/1] x86/acpi: Use FADT flags to determine the PMTMR width To: =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Grzegorz Uriasz References: <6b921b43-03f6-448c-297e-8c8f041eea2a@suse.com> <20200616103204.GN735@Air-de-Roger> From: Jan Beulich Message-ID: Date: Tue, 16 Jun 2020 15:25:42 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200616103204.GN735@Air-de-Roger> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: artur@puzio.waw.pl, Wei Liu , jakub@bartmin.ski, Andrew Cooper , marmarek@invisiblethingslab.com, j.nowak26@student.uw.edu.pl, xen-devel@lists.xenproject.org Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" On 16.06.2020 12:32, Roger Pau Monné wrote: > On Tue, Jun 16, 2020 at 10:07:05AM +0200, Jan Beulich wrote: >> On 14.06.2020 16:36, Grzegorz Uriasz wrote: >>> --- a/xen/arch/x86/acpi/boot.c >>> +++ b/xen/arch/x86/acpi/boot.c >>> @@ -480,7 +480,10 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) >>> if (fadt->xpm_timer_block.space_id == >>> ACPI_ADR_SPACE_SYSTEM_IO) { >>> pmtmr_ioport = fadt->xpm_timer_block.address; >>> - pmtmr_width = fadt->xpm_timer_block.bit_width; >>> + if (fadt->flags & ACPI_FADT_32BIT_TIMER) >>> + pmtmr_width = 32; >>> + else >>> + pmtmr_width = 24; >> >> I think disagreement of the two wants logging, and you want to >> default to using the smaller of the two (or even to ignoring the >> timer altogether). Then there wants to be a way to override >> (unless we already have one) our defaulting, in case it's wrong. > > TBH, I presume timer_block will always return 32bits, because that's > the size of the register. Then the timer can implement less bits than > the full size of the register, and that's what gets signaled using the > ACPI flags. What we care about here is the number of bits used by the > timer, not the size of the register. > > I think we should only ignore the timer if pm_timer_block.bit_width < > pmtmr_width. > > Printing a (debug) message when those values disagree is fine, but I > bet it's going to trigger always when the implemented timer is only > using 24bits. The 2nd system I tried on would trigger it, so maybe there's no point in logging indeed. How about the below as a basis? Jan --- unstable.orig/xen/arch/x86/acpi/boot.c +++ unstable/xen/arch/x86/acpi/boot.c @@ -480,7 +480,9 @@ static int __init acpi_parse_fadt(struct if (fadt->header.revision >= FADT2_REVISION_ID) { /* FADT rev. 2 */ if (fadt->xpm_timer_block.space_id == - ACPI_ADR_SPACE_SYSTEM_IO) { + ACPI_ADR_SPACE_SYSTEM_IO && + (fadt->xpm_timer_block.access_width == 0 || + fadt->xpm_timer_block.access_width == 3)) { pmtmr_ioport = fadt->xpm_timer_block.address; pmtmr_width = fadt->xpm_timer_block.bit_width; } @@ -492,8 +494,10 @@ static int __init acpi_parse_fadt(struct */ if (!pmtmr_ioport) { pmtmr_ioport = fadt->pm_timer_block; - pmtmr_width = fadt->pm_timer_length == 4 ? 24 : 0; + pmtmr_width = fadt->pm_timer_length == 4 ? 32 : 0; } + if (pmtmr_width > 24 && !(fadt->flags & ACPI_FADT_32BIT_TIMER)) + pmtmr_width = 24; if (pmtmr_ioport) printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x (%u bits)\n", pmtmr_ioport, pmtmr_width); --- unstable.orig/xen/arch/x86/time.c +++ unstable/xen/arch/x86/time.c @@ -465,7 +465,7 @@ static s64 __init init_pmtimer(struct pl u64 start; u32 count, target, mask = 0xffffff; - if ( !pmtmr_ioport || !pmtmr_width ) + if ( !pmtmr_ioport ) return 0; if ( pmtmr_width == 32 ) @@ -473,6 +473,8 @@ static s64 __init init_pmtimer(struct pl pts->counter_bits = 32; mask = 0xffffffff; } + else if ( pmtmr_width != pts->counter_bits ) + return 0; count = inl(pmtmr_ioport) & mask; start = rdtsc_ordered();