From patchwork Fri Oct 20 15:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 156179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp1126001vqb; Fri, 20 Oct 2023 08:14:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMXFyKaPJTABrW5wgmpvEyAEaYJg+ZgewO6Dz0g8QmGUCvlQ6WTNebQhln3dM39pK1mhaF X-Received: by 2002:a05:6358:280e:b0:166:e3c3:b26d with SMTP id k14-20020a056358280e00b00166e3c3b26dmr2471081rwb.25.1697814854919; Fri, 20 Oct 2023 08:14:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697814854; cv=none; d=google.com; s=arc-20160816; b=pKeGg01CU+061KPY1Oa3Oz1aKOHdKlYJXu7Hp5TG82ovMzuDeS2XZBs21KoW4rJ8D+ S6NT2zbUN/iEz15rUqDUG/pCL1x3rG6tp5RK46o9EMoMlOzZP0i4xPJalTiDkOdDiCvR hZPgueCSMJcxtA0AV2M5WM6sLRl0ShQRx41N+FQLCu3yj+Dc936bCkumAPMP9Dem2FUF esBGiyNEP+71o34QnO0Sj5sW1fQW92SRRzMPJAraZu2TOQxr7BKF0nCl3UD5s5D7ebiq pfBBY8zT+dti5n3kjPUNKVe5qyLAk3J7gspr5MOmmlkAFfcF8ofdpM98IQ7oAdPnNQBw t4yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rvWYvGmt+wLMQBEYKZePHThPV6tkj1Bgwku8Gra9LjU=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=Pg62d+1ggzN288/c/I8FzkyGyylnK04j6yeM2nsin01SllwgC5jk16HgC8R1YdZ/Ly w4yd8TaXQ5+tioy/aUmOxRy/mqpA93tkBgjHLcxJ5E8JihDXwpFuN7Mdze09ehgvNU+i HJGT6IFSOciy9iaSi2CStdhQ0KNZj8/ZA7FMCyc6XizyM5KcxdpaqmyEI2Wy1gTAisVX 7kTvviLhlGXe3D5zIfc/jdE8EK7Rd8HeUIFVS7xotqcOprmt5tBM59lIVS/3df3fw6HL U994kC0ArHan3aMbe+VZQRJCGG0lbgeLB7swJFe6lpe/YD1PyDH4XZWLU0vRRfZoBOR9 iZhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="LkUdVSv/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id i12-20020a633c4c000000b005acd3068202si2061984pgn.552.2023.10.20.08.14.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:14:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="LkUdVSv/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 0B5A88315487; Fri, 20 Oct 2023 08:14:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377677AbjJTPNN (ORCPT + 26 others); Fri, 20 Oct 2023 11:13:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377655AbjJTPNL (ORCPT ); Fri, 20 Oct 2023 11:13:11 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5099FD76 for ; Fri, 20 Oct 2023 08:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697814783; x=1729350783; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6+Xn4E2qr8LKB1fom9PaZEE3U7cyiyObDREDtKSMetw=; b=LkUdVSv/BBprcTjCntlXtmylvL61PEHz0TuHT1JO+TbWgLlp7Cz0/tgj fdh8QClfRs9CvmQ61sfkdvwZ0cjGMa/YHk8UAkLZjYBdDptiWeYkZXhg8 +VT/Nv0tbA4GmVh8NUJTr1rDSdqXTvp/ywZ0DbYPSKvKg18rPkNKrUygG s+AMCYoXMJ3jBJSt5oyDBv8hGYM7jk6UDA/Gk9HhuEULV6tzTc8TqWXXC 0heSpiaSWfTHvIvuKGKOBGzAhnoiRhT0uXEIfpSUvz5zZfIZ69KucNoNS qfhay9cYYjT5+PxYx7+RsVtbETh5bU7oZW/85yT+bv35lPdX7xm72yp5X w==; X-IronPort-AV: E=McAfee;i="6600,9927,10869"; a="376893662" X-IronPort-AV: E=Sophos;i="6.03,239,1694761200"; d="scan'208";a="376893662" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 08:13:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10869"; a="761080285" X-IronPort-AV: E=Sophos;i="6.03,239,1694761200"; d="scan'208";a="761080285" Received: from dgutows1-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.249.39.237]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 08:12:56 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 67D2710A29E; Fri, 20 Oct 2023 18:12:45 +0300 (+03) From: "Kirill A. Shutemov" To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "Rafael J. Wysocki" , Peter Zijlstra , Adrian Hunter , Kuppuswamy Sathyanarayanan , Elena Reshetova , Jun Nakajima , Rick Edgecombe , Tom Lendacky , "Kalra, Ashish" , Sean Christopherson , "Huang, Kai" , Baoquan He , kexec@lists.infradead.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv2 12/13] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Fri, 20 Oct 2023 18:12:41 +0300 Message-ID: <20231020151242.1814-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020151242.1814-1-kirill.shutemov@linux.intel.com> References: <20231020151242.1814-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 20 Oct 2023 08:14:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780287909313525992 X-GMAIL-MSGID: 1780287909313525992 To prepare for the addition of support for MADT wakeup structure version 1, it is necessary to provide more appropriate names for the fields in the structure. The field 'mailbox_version' renamed as 'version'. This field signifies the version of the structure and the related protocols, rather than the version of the mailbox. This field has not been utilized in the code thus far. The field 'base_address' renamed as 'mailbox_address' to clarify the kind of address it represents. In version 1, the structure includes the reset vector address. Clear and distinct naming helps to prevent any confusion. Signed-off-by: Kirill A. Shutemov Reviewed-by: Kai Huang Reviewed-by: Kuppuswamy Sathyanarayanan --- arch/x86/kernel/acpi/madt_wakeup.c | 4 ++-- include/acpi/actbl2.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index 9bbe829737e7..ad170def2367 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -79,7 +79,7 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, acpi_table_print_madt_entry(&header->common); - acpi_mp_wake_mailbox_paddr = mp_wake->base_address; + acpi_mp_wake_mailbox_paddr = mp_wake->mailbox_address; cpu_hotplug_disable_offlining(); @@ -98,7 +98,7 @@ int __init acpi_parse_mp_wake(union acpi_subtable_headers *header, * * This is Linux-specific protocol and not reflected in ACPI spec. */ - mp_wake->base_address = 0; + mp_wake->mailbox_address = 0; apic_update_callback(wakeup_secondary_cpu_64, acpi_wakeup_cpu); diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h index 3751ae69432f..23b4cfb640fc 100644 --- a/include/acpi/actbl2.h +++ b/include/acpi/actbl2.h @@ -1109,9 +1109,9 @@ struct acpi_madt_generic_translator { struct acpi_madt_multiproc_wakeup { struct acpi_subtable_header header; - u16 mailbox_version; + u16 version; u32 reserved; /* reserved - must be zero */ - u64 base_address; + u64 mailbox_address; }; #define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032