From patchwork Thu Oct 6 17:38:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1687132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MjzFt34gCz20Vp for ; Fri, 7 Oct 2022 04:39:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogUps-00035g-Sp; Thu, 06 Oct 2022 17:39:04 +0000 Received: from mail-pg1-f173.google.com ([209.85.215.173]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogUpo-000346-Gk for kernel-team@lists.ubuntu.com; Thu, 06 Oct 2022 17:39:00 +0000 Received: by mail-pg1-f173.google.com with SMTP id c7so2435905pgt.11 for ; Thu, 06 Oct 2022 10:39:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=LjyfPOfdDUu6rbS4uu7sTuUlGxGmF6bAMJ74S8L8wfs=; b=znX2CCB8a9fn1KPg/ACNDLoVoh27bXR3JbPkFkHtyiPcFuV1lW6mamtvOZ7Z80rq+d tApIrlp0qrFpcBxBNROMr6Pm2zzhNh9cWjCY4KPa8dPOeAKyZ7Ezl8hjNRRA6N0p74EF PpuXIJvM2h7yStHUcYTaobifICmTlcbCfl91ptKJ6/b73jVKMb4KkSVrJuveJZv1am/n FX6F9R50a8fCyLl15H007SsIWNl7bZfgr/epTlc/aqk6b3mc+iEAJTB6z5s0EIkVaU2o OAXsvl66gIkvIMfiQiSV2S34onzcmTtYl+22jJ5kYh/z7gQ/xbzmrVsH6OwsotGxwyxi Gh6g== X-Gm-Message-State: ACrzQf0AyoZRHLTnwVOPG0OUOD4+4WXPeerivq7oNDLNfg1W5ecR7IY8 lw11asmycNvMVqpADeDzPCQbYovNKIU= X-Google-Smtp-Source: AMsMyM4wPPZ/DCIA00TG5NsNn9dJiTjp0na54Lzkrp+pkKoG49G94tPijJyNT8B/gpy1PEgbBUYMIQ== X-Received: by 2002:a63:88c8:0:b0:458:9ddd:e8ea with SMTP id l191-20020a6388c8000000b004589ddde8eamr808932pgd.622.1665077938466; Thu, 06 Oct 2022 10:38:58 -0700 (PDT) Received: from localhost.localdomain (61-227-97-62.dynamic-ip.hinet.net. [61.227.97.62]) by smtp.gmail.com with ESMTPSA id k5-20020a170902694500b00172e19c5f8bsm12566766plt.168.2022.10.06.10.38.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 10:38:58 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][Jammy/OEM-5.17/Kinetic] UBUNTU: SAUCE: crypto: ccp: Add support for TEE for PCI ID 0x14CA Date: Fri, 7 Oct 2022 01:38:12 +0800 Message-Id: <20221006173813.758910-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221006173813.758910-1-vicamo.yang@canonical.com> References: <20221006173813.758910-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.173; envelope-from=vicamo@gmail.com; helo=mail-pg1-f173.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/1991608 SoCs containing 0x14CA are present both in datacenter parts that support SEV as well as client parts that support TEE. Cc: stable@vger.kernel.org # 5.15+ Tested-by: Rijo-john Thomas Signed-off-by: Mario Limonciello (cherry picked from https://lore.kernel.org/linux-crypto/20220928184506.13981-1-mario.limonciello@amd.com/T/#m1b933ea4b961d17cb1be5be74e2d22a860507ca0) Signed-off-by: You-Sheng Yang (vicamo) Acked-by: Tim Gardner --- drivers/crypto/ccp/sp-pci.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index b5970ae54d0e..77b0b724de73 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -381,6 +381,15 @@ static const struct psp_vdata pspv3 = { .inten_reg = 0x10690, .intsts_reg = 0x10694, }; + +static const struct psp_vdata pspv4 = { + .sev = &sevv2, + .tee = &teev1, + .feature_reg = 0x109fc, + .inten_reg = 0x10690, + .intsts_reg = 0x10694, +}; + #endif static const struct sp_dev_vdata dev_vdata[] = { @@ -426,7 +435,7 @@ static const struct sp_dev_vdata dev_vdata[] = { { /* 5 */ .bar = 2, #ifdef CONFIG_CRYPTO_DEV_SP_PSP - .psp_vdata = &pspv2, + .psp_vdata = &pspv4, #endif }, };