From patchwork Fri Oct 13 10:32:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 152483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1792532vqb; Fri, 13 Oct 2023 03:32:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGZcszOu0oS5ybunzqzm7yrVMAUVViZu87E2Z8LTarQK9nLspWsviolFSIAqYAMyu1803eY X-Received: by 2002:a05:6a20:5484:b0:171:737:dfaf with SMTP id i4-20020a056a20548400b001710737dfafmr13315560pzk.5.1697193155608; Fri, 13 Oct 2023 03:32:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697193155; cv=none; d=google.com; s=arc-20160816; b=K7JUor3c0JSs9x9vxKbtwCIYrd+sXCOncMwIinN2VwBASpQZg0XCipnpcFQkXRStmW Qiu4S21cxbwyhcVIVcqM7amBBpqF7+hXNs9gpQY39vPEkgLVpdjji1+BMjC2QGaa7l++ rYcg7AscylvGnXqMy0M4fK8p5bRTVcyteyQEzj5VnPW/fjUlZ1QTBOhkP4Zq7O4Up33T Y+nFbYiRZiPnqD0NzK0YmYnGVa/KOMCtbQ9mt4V4OBx3hVsbOwtB9AJoKKj+E0D4mzai N3sGvw091vpmBHtjbU0pRpwKBL0XR2zjyTzK/4Q+F1UkqgPGq3/s8K6YwFO7U8ZCdMsL Or8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=8GqFWLwKpBTs9NmQk+Iig1hSCyVU4NpiAHXus0C4MYY=; fh=jyDpbnN4Jam/tI44hvGQUbcJ+ny/WD3skfcKHn8tJZE=; b=iLmclC0A19wwYzsuibtdtCRZflfgs3E/G/um4qpkd+YQlViHfmRfcWw4mO7V/V3rij tX5HdLm+vLrDp9BeiI4hJpeEpGcXqKfjwvCWoMH6OR5Sgi+RfSSeXEg/BklvI04/yMdp 2g3V2jgAaX6kShfxnqMfiRO9yX/cDjWPBfnKfNjZVcVRONn3TIw9JaZHJpgyVuYOMsc/ TgQiBzjudlOIm8dODrYOnNZiAJI3053kIzR2yqmnjQJG9pZJ2ZQXB+u63Kb01PbxZFd6 lFktG0YKPwv+wLlWQb7Uj63BqnjNuMdFNVhAXoTyJm1Z9ffJpP5vM2pMGMEHJ/4Pd+/s UBqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=C9xkqxnk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id 16-20020a17090a195000b00276bf69ac44si4088118pjh.5.2023.10.13.03.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 03:32:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=C9xkqxnk; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 8014F83C6374; Fri, 13 Oct 2023 03:32:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjJMKcX (ORCPT + 19 others); Fri, 13 Oct 2023 06:32:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230193AbjJMKcU (ORCPT ); Fri, 13 Oct 2023 06:32:20 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5377C0; Fri, 13 Oct 2023 03:32:18 -0700 (PDT) Date: Fri, 13 Oct 2023 10:32:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697193137; h=from:from:sender:sender:reply-to: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: in-reply-to:in-reply-to:references:references; bh=8GqFWLwKpBTs9NmQk+Iig1hSCyVU4NpiAHXus0C4MYY=; b=C9xkqxnkOPfo8XMwxlWuc1XAQDG9/H4lYI2e5ErusY6y4gw2296g/tqhdhYn2m2USH977n UhDoFRgKS9vVFOH1fkMxsaaMuzQ5D3zTARNKBkUB8MUHZpweINzxZa3hOu4I5loA7mUKC7 kwQLs4fd44ih3kaFAp37VuDhpDpaKsco9hnb40N6fp3HjOp53TgafstJIQOanpTcd3ZUZU Cas6JOCsAPDE7SLIOuf9ZQsg0SwjU6NALFUUZ7iZ/pFsQp8ut7Wm1IFwER30qvOuhKDl/j rZkTor6Vt3UWRbBApwX+kNSNoKzjJ+cg2Ig0p120BvV4PymRLPQm3Ew+ZUSAdA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697193137; h=from:from:sender:sender:reply-to: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: in-reply-to:in-reply-to:references:references; bh=8GqFWLwKpBTs9NmQk+Iig1hSCyVU4NpiAHXus0C4MYY=; b=iZRw9O5fftztFdFP0XV6JtFZcbG7KQ+5+50BZC69hgsZkzJTQOH+rqKFPgEynIIZarPHTW Bw8xuy47xSd18kAQ== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/apic, x86/hyperv: Use u32 in hv_snp_boot_ap() too Cc: Ingo Molnar , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230814085113.233274223@linutronix.de> References: <20230814085113.233274223@linutronix.de> MIME-Version: 1.0 Message-ID: <169719313683.3135.11702474908875768918.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 morse.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 (morse.vger.email [0.0.0.0]); Fri, 13 Oct 2023 03:32:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779636010187837769 X-GMAIL-MSGID: 1779636010187837769 The following commit has been merged into the x86/core branch of tip: Commit-ID: 92fe9bb77b0c9fade150350fdb0629a662f0923f Gitweb: https://git.kernel.org/tip/92fe9bb77b0c9fade150350fdb0629a662f0923f Author: Ingo Molnar AuthorDate: Fri, 13 Oct 2023 12:14:27 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 13 Oct 2023 12:26:58 +02:00 x86/apic, x86/hyperv: Use u32 in hv_snp_boot_ap() too The data type for APIC IDs was standardized to 'u32' in the following recent commit: db4a4086a223 ("x86/apic: Use u32 for wakeup_secondary_cpu[_64]()") Which changed the function arguments type signature of the apic->wakeup_secondary_cpu() APIC driver function. Propagate this to hv_snp_boot_ap() as well, which also addresses a 'assignment from incompatible pointer type' build warning that triggers under the -Werror=incompatible-pointer-types GCC warning. Fixes: db4a4086a223 ("x86/apic: Use u32 for wakeup_secondary_cpu[_64]()") Signed-off-by: Ingo Molnar Acked-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230814085113.233274223@linutronix.de --- arch/x86/hyperv/ivm.c | 2 +- arch/x86/include/asm/mshyperv.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c index 8c6bf07..c6edde1 100644 --- a/arch/x86/hyperv/ivm.c +++ b/arch/x86/hyperv/ivm.c @@ -288,7 +288,7 @@ static void snp_cleanup_vmsa(struct sev_es_save_area *vmsa) free_page((unsigned long)vmsa); } -int hv_snp_boot_ap(int cpu, unsigned long start_ip) +int hv_snp_boot_ap(u32 cpu, unsigned long start_ip) { struct sev_es_save_area *vmsa = (struct sev_es_save_area *) __get_free_page(GFP_KERNEL | __GFP_ZERO); diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 033b53f..a9630e9 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -276,11 +276,11 @@ int hv_unmap_ioapic_interrupt(int ioapic_id, struct hv_interrupt_entry *entry); #ifdef CONFIG_AMD_MEM_ENCRYPT bool hv_ghcb_negotiate_protocol(void); void __noreturn hv_ghcb_terminate(unsigned int set, unsigned int reason); -int hv_snp_boot_ap(int cpu, unsigned long start_ip); +int hv_snp_boot_ap(u32 cpu, unsigned long start_ip); #else static inline bool hv_ghcb_negotiate_protocol(void) { return false; } static inline void hv_ghcb_terminate(unsigned int set, unsigned int reason) {} -static inline int hv_snp_boot_ap(int cpu, unsigned long start_ip) { return 0; } +static inline int hv_snp_boot_ap(u32 cpu, unsigned long start_ip) { return 0; } #endif #if defined(CONFIG_AMD_MEM_ENCRYPT) || defined(CONFIG_INTEL_TDX_GUEST)