From patchwork Thu May 11 11:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13237800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD7F0C77B7C for ; Thu, 11 May 2023 11:51:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.533283.829811 (Exim 4.92) (envelope-from ) id 1px4pF-0003zq-1d; Thu, 11 May 2023 11:51:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 533283.829811; Thu, 11 May 2023 11:51:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1px4pE-0003zj-U6; Thu, 11 May 2023 11:51:12 +0000 Received: by outflank-mailman (input) for mailman id 533283; Thu, 11 May 2023 11:51:11 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1px4pD-0003SF-Km for xen-devel@lists.xenproject.org; Thu, 11 May 2023 11:51:11 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0613.outbound.protection.outlook.com [2a01:111:f400:fe1f::613]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1e667cac-eff2-11ed-8611-37d641c3527e; Thu, 11 May 2023 13:51:09 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by GV1PR04MB9071.eurprd04.prod.outlook.com (2603:10a6:150:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.33; Thu, 11 May 2023 11:51:07 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::8e41:82b6:a27f:2e0c]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::8e41:82b6:a27f:2e0c%4]) with mapi id 15.20.6363.033; Thu, 11 May 2023 11:51:07 +0000 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" X-Inumbo-ID: 1e667cac-eff2-11ed-8611-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFO2N8g1N3L29rBDP2FEWSuT/Q78PjkkozzTuD5SiDey7pTKa72YA+SK6ycMHjYhpordTr0R+M8yMphxywIvB4qb4KL3+B2y8bfJLQ08mbBEZiGJggn3zt6PcIjIHKHijfERtDJZ80OqhBkGeOnFh35ABgF60VoDBhwxDaM13qO4ky80F3pxdsAn+G4bgGZA+30qidPKmi9CdnhUxz+k3VdoeKglNXbTSk6vS/YE8zCNbKC8flUCPNlqczQFNe+3MtHIdWvbiCkVUrC3OH5Y0vA5Ujlmjzjicqya7ML8h+92zvZVOqG5R01BbazrnMtUYXr7wkqPj4JkrDooiJ7pGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mpgonQYUpEAl3AwPVAhrNHwGHxi1zyVswuSPi4ojvwU=; b=h/yOGzGTBVQQqe+IE1kPMMHvttNfp105yaRhV0UJ+ZxJ7MFEFru6THmhTJii9XMji2OuJiWmLbQIDpQUzPVy2xofFd35iYjjeYpxjjrxouMvKnltNe9DCVGdBMrl0i5rxrdrghryhsutNzQXG3JN4H4qHNMkJATHog3q952RksaZAJ6LAUe8Gg1ip5/8J48DRaDaRyLTaXW8UnBkrdGbQVahHV9a2Asklek3omrbvvfjVDLaFNgLOLS4l7eR15urUsC6qlvlgmhibr5hkJfVQYyy19+PWv078PPUgWGb5nB//Ti1W2KGuT1EoA4qYEXRrWmljTMpZCZ6M3HDxhCQzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mpgonQYUpEAl3AwPVAhrNHwGHxi1zyVswuSPi4ojvwU=; b=D4oukvQKTxQ8eXVAfD3w4TL8nbZuX+FKpkQxNWQfmz/W9ZEzvrgzWz0HjhIL7iKTMvrkMSTjjk+y1MBVcaDspIIu/MT0vnlmQdoutIg+cYON2Hbo3Rto2VvU+1G0d1l2JugMVF7ayWYoyFVddLYbPCAhnDGO8Abk6p9J1/6uGTQxtoBVTUWOY3nAm0/FLcoZ3lXRaNYRX12muTiPrURfwCyd5z4+hepiNS9mWZb7MqHHSIer6p0tvaw0fVS0Sp5YcvRxsjGGi3HhuxvpgD+c4qJ3csQjd6nNNANaTyK49keO8eE4H99G7H7cyS2vOtJzyNdoR554ozZC3JalmNrcUA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <39903e79-af15-9017-e470-65124bd60847@suse.com> Date: Thu, 11 May 2023 13:51:06 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= From: Jan Beulich Subject: [PATCH] x86/vRTC: minor adjustment to reads from index port X-ClientProxiedBy: FR0P281CA0141.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::12) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|GV1PR04MB9071:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b0b0b17-c3d9-4f3d-9b4e-08db521601d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kpvtAOjYy/gARNh01M5gdl+u/L26WXcIcDmo44RtGWuPr9WDhiBjhPS/Ao2g4vupt72ey7k/DD8oraFIUH9UhZ3mQ38EM62tjbnLjPmJlDZNGHnC5sHzVPFnXmOxhOcrQUvoYNIGRRCRIMi2BKpS9lzui4IpOBXHeDPMc7Ms/8r7BGIvZvBjlRp2twQhDKHe+O2nQALAokwBd8sbXN/3TD6Y3kioW36GO13j82hxLrKEm1HCRFBxvG0g211tkOqcnE9LnxnFKZPiS8d7cRc5B8lkFTBx/0Xd6Pa73ScB/AWUpJyA/X9IxkObB0xWiG+U4sIICIBrWe364N5JkHLlWOTbVwcJCallWb7vy8rh18MpwjEcUe8KXCEkILjJRaE/MHJjNZPu8lfcC4ZbpBHhdwPADP+RXCz6ooHDowRENpCe2LHGVpn9pQLnaR2EGZ6JcsiAs36+MyLUECARR+fzEl8iKcYrs4zFmg2WDqmd/HQizb6Msv0KD1U5EGqszku+mNRId3xjSQ1F7VsOIM4I6KX+aLropvIvLSGmjuKgWGetDsA4NVIU1ar1WXcB+oNPxEUyz2TaJzkeIYv4QMUzKd7wRdFFN5U7o5ZkabOILaotdr0gy/QqIQ+ZwfSKFuDzzCWD0ny1cyMNiTUc2vV05w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(346002)(376002)(136003)(366004)(396003)(451199021)(66476007)(66556008)(316002)(5660300002)(66946007)(4326008)(6916009)(31686004)(54906003)(41300700001)(83380400001)(6486002)(38100700002)(8936002)(2616005)(8676002)(6512007)(26005)(186003)(6506007)(478600001)(2906002)(36756003)(4744005)(86362001)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?oHqHaoP1BRip1Oxs62yFAQWASL3m?= =?utf-8?q?VsnLYsmoEyFuU6JCaurbkPwZeU+xccrytpHbWIh1ukDM5G09qTKvtMIhddzMb+JNU?= =?utf-8?q?L9fCx3lygYlLoMMjOVpUGZ3rbNk6aPvnMNAGtxOMtFIKAtwNYaRwp6eiiC/2wiBlN?= =?utf-8?q?Cxn1W9mzyUdAQG0H2YyC64kxz5nlJI2TqU1llWsWXE9JVK2jeO25aCw6PUGDOy1kW?= =?utf-8?q?CzCS39xNP/JNrNB56LYSq5XtuNAPOW5wFrItpK6wksH6g112g6x0Q580H+DyBH1+m?= =?utf-8?q?UjI/sm/7uRyHeH5yiGyPpgy6si1426uwgL1a/JpABcu1+o9BTE5ztiD1FPmOuEOZf?= =?utf-8?q?SdMP90zTG2Ib+8fDnw7KTtTNRfhGVs8TW8nE2nhUpKQljWOOfJIV1Fq4zVEP7xYwy?= =?utf-8?q?xaM9GVyuX4Esz0W6UXqpgSSJf8/wIvMmOgQxR/5KSVe5nh6rsjIB3iH12EhImZNL0?= =?utf-8?q?0Q56XDMhpZcXsLhRkIhPAg4inQUR0BXriEzTBSlP4we1AvvxHty1zgCJDdAXEA5op?= =?utf-8?q?CRgtMJ9GtUAo3ytbBFZ6KcxEIm47Sa4shi/wjFBEHjOk64KZushoUjbShAHlx/EyK?= =?utf-8?q?j4c69vg9Dtdtjfq67IzaD5yV9Z0HRPrZFkjCLoxt9eGx7Zzsw2gC+aXeq/Sf5mpQn?= =?utf-8?q?Oj2lrGDc8PVV+7uC8sAQpF0M7IdoEvvyHB33tGbyAFbB9pBpLjhUfwQth1bcwm6pd?= =?utf-8?q?uY0ntm9zotLkW+oomGyYihRNQ0uZHuHSqI3k9ZV7INvBhjWsU7GDtSvLia3fAsgR8?= =?utf-8?q?WMdmhYU8ktF9oMaZ+akGXiFFmmHOfPtgDDDDBKl9U7GDhM5K9HI8BvUwwoQ/9f1k1?= =?utf-8?q?m/vRz9SdMhRprNZSiREAOHGG6ku/f8DaiHvn4u1cgnrwuLJurJFAECXpTfn20+r9w?= =?utf-8?q?/CBW1j8Nyl6hcZ4czNOr3r/m0eM0827FHiqD69YWmOVi0criJQwsMVyzkaT21VP/k?= =?utf-8?q?Nvw94ehAd3RCdjx9WCG/zqsazgD6z2UbTftuqBEqT/7ARCNz+PUDThudXKVrcESKq?= =?utf-8?q?iIws1lqiZqbVPZCgJedvwFWM6Bie0mQitqRRkbYA4AtPD2w7fpNBPrqPsRu0VTrlO?= =?utf-8?q?44JV1C19vAovWk5IHbsx5g5lWdJq4Rif41lw9EthvA/sge6ghF7y93HgGwAibLEoE?= =?utf-8?q?heO42a+XVLn2Xm/+aF+n7YSk2vBp/RRnZUPblCK1j/tfGzfLWjFYHrPltzk7gCAqt?= =?utf-8?q?NUzTOgskNzbUnmjyILdEkANYdJrpi6WMcTFsZQtyMSz5E1W26ufHsojMbWSlm87TP?= =?utf-8?q?S/BGvol8J+luy0KdwFDcQgZhJYekePBoZFYxmmgU9ueSM+iqDVafbN2SE4eeIV2Xr?= =?utf-8?q?8A/M1IPDWLht5UBt+VtPuvyIEB+KHb2UWsknNzIcXshvtYavmztE4e48aNb+kHmwM?= =?utf-8?q?j/RMYOGUPCcnRz5dheMbsKC2MsvUS6KCzOhCRu+PH/Rfm+RVWmFaLfBMNvwUPQpJy?= =?utf-8?q?7fUqkL5R7lVTqHfnwOFtf9aRerC5mzlzI20fmV7gLYiHT//d7CT/BQCTmO5iyTYAf?= =?utf-8?q?1EQM8oHrybKq?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b0b0b17-c3d9-4f3d-9b4e-08db521601d9 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 11:51:07.8234 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zsbEhomY/kKCtwP2YeMvsr+EaevzlClPaJ6dIFeHobJ+3FuFUoBi1PNDITIASIouVDTMcN8dbZmwGreOu/DLQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9071 Whether to handle this shouldn't depend on the present value of the index register. Since the handling is done outside of the lock anyway, pull it out into the sole caller and drop the no longer needed function parameter. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- a/xen/arch/x86/hvm/rtc.c +++ b/xen/arch/x86/hvm/rtc.c @@ -645,14 +645,11 @@ static int update_in_progress(RTCState * return 0; } -static uint32_t rtc_ioport_read(RTCState *s, uint32_t addr) +static uint32_t rtc_ioport_read(RTCState *s) { int ret; struct domain *d = vrtc_domain(s); - if ( (addr & 1) == 0 ) - return 0xff; - spin_lock(&s->lock); switch ( s->hw.cmos_index ) @@ -714,9 +711,14 @@ static int cf_check handle_rtc_io( if ( rtc_ioport_write(vrtc, port, (uint8_t)*val) ) return X86EMUL_OKAY; } + else if ( !(port & 1) ) + { + *val = 0xff; + return X86EMUL_OKAY; + } else if ( vrtc->hw.cmos_index < RTC_CMOS_SIZE ) { - *val = rtc_ioport_read(vrtc, port); + *val = rtc_ioport_read(vrtc); return X86EMUL_OKAY; }