From nobody Sat May 30 11:15:02 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=1778597937; cv=none; d=zohomail.com; s=zohoarc; b=ihT0fevlxPJH5bVCAV0Ku+y2cDURUBU7fxYBFCrglFwOQOd3xtfYKJfe8PC5upto/IIolN57MzSIgEUS8N6b3KdxH72Aethc2OnmAWAj3YitNlVcLHadSnCAWRfOsRy9VrNNHfmd6PyCp0tHXwqeHExcZLnfWXO7MIqPNxPY/s4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778597937; 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=vb/ECc+CQkgyVidhmMkxB17AGrIKgu+mPY3rejswq4s=; b=D0OZKnt9JRl/0aZ8WLNjCL5BnM8GenmYjl6939B7PxXr23A3ZTsSJjVwObBz7/hK0oa59eN2uJwX7x9Vkgv+x+z76qNEnfRlsTWJ0jTDVfKLT9548I3vDqiDIjIVaptiK+k5ZvfjQfYKZEGuCjGVocAuBpaCVjbz0RzwPVImMb4= 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 1778597937606796.7915180163609; Tue, 12 May 2026 07:58:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1306883.1578611 (Exim 4.92) (envelope-from ) id 1wMoZK-0008Gs-Pn; Tue, 12 May 2026 14:58:46 +0000 Received: by outflank-mailman (output) from mailman id 1306883.1578611; Tue, 12 May 2026 14:58:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoZK-0008Gl-Mu; Tue, 12 May 2026 14:58:46 +0000 Received: by outflank-mailman (input) for mailman id 1306883; Tue, 12 May 2026 14:58:45 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoZJ-0008Gd-FN for xen-devel@lists.xenproject.org; Tue, 12 May 2026 14:58:45 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wMoZI-001UUo-SJ for xen-devel@lists.xenproject.org; Tue, 12 May 2026 16:58:44 +0200 Received: from [10.42.69.5] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a034015-2eae-0a2a0a5409dd-0a2a4505cdba-38 for ; Tue, 12 May 2026 16:58:44 +0200 Received: from [209.85.221.43] (helo=mail-wr1-f43.google.com) by tlsNG-c201ff.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a034024-aaa8-0a2a45050019-d155dd2bd5dc-3 for ; Tue, 12 May 2026 16:58:44 +0200 Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-43d7645adbdso3076242f8f.1 for ; Tue, 12 May 2026 07:58:44 -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-4549120ec0asm32552049f8f.17.2026.05.12.07.58.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 07:58:43 -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=1778597924; x=1779202724; 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=vb/ECc+CQkgyVidhmMkxB17AGrIKgu+mPY3rejswq4s=; b=AdKyJosijduxu28veENhrg152LJlxB9mD4NRq/mmLOeNAEqLnebMaICtVpHUNf2QwB IDIrvdCqqSi607iPeHq0Yn5kdn3Cx2j4ohRrRJRq+ur1QZMQhP1X2CucvECyQOFYIphP 9HJc+kZVEwX6EtgOAgVOXYPwHr7u6VoUSlpT5AQfdkSTr5SJVtRnKfvrhMU49ZHJzt2r n5AjNEvt7uFQkZPWcseQYskiScXbQRPBPGqkRhQZoEBX2qUEHUAriJWMRcoBMd3gj1QG rhKj22yohOb9VEuVVsIlDX6tUcpwXgSx0W05K1bi3dghh60BJZtjk3tlp26sg10E8vc/ 2Dsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778597924; x=1779202724; 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=vb/ECc+CQkgyVidhmMkxB17AGrIKgu+mPY3rejswq4s=; b=hmHuCCdnGflSS8oWQmsdfWgjlGJwvgNp75FTeweE/Zkw+HDANepS6gCQg5XqbhLj7O n3+zyr8Wnnt2sL/dT/1IFGi6nrEYoPruSxLzA7T2qixJcPgDNAjBYnhiVbNOAAWI0NMJ /LHsR2c2famS400VcPxoPkEG2M26bQ94wLBDcD3lcXO5mKHhkpgh1sdp7pj+b2lwgF3t 9+mG3M3WXwhgIpQ6Jg83Ql7eIuyMxBpziMKIXKGAzvoaeCsVSeAUR+1NDOuLz+bgNYLN 5IZzBpByzL1c5YSJFty8QOCfNGGPhk6f3W5hDhyxDNDhY3QFIBcjk/ScmfG5oDW8ZbNK PyZQ== X-Gm-Message-State: AOJu0YzoNRJ6pMzH1ImJ3OPyGPpD1bovGQ4kbE5zF2gDlbRaP3v1tBQJ 30yTy++FcFiHL1MXTgnZFSKmNPb5J4YdKunDQHi0S9fk+w6ZY1+9PFnGNG7Fm+3azVjGSB8Rjws H7cQ= X-Gm-Gg: Acq92OEFJ9zeRBV0TdzLE/7r1HOPOicqYiWqFWGteIrzkPwZV0b8s4iX9CjBIl/82v7 bVH2HahbcHsufEwPlOQ2mQjLhsP1hd/55ERCzo4w2gkaQHDkFyPWhgmNkHjUduOpk9tMnvs6E0Y +/WYIXqO5h4T66hm7AIDGwMYTA8B9gWiE2KTzC9rjTrwMPjR4aBdRx52fYZRc4+mTECrH9Np05A 3kM0qzgX9WizZ1JkXefRILYvbJ1AO8LNcY8jKhwi1AQufcmi3dm5utXQ/uCzUFfRjLgN9H7bGR3 fZX00qQv1KhbWXZ3/KGQSCLzsyN1lQeA5N97uvKFeDf0P+mxanYTViY56T7yeqojbYcX0NzXJon MYxSZCGdXqAH2Ufr2fewdRRHwlBDcdRZRahKifuvr2L5p/lFYl9N9G+E+sh6cJxOV53oZCoNol6 Vla/sbGRxZDf5E2tyOlUkypNpglttLrDxi4nqwxLY5n7FhjTgD3JUSO5vAA/RbdtVOj242yoh48 fCpWVXgVlw/bXHrniYQT6dKGA== X-Received: by 2002:a05:6000:310a:b0:44a:52d5:e4f1 with SMTP id ffacd0b85a97d-45b115c7b81mr5059543f8f.5.1778597924266; Tue, 12 May 2026 07:58:44 -0700 (PDT) Message-ID: <2723456f-5d8c-4a2a-9876-e65d35579936@suse.com> Date: Tue, 12 May 2026 16:58:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH for-4.22 1/5] x86/time: use RTC century byte when available From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie , Oleksii Kurochko References: 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: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c201ff/1778597924-D8145443-669DBB71/0/0 X-purgate-type: clean X-purgate-size: 1198 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778597939735154100 Content-Type: text/plain; charset="utf-8" Without this the present logic will misbehave from 2070 onwards. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1257,6 +1257,7 @@ struct rtc_time { static bool __get_cmos_time(struct rtc_time *rtc) { s_time_t start, t1, t2; + unsigned int century =3D 0; unsigned long flags; =20 spin_lock_irqsave(&rtc_lock, flags); @@ -1280,6 +1281,8 @@ static bool __get_cmos_time(struct rtc_t rtc->day =3D CMOS_READ(RTC_DAY_OF_MONTH); rtc->mon =3D CMOS_READ(RTC_MONTH); rtc->year =3D CMOS_READ(RTC_YEAR); + if ( acpi_gbl_FADT.century && acpi_gbl_FADT.century < 0x80 ) + century =3D CMOS_READ(acpi_gbl_FADT.century); =20 if ( RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ) { @@ -1293,7 +1296,12 @@ static bool __get_cmos_time(struct rtc_t =20 spin_unlock_irqrestore(&rtc_lock, flags); =20 - if ( (rtc->year +=3D 1900) < 1970 ) + if ( century ) + { + BCD_TO_BIN(century); + rtc->year +=3D century * 100; + } + else if ( (rtc->year +=3D 1900) < 1970 ) rtc->year +=3D 100; =20 return t1 <=3D SECONDS(1) && t2 < MILLISECS(3); From nobody Sat May 30 11:15:02 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=1778597964; cv=none; d=zohomail.com; s=zohoarc; b=PhdYjbg0Pv61DQu7gvqn93RXPCsYFmRPAGVYnT5bcj36ljfmhB4s5W5Bgz0C+mpXhPe7kndGrLl87+Gf9H+VapvfiwVNylqCF/KFENy0os7uQHBQi9XHz/frrJTI4lpHCsSfw1WEWDsepsSMCMLXwKQGiVCVALN2zC1avVuMtuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778597964; 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=RtTs+7fsFA7jyJwnZMuGqHUYX2G2jVMYQ4upOGKNn6I=; b=dfLsoAVKDmtySkUKz8x88PD5WXp332KFRygIT5+hjq+mNr2OyMm8dz7BP2hRSSMEjfZ5ef1DvlFt2A85hJChdrw7GH75sBmLHgdi0DrqhayiO+O+juqbZpCBIIfunN1Pv5ut9BkeJsfnQE6JKGpN/11ciAuSfb3pprX8I7Ef2Ek= 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 1778597964162620.472954218052; Tue, 12 May 2026 07:59:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1306887.1578621 (Exim 4.92) (envelope-from ) id 1wMoZe-0000Eo-50; Tue, 12 May 2026 14:59:06 +0000 Received: by outflank-mailman (output) from mailman id 1306887.1578621; Tue, 12 May 2026 14:59:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoZe-0000Eh-1s; Tue, 12 May 2026 14:59:06 +0000 Received: by outflank-mailman (input) for mailman id 1306887; Tue, 12 May 2026 14:59:05 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoZd-0000EM-7h for xen-devel@lists.xenproject.org; Tue, 12 May 2026 14:59:05 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wMoZc-00B5ja-Kr for xen-devel@lists.xenproject.org; Tue, 12 May 2026 16:59:04 +0200 Received: from [10.42.69.6] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a034037-5cb7-0a2a0a5109dd-0a2a4506e0c2-4 for ; Tue, 12 May 2026 16:59:04 +0200 Received: from [209.85.128.41] (helo=mail-wm1-f41.google.com) by tlsNG-16d1c6.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a034038-7371-0a2a45060019-d1558029f084-3 for ; Tue, 12 May 2026 16:59:04 +0200 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-488d2079582so59943355e9.2 for ; Tue, 12 May 2026 07:59:04 -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-48e8e566cf7sm36384185e9.0.2026.05.12.07.59.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 07:59:03 -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=1778597944; x=1779202744; 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=RtTs+7fsFA7jyJwnZMuGqHUYX2G2jVMYQ4upOGKNn6I=; b=OPH+LzGLdGsl5lvR3urPIkpn6vtSX76DyKQmdc0SChH/5gl1JfZ5EAHMS6CQOJhmst PerqNdZrEChEiB0D/kytk2JLuFrsv0olaSkeSafZ8+0Tmwfgz1cuv6UQed1LrhSLkV3U PAS/x0PhbwBEb0asnGAPPU8evwM9cyPjodpVCoXWu8swg/ejjjevTMbRF/afPpEVwsxk vI2cIl5dGLRo1tdzp1tYXE3A8G0Yv9qSUriibPkGjCSyiHsAIla+xTdylhH553hJ31wZ tBII7otLmxClOijtGIhSYNdFieCVL+Gs4oqI+8cDJc47L/QUv6Tex5KlsD6UI6ZiaAKk dSig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778597944; x=1779202744; 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=RtTs+7fsFA7jyJwnZMuGqHUYX2G2jVMYQ4upOGKNn6I=; b=JRca08NTpslnZco/6ZOR2wjuToxze3qd6kOzdIlC7luEdDU42oHvzt9VNJvrKxhWip IsRmDD10EZbPn/PKTtRJtWqvkAZwRsUWsnfwOIsSo5KUE03gIazugYrIWA9qkUNd9QeF iKJsV0QvRYUJSGPMyeth7jUCAe1PxwCz7GvYWYyU+vpTj+C6fE6KdTg+YVOGErLGNK25 d1oXN4Vg5ol3yKHv3myu+AI3w3XXsCZb7dSfL16+1ckGRHyI5VGpf71pU4K8gIqtluj7 5VVpXKpnDsdaYEkIgkyahGeYUV3x5bvak8+uLAoJ9yhPWMSXRX0P71yRTSGk50u1JyGl k6gQ== X-Gm-Message-State: AOJu0YxtGh7IOuYE+lEkAjMuARBqTjyfJW0OT0DkmMS3Vn8mNpLo72Dj 7XNR08YJoF4TMm+YXslNsq5iedl0Bpe+QzHK7Zz1TFtwK5vpNfMtGTYHTCT9YhPDbtzVMSclV4L ngBc= X-Gm-Gg: Acq92OFf7TOHCOIdq1C22MhW52Z3ITN+/dvF30YcnHyhhGIXyGAPtHjCXCthvOmnnId H1lsYX86d5kDKuz41LiarRTAPeQh12OxmXlkaP7fecEQ9luW/WZKDXHsElkuApSN1vjcB7dKU1B blygT+3NETvPJPA1s9j3tDd4CE8mAgljSFjE1CxIdH/z8Ak0hPGovfgdYfPDiyfbIZ/pYxtmCDB C9nocekemGM27Z+tJ9kNVfV4jovuBGluW9G94397qWdi+zXC7XoKqItOZhvJwVCWbPRQadqBIT2 X/nLV3PrxDXursiVv9f9gH1oI0T1XWaMmoQX+XxHlcnqLapJAbP6njbk5eSJ5xe/me1g5zuWtRf cyrNLmOJ38xx532/KYYyDHPDOZ0aAHlMUKsKv9wCpuC+X5fxX9f2zWo/o2FuUMgsXfWbqRh6nLR rSKwX+qT+8/MEvxMhbhbh8Yi1yDRXi0wpio5hyApqr0aM0GNf7QChzePIwJbBynDIHS4ffpdRag eDy7VkI5/hYfMg= X-Received: by 2002:a05:600c:1d18:b0:488:78f2:6b0 with SMTP id 5b1f17b1804b1-48e51f41b9cmr453681025e9.29.1778597944085; Tue, 12 May 2026 07:59:04 -0700 (PDT) Message-ID: <2c5af8f9-05f6-43c4-afb4-a50cbacd2d49@suse.com> Date: Tue, 12 May 2026 16:59:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/5] x86/time: move BCD_TO_BIN() uses From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie , Oleksii Kurochko References: 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: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-16d1c6/1778597944-8797CD75-EA009AFA/0/0 X-purgate-type: clean X-purgate-size: 1496 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778597964518158500 Content-Type: text/plain; charset="utf-8" ... outside of __get_cmos_time()'s locked region. There's no need to hold the lock for these computations. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- How come RTC_ALWAYS_BCD is compile-time constant 1? And then even with an inverted comment? Looks like we've inherited this from Linux, and even in Linus'es current tree it's still this same way. Yet all half-way recent chipsets I'm aware of properly implement the DM bit in reg B. Might this be another 32-bit leftover? --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1257,6 +1257,7 @@ struct rtc_time { static bool __get_cmos_time(struct rtc_time *rtc) { s_time_t start, t1, t2; + bool bcd; unsigned int century =3D 0; unsigned long flags; =20 @@ -1283,8 +1284,12 @@ static bool __get_cmos_time(struct rtc_t rtc->year =3D CMOS_READ(RTC_YEAR); if ( acpi_gbl_FADT.century && acpi_gbl_FADT.century < 0x80 ) century =3D CMOS_READ(acpi_gbl_FADT.century); - =20 - if ( RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ) + + bcd =3D RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY); + + spin_unlock_irqrestore(&rtc_lock, flags); + + if ( bcd ) { BCD_TO_BIN(rtc->sec); BCD_TO_BIN(rtc->min); @@ -1294,8 +1299,6 @@ static bool __get_cmos_time(struct rtc_t BCD_TO_BIN(rtc->year); } =20 - spin_unlock_irqrestore(&rtc_lock, flags); - if ( century ) { BCD_TO_BIN(century); From nobody Sat May 30 11:15:02 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=1778597990; cv=none; d=zohomail.com; s=zohoarc; b=UmTvdcJO06npcbB5pSwYhjjpwreCi8URLPTcy/FtWKJHozq8e+4uhpvXRAv2B+/4sh5fO2jSfaviKQThjMCcOW1u+XVYfxVtV41gOeXXcWhbxrX6rCGGwH3xojAb6Cem4S6Rcg+BSgF8D0vx+sMey8iXYkeyBasZTXXmD8Kl034= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778597990; 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=B8notKPIJCgXsLW2/zUhwvqNucwwalfHeP2cxpiywdE=; b=EKiyn1a5OJbEMNInDfqe3OI5zbjvjhO1+GGTkQLoFKWXSQPB0AydAOS6vjb4iZ76Z9/qSOAFU8mrI66OrVPd4wh1JMbia65mrA5/0cNMrm8RPyPP1ytC+KWE1jDaj+BgPo1TLpym0OUWHP/Sy+VgoO9o+d/t2YIunSnC2vl/5eU= 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 17785979901718.883336891062754; Tue, 12 May 2026 07:59:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1306897.1578629 (Exim 4.92) (envelope-from ) id 1wMoaB-0000pI-Bi; Tue, 12 May 2026 14:59:39 +0000 Received: by outflank-mailman (output) from mailman id 1306897.1578629; Tue, 12 May 2026 14:59:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoaB-0000pB-97; Tue, 12 May 2026 14:59:39 +0000 Received: by outflank-mailman (input) for mailman id 1306897; Tue, 12 May 2026 14:59:38 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoaA-0000nk-7x for xen-devel@lists.xenproject.org; Tue, 12 May 2026 14:59:38 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wMoa9-00B61l-Kx for xen-devel@lists.xenproject.org; Tue, 12 May 2026 16:59:37 +0200 Received: from [10.42.69.3] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a03403e-e002-0a2a0a5209dd-0a2a4503a98e-30 for ; Tue, 12 May 2026 16:59:37 +0200 Received: from [209.85.128.41] (helo=mail-wm1-f41.google.com) by tlsNG-33051d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a034059-672d-0a2a45030019-d1558029b5cf-3 for ; Tue, 12 May 2026 16:59:37 +0200 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-488b150559bso44170885e9.1 for ; Tue, 12 May 2026 07:59:37 -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-48e8f3cf0cdsm36745795e9.2.2026.05.12.07.59.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 07:59:36 -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=1778597977; x=1779202777; 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=B8notKPIJCgXsLW2/zUhwvqNucwwalfHeP2cxpiywdE=; b=G/U/WGIEI/0J686iM8KHKBxa7VKJgmGQvQ/UiMwamOTX1jjgRcClRsh9nm85WgXmra xJsgNfhlQHHSu5mzKvbuDegGDzfjRBAOKmaq+ZHfLGnmVHUBHSXS3/jkR71AoJV3Crmd /7YLnrcK7jLZTzzg3XmgOaCmjYS2odtn68o87J/NpELoyOveRJmd1U25ONJgydhrbxA1 CnFajvNRok6SkXlHUdgPGf+ei1PpUOP1Jjp24DdrDn/3QZ/4Z8OyMxkJwO7ZmQgqYPac 9ahfdqy6H9riPe4qVR2EwWGQUrKDHNOTpRaH+Ml//gHQDnWsxK5ds1Ll6wFQlnhtyeNZ 3Kag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778597977; x=1779202777; 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=B8notKPIJCgXsLW2/zUhwvqNucwwalfHeP2cxpiywdE=; b=Taq/ZaCHb0iiJvyVduyXkBa00AnXMvcBLiYo/lzFYdapjqnqvXeJ/krEs1tZMYPz5E rLDrVzPoSnBWuDfhF3wcfkAk2i0ak+hg7HLkg1DxWXZ+ch9pgMWzKvh6wNX5h//Wih4y Ayd2FiTcyNfYZKXTP7rMi/swfvrssPVkmhAhj5CZkE53FgwI7JOPSbC+0VlzZe4FThaH UTBiH8FYkNrCksJ9sbBogLKiYO1XCK6hAPTyKHHT/Ocjbb+QAeh47fH4vY+P+mB/3RyP PBFSgPWE+U/NEB84AmWGpJ8UHvjkyzg+yjc4a2Cxpv2GSMdX6JAymfUL0E1Nm+2lpNJM c92Q== X-Gm-Message-State: AOJu0YzF2WZ/DzjTQorTGd6mlgx3Kw1nq7k/GQBGGeQsRgRPh0P//ZiG Ve5mRdkuamZmaQ27iV9mHYaO5LKUcu4TI1jXtGFX0GpLG5NCEBJ1tR5zFCID1uhd+oUWiL7gbMC XEGo= X-Gm-Gg: Acq92OGz0RoUfChJ3sjld8naEIg6oDbcslhKxqMixTTHw5rMzD3J3zs08uonvCa9AY/ cOpgSu8NPhpQCQqjkIzfBcVs2LeItjP9xmZMCjKDIiOSw5dYKzzHWWEElOETDGX0PWsUu/Y857F 1XFDKYB7BasoBg+aB7EAMFLuC7ZPi9kcYGEUi2bIY01lNoBGzS4qnwnGu4hdF73lq+tXOFwT6vB pJUta1qgyvAI7pbkieQ47YCMeIDibsGVL0An+HMWYf/TBmwqYpnur6icSMKNe+tP0NbGdWaLzFo DiRfg+TwkEgQnPHATJZJWSpWKzfTsFGgxSqZ8Y0YOe8wiUv0BRDgFHq1IYztLN0d8IDEwTKqWC6 FKVS/87aOrFSffgFD7rfUb5QgMvrsJV2kM7dXL1mg4bvNZk7kq3mxs7Os6EmAajNmKmsXkcGIEg s9i1yCewhMWMBT8IfEIiirBuJ3/SnkayH4U1fiM7A46p8HYW0p61F6oqcF/aBF7xYbDKpzpFzzL Bqfo2LIZWUcP0s= X-Received: by 2002:a05:600c:8b83:b0:485:40db:d40c with SMTP id 5b1f17b1804b1-48e706acfb7mr221411515e9.3.1778597976920; Tue, 12 May 2026 07:59:36 -0700 (PDT) Message-ID: <383355d1-7032-4445-8a06-cb4411ea797e@suse.com> Date: Tue, 12 May 2026 16:59:35 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH for-4.22 3/5] 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 , Oleksii Kurochko References: 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: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-33051d/1778597977-4086B938-1FA6D66E/0/0 X-purgate-type: clean X-purgate-size: 8908 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778597992658154100 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. 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? I can't help the impression that this introduces a latency issue for the 2nd of gmtime()'s while() loops: We now allow years up into the 99th century, i.e. over 8000 years away from 1970. 8000 years are very roughly 2^^38 seconds, making for (again very roughly) 5 million iterations there. Did I get my math wrong, or do we need a prereq change to (vastly) reduce the number of iterations of that loop (e.g. along the lines of the other one, first going in 400 year steps)? 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? --- 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%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x,= index 0x%2.2x\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 @@ -47,6 +47,12 @@ #define epoch_year 1900 #define get_year(x) ((x) + epoch_year) =20 +static inline bool is_century(unsigned int x) +{ + /* Constant below should match epoch_year above, just as BCD value. */ + return x >=3D 0x19 && (x & 0xf) < 10 && (x >> 4) < 10; +} + enum rtc_mode { rtc_mode_no_ack, rtc_mode_strict @@ -482,16 +488,32 @@ static int rtc_ioport_write(void *opaque data &=3D 0x7f; s->hw.cmos_index =3D data; spin_unlock(&s->lock); + /* RTC_CENTURY always forwarded to DM. */ return (data < RTC_CMOS_SIZE); } =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: + orig =3D s->hw.century; + if ( !is_century(orig) || !is_century(data) ) + { + /* Prevent further use of the field. */ + s->hw.century =3D 0; + spin_unlock(&s->lock); + return 0; + } + break; + + 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 +529,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 +538,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 +617,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 ( is_century(s->hw.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 +664,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 ( is_century(s->hw.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) @@ -656,6 +697,13 @@ static uint32_t rtc_ioport_read(RTCState =20 switch ( s->hw.cmos_index ) { + case RTC_CENTURY: + if ( !is_century(s->hw.century) ) + { + ret =3D UINT32_MAX; + break; + } + fallthrough; case RTC_SECONDS: case RTC_MINUTES: case RTC_HOURS: @@ -669,7 +717,10 @@ static uint32_t rtc_ioport_read(RTCState 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,10 +769,12 @@ 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->hw.cmos_index =3D=3D RTC_CENTURY ) { *val =3D rtc_ioport_read(vrtc); - return X86EMUL_OKAY; + if ( *val !=3D UINT32_MAX ) + return X86EMUL_OKAY; } =20 return X86EMUL_UNHANDLEABLE; @@ -873,6 +926,8 @@ 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 + s->hw.century =3D 0x20; /* Arbitrary initial value satisfying is_centu= ry() */ + s->current_tm =3D gmtime(get_localtime(d)); s->start_time =3D NOW(); =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 @@ -485,7 +485,7 @@ struct hvm_hw_rtc { uint8_t cmos_data[RTC_CMOS_SIZE]; /* Index register for 2-part operations */ uint8_t cmos_index; - uint8_t pad0; + uint8_t century; /* RTC offset from host time */ int64_t rtc_offset; }; From nobody Sat May 30 11:15:02 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=1778598031; cv=none; d=zohomail.com; s=zohoarc; b=SkWnXeR86jiXk8zGZUpyPwV5e/nRjD2NxUNQHJErITGe5DK2VWeOdaPTxIKv52i5c9hlONrpRFbKJGTD0jazSxNBupx5Skd+8XNVPyYzFOLDYy7IHYDjdMFDv5Z2VkgCndI3PzntlIDl00GkT/lPzrr8mOkM9y0JaGAVJht/gOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778598031; 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=2L5XWk37Hty4eGHWvaxUEX6h6h0l+D2/1Nxh6sBvqFg=; b=BBKp2cLnBMrxlKpZ95bFaDd4M1czPzgVq/TgOvG/KPOVsLZchbuCaRcD/M83ql7FxMTfDCsXRm2oj90gmG0Kh5ookjaenYbiBRI3mwUuciILhbK3KF5NjsTSSDeVbNSsUzjaXHsux5ExI4XZNjxw2JYGWYtAErRo6z/ZSRLg/ew= 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 1778598031585187.98903486996028; Tue, 12 May 2026 08:00:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1306906.1578638 (Exim 4.92) (envelope-from ) id 1wMoae-0002Is-KJ; Tue, 12 May 2026 15:00:08 +0000 Received: by outflank-mailman (output) from mailman id 1306906.1578638; Tue, 12 May 2026 15:00:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoae-0002Il-H1; Tue, 12 May 2026 15:00:08 +0000 Received: by outflank-mailman (input) for mailman id 1306906; Tue, 12 May 2026 15:00:06 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMoac-0002Fv-R3 for xen-devel@lists.xenproject.org; Tue, 12 May 2026 15:00:06 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wMoac-00AJkn-7g for xen-devel@lists.xenproject.org; Tue, 12 May 2026 17:00:06 +0200 Received: from [10.42.69.8] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a034076-bab6-0a2a0a5309dd-0a2a4508cdb2-0 for ; Tue, 12 May 2026 17:00:06 +0200 Received: from [209.85.221.54] (helo=mail-wr1-f54.google.com) by tlsNG-c1860d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a034076-63b5-0a2a45080019-d155dd36ac8c-3 for ; Tue, 12 May 2026 17:00:06 +0200 Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-44e1860558fso3656599f8f.0 for ; Tue, 12 May 2026 08:00:06 -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-45491304387sm32459259f8f.21.2026.05.12.08.00.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 08:00:05 -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=1778598005; x=1779202805; 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=2L5XWk37Hty4eGHWvaxUEX6h6h0l+D2/1Nxh6sBvqFg=; b=D/oRAY/Z1bkF+oIGgGRd4+OFrQSm96a6pXz5gi6UnrF4kIPoPz57Dcsy4kAGyZNcXE +2hvOMwtFof7EJ5yYXXeHmuvRau8mnnno641O0P24NUhA4vT7ilYL4jHIwscWHSOyhG3 2gyOAuk0Cz4109RZOeOn5ABb3ZSmfqW3HxD3Rwsne3jk3WYPZvj6J+j9xqJtgI1JdAu8 uC41ue9axhLZB1RDpRIcuxhoEZ3x24sSv8PbVP5kdlAWqxJxrMaSESRDyjLZtBZoO4DP Lb4uDiq3N7Q60/nm4cw40ZUCYbXiSEg3ZEBT+kfnLuw6uMr0/U/m5Wlux/cVILEeYEt5 QPdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778598005; x=1779202805; 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=2L5XWk37Hty4eGHWvaxUEX6h6h0l+D2/1Nxh6sBvqFg=; b=d0AaBMnSKWLqwk8ws34rplh8xyror5+862NSRDmGSN08O+XVNQoSyMk9cQzUKETa+C OGoWHU29hlcS9y3q6WJq7U39rSK9XDNDKdllgUxtmop7EsYnr8m3D9KW2aW64pTK33+2 FNqbjwbvI0bWY4o6jzj9jhKsMvSG+1AMmGIvNGfJ6ZUYdeoejtd63/63JfOq1OFPpbmD wYo76UHmlk8JuCJPTHLn+6lNKmwh8xZ2yFB3t/e4xABAFNADQ9ck75RP18RuCc9wApN6 9B9kPhXRuA9IXF/5pYi+cxa6uofbdM7EBg8Wr4C41ic+LeZOsXOavvywoZy7g3pQLJDn bFTw== X-Gm-Message-State: AOJu0YyJRH76MG4LCklmOjIsOaU9LpYecqUSg+CFbs23HiNOus/eZzR0 vycGJ3/VWJ6qK4BUfSyaKn2ZNzs4w1yZvg/u94B4RvhFdGS1312o22owjl7FpH9LCQXKK1CNO0m uaM4= X-Gm-Gg: Acq92OEkFAuJTpSKE2Ax2pMdSD6fGnuUVKZXXHdhGgupqgK8gtVjH3eS+CAldgOGG0F Cq3eoSof11vR2TWYaZdcUAWr8WZVzDdjRc6Zl9mVlnuDNDEm/JLzy84YbRRijmGnXkZdAJzEK5J XYcIpN3C2PAOVJRAaqwZMDmT/tp2qHYxhg3kDh2vl1fmMAGBWswyS6kSlJmkoHhGfGjwHN7NmwV xjJpAsOQ6kxbrsBYEtFHGOav3YXZXY2plIpzioEBiQn1io+hZtEnX0lOFT6YnvAiQseqiVgKh40 yd77lM4L1CKHa3LAiLZ2LZnex3g6hKgXmJdLveDs5PT4KS/+GrO5ie/ZXzZXwyTEjw857XY/1DO qZXvM0HaGdZJXS6KsYpExNq/sxoGT3N/9I5y3x09cVormFaN4krRbD85ZoDzXeWcpsyF23jdjXK T4DpSFx5Fk+bcgajHwSQKU4PQdmkjRX29+ysn71rMps/+oSmymSG/2Ux1wxcARoRMvF7set+Pf X-Received: by 2002:a05:6000:1a85:b0:43c:fdd:ea96 with SMTP id ffacd0b85a97d-45462c342e0mr30075541f8f.26.1778598005512; Tue, 12 May 2026 08:00:05 -0700 (PDT) Message-ID: Date: Tue, 12 May 2026 17:00:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 4/5] x86/vRTC: use available macros for BCD <-> BIN conversion From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie References: 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: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c1860d/1778598006-C5386DB1-604F2D14/0/0 X-purgate-type: clean X-purgate-size: 889 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778598033436158500 Content-Type: text/plain; charset="utf-8" There's no need to open-code these. No functional change intended, even if the | changes to + in to_bcd(). Signed-off-by: Jan Beulich Acked-by: Roger Pau Monn=C3=A9 --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -253,18 +253,18 @@ static void cf_check rtc_update_timer2(v =20 static unsigned int to_bcd(const RTCState *s, unsigned int a) { - if ( s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY ) - return a; + if ( !(s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY) ) + BIN_TO_BCD(a); =20 - return ((a / 10) << 4) | (a % 10); + return a; } =20 static unsigned int from_bcd(const RTCState *s, unsigned int a) { - if ( s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY ) - return a; + if ( !(s->hw.cmos_data[RTC_REG_B] & RTC_DM_BINARY) ) + BCD_TO_BIN(a); =20 - return ((a >> 4) * 10) + (a & 0x0f); + return a; } =20 /* From nobody Sat May 30 11:15:02 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=1778598059; cv=none; d=zohomail.com; s=zohoarc; b=kNtbDx7ON+Jxuxp4dZqGdKzMNmpQPb25TQ23UDuMQjL6tJ7+TkCoVC4j9S8R1j4SSbctv9Zl0bmXjPWCguJzxqhGjyB1m3vCWhSwJ4IHUw5CZ2gegZ2b9Iz3RgKpmgbuApGfcHMUwZlHdPaCno6tXZ0OCIfubNnpGymXZNoQ2lU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778598059; 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=+4wWtJqQjz6zQQRwVYkyfsmuZHB9+q0gyFAm93ZpUBw=; b=hl4ZE9qEWzJlm2O3YHtdJi+DTW86RUCeNJkQROCGFdlC2wgxpprS8eueTR02VMJpzfjJleoVhFJqdJjsWdWSMiPFeKop02K7wu85nnDrIAQnyrbFGL/XiQwWuHtXh5SGapA8SIrNHMbIwRA+fjnMcHQNhS+oXf2X7EU0sSMQjWA= 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 1778598059837297.9126809637004; Tue, 12 May 2026 08:00:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1306914.1578648 (Exim 4.92) (envelope-from ) id 1wMobI-0002qx-0w; Tue, 12 May 2026 15:00:48 +0000 Received: by outflank-mailman (output) from mailman id 1306914.1578648; Tue, 12 May 2026 15:00: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 1wMobH-0002qp-Tp; Tue, 12 May 2026 15:00:47 +0000 Received: by outflank-mailman (input) for mailman id 1306914; Tue, 12 May 2026 15:00:45 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wMobF-0002qd-QA for xen-devel@lists.xenproject.org; Tue, 12 May 2026 15:00:45 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wMobF-004Fsk-70 for xen-devel@lists.xenproject.org; Tue, 12 May 2026 17:00:45 +0200 Received: from [10.42.69.4] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a034097-bab6-0a2a0a5309dd-0a2a4504baf4-36 for ; Tue, 12 May 2026 17:00:45 +0200 Received: from [209.85.221.45] (helo=mail-wr1-f45.google.com) by tlsNG-ebf023.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a03409d-1dec-0a2a45040019-d155dd2dc5a2-3 for ; Tue, 12 May 2026 17:00:45 +0200 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-45562c41ec7so2406316f8f.1 for ; Tue, 12 May 2026 08:00: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-4548ec6be40sm34620921f8f.12.2026.05.12.08.00.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 08:00: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=1778598044; x=1779202844; 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=+4wWtJqQjz6zQQRwVYkyfsmuZHB9+q0gyFAm93ZpUBw=; b=M9CWg80+qkur906rO/i8XQBcF/l54mFXNXnXUuB7QBpdgIYfqHRADqXPxj6epez5aT tK6khm1NBuUxLDP5zcjVHSBpDUqyt+Sfkg7JRoDyZTdJiPEN5859daJtyqbsMv+7tguD 75i9XJFSguC6PwJo+nKjclinDFTSk/xcByjzwINIIQxf36l87+dy+2UQNm+zztJIADmd b2m7I7QHncAY86LaypPESi3fHmKvaD1MAvCTPrQqM0WKyOMquakIOQbQZzhX5bKNLoQt PBGetPePVC0FmGet2dXayFemhIBoVwbXgjy+LgVyANp4OfHKumlbbF75xnPg+PCUle/O 3k2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778598044; x=1779202844; 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=+4wWtJqQjz6zQQRwVYkyfsmuZHB9+q0gyFAm93ZpUBw=; b=o7ErCHNxQMXZb4wNNiby4JuxJZGZWx0m2mVVq4ToqGBc4Rzjk0yX6vVHeFZPL/KrIb ENQ0ugbFljD2CpSBiitMqEXMhtis4tYsENAh+frwK46MMYnx7ITjTM0QHosl2w8Kf4xa 3zQHlLAm3+ETk9qkeXLn7MQpou+GDpNdlCnYyDD0sEsNyMfQ27dDJ72bARpq1Nf/UurV IBmjL1OfoUv6bEYCFXDH68q5wzOkiZqA3dM3pZtPbF8x7BEPE0sg4js+ukig2JMkO+Oz xmwWnkpeI6C1/16k2m6w2KUzbKvwOO0jWeYFcaQzqUpLWEjKtcaPVV77VmzntSnOyEnq LioA== X-Gm-Message-State: AOJu0YxRetPNfHKXwqoxTW7arBiJf+Ix14GelMoKhmEW1h0AGqjQGevb QdeoHmNS7+Z8cdNzMBPQeR7YpF0hxK+n0tAa+Bq2Mz9Az3i22FDZl3iLvlrqymSo2NEDjgr4v6H OqoU= X-Gm-Gg: Acq92OHKBZjGVwAZ+dU8ccIYAJczruylgYq/aDL3vQC2zO6KXAhcQ3eltfwgFBzruTQ 5K7aerau3rGMsE/sTduIoDmEgBdbor/nxSsczcQmxo0tSX94kBYxhDQSdwL5OteqmwR2YqyJt9k g/yBLUs5xe8MGrOHC0aUoq6hrpKurp8QOOLZqfU26VooKQWXQGij7IHa4i46yilvXLbqFJdBgzw v6KWG2wDpQ9bY1UsIL9Eo7e5L/njeLrzbrveuIw9lyCx9nqJsjihleKlGH1WInfFC7FLjXVoutD TNqGGLFMh+vLwVFZV8ozPcxrV8NsZYliVKmkel4REsvWnOmCGXVsqfpVaTaB5OAQGHNDWm1zvS7 LzE+KPPmiT3DEOMgON8MEnKEd5scFMWyFF6YeNe5hW6sKgcJSgbbFHDVEQHrL656dVeknoCcMea 3vuU7tL3rLyMiOqPu9BOu5W+/8x6Kfk+ir01ZlOXRyCFTOR7XpBUiTq561ConJA3CU644iDR+7O WUMtZaJSbS4bvQ= X-Received: by 2002:a5d:5f86:0:b0:43d:77a8:3baf with SMTP id ffacd0b85a97d-45b15682310mr5149035f8f.32.1778598044522; Tue, 12 May 2026 08:00:44 -0700 (PDT) Message-ID: <4bcd76e9-1bd5-4a2c-8d75-7d29b9dfa31f@suse.com> Date: Tue, 12 May 2026 17:00:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 5/5] tools/xen-hvmctx: shorten various format strings a little From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Teddy Astie , Anthony PERARD References: 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: Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-ebf023/1778598045-433673FF-6E94AD80/0/0 X-purgate-type: clean X-purgate-size: 6655 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1778598061803158500 Content-Type: text/plain; charset="utf-8" %4.4x and alike format specifiers can be expressed shorter as %04x or, as e.g. dump_ioapic() has it, %.4x. In dump_fpu()'s XMM register dumping, also move away from showing bogus xmm03 and alike. The proper register name is xmm3 for that particular example. Also strip trailing whitespace from lines touched. Signed-off-by: Jan Beulich Acked-by: Anthony PERARD Acked-by: Roger Pau Monn=C3=A9 --- a/tools/misc/xen-hvmctx.c +++ b/tools/misc/xen-hvmctx.c @@ -107,26 +107,26 @@ static void dump_fpu(void *p) struct fpu_regs *r =3D p; int i; =20 - printf(" FPU: fcw 0x%4.4x fsw 0x%4.4x\n" =20 - " ftw 0x%2.2x (0x%2.2x) fop 0x%4.4x\n" - " fpuip 0x%16.16"PRIx64" fpudp 0x%16.16"PRIx64"\n" - " mxcsr 0x%8.8lx mask 0x%8.8lx\n", + printf(" FPU: fcw 0x%04x fsw 0x%04x\n" + " ftw 0x%02x (0x%02x) fop 0x%04x\n" + " fpuip 0x%016"PRIx64" fpudp 0x%016"PRIx64"\n" + " mxcsr 0x%08lx mask 0x%08lx\n", (unsigned)r->fcw, (unsigned)r->fsw,=20 (unsigned)r->ftw, (unsigned)r->res0, (unsigned)r->fop,=20 r->fpuip, r->fpudp,=20 (unsigned long)r->mxcsr, (unsigned long)r->mxcsr_mask); =20 for ( i =3D 0 ; i < 8 ; i++ )=20 - printf(" mm%i 0x%4.4x%16.16"PRIx64" (0x%4.4x%4.4x%4.4x)= \n", + printf(" mm%i 0x%04x%016"PRIx64" (0x%04x%04x%04x)\n", i, r->mm[i].hi, r->mm[i].lo, r->mm[i].pad[2], r->mm[i].pad[1], r->mm[i].pad[0]); =20 for ( i =3D 0 ; i < 16 ; i++ )=20 - printf(" xmm%2.2i 0x%16.16"PRIx64"%16.16"PRIx64"\n", + printf(" xmm%-2i 0x%016"PRIx64"%016"PRIx64"\n", i, r->xmm[i].hi, r->xmm[i].lo); =20 for ( i =3D 0 ; i < 6 ; i++ )=20 - printf(" (0x%16.16"PRIx64"%16.16"PRIx64")\n", + printf(" (0x%016"PRIx64"%016"PRIx64")\n", r->res1[2*i+1], r->res1[2*i]); } =20 @@ -134,20 +134,20 @@ static void dump_cpu(void) { HVM_SAVE_TYPE(CPU) c; READ(c); - printf(" CPU: rax 0x%16.16llx rbx 0x%16.16llx\n" - " rcx 0x%16.16llx rdx 0x%16.16llx\n" - " rbp 0x%16.16llx rsi 0x%16.16llx\n" - " rdi 0x%16.16llx rsp 0x%16.16llx\n" - " r8 0x%16.16llx r9 0x%16.16llx\n" - " r10 0x%16.16llx r11 0x%16.16llx\n" - " r12 0x%16.16llx r13 0x%16.16llx\n" - " r14 0x%16.16llx r15 0x%16.16llx\n" - " rip 0x%16.16llx rflags 0x%16.16llx\n" - " cr0 0x%16.16llx cr2 0x%16.16llx\n" - " cr3 0x%16.16llx cr4 0x%16.16llx\n" - " dr0 0x%16.16llx dr1 0x%16.16llx\n" - " dr2 0x%16.16llx dr3 0x%16.16llx\n" - " dr6 0x%16.16llx dr7 0x%16.16llx\n" + printf(" CPU: rax 0x%016llx rbx 0x%016llx\n" + " rcx 0x%016llx rdx 0x%016llx\n" + " rbp 0x%016llx rsi 0x%016llx\n" + " rdi 0x%016llx rsp 0x%016llx\n" + " r8 0x%016llx r9 0x%016llx\n" + " r10 0x%016llx r11 0x%016llx\n" + " r12 0x%016llx r13 0x%016llx\n" + " r14 0x%016llx r15 0x%016llx\n" + " rip 0x%016llx rflags 0x%016llx\n" + " cr0 0x%016llx cr2 0x%016llx\n" + " cr3 0x%016llx cr4 0x%016llx\n" + " dr0 0x%016llx dr1 0x%016llx\n" + " dr2 0x%016llx dr3 0x%016llx\n" + " dr6 0x%016llx dr7 0x%016llx\n" " cs %#6.4" PRIx32 " (%#18.8" PRIx64 " + %#10.8" PR= Ix32 " / %#7.4" PRIx32 ")\n" " es %#6.4" PRIx32 " (%#18.8" PRIx64 " + %#10.8" PR= Ix32 " / %#7.4" PRIx32 ")\n" " ds %#6.4" PRIx32 " (%#18.8" PRIx64 " + %#10.8" PR= Ix32 " / %#7.4" PRIx32 ")\n" @@ -158,12 +158,12 @@ static void dump_cpu(void) " ldtr %#6.4" PRIx32 " (%#18.8" PRIx64 " + %#10.4" PR= Ix32 " / %#7.4" PRIx32 ")\n" " idtr (%#18.8" PRIx64 " + %#10.4" PRIx32 ")\n" " gdtr (%#18.8" PRIx64 " + %#10.4" PRIx32 ")\n" - " sysenter cs 0x%8.8llx eip 0x%16.16llx esp 0x%16.16llx\n" + " sysenter cs 0x%08llx eip 0x%016llx esp 0x%016llx\n" " shadow gs %#18.16" PRIx64 " efer %#18.8" PRIx64 "\n" " lstar %#18.16" PRIx64 " cstar %#18.16" PRIx64 "\n" " star %#18.16" PRIx64 " sfmask %#18.8" PRIx64 "\n" - " tsc 0x%16.16llx\n" - " event 0x%8.8lx error 0x%8.8lx\n", + " tsc 0x%016llx\n" + " event 0x%08lx error 0x%08lx\n", (unsigned long long) c.rax, (unsigned long long) c.rbx, (unsigned long long) c.rcx, (unsigned long long) c.rdx, (unsigned long long) c.rbp, (unsigned long long) c.rsi, @@ -260,7 +260,7 @@ static void dump_pci_irq(void) { HVM_SAVE_TYPE(PCI_IRQ) i; READ(i); - printf(" PCI IRQs: 0x%16.16llx%16.16llx\n",=20 + printf(" PCI IRQs: 0x%016llx%016llx\n", (unsigned long long) i.pad[0], (unsigned long long) i.pad[1]); } =20 @@ -268,7 +268,7 @@ static void dump_isa_irq(void) { HVM_SAVE_TYPE(ISA_IRQ) i; READ(i); - printf(" ISA IRQs: 0x%4.4llx\n",=20 + printf(" ISA IRQs: 0x%04llx\n", (unsigned long long) i.pad[0]); } =20 @@ -305,10 +305,10 @@ static void dump_rtc(void) { HVM_SAVE_TYPE(RTC) r; READ(r); - printf(" RTC: regs 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x = 0x%2.2x 0x%2.2x\n", + printf(" RTC: regs 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x= 0x%02x\n", r.cmos_data[0], r.cmos_data[1], r.cmos_data[2], r.cmos_data[3],=20 r.cmos_data[4], r.cmos_data[5], r.cmos_data[6], r.cmos_data[7]); - printf(" 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x 0x%2.2x,= index 0x%2.2x\n", + 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);