From patchwork Mon Apr 3 09:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinghui Li X-Patchwork-Id: 78470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2186585vqo; Mon, 3 Apr 2023 03:07:25 -0700 (PDT) X-Google-Smtp-Source: AKy350Z+6WjOI/HN2NbiNJCBvkAjlpg90FwMmmXXgtZf0vPB96vEWnJ3Qft4Me8Wci+vWQSF4WPM X-Received: by 2002:a17:903:27ce:b0:19f:1c79:8b21 with SMTP id km14-20020a17090327ce00b0019f1c798b21mr30830787plb.42.1680516445270; Mon, 03 Apr 2023 03:07:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680516445; cv=none; d=google.com; s=arc-20160816; b=f0brlws84wr2rDWg6p9fCD1RWrxt42Lzg665/2n3XfCcExMg/N2AIEveZmwmvj3iGn eOJ7InbwCtAOcj2Id7hj73u2dQ+X3dYOR9OveBG3esUlyjexs3fLJm3xiGkzaora21Df nXznfbXky1CwPcJSZARvncCm1X/FtPr2l5T1Ocr2Ci9TaL3/dU6fz4RP5zDIOHl+/rIi s/XXn/+6cGU29HrSoCax8ua0u34GPpC+mYWC5MEqnzyJCG+qJbbZrmgjHzs+v8iyphyu xidLJi2MGeIrEqSEcrp6p+fhSa9G5H25bMUdCZcfsp0KXHMyJt3+9jtNfvhVFugYaXCx mVyA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=IYesVtVaAhJA/ajSb+Aj1pLBMVkQO/KZX+wBwWZpDAQ=; b=Btkmtl+882btATvE+z+GZ+V1d4zx/WeeHiGRe9O85792elRHVIxXqDk86tcs4Qbg+r d6tltd+6zHhFiZ2UUCUXUeMHzazEg4Ay8Hzf82pbunD0nqKmdU8ux78b9q3HffieFa7u UebFzZey6HHJL+Zx+XK2CjKCKe2hT/Dp/3O7RCj1mfp2VXpGNwXkHMZTL71LOydAG+no 5LqtSh0NapvlI+Gkp60EiRxXbdNpWr7AN5vv/TlhPclMv0a8oFugX35LKko6cpGLozyl Ldzp2WV7Ew+FEjJS+Gb5k9kX2x2bYhpv+t9uU+JHcFe6z+esc1yGu0suKspcckT8jUnS 5Bgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SumYnLdj; 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=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w9-20020a170902a70900b00194bdcf1aafsi7387448plq.541.2023.04.03.03.07.10; Mon, 03 Apr 2023 03:07:25 -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=@gmail.com header.s=20210112 header.b=SumYnLdj; 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=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232155AbjDCJxO (ORCPT + 99 others); Mon, 3 Apr 2023 05:53:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231743AbjDCJwt (ORCPT ); Mon, 3 Apr 2023 05:52:49 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0ACAC1BF54; Mon, 3 Apr 2023 02:52:06 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id z19so27470084plo.2; Mon, 03 Apr 2023 02:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680515525; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IYesVtVaAhJA/ajSb+Aj1pLBMVkQO/KZX+wBwWZpDAQ=; b=SumYnLdjpOzBVt//ygioA9IzfhC6Y6LOmYxdP9b8AEi7kazu6WTW2wt4sVREo92fcz FGi9e9OPvj3jCrDA5uIFawTFKnaPZttEhgMxR9GrbrRBH9o/w8xQfI9iSb6eAahr7MV1 uSb5fD3Hf7HdXLA776uhhqfxE43ZjmwJA8X6D4fPL+vsSqRO4+f2GTqCUhiXyYOtINlF Jt1X5j1Xkl85B4iHKrvLJKEFQk+H1SF/6V/kpS2UPqrKbtkCaaOnBmrVHmXJ2nz2j03r JnXDiFdoWukzLyxU4TvVo70fbqSmsqh82tj4K8vnDznBn7J+ZBGZiGNVDwHknYabMgyY Ck3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680515525; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IYesVtVaAhJA/ajSb+Aj1pLBMVkQO/KZX+wBwWZpDAQ=; b=jDHc5lJXDsyDjavKKjMZJUNUwXKplR6exMNNqqg/tkgGJ+4c2PRB1ARyQzI5X/zunY dAKXZrO/5evtJ2HJS+BiVkIC9Q7P7pdSpzgj3TOS8yprUXeLMXgpokGVsMWeO6i6eVEd 0cB/cICguZ1xmnDUN1YBd6QNTwdpuCYLPIOLYVU3lh9MV1IM0YnyNbYzEnPur14n+gYi hUr06fwbjABd5n0ruhDgIK6eb7Ve8MwtyChc61fipntU+1WXHJFMimMfxwLn4avNMStD syxPmQuxPpZ65yF/vv8AhYjFn4FNQuiVfxecz+0dxDVrvAntuDEa45/etQ1WfjItTefX RyWQ== X-Gm-Message-State: AAQBX9cbW9xZ4UJzZ0Z62yWsMQwNlvcP/0wnm2HpUhjtc91fldF1ayxK QGemX7sFqIeew9n6w2iNyFwJ44lj6kAX+CvZ X-Received: by 2002:a17:90b:4ac8:b0:23d:3761:6087 with SMTP id mh8-20020a17090b4ac800b0023d37616087mr38197065pjb.1.1680515525644; Mon, 03 Apr 2023 02:52:05 -0700 (PDT) Received: from localhost.localdomain ([43.132.141.4]) by smtp.gmail.com with ESMTPSA id gx3-20020a17090b124300b002311c4596f6sm9260763pjb.54.2023.04.03.02.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 02:52:05 -0700 (PDT) From: korantwork@gmail.com To: seanjc@google.com, pbonzini@redhat.com, tglx@linutronix.de, mingo@redhat.com, mlevitsk@redhat.com Cc: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org, Xinghui Li Subject: [PATCH REBASED] KVM: x86: SVM: Fix one redefine issue about VMCB_AVIC_APIC_BAR_MASK Date: Mon, 3 Apr 2023 17:52:00 +0800 Message-Id: <20230403095200.1391782-1-korantwork@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762149212089911512?= X-GMAIL-MSGID: =?utf-8?q?1762149212089911512?= From: Xinghui Li VMCB_AVIC_APIC_BAR_MASK is defined twice with the same value in svm.h, which is meaningless. Delete the duplicate one. Fixes: 391503528257 ("KVM: x86: SVM: move avic definitions from AMD's spec to svm.h") Signed-off-by: Xinghui Li Reviewed-by: Like Xu --- arch/x86/include/asm/svm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 770dcf75eaa9..e236b896f8b4 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -278,7 +278,6 @@ static_assert((AVIC_MAX_PHYSICAL_ID & AVIC_PHYSICAL_MAX_INDEX_MASK) == AVIC_MAX_ static_assert((X2AVIC_MAX_PHYSICAL_ID & AVIC_PHYSICAL_MAX_INDEX_MASK) == X2AVIC_MAX_PHYSICAL_ID); #define AVIC_HPA_MASK ~((0xFFFULL << 52) | 0xFFF) -#define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL struct vmcb_seg {