From patchwork Mon Feb 14 09:18:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12745280 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 D5DFFC433F5 for ; Mon, 14 Feb 2022 09:19:29 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.271252.465631 (Exim 4.92) (envelope-from ) id 1nJXVT-0000NK-Oh; Mon, 14 Feb 2022 09:18:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 271252.465631; Mon, 14 Feb 2022 09:18:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nJXVT-0000Mt-HO; Mon, 14 Feb 2022 09:18:51 +0000 Received: by outflank-mailman (input) for mailman id 271252; Mon, 14 Feb 2022 09:18:51 +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 1nJXVT-0000Mn-0U for xen-devel@lists.xenproject.org; Mon, 14 Feb 2022 09:18:51 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1bdb9582-8d77-11ec-b215-9bbe72dcb22c; Mon, 14 Feb 2022 10:18:45 +0100 (CET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28-Pe1rmBISPdm6btwxw60gdg-1; Mon, 14 Feb 2022 10:18:47 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by AM6PR04MB5701.eurprd04.prod.outlook.com (2603:10a6:20b:a5::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Mon, 14 Feb 2022 09:18:47 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%5]) with mapi id 15.20.4975.015; Mon, 14 Feb 2022 09:18:46 +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: 1bdb9582-8d77-11ec-b215-9bbe72dcb22c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644830328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NHclxgsO2wIjGnas3J2z0bvbE6Wc/i62+cLKn6ifHNc=; b=aYs7hdz+/+DPgwQq7HThKqP8+M405G657drDeuWEMw4cZAOK//VAVhjKHcYwWV6gh5F2YR 1jx4VbcHZ96zc4aCY+izar/DwihE2W/D0oqJ12IEiHut//QPwP5JHPJKbecCXni2LQo/+G ByireRQkGHRLJrtXlqqkzJxTfnNwD9c= X-MC-Unique: Pe1rmBISPdm6btwxw60gdg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k1LZkgtKYVsPRUXovmXXrMqRrl8zc3WwhvukIHx/tzGsdhkcGnbzun8IMUkqus9D6mbpw1FefJjAqUpTnMWuczmi5SsiG9zolshSCiAN7Ur7fJLa4LPaGeQMch6bIwXvEhmNbd1uqvRYyYj7yWC+AnfiwK/4fZKBmhpUyE5XQLpCSxBIeUN4x48hTSKokfsq4NBNTkF8U3YYrsAjqRVUNdFVzrsptSSZg0H1YSU75oNsy4R81IcOe2dO3pbAYRSGilfmeTmd6LQRiBNgaijuNG/0vWpMuprnjnHBHbyBr5MFIhLCH0tC6cRYqGY5mlEWxx37SevnFMQcM5P80Iaobg== 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=NHclxgsO2wIjGnas3J2z0bvbE6Wc/i62+cLKn6ifHNc=; b=YiLdY3Fyp3us9kbTfuSb4y5w8coSkobAw3TPbt3FBKC+k8v0Zv6CSf9QD2msHXOH21I+e/FD31EyWKtYEHUt2JZZlF93IlB870bkvAhg10ZwUdwMvxjSLn/9mlrjAVG0XUs3g1JzL2NrjDor30Q1H/KB7+Z1LKwgkXvi2e8++7SBhYsgXym+d+hprP/vJdpYw8un5KoT/y2kWOcRmIRagt2D4KcgKHz9Ig9RWr0DGGPQtd50o8p29eQud/1yTXXrW1TBoKxuy6ID1EGjW6pRSrDsw+moXlocB956NppIHlk38/YpDeLabHUNMEqJ0/EM2N1uQKJpOXfAKNYII9nw4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <92d00aea-9984-3940-2e2a-d54281e4c3a1@suse.com> Date: Mon, 14 Feb 2022 10:18:47 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 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/Intel: re-indent family 6 switch() in intel_log_freq() X-ClientProxiedBy: AM7PR02CA0012.eurprd02.prod.outlook.com (2603:10a6:20b:100::22) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49c7c767-5e7e-4b03-a397-08d9ef9b00ff X-MS-TrafficTypeDiagnostic: AM6PR04MB5701:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NoAMbhcwcBjRCNl1734LlLB4UdnZ156+D7OiRHssbLaNIbnedP+rr8B+f3QBajaEX/VJxFbbEADl9NOKwfkXpqDKHb+Nn9lCgBLlIFhcimd3RHQzdtEqXdSfxbPJHO/D0V0iZ+D1FgW9CkKMnOV3vclQctKQcJZfKZfJ6SWMtNzayr8a4hfz6sZdmcNEgS1wMyd7U61JgADcCdfIZ1HCfJl3Zv49xJw0rtq82o05g7NNSjKLOdtmSyfXlEgJKi2qJGy1uN21ycmuUvQaPjS+NJQnYiwuCpyREESsMGRw2jPZqGr6VLAnBH41TS/BhLrU02Ll5IJhYJ4/Qk5Taz28T9Vwvnl2uyzc3dnF31J7q+r22KRw43dXPkNdiJvCk497VTnRAvfKAUlCnOmMK8Utkd2H1aDdKKWiKYU1K6RmQvWm9SL9US3vq3uvdLv61Uz1gR4Kf4aF8DTKcuFQiZND9plY4Rsa+QZZba24GnEkO3pFNstbDAv5dksZmW7uwLIcXFYzcyZ6ZDTzAyoBo+ZsZkN2trq+JZC5DfcEeq+L6/gq7wAkld8Vikv9fQgAWL92nXlV9rHQu/q3ePJS0Ad7A+un0wy73QCo3zpp68RIL2F+ZcNAva5zbGad1X2zoVL3SeAyuQHyRFOfOjP6ZmBpYiwOHGUjrScIGiRl55NjNM3sRi5Z3L6yjFlFXtTwcwcODLp0xfSq681yqTiOC4okRuDr0tCULEFFzHpP6yrm5AY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(31696002)(6916009)(54906003)(86362001)(508600001)(316002)(6486002)(66946007)(31686004)(6506007)(38100700002)(8936002)(5660300002)(36756003)(6512007)(2906002)(26005)(8676002)(4326008)(66476007)(66556008)(2616005)(186003)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JhPOpvixqWbFed4yCpdgVCQlDYsw?= =?utf-8?q?lGnUghn3ouaoRb8dN5W5p6ir7yjeu2KoC3+dfhckSy420UMfia6z7mTmv8VPos21H?= =?utf-8?q?9bCvHATXHXck2zvgRhGQicrI/sZG1agSM2CveziY1HXh//nGnoe778Qw7ik/gJBbE?= =?utf-8?q?UJNm1riXTyOyhEdHrWfmS9ScxTgbePjbsQBx87eS7xn2kHPKia6+G3i2JSCyH/JL5?= =?utf-8?q?UKxrKjole9j+VpPyreGiw4SLoNpbul4hsokl8bR1kVJoYGMp8VbdwdmTqQV9pEvLc?= =?utf-8?q?06DN2UCkYFzkw0lGMTpcGyQef03jtwujKg8DjboDtC58dDS4CNhVdu/aXrs1Yunnn?= =?utf-8?q?zMsEuM+MLYbSMxyhs00lHhOAsP15vHxMbrsgTaq19Lzw/nkBJrtpLKD741CFDCRJl?= =?utf-8?q?Iq8kiz2lyFa+9xgjxhYAvVs//nwNDNTxyZnSd2OcFrT4u4sF5Dlii1Aj/4HrIdCQb?= =?utf-8?q?6JdOtc/XGbsr6k/TFaVMGsqDo0RaZQoy2eSeJZCVlP92vwVNtrtugyQ2Wtsw00OoA?= =?utf-8?q?+C5lX5RnH8dB6lxoACro6tRWFlJ2fC2YdZtowg/opoD4xJEMziLm9tHlmGnwhMJG8?= =?utf-8?q?Jy2IbpwrwuPNMtwLXaW6zusNgo+Y+8JqPovwtbtepEawT/VsXFSddtoc6Qy6FLcwf?= =?utf-8?q?umapLXaffrQIKih5sUgMTsFakGtfhRLGyijYOwei1+4TQ8vr/zTJO0zibS0BKU+TE?= =?utf-8?q?kDe4F5i1hJ1pCQmmeeIWqSp8/p1aT9f1lTLez6UJgr/q3ZQ2SxR/QO8SXtxUIw2sy?= =?utf-8?q?kGr0pQbOvimN/sYHkQUcf9PTJKocohtiprBquN8tSnVvpUlhZrm0pFRqTaUUMn56o?= =?utf-8?q?q9j0DiTAgecUhJzQyHa/xOa2d8eNTDDEtPDOukzeodL7FSqfo4IJ9J3R3lsxSP3+b?= =?utf-8?q?RAdEEnq6uzPFdJNGpjpmD4NdVpL547g626TWl9Jn5WoPG5VFLi1Q8Dhs+qDQQ9fqu?= =?utf-8?q?ndQy6MH6Eph4yPFRvY0hOOj3G1dNgjcok49Bsr2NUCHMiR6HF0/O1nEzHsOT6eY7x?= =?utf-8?q?ZPKkgrDkLPcXhRbC5olESYuJfHtuTfBchgA/8HbOxBTOPTeghaq97NBw89sO4jFGC?= =?utf-8?q?N+RQuGZT9g654LYUnghpMyUGnAh99DE020wQi+inEc8430fSkR2PyimRtPvlsl75B?= =?utf-8?q?htLfdGDPzabHa7Mr3fWygPny/eyrxG2DQFTjWcCoX3EP3+Hcp45ok9CUZjx/0DXcx?= =?utf-8?q?G5ttRLS/6XxHSDH40so9nZxppIkFcx7u6GTLEi4oOdXpnHIqyVSS/q98dcvq9mFJ6?= =?utf-8?q?0R84aEGqsFnhJogrCNq4/n5eg/6B1PT+qNMBhLswQp4a8Ccozw1T6YsCYXm7HDu9Z?= =?utf-8?q?PIFtudqHlkD5bCyV7fFlaSbuP6/hNQlUZtXwasKMgTqzCTOLR+K7nI/O9M0sj3+1+?= =?utf-8?q?xJxCx2L8E+YH87m1Z8i6nglB7d6xqtHBz+jOpRuwRSKvxOWtUI3sOydUc3giiI54A?= =?utf-8?q?kifrJI6XXgaNEai/+LH9r2MjGh6BMwd5rWpFJQdQ6ka8A8KLb5MlOA10Mr+Rb8gm6?= =?utf-8?q?HlWgFF1dpKib4b6LZQ72bYpA6gtspwf4zEWd8DOvs2XoKTPRXfojF6k=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49c7c767-5e7e-4b03-a397-08d9ef9b00ff X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 09:18:46.7389 (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: 1LDO4MM3Wdj3F8ONEjhEuvpI+gUmVFXLx00RgK8ZHWQSRBr2h3bDck9PigSsx+2sI/jCzkRoair6kt5UUuYMIA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5701 This was left at its previous indentation by e6e3cf191d37 ("x86/Intel: also display CPU freq for family 0xf") to ease review. Remove the now unnecessary level of indentation. No functional change. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -468,35 +468,33 @@ static void intel_log_freq(const struct if ( !max_ratio ) return; + switch ( c->x86_model ) { - switch ( c->x86_model ) - { - case 0x0e: /* Core */ - case 0x0f: case 0x16: case 0x17: case 0x1d: /* Core2 */ - /* - * PLATFORM_INFO, while not documented for these, appears to - * exist in at least some cases, but what it holds doesn't - * match the scheme used by newer CPUs. At a guess, the min - * and max fields look to be reversed, while the scaling - * factor is encoded in FSB_FREQ. - */ - if ( min_ratio > max_ratio ) - SWAP(min_ratio, max_ratio); - if ( rdmsr_safe(MSR_FSB_FREQ, msrval) || - (msrval &= 7) >= ARRAY_SIZE(core_factors) ) - return; - factor = core_factors[msrval]; - break; + case 0x0e: /* Core */ + case 0x0f: case 0x16: case 0x17: case 0x1d: /* Core2 */ + /* + * PLATFORM_INFO, while not documented for these, appears to exist + * in at least some cases, but what it holds doesn't match the + * scheme used by newer CPUs. At a guess, the min and max fields + * look to be reversed, while the scaling factor is encoded in + * FSB_FREQ. + */ + if ( min_ratio > max_ratio ) + SWAP(min_ratio, max_ratio); + if ( rdmsr_safe(MSR_FSB_FREQ, msrval) || + (msrval &= 7) >= ARRAY_SIZE(core_factors) ) + return; + factor = core_factors[msrval]; + break; - case 0x1a: case 0x1e: case 0x1f: case 0x2e: /* Nehalem */ - case 0x25: case 0x2c: case 0x2f: /* Westmere */ - factor = 13333; - break; + case 0x1a: case 0x1e: case 0x1f: case 0x2e: /* Nehalem */ + case 0x25: case 0x2c: case 0x2f: /* Westmere */ + factor = 13333; + break; - default: - factor = 10000; - break; - } + default: + factor = 10000; + break; } break;