From nobody Sat Jul 4 21:04:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1782984570; cv=none; d=zohomail.com; s=zohoarc; b=NfPrPCQjFsogZ91GTEwXWrTtcWVtpuoW8BEXiTplrSI/tmpjGR376IW9Pi7xzs2otcsILRIrYQpY8mKQ4J/S1EUCCzMeHCv799aHDrtpkhX6/Lh3KlBtiPbp3hanLX/owQNPtDCHHSJ7e3Suyx/CcuYelDmPNwYCOAv2CQK1AFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782984570; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rNeLuZWOoZ4GW+Y/apOrOAS/S2cqMXKJ1Ia6qOHbnNw=; b=cX/xl0N7k748N6LqInxcr2GknSmMloQrae4nsHERfqb9dgA7LCSW9ZXrZ23h1gXAZWCnbILUO2uxFuzWE+SPToa3EfdTMke0Ql7jesoWpXHQluiW8O+1LcBLIWpEHMO0MNtN8sPT2jdFGbMAhE3EpQUoYAI5K1jH/PCHug9bDtA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1782984570614852.7262294173959; Thu, 2 Jul 2026 02:29:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1351462.1608627 (Exim 4.92) (envelope-from ) id 1wfDjO-00066v-Pu; Thu, 02 Jul 2026 09:29:14 +0000 Received: by outflank-mailman (output) from mailman id 1351462.1608627; Thu, 02 Jul 2026 09:29:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDjO-00066o-NA; Thu, 02 Jul 2026 09:29:14 +0000 Received: by outflank-mailman (input) for mailman id 1351462; Thu, 02 Jul 2026 09:29:14 +0000 Received: from mx.expurgate.net ([195.190.135.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDjN-00066b-Uv for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 09:29:14 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wfDjM-005BD9-KF for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 11:29:12 +0200 Received: from [10.42.69.6] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a462f63-e002-0a2a0a5209dd-0a2a4506c242-26 for ; Thu, 02 Jul 2026 11:29:12 +0200 Received: from [209.85.128.45] (helo=mail-wm1-f45.google.com) by tlsNG-16d1c6.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a462f68-08de-0a2a45060019-d155802dad8f-3 for ; Thu, 02 Jul 2026 11:29:12 +0200 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-490b1bbcf3aso8765275e9.1 for ; Thu, 02 Jul 2026 02:29:12 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493c635c41dsm63880115e9.5.2026.07.02.02.29.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jul 2026 02:29:11 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1782984552; x=1783589352; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=rNeLuZWOoZ4GW+Y/apOrOAS/S2cqMXKJ1Ia6qOHbnNw=; b=dPTCulflmz29SUvLuAyoL9rb09+33MWaPtqhhbTXGygS2qWs+D8SssEKau4kxE2Weh 82y1NM01KcSlYbeDpX6LI98rR8Vpbo79sjvP2bOcl8Subd5vDtcMB5VNjBFZMsHsx4Qt meIT2xSEAzQmvKcBrtZA25+DvU/7mWYOQo65RDza3x5YR8MhHfKLxtBteZaFGbfRhfkF EUxzDbllchRTUNu5cSszAcJpMidkgsdAgC5RnDu0v1Z0aJvkVtCuAKW1/gBh+7/rp9ad vEUMmMdL29/LS3y2AqX72VAH2W/A5sR8BdCAOUj4Ghmb/dw0H8c6qh8ubDGKCc0jUy/a bnNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782984552; x=1783589352; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rNeLuZWOoZ4GW+Y/apOrOAS/S2cqMXKJ1Ia6qOHbnNw=; b=Hzxw6qIVm5bGnoCod8G1LQ9heHJ07qnBwr1XZPffN8VSSvve2aqvj8XqQcWq+9tTDu 30AN4kejaYoM2y1wwfGxM7d0E/ljMMxZOkF/yNaLxS0cSfXaV6SNTaGYdsmfnPJNiGDa p5rSJeTJxerS7cnwGPQZq4+iedeCOLtPUapwCJdHOhdnb3u2/TjRQeWRRDtzhvbL8oNx BV1cIqRToUOv3kFk/BfUj1su1d5r5S2NQTelJfVmCKW9M/t74rcmW6ON3+6bnCQU8X/n V+6QZwk8OVmfd2ahDsMg8mcuKZ+r/GNdJQsN2vU9u1566PGnn3yRHqCa1jZfJMPl3KQE PkXw== X-Gm-Message-State: AOJu0Yx4aqNsnHYTWXPLLvxxh3N6w0iqVXtraJG0Bf1GbxcZMdwTo9PA IFPVI5255M//FK8UncNlyVQXqlwrskblrkcFy4WVN3c/NteQfHh7NO/BuIoXEvIUv/N2ogTFvjE 0IrIv2w== X-Gm-Gg: AfdE7cmzOvkoYMCifM3PsjrPV16GXdQWSmab6gywP4hFOzWy15uRcwDm/KFfGJRXQaY WNFVSj55V5lO5WUExrCxL0XUuzjebZuJYezMfvH2krJW5k+aYD6Hp2+YV6XQVDiH9Y899noFB/C 0rjkaEx72iDIJzHyxFkzjQI9SS3+d4F+Bn6p+hbpF/jvsd8w0KMpMYGHH3XVySMkwr+ZrZamZ/+ lOEKHXMBJHSnBlgrgdlWIhLTyLn9+DOgiBreHK16QW03dviyCJqYNwTiL0yx52ZObEcXlntjtTd jh4p2C2ZvWn+UyEzbMqIjpQU0QHqITdCDJ/ySu9A8hT4XgX0C5FYT2wr7SLlAbnysvHyr/iTAp9 OPE8nufsIAL598tt1ZoFWFVW0bSpq3y2l7Aa/ceSHM9KTxS+gfQ34+rBYj2+b1xFcFfS4NcpW47 wYMcftefALdTBUzZZZxZtZf1PqYSxUSeMzpPRICWJHTeRE/A9iancQ49+krzosTgEJ7Q/fkW7Sw P/DBMpjsoPW7CY= X-Received: by 2002:a05:600c:1f84:b0:492:63c3:8eeb with SMTP id 5b1f17b1804b1-493c2ba53e4mr72531165e9.35.1782984551966; Thu, 02 Jul 2026 02:29:11 -0700 (PDT) Message-ID: <5945d8f4-aece-4572-8e89-60408dd7ac32@suse.com> Date: Thu, 2 Jul 2026 11:29:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 1/4] x86/time: CMOS RTC may run in binary mode From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-16d1c6/1782984552-C453168D-9984B018/0/0 X-purgate-type: clean X-purgate-size: 3621 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1782984571439158500 Content-Type: text/plain; charset="utf-8" Indicating it would always use BCD mode is just wrong (and then the comment there said the opposite). All halfway recent (and really all 64- bit capable) systems having a CMOS RTC should properly indicate the mode in control register B. Make use of the flag, but provide a fallback mechanism in case people run into systems not matching the above assumption. Additionally, when binary mode is indicated and when "cmos-rtc-probe" is in use (but "cmos-rtc-bcd" isn't), probe whether the clock really runs in binary mode. (This probing, sadly, can take up to 10 seconds.) Signed-off-by: Jan Beulich --- v2: New. --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -339,6 +339,14 @@ parameter to "stable:socket". Specify the event count threshold for raising Corrected Machine Check Interrupts. Specifying zero disables CMCI handling. =20 +### cmos-rtc-bcd (x86) +> `=3D ` + +> Default: `false` + +Flag to indicate the CMOS Real Time Clock uses BCD mode irrespective of +control register B indicating binary mode. + ### cmos-rtc-probe (x86) > `=3D ` =20 --- a/xen/arch/x86/include/asm/mc146818rtc.h +++ b/xen/arch/x86/include/asm/mc146818rtc.h @@ -96,7 +96,6 @@ bool is_cmos_port(unsigned int port, uns =20 #ifndef RTC_PORT #define RTC_PORT(x) (0x70 + (x)) -#define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */ #endif =20 /* --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1250,6 +1250,9 @@ mktime (unsigned int year, unsigned int )*60 + sec; /* finally seconds */ } =20 +static bool __ro_after_init opt_cmos_rtc_bcd; +boolean_param("cmos-rtc-bcd", opt_cmos_rtc_bcd); + struct rtc_time { unsigned int year, mon, day, hour, min, sec; }; @@ -1285,7 +1288,7 @@ static bool __get_cmos_time(struct rtc_t if ( acpi_gbl_FADT.century && acpi_gbl_FADT.century < 0x80 ) century =3D CMOS_READ(acpi_gbl_FADT.century); =20 - bcd =3D RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY); + bcd =3D opt_cmos_rtc_bcd || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY); =20 spin_unlock_irqrestore(&rtc_lock, flags); =20 @@ -1353,6 +1356,48 @@ static bool __init cmos_rtc_probe(void) return false; } =20 +static inline bool __init attr_const is_bcd(unsigned int x) +{ + return (x & 0xf) < 10 && (x >> 4) < 10; +} + +static void __init cmos_rtc_probe_bcd(void) +{ + bool bcd; + unsigned long flags; + + if ( opt_cmos_rtc_bcd ) + return; + + spin_lock_irqsave(&rtc_lock, flags); + bcd =3D !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY); + spin_unlock_irqrestore(&rtc_lock, flags); + + if ( bcd ) + return; + + for ( unsigned int seclo =3D 0; ; ) + { + struct rtc_time rtc; + + if ( !__get_cmos_time(&rtc) || + !is_bcd(rtc.sec) || + !is_bcd(rtc.min) || + !is_bcd(rtc.hour) || + !is_bcd(rtc.day) || + !is_bcd(rtc.mon) ) + return; + + if ( seclo > (rtc.sec & 0xf) ) + break; + + seclo =3D rtc.sec & 0xf; + } + + printk(XENLOG_WARNING "CMOS RTC indicates binary mode but uses BCD\n"); + + opt_cmos_rtc_bcd =3D true; +} =20 static unsigned long cmos_rtc_read(void) { @@ -1614,6 +1659,10 @@ static void __init probe_wallclock(void) if ( cmos_rtc_probe() ) { wallclock_source =3D WALLCLOCK_CMOS; + + if ( opt_cmos_rtc_probe ) + cmos_rtc_probe_bcd(); + return; } if ( efi_enabled(EFI_RS) && efi_get_time() ) From nobody Sat Jul 4 21:04:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1782984632; cv=none; d=zohomail.com; s=zohoarc; b=NjfdPtJNIveFBXtRihtGIA+9/lXONyWWePWgf6H8kMaGIrZ9jjZ5weDZOM/ZtLvhK5r9MNAQcOLgA75TMI21oN486K2iMhNTFYDcn320BSl691YxWxhPetY5h6cbBS9fUQP6fgvBSdEMwmk4V0aTo5/ZLW1jBiofJcNJukOHr60= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782984632; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jsZGfw5l+d7+WFu2XU7K4eUza6w7rx46SRYGAdrvpLc=; b=Dw/dbswXM6IhPnmYcQUPqx3rhVN3Uw45R3qcVtm0PmLRHLZHMJxEWzH7C6XFju+HTpxRkRHzmo5J3GsCD4lSZGju3qGroF083dlU7GEIjFlGv/hX8WcHu4tbb+Par5fFJLGF8Glxc0XO0VUt7gKbJnyCZ17zMgj3e3dU2/XsCbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1782984632819409.58510389687603; Thu, 2 Jul 2026 02:30:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1351469.1608637 (Exim 4.92) (envelope-from ) id 1wfDkP-0007aY-4P; Thu, 02 Jul 2026 09:30:17 +0000 Received: by outflank-mailman (output) from mailman id 1351469.1608637; Thu, 02 Jul 2026 09:30:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDkP-0007aN-0I; Thu, 02 Jul 2026 09:30:17 +0000 Received: by outflank-mailman (input) for mailman id 1351469; Thu, 02 Jul 2026 09:30:16 +0000 Received: from mx.expurgate.net ([195.190.135.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDkO-0007aE-Ed for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 09:30:16 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wfDkN-005BnN-R1 for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 11:30:15 +0200 Received: from [10.42.69.4] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a462fa0-bab6-0a2a0a5309dd-0a2a4504a8e6-34 for ; Thu, 02 Jul 2026 11:30:12 +0200 Received: from [209.85.128.43] (helo=mail-wm1-f43.google.com) by tlsNG-ebf023.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a462fa4-a01d-0a2a45040019-d155802be9da-3 for ; Thu, 02 Jul 2026 11:30:12 +0200 Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-493c5220cb7so6126625e9.3 for ; Thu, 02 Jul 2026 02:30:12 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477ddf0fb15sm6408144f8f.29.2026.07.02.02.30.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jul 2026 02:30:11 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1782984612; x=1783589412; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=jsZGfw5l+d7+WFu2XU7K4eUza6w7rx46SRYGAdrvpLc=; b=RToPEnpl+ShX+B34QkEWrW7wgJk3lnxFeiB6C/7RLRpgjo+hzITy+QrVKv2anq+ut0 kIdX6f9zk5vzoqBXRLPOvCSo3U1WPjUarTAlah6V1EI5JiHGEFmewFzMO0ddl/a/3TtC E3vXmB2k8nF695Gey3/KkdP8PvoK6NF/eIKivq7iTZFZAB8n41x3l2+Gx8lAMlh7MAvZ iXpJD1RS7TpI++Weh4Unb/Yx79nIz8KjP1HpuKCX29V9MDYN6QtbmAynJcIhbp5GVIH3 tTW/OeH8KmOE2m4j26yzZAv6ElB840ql3lVfzqoIKCa8GJZzPAqjRjKi3+nPjN+ZRllu Evhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782984612; x=1783589412; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jsZGfw5l+d7+WFu2XU7K4eUza6w7rx46SRYGAdrvpLc=; b=TWrocYTEor473Qd9cwemBwbKpKesE3b4rCRTXT5dbs1V8clPslAGcbezDxOnMAea0A 3kl5djXHb8WxiVUu0ql5AP2+B0+USRwhejJVdfiTfs7Jouu9/JpteGwGU8XJCHCWxI1y mbnmdJJLfQ2NXKllAPrX4P8YFEgiJ6FeA5q+VT4fyb4Xi9Ad7nsae40LevkGVnYzh1To r8ekhkI8oVDdsO4BTCIGbrfje/bTVd1X4GDjAiKQno+wDI4EgOqwMCHyYkYDud45p9UF dajQD3WY2eMZu3AO0KBt88Qy7E1Ffaqlsvv/i9YMW25TH0ZaLq9NJnXA2cooWPWLoQM0 nGFQ== X-Gm-Message-State: AOJu0YzI3lfy4fuDrvXLKW86EBvFcZJlElamP0QUVRX1MtK9oC78Vqaf l2FDGtK/N6+xPFaeEB/iKIuP7/abbn3ZGRQu0FnMm7oJaHf/ASs/n4E67Vy8TCrbdbn0OOnep95 9EqU1jQ== X-Gm-Gg: AfdE7cl/UNXC2UXQ/FphH52xBVCWDKZhP4F2kgvb/W34dtE/PR2BI1Kdas0PfYZDTNF tnK9unBZHyIDFqSFtr5dmQPmkJQFFBqlO98gxVoxDDPx9LCgSAPG/F8+NWGsAOIih7k+jL4swG/ ogg1yB2BaTk12Qi0aqDyruh2m5SMP2snNd0jQRTp+UtZikhAI8dluGMqlHivfILqFys2Oxdj3Kc nzDoIuEJhVL2ytCCkNwDTo5df8UkSY4EI1LQB3xDLpI7SJY9nwicuFrQL7/VzoUBqD3OhGg8Q8G 32ycbMb8gXJ+VbYOioF76n4+Bo4Yf4cC529AQAm8byzc05fEEUII5HRq3q1M1TSjESQW55XQqoe ImhxPDZGut5zYi2jtVHBcufjcjWJXZLGbZenVMMVfdhpG+kQLI12iqScsvL/LXowHraYvQnxhG8 1nPGKHKpN9B9ZZPM5zte+TzPd89VOcHUWphAwJqU11XTEHwvhIR/0wSWe+q3af3lUqTS3uj0+5W 4iTS6VxKQr+yZI= X-Received: by 2002:a05:600d:15a:10b0:493:b92d:9166 with SMTP id 5b1f17b1804b1-493c3cdb264mr46373155e9.12.1782984611990; Thu, 02 Jul 2026 02:30:11 -0700 (PDT) Message-ID: <7bed7164-9a53-4e53-9fc1-7af68108bdf8@suse.com> Date: Thu, 2 Jul 2026 11:30:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 2/4] time: shorten year determination loop From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , Anthony PERARD , Michal Orzel , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-ebf023/1782984612-AE3371CC-6FE7A245/0/0 X-purgate-type: clean X-purgate-size: 1420 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1782984633593158500 Content-Type: text/plain; charset="utf-8" For dates very far into the future (the MC146818 RTC's century byte can go up to the 99th century), the present year-wise loop would become somewhat inefficient (taking perhaps several thousand iterations). Prefix that loop with a 400-year granular calculation (somewhat like the earlier loop does for dates in the past). Signed-off-by: Jan Beulich --- v2: New. --- a/xen/common/time.c +++ b/xen/common/time.c @@ -27,6 +27,8 @@ #define __isleap(year) \ ((year) % 4 =3D=3D 0 && ((year) % 100 !=3D 0 || (year) % 400 =3D=3D 0)) =20 +#define DAYS_IN_400_YEARS (365 * 303 + 366 * 97) + /* How many days are in each month. */ static const unsigned short int __mon_lengths[2][12] =3D { /* Normal years. */ @@ -57,7 +59,7 @@ struct tm gmtime(unsigned long t) while ( t & (1UL<<39) ) { y -=3D 400; - t +=3D ((unsigned long)(365 * 303 + 366 * 97)) * SECS_PER_DAY; + t +=3D (unsigned long)DAYS_IN_400_YEARS * SECS_PER_DAY; } t &=3D (1UL << 40) - 1; #endif @@ -71,6 +73,11 @@ struct tm gmtime(unsigned long t) tbuf.tm_sec =3D rem % 60; /* January 1, 1970 was a Thursday. */ tbuf.tm_wday =3D (4 + days) % 7; + if ( days >=3D DAYS_IN_400_YEARS ) + { + y +=3D (days / DAYS_IN_400_YEARS) * 400; + days %=3D DAYS_IN_400_YEARS; + } while ( days >=3D (rem =3D __isleap(y) ? 366 : 365) ) { ++y; From nobody Sat Jul 4 21:04:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1782984669; cv=none; d=zohomail.com; s=zohoarc; b=RT8DYmvCdilDZ9P3F8ttQurReKcbeynKW+yHqKDnnju9zi42wujq4p0JndzpJu3sVLuSO30Bg30DNFfA60QOjRqHMcSG1SJH433EXEjzNhNAt4MYes8Mg5KFAsk/IjVYsy30nhCIDklMq4DZGoFi/N3/ev9FMhMKyQKHxkgRu8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782984669; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mJ8woLo45Zcyjbsvy9U/vb99ZvZrS30qykRl4pv4VUo=; b=gy+006hov1MVkefAp/Eb4vIEtsyluN0z4WCKlwlpZbK0/aAwZB/MxeyVh3kYre0Eg6oJoWXB1EpZjnPCc3Ir5R12xOesryQckBjOO6nqrJLNdxYVUGLHx6tYKkiolW4BbvVcRqBhS1XEHM/lixLkYikXr9FSKRxbPTXIBSHHNs8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1782984669953338.83088356163546; Thu, 2 Jul 2026 02:31:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1351475.1608645 (Exim 4.92) (envelope-from ) id 1wfDkt-00085C-DP; Thu, 02 Jul 2026 09:30:47 +0000 Received: by outflank-mailman (output) from mailman id 1351475.1608645; Thu, 02 Jul 2026 09:30:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDkt-000855-9z; Thu, 02 Jul 2026 09:30:47 +0000 Received: by outflank-mailman (input) for mailman id 1351475; Thu, 02 Jul 2026 09:30:46 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDks-00083f-3u for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 09:30:46 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wfDkr-007LhY-Cd for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 11:30:45 +0200 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a462fc1-bab6-0a2a0a5309dd-0a2a4502b084-16 for ; Thu, 02 Jul 2026 11:30:45 +0200 Received: from [209.85.128.50] (helo=mail-wm1-f50.google.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a462fc5-5a27-0a2a45020019-d1558032adc5-3 for ; Thu, 02 Jul 2026 11:30:45 +0200 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-490b1bbcf3aso8774945e9.1 for ; Thu, 02 Jul 2026 02:30:45 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dba3csm7260779f8f.3.2026.07.02.02.30.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jul 2026 02:30:44 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1782984645; x=1783589445; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=mJ8woLo45Zcyjbsvy9U/vb99ZvZrS30qykRl4pv4VUo=; b=Q4s5MUdwPvZbit11Oh/C7jQJ3+6m/gTLzOdJffKS7a8n2/PW6GAIdgb9Rr/NLoGjlf dXqTN2ne+UGxxkJNoAWSj4Z63AZJqhjdcaf4FusnalTgLwNhBwRxm5HfQoJQTroVkyZi UMRW29BTNChWQ9JH73WLCK8q7JPIcZrdUuK6GBxkV4Q5kZonHWJHQDtS3XWjWveQ6bal Xq9wMDru9EDoDALfd4zD8GfQnPbZfGbavqMkb5HwYqaqCFKBPIAfhDk2Ocryw7N3vNoO U+ywn5AVaQX/2gHTNWv1XJE71TFsyGVMCH//ftqqos8cH60xDVj84vziMloLwb85sm+B 9sDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782984645; x=1783589445; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mJ8woLo45Zcyjbsvy9U/vb99ZvZrS30qykRl4pv4VUo=; b=fUspJIK95nB5LEBp2zlcIyTv1fCzE21GwwhewORGEEtHzdW3iWLlCW4xYKtJFvNM0p TPPyAUFEw8BqyLmRZe034tIpFxVImUGSCrw/lXH33mcWJ6uA5uHaFob+O7zFLvzE8a2q O3Py5NrMV4onefAYJNGgTV8SCeOGWKpNBgjxBBcXUWLxeWy8iHmyzxTriZBL8/fKqZ2O QWoAvaGQt7X/l28l4cV2oF1vXeGM0Y2EoK6H2ceThN1zsA3Uq4qFMdaoOFSQMuc6yIAm A4eItt3D3eDJyqvNxKuAnGpmlVuXR6ac09ryboP96bclhRHNHegNViGwqj5dEWC7eAy0 3kjQ== X-Gm-Message-State: AOJu0YxYuC+q01aM/HcW7P4zOrxaijUT0+NGQNjVVxYW5Uecq0F51PHm +Zwyy71G1PkIrADda0xHEecr4W4RVZze3Cmebd05Sw7MXJehR3iSQNTBYeV1lb20uG90Eph0Bf/ wVAS4Nw== X-Gm-Gg: AfdE7ck7825InuIJNxMkUjkMy0eU0mmsR5Yc9oH4JsU/RlGwrNSTgXnSXfAoS+g9LZ3 1Gb2sKWMgg/+UmRtoFOSlgvLisKrA1dC0guBrNYfF4wgUcT4lxgIVO1n7Qac3Tn6GBv0Xltk913 71P1hYvmeuOKAONbfr55wL8jivxViQ12bmDoJtp0TJTaDTsHWBGW866f5tQ388bmoe3wrSrjLFJ 7BYk5qPJzx7rSbU8MD8yvKzABjrDq8Hwk8GPo8Q3aIaS2+u9uor7rZksyHx9HUyVgUK1rvTHPhH MswHyTIgTFiVnJXuhh58r8UW5J0hZBK6FGG2J/WybfmTe2ErUw3TFAE44D12zrR2sXJLFj1esOc WK9Fhry5dOJGRwC9z/BCIvrWnF0nDAR0pxSQPqeEsV/OSXgEy2ufEZkTc0TDruGIjveqRVe3ZBH X5cfKTiDM1N6Wa2+bbbeof6Qw7esELRBoTI+XY+EMrXwLuTaF1C+nIROm8M0AuVZQJl0iJs/pfa Pz7Xs87UVGuw/g= X-Received: by 2002:a05:600d:8649:10b0:490:44eb:c1ea with SMTP id 5b1f17b1804b1-493c2b905d3mr60498205e9.24.1782984644789; Thu, 02 Jul 2026 02:30:44 -0700 (PDT) Message-ID: Date: Thu, 2 Jul 2026 11:30:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 3/4] x86/vRTC: the use_timer field is a boolean one From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-720697/1782984645-545187C5-63C8DB66/0/0 X-purgate-type: clean X-purgate-size: 1382 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1782984672414154100 Content-Type: text/plain; charset="utf-8" ... and hence wants to be of bool type. Signed-off-by: Jan Beulich --- v2: New. --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -186,7 +186,7 @@ static void check_update_timer(RTCState if (!(s->hw.cmos_data[RTC_REG_C] & RTC_UF) && !(s->hw.cmos_data[RTC_REG_B] & RTC_SET)) { - s->use_timer =3D 1; + s->use_timer =3D true; guest_usec =3D get_localtime_us(d) % USEC_PER_SEC; if (guest_usec >=3D (USEC_PER_SEC - 244)) { @@ -214,7 +214,7 @@ static void check_update_timer(RTCState } } else - s->use_timer =3D 0; + s->use_timer =3D false; } =20 static void cf_check rtc_update_timer(void *opaque) @@ -673,7 +673,7 @@ static uint32_t rtc_ioport_read(RTCState break; case RTC_REG_A: ret =3D s->hw.cmos_data[s->hw.cmos_index]; - if ((s->use_timer =3D=3D 0) && update_in_progress(s)) + if ( !s->use_timer && update_in_progress(s) ) ret |=3D RTC_UIP; break; case RTC_REG_C: --- a/xen/arch/x86/include/asm/hvm/vpt.h +++ b/xen/arch/x86/include/asm/hvm/vpt.h @@ -106,7 +106,9 @@ typedef struct RTCState { s_time_t check_ticks_since; int period; uint8_t pt_dead_ticks; - uint32_t use_timer; + + bool use_timer; + spinlock_t lock; } RTCState; From nobody Sat Jul 4 21:04:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1782984692; cv=none; d=zohomail.com; s=zohoarc; b=CstfL/H8Ze7PHLewrp52twarn+l1KK/q5akGj2/AqzdE6gP4fofXzaf7Z0LdJGnsZYbVQzQi84MZu3zGdDKjVemU0PC78AACnWXDwzcP6axdKiwLq1u27ezWpgY37ppfNRoTSL85Ir+KC3Ft93bJFgP/DuIbRqTT/skrIye4DAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782984692; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DyaH8jfrEj4hQ9whXJcni+qiFjc9whuT9c1Kf2l86fU=; b=R3Bb2y0letwOmDVgL6ibpObNPDPr7Rj6QUE34GAodQGq5kiVUV6ogc13StujuD4g8wngZEfs5VEbxj+KE3GGXw4u7FUQScOb04IgLSuiJZ66SPfTwbmGw8DAbkiGqLooqNg4i5lgz78nersRHizk0YCqBGu2Ht/rGaxbP71yqSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1782984692691955.4000373991308; Thu, 2 Jul 2026 02:31:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1351486.1608653 (Exim 4.92) (envelope-from ) id 1wfDlO-0000Ck-L8; Thu, 02 Jul 2026 09:31:18 +0000 Received: by outflank-mailman (output) from mailman id 1351486.1608653; Thu, 02 Jul 2026 09:31:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDlO-0000Cd-Hw; Thu, 02 Jul 2026 09:31:18 +0000 Received: by outflank-mailman (input) for mailman id 1351486; Thu, 02 Jul 2026 09:31:17 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wfDlN-0000CK-5O for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 09:31:17 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wfDlM-007Lzy-IA for xen-devel@lists.xenproject.org; Thu, 02 Jul 2026 11:31:16 +0200 Received: from [10.42.69.5] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a462fdd-5cb7-0a2a0a5109dd-0a2a4505d4b2-18 for ; Thu, 02 Jul 2026 11:31:16 +0200 Received: from [209.85.128.48] (helo=mail-wm1-f48.google.com) by tlsNG-c201ff.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a462fe4-3cb2-0a2a45050019-d1558030a59c-3 for ; Thu, 02 Jul 2026 11:31:16 +0200 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4938d5f86f3so3223875e9.1 for ; Thu, 02 Jul 2026 02:31:16 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-477db3dbacbsm7498135f8f.4.2026.07.02.02.31.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jul 2026 02:31:15 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=suse.com header.i="@suse.com" header.h="Content-Transfer-Encoding:In-Reply-To:Autocrypt:Content-Language:References:Cc:To:From:Subject:User-Agent:MIME-Version:Date:Message-ID" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1782984676; x=1783589476; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=DyaH8jfrEj4hQ9whXJcni+qiFjc9whuT9c1Kf2l86fU=; b=XpA/o+iuXdyhPnXCCcO+7ch6FVt+jyEjvPZyqNAWDcDfcobpbka3o0RigzWSJGPWZW JieXBXo5q3v4YLqpS1YT2/109/3pSBPKmraMZEVITm+t3VBSw9s79pxAU5OGISXKCzM1 nJ3fgYdrR8Mmomg3jrlFriBO/mXuLcd8l/sc6GB+tRqB0Rh6+y3xbO7n7TMwHlsm0tao B4omRz/jKicjb5fxS9tX0VYYKp5o63Eu33u3XBe2fZKYR3B1UvqgRWzLaQZeSF087tn6 V6SSK5zMDEwxDkI3gUH6zlP5+o2rnvTzaKq13CtXUBhIttK2cSdvAhF+kQm9EJWP2qtF LaUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782984676; x=1783589476; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DyaH8jfrEj4hQ9whXJcni+qiFjc9whuT9c1Kf2l86fU=; b=O+Y2hvc1SkcKxsy5SHrNBby88xs7KD+OfE6jcllmW2arFAVwHLC4gMAaaCMMwWeYfD FYfWoB1qVhb+ax4SkFppY7rEz5dyTGKjBA6GCiV/W8GxCf+sElfitkaTvuYNpa8NzDYU 2cmVEYU1/soRYh0HCIXc4Lj0YNSmPnTFj++2jrkEvo6WCY7yHU0sfOb1OFRjNhKZaYXL NTC3UNkXm5IKssO+lqsPTzB8AHWsChL6Dp+m1gjat1PDmJj+duryWH1lF6Rsuxm3qn5n mUm+InAhcB7NSOgErm7IyHaz8FwtwPgCQIs3Q2ydtMIpAl3Uf7wNiC5MkIC9APGP7oCE Qtsg== X-Gm-Message-State: AOJu0YxW29QbOA6ekOAMOE6M4oA7e0/Jg69PGsRbmJyCsmyfDplIlrWs 9GSzdELsWdNqUCl055DTKlk7CrXxKRRBJbTRx104BNkhGGaJ4iUtYGsTIU1CeSjmK9gUg7ESryV ENcY91g== X-Gm-Gg: AfdE7ck+3G8ILs6CtnYsiP/+qjZhB6/+18JkNCZWG8nlJyQZsjNBLbl9mZih/TFHea+ z9IQUjZkR9lJ+7UbjJ9U67kHaumTbUozB/3QjbY9hlVQ5bGYVMLjL42WG29PC8eU1EYFzVY2SKL 0oMeLhrf9CRzJ/i2ASAVWXVQkbsLm2MuP9L2X4295yrEoD60faxIKiBF6wG+MOJtnUHyjTXR8GD R0IaTdxf2NxoIc9M0rSPA903PW+713gIR7I0Dy+wVCNaQHHASGLnmXjNYkjjrIP81F9LTCqZ/NC xKJVIn16FVGKMZ/OSTeCl/dlWCYey+fJewJXX5kbMjwNy6dZ3u0zYhgQYHOQ7OxM5ZKCPxxr44+ Awdti1sqf/i6O8zZk0L2oZmSQHfx6oV7fG4Q4G6brWcFlmeHkF+L/Di9Yf3BF5YNDpparu/bSRH 3BTUB+QaSG1GL9UBWTk7p8clmsF7rM0I1om2ihBt/lkdczb4aQ10NfCo/ktQw6C65spxxmbQ/jd BeR X-Received: by 2002:a05:600c:3317:b0:490:55d9:149a with SMTP id 5b1f17b1804b1-493bc278166mr87474535e9.18.1782984675774; Thu, 02 Jul 2026 02:31:15 -0700 (PDT) Message-ID: Date: Thu, 2 Jul 2026 11:31:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 4/4] x86/vRTC: support century field From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <79d50725-3892-4643-b854-bfec9c0c0d79@suse.com> Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c201ff/1782984676-0FF1F2B8-7CD43C0D/0/0 X-purgate-type: clean X-purgate-size: 9785 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1782984694289154100 Content-Type: text/plain; charset="utf-8" Both ROMBIOS and SeaBIOS (with CONFIG_QEMU=3Dy, as we build it) blindly assume availability of this field (at its conventional index 0x32); OVMF at least has code to inspect FADT. Hence we ought to have supported it virtually forever. As the index is beyond RTC_CMOS_SIZE, leverage the padding field in struct hvm_hw_rtc to hold its value. Update the field only when involved values are valid BCD century specifiers. Otherwise (for VMs migrated in from an older hypervisor) leave handling to the DM. This makes the Linux rtc-cmos driver report y3k compatibility. In the new rtc_check(), besides checking the new fields also check the pre-existing pad0 field. While extending xen-hvmctx.c:dump_rtc() also add RTC offset there. Fixes: 4ca161214355 ("[HVM] Move RTC emulation into the hypervisor") Signed-off-by: Jan Beulich --- Am I overly paranoid with the checking of the field, considering that Xen 3.x post-dates year 2000 and hence all firmware nowadays usable guests have ever run with should have been aware of the field? Or am I, quite the opposite, still not strict enough? Now that we extend struct hvm_hw_rtc, should we perhaps save not only the century, but also its index? Likely more sanity checking could be added to rtc_check(), but that's for a separate patch imo. Isn't day-of-week handling flawed? If the field is brought out of sync with the other values, shouldn't it stay respectively out-of-sync? And isn't it excessive overhead to go through rtc_set_time() when the field is updated while SET is clear? Perhaps we ought to also support alarm day/month features? --- v2: Don't re-purpose pad0 field of struct hvm_hw_rtc. --- a/tools/libacpi/static_tables.c +++ b/tools/libacpi/static_tables.c @@ -33,6 +33,8 @@ struct acpi_20_facs Facs =3D { #define ACPI_PM_TMR_BLK_BIT_WIDTH 0x20 #define ACPI_PM_TMR_BLK_BIT_OFFSET 0x00 =20 +#define CMOS_CENTURY 0x32 /* Conventional index used also without ACPI */ + struct acpi_fadt Fadt =3D { .header =3D { .signature =3D ACPI_FADT_SIGNATURE, @@ -88,7 +90,9 @@ struct acpi_fadt Fadt =3D { .register_bit_width =3D ACPI_PM_TMR_BLK_BIT_WIDTH, .register_bit_offset =3D ACPI_PM_TMR_BLK_BIT_OFFSET, .address =3D ACPI_PM_TMR_BLK_ADDRESS_V1, - } + }, + + .century =3D CMOS_CENTURY, }; =20 struct acpi_20_rsdt Rsdt =3D { --- a/tools/misc/xen-hvmctx.c +++ b/tools/misc/xen-hvmctx.c @@ -311,7 +311,7 @@ static void dump_rtc(void) printf(" 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x, index= 0x%02x\n", r.cmos_data[8], r.cmos_data[9], r.cmos_data[10], r.cmos_data[11= ],=20 r.cmos_data[12], r.cmos_data[13], r.cmos_index); - + printf(" century 0x%02x offset %"PRId64"\n", r.century, r.rtc= _offset); } =20 static void dump_hpet(void) --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -482,16 +482,27 @@ static int rtc_ioport_write(void *opaque data &=3D 0x7f; s->hw.cmos_index =3D data; spin_unlock(&s->lock); - return (data < RTC_CMOS_SIZE); + return data < RTC_CMOS_SIZE || (s->has_century && data =3D=3D RTC_= CENTURY); } =20 - if ( s->hw.cmos_index >=3D RTC_CMOS_SIZE ) + switch ( s->hw.cmos_index ) { + case 0 ... RTC_CMOS_SIZE - 1: + orig =3D s->hw.cmos_data[s->hw.cmos_index]; + break; + + case RTC_CENTURY: + if ( s->has_century ) + { + orig =3D s->hw.century; + break; + } + fallthrough; + default: spin_unlock(&s->lock); return 0; } =20 - orig =3D s->hw.cmos_data[s->hw.cmos_index]; switch ( s->hw.cmos_index ) { case RTC_SECONDS_ALARM: @@ -507,6 +518,7 @@ static int rtc_ioport_write(void *opaque case RTC_DAY_OF_MONTH: case RTC_MONTH: case RTC_YEAR: + case RTC_CENTURY: /* if in set mode, just write the register */ if ( (s->hw.cmos_data[RTC_REG_B] & RTC_SET) ) s->hw.cmos_data[s->hw.cmos_index] =3D data; @@ -515,7 +527,10 @@ static int rtc_ioport_write(void *opaque /* Fetch the current time and update just this field. */ s->current_tm =3D gmtime(get_localtime(d)); rtc_copy_date(s); - s->hw.cmos_data[s->hw.cmos_index] =3D data; + if ( s->hw.cmos_index !=3D RTC_CENTURY ) + s->hw.cmos_data[s->hw.cmos_index] =3D data; + else + s->hw.century =3D data; rtc_set_time(s); } alarm_timer_update(s); @@ -591,7 +606,16 @@ static void rtc_set_time(RTCState *s) tm->tm_wday =3D from_bcd(s, s->hw.cmos_data[RTC_DAY_OF_WEEK]); tm->tm_mday =3D from_bcd(s, s->hw.cmos_data[RTC_DAY_OF_MONTH]); tm->tm_mon =3D from_bcd(s, s->hw.cmos_data[RTC_MONTH]) - 1; - tm->tm_year =3D from_bcd(s, s->hw.cmos_data[RTC_YEAR]) + 100; + tm->tm_year =3D from_bcd(s, s->hw.cmos_data[RTC_YEAR]); + if ( s->has_century ) + { + unsigned int century =3D s->hw.century; + + BCD_TO_BIN(century); + tm->tm_year +=3D century * 100 - epoch_year; + } + else + tm->tm_year +=3D 100; =20 after =3D mktime(get_year(tm->tm_year), tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); @@ -629,6 +653,12 @@ static void rtc_copy_date(RTCState *s) s->hw.cmos_data[RTC_DAY_OF_MONTH] =3D to_bcd(s, tm->tm_mday); s->hw.cmos_data[RTC_MONTH] =3D to_bcd(s, tm->tm_mon + 1); s->hw.cmos_data[RTC_YEAR] =3D to_bcd(s, tm->tm_year % 100); + + if ( s->has_century ) + { + s->hw.century =3D get_year(tm->tm_year) / 100; + BIN_TO_BCD(s->hw.century); + } } =20 static int update_in_progress(RTCState *s) @@ -663,13 +693,17 @@ static uint32_t rtc_ioport_read(RTCState case RTC_DAY_OF_MONTH: case RTC_MONTH: case RTC_YEAR: + case RTC_CENTURY: /* if not in set mode, adjust cmos before reading*/ if (!(s->hw.cmos_data[RTC_REG_B] & RTC_SET)) { s->current_tm =3D gmtime(get_localtime(d)); rtc_copy_date(s); } - ret =3D s->hw.cmos_data[s->hw.cmos_index]; + if ( s->hw.cmos_index !=3D RTC_CENTURY ) + ret =3D s->hw.cmos_data[s->hw.cmos_index]; + else + ret =3D s->hw.century; break; case RTC_REG_A: ret =3D s->hw.cmos_data[s->hw.cmos_index]; @@ -718,7 +752,8 @@ static int cf_check handle_rtc_io( *val =3D 0xff; return X86EMUL_OKAY; } - else if ( vrtc->hw.cmos_index < RTC_CMOS_SIZE ) + else if ( vrtc->hw.cmos_index < RTC_CMOS_SIZE || + (vrtc->has_century && vrtc->hw.cmos_index =3D=3D RTC_CENTURY= ) ) { *val =3D rtc_ioport_read(vrtc); return X86EMUL_OKAY; @@ -760,6 +795,32 @@ static int cf_check rtc_save(struct vcpu return rc; } =20 +static int cf_check rtc_check(const struct domain *d, hvm_domain_context_t= *h) +{ + const struct hvm_save_descriptor *desc =3D + (const struct hvm_save_descriptor *)&h->data[h->cur]; + struct hvm_hw_rtc s; + + if ( !has_vrtc(d) ) + return -ENODEV; + + if ( hvm_load_entry_zeroextend(RTC, h, &s) !=3D 0 ) + return -ENODATA; + + if ( s.pad0 ) + return -EINVAL; + + for ( unsigned int i =3D 0; i < ARRAY_SIZE(s.pad1); ++i ) + if ( s.pad1[i] ) + return -EINVAL; + + if ( desc->length >=3D endof_field(struct hvm_hw_rtc, century) && + ((s.century & 0xf) >=3D 10 || (s.century >> 4) >=3D 10) ) + return -EINVAL; + + return 0; +} + /* Reload the hardware state from a saved domain */ static int cf_check rtc_load(struct domain *d, hvm_domain_context_t *h) { @@ -793,12 +854,18 @@ static int cf_check rtc_load(struct doma check_update_timer(s); alarm_timer_update(s); =20 + if ( !s->hw.century ) + { + s->has_century =3D false; + s->hw.century =3D 0; + } + spin_unlock(&s->lock); =20 return 0; } =20 -HVM_REGISTER_SAVE_RESTORE(RTC, rtc_save, NULL, rtc_load, 1, HVMSR_PER_DOM); +HVM_REGISTER_SAVE_RESTORE(RTC, rtc_save, rtc_check, rtc_load, 1, HVMSR_PER= _DOM); =20 void rtc_reset(struct domain *d) { @@ -873,6 +940,12 @@ void rtc_init(struct domain *d) s->hw.cmos_data[RTC_REG_C] =3D 0; s->hw.cmos_data[RTC_REG_D] =3D RTC_VRT; =20 + /* + * By default we make the century byte available, unless an incoming s= ave + * record says otherwise. + */ + s->has_century =3D true; + s->current_tm =3D gmtime(get_localtime(d)); s->start_time =3D NOW(); =20 --- a/xen/arch/x86/include/asm/hvm/vpt.h +++ b/xen/arch/x86/include/asm/hvm/vpt.h @@ -109,6 +109,8 @@ typedef struct RTCState { =20 bool use_timer; =20 + bool has_century; + spinlock_t lock; } RTCState; =20 --- a/xen/arch/x86/include/asm/mc146818rtc.h +++ b/xen/arch/x86/include/asm/mc146818rtc.h @@ -37,6 +37,9 @@ bool is_cmos_port(unsigned int port, uns #define RTC_REG_C 12 #define RTC_REG_D 13 =20 +/* Conventional index used without (and typically also with) ACPI. */ +#define RTC_CENTURY 0x32 + /********************************************************************** * register details **********************************************************************/ --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -488,6 +488,8 @@ struct hvm_hw_rtc { uint8_t pad0; /* RTC offset from host time */ int64_t rtc_offset; + uint8_t century; + uint8_t pad1[7]; }; =20 DECLARE_HVM_SAVE_TYPE(RTC, 11, struct hvm_hw_rtc);