From patchwork Tue Dec 5 00:45:08 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: 173624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3134094vqy; Mon, 4 Dec 2023 16:47:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvrTW6Mm+bgHAeKMm/J0COXBMb9XktXKmjKp7O/uhLVTwMOuMIh3LzSaq1VBIt8ZQC7j75 X-Received: by 2002:a05:6a21:998d:b0:187:a2ca:409c with SMTP id ve13-20020a056a21998d00b00187a2ca409cmr3347629pzb.5.1701737230203; Mon, 04 Dec 2023 16:47:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701737230; cv=none; d=google.com; s=arc-20160816; b=c+CW/32k/I4ZI2G++94XcdWweS9uqBb7bpwCxZHZMvymPhixyyvgtNfN5PE/w4CLCB VRVSuXQTaOfdd6Iz/FlKM4fgUESu4zMwWxwW9SqN6SaYSeFSv/egmugKWWFETI8WVyzg Fo8HIia7BP5ZGsE+Kvc86SGR+lfRarHUI5ygTUzUI6RXj8MT0p8Y2n2xaILSCeMGiUnr CA8UTF1DiDFwGYAQf3eMigT8RK5rs/kQfDqO0tAATgxcOXEbBdEfON63D5t4cu1yYbwx Hzk+bxQgTL5jupH6HRvMVZbaTqJO4ELVFdAgcUKJzG2UT+PXzbPSnIa9MLRjqvaXLOJD YEAQ== 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=jK8tL2dJndkpGmuVftMuushnGeaBuKSnOT/uI2yepis=; fh=OvJRnOqsMTm9XoNmEwebcqh9Ud7yh1CTeKAP84ols98=; b=E5PW1Bd7SrgIRuXbrOP7eFqXhECpDKisdwnY0X2Zszs61tjHmQKi6LDH/4mbZlSNpw +XM1fxAz0q15OPNqYDrSrJ8vmtfmG3n+X59k41OgqENiEnpvuVvXm06+CEc+Kh/gksiZ pyyj5KxXMhRvkQkIUDd63spEnnMx+NneyvuRbwyzjiaqwPLFD3TPNgyfLa39T1nWYxm9 djaA+ZQ6HOwxLco46HcvWaoPiToLoJTkBKiVHe8Mgy0kMFWnHZ7xlpybQHWNctZg6IJx GrwtRsIDOZ4B91dm2K6zpznwh4n2OTYJnC/0JMzjA7Qjr1KM5GRQFAUT0Po9OKVMfym5 j2DA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dSj8Tyho; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id l5-20020a170903120500b001d00c80f3b3si8628202plh.280.2023.12.04.16.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 16:47:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dSj8Tyho; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id F3731808E551; Mon, 4 Dec 2023 16:47:06 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376336AbjLEAq2 (ORCPT + 99 others); Mon, 4 Dec 2023 19:46:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234814AbjLEApg (ORCPT ); Mon, 4 Dec 2023 19:45:36 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44C7D119 for ; Mon, 4 Dec 2023 16:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701737138; x=1733273138; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hDA/+p+nxM87pJNv9Ukdh1cz+IjWMOLujDQdnMnWdrA=; b=dSj8TyhoTN9rZ3u1fCma5ZsSdILXI1OB0cUUdTmOxcFMKE+3+aCcPn1z gGZ5yIf0nMdyIQlRp3sTTwoEVgVXXLgdSUHvQzFKKroQzTBiEDMO21cYC /Pmuzd1XGSQNsqaGmYrhsMtd+g3NSfO9/7gbVueg3zyAbgT5RD4SNW8yN X1D1jzILF8uwWy0qEzCDHRaq6eDTTYyRzu9s7Cdsct5lCTzbY3su22/xL Kjm2Kx5FLSr+47gje1KPHeWfeaqo3DTSp8HEFCAwsetDKo4Ltq+9PlOqT pnjnhcmMGqFYddOIYBmKAgO+Ur4Qr7JFZ6Jft+2Jfst5OCLdvWnLWwLrX Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="392688735" X-IronPort-AV: E=Sophos;i="6.04,251,1695711600"; d="scan'208";a="392688735" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 16:45:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10914"; a="944067953" X-IronPort-AV: E=Sophos;i="6.04,251,1695711600"; d="scan'208";a="944067953" Received: from abijaz-mobl2.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.61.240]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2023 16:45:30 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id AB59210A44F; Tue, 5 Dec 2023 03:45:20 +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: [PATCHv4 12/14] x86/acpi: Rename fields in acpi_madt_multiproc_wakeup structure Date: Tue, 5 Dec 2023 03:45:08 +0300 Message-ID: <20231205004510.27164-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231205004510.27164-1-kirill.shutemov@linux.intel.com> References: <20231205004510.27164-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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 04 Dec 2023 16:47:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784400817831598929 X-GMAIL-MSGID: 1784400817831598929 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 | 2 +- include/acpi/actbl2.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/acpi/madt_wakeup.c b/arch/x86/kernel/acpi/madt_wakeup.c index f7e33cea1be5..386adbb03094 100644 --- a/arch/x86/kernel/acpi/madt_wakeup.c +++ b/arch/x86/kernel/acpi/madt_wakeup.c @@ -74,7 +74,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(); 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