Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2392749rwd; Fri, 9 Jun 2023 10:27:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XWMJbZEwrt86T0Af3ZX7GFcG/FDUhc9RBWD4gC4dVtUD5P0PeMaiswFPToFDPMMFv0MIM X-Received: by 2002:a05:6808:258:b0:398:5478:b7fa with SMTP id m24-20020a056808025800b003985478b7famr2297988oie.45.1686331673906; Fri, 09 Jun 2023 10:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686331673; cv=none; d=google.com; s=arc-20160816; b=qFJdhNznlBViQhlGupIuY/HfcH1OZR3Khnkut/a3/17GJCfkeQAMd7f7PvLIILyqjw zwHKgUJ64Y3fXAACyK8yWijjydbAnrnpkbWeAByRseIifbUX2TlMMgty7x8k8KUvnKnE MRsvw0VKX1VvEOY4jv9ModJGYNGoMnh4brCem7MYFV/PRtTADY2IcSuw9HHTGabtJKoo AiEL0hY5gn3nSnUuLfti0TAJb4ahc+m6v4NyDcUICSXvcILf2111M2jGaMLvkxssm5NP AwVeUARU6i5UvHw47JcvNRqs+gsbJm8jSsdhWxB7wfu8yxGdBtc6IuBLKGqBn4xHcE7N 9wkw== 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=nQZoBX4bLJU7fnJkl+qEygk4X2SFMDkNdftL1cgPTrM=; b=dG3kbz84cEG96JaV032IL9a7Fl3wm9I4RLMuMd0JGc/nkpb/sSZozAGb7IovibpO9v aUhR/hYpVuuu3nrX9jU3m5pZ+OAtGNENbdMp9MYyh+nTI21kOR7VACS1spjB5x7oyVEf qcSiwS9vDoFmREF/DGEFJDUBf1TOdF4UcX8rROU3SsofPGhTDW27P5I9+Xr3yB4vCljR USH+Xu19WLWZU3yWDNT3+ov83NbxWxds3LL0JhfMEKj7XRbxcWkENM40aAnBrH4GQn3l 0dcE9+3C0QFiKC4KUCE2r7IfS2YptNfSEowrdPCtgl/2auWmwlGe0rxz3y2/P6mLBfQi t72Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hF0d3SXa; 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=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rj14-20020a17090b3e8e00b00250d10c6fe7si69824pjb.67.2023.06.09.10.27.39; Fri, 09 Jun 2023 10:27:53 -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=@intel.com header.s=Intel header.b=hF0d3SXa; 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=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229551AbjFIRMn (ORCPT + 99 others); Fri, 9 Jun 2023 13:12:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjFIRMl (ORCPT ); Fri, 9 Jun 2023 13:12:41 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C3351FFE for ; Fri, 9 Jun 2023 10:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686330760; x=1717866760; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ie+Bhj1N8EkFJvCkDe8BVuLNzwjQbe52gKt6eY6latA=; b=hF0d3SXaFPl/RgFAGOZl+siEWUJPYa80AUN4Du0D1qMXRgwNAeTemMbq evVEwvlVdQ8Z4+NXffUjCCL3T+ojwt5kvdOmGwSECu7UkwZUAvSH5aOl4 UA44lJiDU8ahaoW0stNMy5YXpDVV3lk+/N57mcCMkm+7abMrpTnqWZLwr lF0N1JZa5p4s3wXgOd46QWPASAoE/Lx+Psd44c2M0zOc9iUiWyaX4Sj5p tf/0h0O6BgzKPUsNooZ7eR7A/k4vEwtT6z7KhgMwSWFfWooqHUMBvIeSV 5yXKDhVKyymYRfdhpynuRG4BKellUT4/X4Y/fEPFopckpNAv/kAAUgyTm A==; X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="357647299" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="357647299" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2023 10:12:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10736"; a="660824608" X-IronPort-AV: E=Sophos;i="6.00,229,1681196400"; d="scan'208";a="660824608" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 09 Jun 2023 10:12:37 -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 , Alexander Shishkin Subject: [PATCH v2 0/2] x86/sev: Generalize sev_setup_arch() Date: Fri, 9 Jun 2023 20:12:12 +0300 Message-Id: <20230609171214.31846-1-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,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 Hi, Since previous version [0], I added 2/2, which is a minor cleanup. 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/ 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 | 11 +++++++-- arch/x86/kernel/setup.c | 2 +- arch/x86/mm/mem_encrypt.c | 34 ++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt_amd.c | 36 ------------------------------ 4 files changed, 44 insertions(+), 39 deletions(-) -- 2.39.2