Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp195270rdg; Tue, 10 Oct 2023 07:52:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaFhXRHAGAKEN1BOhtbX4OJcRk+uNpzhQRCCdnwUrHhaSgYXmoxhu3lYYjqsFWNP1kbY+0 X-Received: by 2002:a17:903:22d1:b0:1c6:2b5e:824e with SMTP id y17-20020a17090322d100b001c62b5e824emr18462152plg.28.1696949568333; Tue, 10 Oct 2023 07:52:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696949568; cv=none; d=google.com; s=arc-20160816; b=h7LlqZB0uaWgOmSDWMwyt11KW4/OIH6HU8Am7464oBgIGcs6kh9LlkVffLxg4YZYOn R4X40GYeMPKs8X9vjhmsu5JsWX9UKSzz0Q74mVMkutXVt489rMOOg1XEy5xDbFB6X21Y OIQUld0jo8smKEEiKsXwQONivXlqFG98hdL0tMpUcW5uM/79WogCkAsCfYhsd0EqQJ4H OONrKePNgLP2WjqK79kgiXelEMZMLWdJYC8N2bcenzWTu5pfZ6SihzRgRkKJgleki8KQ 3SYhspG1vtIKbKh+aBFxCvTOHZ/p4Hkmpq9gmyrddAuVSNoGdLdaBQ4GM9uL5ftv+ylX o4oQ== 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=mql6C3svcP3kSVFEcggPqIDFXT1Y7sed0s5ZpI3AoyA=; fh=sIv1O1zr02Mb5r17diiek/ddX0dZBx8mkPtVoP/DpuQ=; b=Aa5EF3HhC+F1R69SB0tliAuZk3URa5CcUldcksF5f0wF8Ylfri0WcoAhbBQ29NZ16d IbkeMv9DlJxhAOyYQXy80QS39baJ9VPXZE4CfT2dLw6sZszh801a2tFITdyZ7JF2Lqqi 57L4t5dbIkcakimysSKq+Q9/vr0SqSEInv4zw7J8JCCKNqjoB+QPH+B68Humdi/8yOfb he6IZUWrRccSElEmHNUrflAOnFDjqp0pPhO6A0717NvKAGR7c6oG46OMzhtGS26Z9NH2 kEknMFj9kXokm987f23zvOhjIhOsJQfV+rGim/SWoMRNrV2s45w5GotrJ4oqBPE9IwgQ QuNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="QwHjc/KG"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id kx8-20020a170902f94800b001c61bd7cee0si11739221plb.211.2023.10.10.07.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 07:52:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="QwHjc/KG"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 94E4D803AF7A; Tue, 10 Oct 2023 07:52:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232818AbjJJOwh (ORCPT + 99 others); Tue, 10 Oct 2023 10:52:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231821AbjJJOwf (ORCPT ); Tue, 10 Oct 2023 10:52:35 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7959B99 for ; Tue, 10 Oct 2023 07:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696949554; x=1728485554; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=prDOZaLhNry5FEtEme6DwAIMpa0s28Zjnwh4T+OU7pE=; b=QwHjc/KGi6BpXOr6IZAT14VyW9QKo8O6naYZ4h0hggoRrRL60oSAI3nY 4tDIep2XkMC7wZoVqKcEdP8QYzM12O1TeaQXiHxmLlx7pjdiPJHa7cRVp xzA53lS4k/GVSu7IEgNzXSXWIPnWCwZBC3yfwmU19/BT/wS5XhcOvuE81 xz2P+CkofMO9rcyzbwkbgbqj7LlllUepU9fDsRAhS8HwfPRt1YqKp9sNs 4y5iHK6Q2l9H9QuwhXEG1wPhRAZynbE0N8AUGU0zvpsfpychhInZfIfoa dD64z+IZWHx5zJTwSSHuHII170YwUyy5bfBzBtSs3dVLgNkqWmi5e8xFm g==; X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="374763954" X-IronPort-AV: E=Sophos;i="6.03,213,1694761200"; d="scan'208";a="374763954" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2023 07:52:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10859"; a="788609429" X-IronPort-AV: E=Sophos;i="6.03,213,1694761200"; d="scan'208";a="788609429" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 10 Oct 2023 07:52:30 -0700 From: Alexander Shishkin To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Alison Schofield , Tom Lendacky , Alexander Shishkin Subject: [PATCH v3 0/2] x86/sev: Generalize sev_setup_arch() Date: Tue, 10 Oct 2023 17:52:18 +0300 Message-Id: <20231010145220.3960055-1-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=2.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Tue, 10 Oct 2023 07:52:44 -0700 (PDT) X-Spam-Level: ** Hi, v3: * rebased * moved mem_encrypt_setup_arch under a common #ifdef CONFIG_X86_MEM_ENCRYPT per Tom's comment v2: [1] * added 2/2, which is a minor cleanup v1: [0] The main intention of this is to move sev_setup_arch() to mem_encrypt.c to reflect the fact that it's not SEV-specific, but covers TDX as well, although unintentionally. While looking at it, I also noticed that mem_encrypt_amd.c still includes virtio_config.h, which was needed for the code that since got moved to a different place (and even there doesn't require the include any more). [0] https://lore.kernel.org/all/20230530121728.28854-1-alexander.shishkin@linux.intel.com/ [1] https://lore.kernel.org/all/20230609171214.31846-1-alexander.shishkin@linux.intel.com/ Alexander Shishkin (2): x86/sev: Move sev_setup_arch() to mem_encrypt.c x86/sev: Drop unneeded include arch/x86/include/asm/mem_encrypt.h | 4 ++-- arch/x86/kernel/setup.c | 2 +- arch/x86/mm/mem_encrypt.c | 34 ++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt_amd.c | 36 ------------------------------ 4 files changed, 37 insertions(+), 39 deletions(-) -- 2.40.1