From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D150C433EF for ; Tue, 8 Mar 2022 16:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232080AbiCHQkv (ORCPT ); Tue, 8 Mar 2022 11:40:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344047AbiCHQkn (ORCPT ); Tue, 8 Mar 2022 11:40:43 -0500 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2046.outbound.protection.outlook.com [40.107.220.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2EB34BFDD; Tue, 8 Mar 2022 08:39:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cNag6ouQLIzzViOQpYxgVO7ZwyXe/iATE6HDs44HTZ6tpu+bexcdTrtIE37hV6j4ONpbBFHJROg7sWfLHS+R+ONb14z6kOILf57WQiuC9IzCt/JBmBcD/gGMnzQfWOqx31cMJuXGr1W2PbKKMGyLs9qWByAKxSqnKZJ/pIO24Arb+/ZHT8Um4cio0itQB63dL6hgH/JgHdEOmtTnzO9qY0ZSifIiU0HYyNC45HOtEUt3bIf1bGu81PCGMOi9ntIwNkA/xjMPBdWW7CEUrOrQ5eHe4P5wc26WZl+LQSL4zSQF4NcFkQbCFYbAYxHU5YnwJHL1w1NbJNUcW3Sk6qLZ/g== 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=Q938zMI2WAdKA3AG3H8hnrl2Pl78D4NodZMJTEpthGM=; b=YlY9LFL/CoLokawSbvhSazR3eWvxCa47vDJsjn8fFLslcSk38lSgqNtgLo9mxUtdzNE3ZTeA7eDnHvlkPQRYzNkP+6f5sH3UHKkNfzya+uC3zeiCX9j0xBPpvZ5Q4IkTgLtcrBtZNJK/QfUAVtLzV5pjrNSodCykLtB/hd7Dj0ColDQeyDG7CjoFB9fkJ7XYIHYXcOYpry+fZIAWN0+posD/YOibSg7e18wYnuLrm6+gu1hB/H3H4sMs4IY2Noz64O7pkYagpg5bAMd/aCKqWImpQ4SuclmPQxwt2oVVbkypKXShM7FL+K5Z0JORSdDUT/y6sYUroR6cXYuu0SUNkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q938zMI2WAdKA3AG3H8hnrl2Pl78D4NodZMJTEpthGM=; b=HYCMjL6NKA2Wk2Fbu2VSs/U7MwPZfDlv5JbehUVFPytUqv7GIS+PtiVM2845EHzcOrfmc/kDfqJ2PSRYT4AbgAH5U1MfRNkdXMaL/iIk8wk2Z33ysS3eiPLI3ZFRcEWDkQxPHpf2RGiYHMn+eCjdbkqC5hKtBVhMzhNim1M20Uk= Received: from BN9PR03CA0313.namprd03.prod.outlook.com (2603:10b6:408:112::18) by DM5PR12MB1369.namprd12.prod.outlook.com (2603:10b6:3:6f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.17; Tue, 8 Mar 2022 16:39:45 +0000 Received: from BN8NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:408:112:cafe::26) by BN9PR03CA0313.outlook.office365.com (2603:10b6:408:112::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Tue, 8 Mar 2022 16:39:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT012.mail.protection.outlook.com (10.13.177.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Tue, 8 Mar 2022 16:39:44 +0000 Received: from sp5-759chost.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 8 Mar 2022 10:39:42 -0600 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [RFCv2 PATCH 02/12] KVM: x86: lapic: Rename [GET/SET]_APIC_DEST_FIELD to [GET/SET]_XAPIC_DEST_FIELD Date: Tue, 8 Mar 2022 10:39:16 -0600 Message-ID: <20220308163926.563994-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220308163926.563994-1-suravee.suthikulpanit@amd.com> References: <20220308163926.563994-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08d88677-c343-4201-c98d-08da0122405f X-MS-TrafficTypeDiagnostic: DM5PR12MB1369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vPZ7NKTdbBZ9JoPe232o10Twhb4wBsNEOvGVHRVCw+qD+uMapRsVjhd6bEyEgLwtvyKo5XXidDzv0rnmLT/dPPbWtksnDC0lCb9aeaXTgpw/632M3x1tbEx3iXc/wkoIoR9lOf2X4cZ1HPPWdPJeunRjz4jRg+X/IYB34lnVRT/MJ+LU96kZoAyTp6o6/131HfkECypg9rSq1h7vPzQP+xLfO2NCjNi5XZL2J2A/Ph8xZJGWZlVq2CfKWbCc61iS+oqKwAcP/Aje/v8zjnfV+YQZusDUtaI4hBH4qZs317ALq3abQx18FRMztwyCcm2PsOGl+gxfZbD8u1un4dTmCWYtFCMH3Z0J5viFFUdxzeWGf2GCNZ6RAx016m7DiaTmvgVbx00zT2ByH+lixJ5Eic5yS1YIqj9RP98/NlAtQnJac7Zh5HW2sz83rZMcirdUKRNAqwdFcMLh80e26mRSuYuwga9I4FfAsUkGNCo90p0NKYZ0e/SFb9U5C1IZIjQn4iydp25btdgKDIpjYqxEdxaB3ab5L0GkbTTJT0/8kUhSEj1oX8HFZajoh2IFX1SDPdJP2rmVt3fB6q4gep/ATIgvnLyq5Ht6gZ0i/KUcPtRbEp0y1kZlwAlssCTEzAb78b6llC1zQ6xFspbBtvd3l2vnUZrdIpPJqV1C2VvSaT+UMMUUkubznNYLs4hqbF+TsmgKPASqW0h6xHCAmcGCfQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(36860700001)(70586007)(70206006)(47076005)(8676002)(4326008)(36756003)(26005)(336012)(426003)(1076003)(54906003)(186003)(2616005)(316002)(83380400001)(6666004)(7696005)(5660300002)(40460700003)(44832011)(110136005)(8936002)(508600001)(16526019)(81166007)(356005)(2906002)(86362001)(82310400004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2022 16:39:44.6256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08d88677-c343-4201-c98d-08da0122405f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1369 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To signify that the macros only support 8-bit xAPIC destination ID. Suggested-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/hyperv/hv_apic.c | 2 +- arch/x86/include/asm/apicdef.h | 4 ++-- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/ipi.c | 2 +- arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/svm/avic.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c index db2d92fb44da..fb8b2c088681 100644 --- a/arch/x86/hyperv/hv_apic.c +++ b/arch/x86/hyperv/hv_apic.c @@ -46,7 +46,7 @@ static void hv_apic_icr_write(u32 low, u32 id) { u64 reg_val; - reg_val = SET_APIC_DEST_FIELD(id); + reg_val = SET_XAPIC_DEST_FIELD(id); reg_val = reg_val << 32; reg_val |= low; diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 5716f22f81ac..863c2cad5872 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h @@ -89,8 +89,8 @@ #define APIC_DM_EXTINT 0x00700 #define APIC_VECTOR_MASK 0x000FF #define APIC_ICR2 0x310 -#define GET_APIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) -#define SET_APIC_DEST_FIELD(x) ((x) << 24) +#define GET_XAPIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) +#define SET_XAPIC_DEST_FIELD(x) ((x) << 24) #define APIC_LVTT 0x320 #define APIC_LVTTHMR 0x330 #define APIC_LVTPC 0x340 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index b70344bf6600..e6b754e43ed7 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -275,7 +275,7 @@ void native_apic_icr_write(u32 low, u32 id) unsigned long flags; local_irq_save(flags); - apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id)); + apic_write(APIC_ICR2, SET_XAPIC_DEST_FIELD(id)); apic_write(APIC_ICR, low); local_irq_restore(flags); } diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index d1fb874fbe64..2a6509e8c840 100644 --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -99,7 +99,7 @@ void native_send_call_func_ipi(const struct cpumask *mask) static inline int __prepare_ICR2(unsigned int mask) { - return SET_APIC_DEST_FIELD(mask); + return SET_XAPIC_DEST_FIELD(mask); } static inline void __xapic_wait_icr_idle(void) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 9322e6340a74..03d1b6325eb8 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1286,7 +1286,7 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high) if (apic_x2apic_mode(apic)) irq.dest_id = icr_high; else - irq.dest_id = GET_APIC_DEST_FIELD(icr_high); + irq.dest_id = GET_XAPIC_DEST_FIELD(icr_high); trace_kvm_apic_ipi(icr_low, irq.dest_id); diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index f07956f15d3b..60cd346acd1c 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -299,7 +299,7 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, */ kvm_for_each_vcpu(i, vcpu, kvm) { if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, - GET_APIC_DEST_FIELD(icrh), + GET_XAPIC_DEST_FIELD(icrh), icrl & APIC_DEST_MASK)) { vcpu->arch.apic->irr_pending = true; svm_complete_interrupt_delivery(vcpu, -- 2.25.1