From patchwork Wed Aug 9 20:36:14 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: 133624 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp84728vqi; Wed, 9 Aug 2023 17:05:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQhuwjksDBKGAmfP17VnZg7c/LAMX96M5zB6DB6ZFNjDL4fUi2bcBR0r5gQBgsZmMQ1QZ/ X-Received: by 2002:ac2:4dbb:0:b0:4fe:958:88ac with SMTP id h27-20020ac24dbb000000b004fe095888acmr445319lfe.6.1691625931267; Wed, 09 Aug 2023 17:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691625931; cv=none; d=google.com; s=arc-20160816; b=Q6PUXj7QEtsDnix3z4VgzmSmKL6EnZYIMORjiFBRDZRpwLvjkVzx1gKEihaNjEX4+L zodKTUpvLL2pjEtamd+K0VoQuWPOwc9YIsBjF0iwhjF39G/dWyMzBsq3VEiRQHGW6yY3 Ddgm41fl0/SrjBMFokZ32YfVlLdABJhPsQaQXI5H8L4bNTOSknZBgWcbKMjJ50QGsq+g 4hmXgCLF6awKekEvRUAIc/mWu99R81XZ/Odrhw6wNhA9mPpXuWS5JCeKqx90vf1KdOtN DOAks6XxvjDYntIwl6JkpwKZ/zuAhjkIOzlQGcPgYAU9SmObBwO/XxB7GutGkhK0OXVA ofoA== 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:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=ncSA6kkBWYMdumbDHnemezwrrAD2YeFSIIbSb9P+7+s=; fh=jBwjuriIPWA1lnCf5oMMiNAPpgGE0iGPmBzZMsd85oQ=; b=HKPs2Ou3pGqahjoGeRgvYuDXI82REcTZd63a1Rs/Rgzwh0F6M1lQ1aitXyPMyUQKOk GbATQCHN/bbPeBNIVQ5pHMBnASB7N+kkiRpFi6/g5OFGEQJDTO7Ie46U7ZOxrWTv+CUw BZp3Yslcwv1137NBEdrP4yDn0FFZXicz3U7G5CSP3jW4OzOwTnLglzttnIMZKhEEk0S3 5Ee0KdJl+1a3ep/sYIKLL4zqujchFzQ4fak9q2RPxSzdDyIcqXAYwytVkAn5Fahpt09y PyQWPq05vmN0IMMJ1S3zN50LS9FgdqicoM98PJiKLAWyAh59CfNSB8QYXcxNTRh/TaBW OZFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=au3CpCmc; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f14-20020a056402150e00b0051bec40640bsi208783edw.603.2023.08.09.17.05.07; Wed, 09 Aug 2023 17:05:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=au3CpCmc; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234795AbjHIUhF (ORCPT + 99 others); Wed, 9 Aug 2023 16:37:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234571AbjHIUgU (ORCPT ); Wed, 9 Aug 2023 16:36:20 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C109268D; Wed, 9 Aug 2023 13:36:16 -0700 (PDT) Date: Wed, 09 Aug 2023 20:36:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691613375; 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; bh=ncSA6kkBWYMdumbDHnemezwrrAD2YeFSIIbSb9P+7+s=; b=au3CpCmc11a30hQqvzi1Tik72ZAPLIn20JsCr8MWTAbxHxdirn5By5LmtLyXExa6ugNQcD A09rAA+whniIG9WOq+nY4N89unjAyJl9MWvmX3Ff7oGw/4CNL14badny5FQMJ0DpHLJDcE +cA/8EWci/0coFKkOZFuXCI48p6kNBKmtbRhp7cLeDSpO703kTPDEtCjDV2Y+xFNWB4GnN wyUeULdW22opzAujXRcY6qMPx3RtSA7MjGrrgWzVSIyoo3X0arGMYCzDB6o6H0PAu8cq8j x6ORjjvytzj3q8IRmo6Q2bO7KqcaR5AnLDSn7db1acJ6hM/vuEB5JCmtdsml/w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691613375; 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; bh=ncSA6kkBWYMdumbDHnemezwrrAD2YeFSIIbSb9P+7+s=; b=goZudmqPIx5MjUk8xgpNuDK9Vbn9LuOuxcXdRZCk/3oGh48E0fEpvAsoxTPkRV3eOVGHJG sCIZuTlEHfxggUDA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic/uv: Get rid of wrapper callbacks Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , Michael Kelley , Sohil Mehta , Juergen Gross , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169161337409.27769.66872517118417432.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773771016014231270 X-GMAIL-MSGID: 1773798351988211252 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 194ac709819c1fe281397ce1b2894f2bb6413599 Gitweb: https://git.kernel.org/tip/194ac709819c1fe281397ce1b2894f2bb6413599 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:04:07 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:29 -07:00 x86/apic/uv: Get rid of wrapper callbacks Why on earth makes a wrapper around some common function sense? Just to be able to slap some vendor name on it... Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Sohil Mehta Tested-by: Juergen Gross # Xen PV (dom0 and unpriv. guest) --- arch/x86/kernel/apic/x2apic_uv_x.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index f532c58..f0580a6 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -783,11 +783,6 @@ static int uv_apic_id_valid(u32 apicid) return 1; } -static u32 apic_uv_calc_apicid(unsigned int cpu) -{ - return apic_default_calc_apicid(cpu); -} - static unsigned int x2apic_get_apic_id(unsigned long id) { return id; @@ -838,7 +833,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = { .get_apic_id = x2apic_get_apic_id, .set_apic_id = set_apic_id, - .calc_dest_apicid = apic_uv_calc_apicid, + .calc_dest_apicid = apic_default_calc_apicid, .send_IPI = uv_send_IPI_one, .send_IPI_mask = uv_send_IPI_mask,