From nobody Tue Feb 10 18:21:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1691509952; cv=none; d=zohomail.com; s=zohoarc; b=l7acOe/r+Sphqe2v7Gbrhjlt6ayjCVBmXPbUi7mlVMUq9yDLsuS1if8LobmV9MAJlAuTMargxMGNIQlz5R3MUdHpvgX8v4R3fjWy67pEzmAX4RkD4OJCh+e5TA9UVEYdKRaotsbAHQ5MWa6tAo+e7TfYiuRSXYrnnlcqMdtfSGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691509952; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n85+WWn6N/DQqkhGtTt5J0iGlzkbg6asFfed0O2vNbo=; b=UvpTAm96Li3CGB5bIAR4gAbQimlAzs3n8tcHx+nMj5fa4yt4zV2uw1pexMGbRgIqWkQSddctRlaZgnRLhwlIVzXzLTpG7IfhYe+kDv0lbU100fo9NbrpFV9NpPuWKbckA9azRuwKAAddnVW0XQ8kydE/VM+KTAYY2mkS+LW5YmQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1691509952987339.6748612868315; Tue, 8 Aug 2023 08:52:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTOzy-0000aH-6Q; Tue, 08 Aug 2023 11:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTOzw-0000Yp-7P for qemu-devel@nongnu.org; Tue, 08 Aug 2023 11:51:52 -0400 Received: from mail-vs1-xe2c.google.com ([2607:f8b0:4864:20::e2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTOzu-00031W-9T for qemu-devel@nongnu.org; Tue, 08 Aug 2023 11:51:51 -0400 Received: by mail-vs1-xe2c.google.com with SMTP id ada2fe7eead31-44781abd5a8so2416585137.1 for ; Tue, 08 Aug 2023 08:51:49 -0700 (PDT) Received: from localhost.localdomain ([146.70.187.10]) by smtp.gmail.com with ESMTPSA id z17-20020a67ca11000000b004409e21cf23sm2013324vsk.6.2023.08.08.08.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 08:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691509909; x=1692114709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n85+WWn6N/DQqkhGtTt5J0iGlzkbg6asFfed0O2vNbo=; b=jOBt0tA4m/c2QYQeZoIPM8rCwku81556Jb41Eael976UcSyE2wJtmtJU5p/DcUg4X2 B2ZeBzz28R+9jphfyRKY8/t185l48KGC8MQ0ZQwY5sPRErocidboSQt2EhgMAbFsQ3mR lNIuPJc6VHjiIZ4sSemsTXRHsBoXV02QnvXE4ldM/y3uonOx2ibZ48vFlAfdotVVEgte o7ix0QvZ+ZW7IzqT3vSxba11qM2ViTL8RlGXmFtDE7wP+9Bb1rChX214+a/0TkDKGn04 VXrop9z2Qca5aGhcaCsxwzsznKmkEpYuEgqBsEdGyz7/4SJaJnwaxK2sn8Ft18ft3jIQ xewA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691509909; x=1692114709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n85+WWn6N/DQqkhGtTt5J0iGlzkbg6asFfed0O2vNbo=; b=kzNeVNjzR6+LmMKweahZpCSdFXVGO0pA0UI6Wjr8yDWJCIigyg1pJSwcSduyacE15D uBL11sXyCUlBTNciO9dVwF1pdm8ZOX+T2fh0oVTlWWTTkfW/ZoWC+3KoKkdX5+5+pcgL 8F6WaEI53JIvpTdNAoJPU0mwVUvHQuOUqjiS0j4C0LmObIez34Kdw5Z7TY9i71pv4PTd bKAJmabOxYO7XCA9jNgEnJYl6MSViGH2yxUcS0uw5qh+26KjH3K7tbUr7jEEwXrYYe8W P6aZ7UQ1GL93+WLj6sV/utacjHGNOIlr52kveAiytcCxDdGNUhqZT0UIdrxXPNRqQyGE xbUA== X-Gm-Message-State: AOJu0Yx1RdouKwD6ALyGiBx2ikqrARVtPR1kcAugPHID85sgCzS2kO6o kcQV3bNkcyVaxV8r1FD57AapqrJWrmt53XpiSdgPdg== X-Google-Smtp-Source: AGHT+IHoAKbuyU9dWLTiDvhIadWWgv3d1N1QxYhtgVTwQV6A6+M2uES4Futb76LUWtoi8g/gX9IHPQ== X-Received: by 2002:a67:f598:0:b0:444:ca59:57a6 with SMTP id i24-20020a67f598000000b00444ca5957a6mr230281vso.8.1691509908978; Tue, 08 Aug 2023 08:51:48 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, hchkuo@avery-design.com.tw, cbrowy@avery-design.com Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, alistair23@gmail.com, Alistair Francis Subject: [RFC v1 1/3] subprojects: libspdm: Initial support Date: Tue, 8 Aug 2023 11:51:22 -0400 Message-ID: <040d4d4246a78bc2025a0309187990f87d6a5959.1691509717.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::e2c; envelope-from=alistair23@gmail.com; helo=mail-vs1-xe2c.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1691509953771100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- meson.build | 78 +++++++++++++++++++++++++++++++++++ .gitmodules | 3 ++ meson_options.txt | 3 ++ scripts/meson-buildoptions.sh | 3 ++ subprojects/.gitignore | 1 + subprojects/libspdm.wrap | 5 +++ 6 files changed, 93 insertions(+) create mode 100644 subprojects/libspdm.wrap diff --git a/meson.build b/meson.build index 98e68ef0b1..3ac91defbc 100644 --- a/meson.build +++ b/meson.build @@ -1864,6 +1864,15 @@ elif get_option('vduse_blk_export').disabled() have_vduse_blk_export =3D false endif =20 +have_libspdm =3D (targetos =3D=3D 'linux') +if get_option('libspdm').enabled() + if targetos !=3D 'linux' + error('libspdm requires linux') + endif +elif get_option('libspdm').disabled() + have_libspdm =3D false +endif + # libbpf libbpf =3D dependency('libbpf', required: get_option('bpf'), method: 'pkg-= config') if libbpf.found() and not cc.links(''' @@ -2141,6 +2150,7 @@ config_host_data.set('CONFIG_VHOST_VDPA', have_vhost_= vdpa) config_host_data.set('CONFIG_VMNET', vmnet.found()) config_host_data.set('CONFIG_VHOST_USER_BLK_SERVER', have_vhost_user_blk_s= erver) config_host_data.set('CONFIG_VDUSE_BLK_EXPORT', have_vduse_blk_export) +config_host_data.set('CONFIG_LIBSPDM', have_libspdm) config_host_data.set('CONFIG_PNG', png.found()) config_host_data.set('CONFIG_VNC', vnc.found()) config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) @@ -3172,6 +3182,7 @@ blockdev_ss =3D ss.source_set() block_ss =3D ss.source_set() chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() +libspdm_ss =3D ss.source_set() crypto_ss =3D ss.source_set() hwcore_ss =3D ss.source_set() io_ss =3D ss.source_set() @@ -3321,6 +3332,56 @@ if have_libvduse libvduse =3D libvduse_proj.get_variable('libvduse_dep') endif =20 +libspdm =3D not_found +if have_libspdm + cmake =3D import('cmake') + libspdm_opt_var =3D cmake.subproject_options() + + libspdm_opt_var.add_cmake_defines({'ARCH': 'x64'}) + libspdm_opt_var.add_cmake_defines({'TOOLCHAIN': 'NONE'}) + libspdm_opt_var.add_cmake_defines({'TARGET': 'Release'}) + libspdm_opt_var.add_cmake_defines({'CRYPTO': 'openssl'}) + libspdm_opt_var.add_cmake_defines({'ENABLE_BINARY_BUILD': '1'}) + libspdm_opt_var.add_cmake_defines({'COMPILED_LIBCRYPTO_PATH': '/usr/lib'= }) + libspdm_opt_var.add_cmake_defines({'COMPILED_LIBSSL_PATH': '/usr/lib'}) + libspdm_opt_var.add_cmake_defines({'DISABLE_TESTS': '1'}) + + libspdm_proj =3D cmake.subproject('libspdm', options: libspdm_opt_var) + + libspdm_lib =3D libspdm_proj.dependency('spdm_common_lib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('memlib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('malloclib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('spdm_crypt_lib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('spdm_responder_lib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('cryptlib_openssl') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('spdm_device_secret_lib_null') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('platform_lib_null') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('spdm_secured_message_lib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('spdm_crypt_lib') + libspdm_ss.add(libspdm_lib) + + libspdm_lib =3D libspdm_proj.dependency('spdm_crypt_ext_lib') + libspdm_ss.add(libspdm_lib) +endif + # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. subdir('qapi') @@ -3593,6 +3654,19 @@ libcrypto =3D static_library('crypto', crypto_ss.sou= rces() + genh, crypto =3D declare_dependency(link_whole: libcrypto, dependencies: [authz, qom]) =20 +if have_libspdm + libspdm_ss =3D libspdm_ss.apply(config_host, strict: false) + libspdm =3D static_library('libspdm', libspdm_ss.sources() + genh, + dependencies: [libspdm_ss.dependencies()], + name_suffix: 'fa', + build_by_default: false) + + openssl =3D dependency('openssl', version : '>=3D3.0.9') + libspdm =3D declare_dependency(link_whole: libspdm, dependencies: [opens= sl]) + + common_user_inc +=3D 'subprojects/libspdm/include' +endif + io_ss =3D io_ss.apply(config_host, strict: false) libio =3D static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], @@ -3668,6 +3742,10 @@ if emulator_modules.length() > 0 alias_target('modules', emulator_modules) endif =20 +if have_libspdm + system_ss.add(libspdm) +endif + system_ss.add(authz, blockdev, chardev, crypto, io, qmp) common_ss.add(qom, qemuutil) =20 diff --git a/.gitmodules b/.gitmodules index 73cae4cd4d..1bf93427ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,6 @@ [submodule "tests/lcitool/libvirt-ci"] path =3D tests/lcitool/libvirt-ci url =3D https://gitlab.com/libvirt/libvirt-ci.git +[submodule "subprojects/libspdm"] + path =3D subprojects/libspdm + url =3D https://github.com/DMTF/libspdm.git diff --git a/meson_options.txt b/meson_options.txt index aaea5ddd77..b61a1f4515 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -292,6 +292,9 @@ option('libvduse', type: 'feature', value: 'auto', option('vduse_blk_export', type: 'feature', value: 'auto', description: 'VDUSE block export support') =20 +option('libspdm', type: 'feature', value: 'auto', + description: 'build libspdm Library') + option('capstone', type: 'feature', value: 'auto', description: 'Whether and how to find the capstone library') option('fdt', type: 'combo', value: 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 9da3fe299b..8a9d3ad01d 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -126,6 +126,7 @@ meson_options_help() { printf "%s\n" ' libudev Use libudev to enumerate host devices' printf "%s\n" ' libusb libusb support for USB passthrough' printf "%s\n" ' libvduse build VDUSE Library' + printf "%s\n" ' libspdm build libspdm Library' printf "%s\n" ' linux-aio Linux AIO support' printf "%s\n" ' linux-io-uring Linux io_uring support' printf "%s\n" ' live-block-migration' @@ -353,6 +354,8 @@ _meson_option_parse() { --disable-libusb) printf "%s" -Dlibusb=3Ddisabled ;; --enable-libvduse) printf "%s" -Dlibvduse=3Denabled ;; --disable-libvduse) printf "%s" -Dlibvduse=3Ddisabled ;; + --enable-libspdm) printf "%s" -Dlibspdm=3Denabled ;; + --disable-libspdm) printf "%s" -Dlibspdm=3Ddisabled ;; --enable-linux-aio) printf "%s" -Dlinux_aio=3Denabled ;; --disable-linux-aio) printf "%s" -Dlinux_aio=3Ddisabled ;; --enable-linux-io-uring) printf "%s" -Dlinux_io_uring=3Denabled ;; diff --git a/subprojects/.gitignore b/subprojects/.gitignore index adca0266be..5d0ac1be1a 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -5,4 +5,5 @@ /dtc /keycodemapdb /libvfio-user +/libspdm /slirp diff --git a/subprojects/libspdm.wrap b/subprojects/libspdm.wrap new file mode 100644 index 0000000000..ca3607fbaa --- /dev/null +++ b/subprojects/libspdm.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url =3D https://github.com/DMTF/libspdm.git +revision =3D 55f5141436d2f6debf4b7cd57641cc78d8e4c6fc +depth =3D 1 +clone-recursive =3D true --=20 2.41.0 From nobody Tue Feb 10 18:21:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1691509961; cv=none; d=zohomail.com; s=zohoarc; b=Ek6xWmllRncB3d2FHKz3QroumKdmPZdZ0EqwxWEKUiJP70yPxNHlsIw5Sh+ImPnPw499+dMP7vol4wwKb/AIU/YK62Xg4CQXuYB8yBJNSxWVKrUKP7nTSukiK6G6WCDY/3C7wFv3AW2OThknz59Pvu6WYvSUN5Ny37GUPV92E74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691509961; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gtrQ+WzacSawTVSmH5F3sN3FASDEzKyHTWVNJRZzpMc=; b=mP3um3FjjMMq2WPArMcri72AqmEPsUILxn2J7F++wZySe8OA5dRFb5Oe55oabxocp0V+2ypKDep+MhNIKLC+gx3JedLXpC9vrXl9JYfOPqEKgkCTM9ncc+aNJhsVf28vWYenQf8DO7jqSvFXp5FCtM4H/PAWJnaQS1un8Ywm94U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1691509961587257.01104080016853; Tue, 8 Aug 2023 08:52:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTP05-0000bZ-4t; Tue, 08 Aug 2023 11:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTP03-0000bF-0l for qemu-devel@nongnu.org; Tue, 08 Aug 2023 11:51:59 -0400 Received: from mail-ua1-x92a.google.com ([2607:f8b0:4864:20::92a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTP01-00032U-Gx for qemu-devel@nongnu.org; Tue, 08 Aug 2023 11:51:58 -0400 Received: by mail-ua1-x92a.google.com with SMTP id a1e0cc1a2514c-79aa1f24ba2so1538806241.2 for ; Tue, 08 Aug 2023 08:51:57 -0700 (PDT) Received: from localhost.localdomain ([146.70.187.10]) by smtp.gmail.com with ESMTPSA id z17-20020a67ca11000000b004409e21cf23sm2013324vsk.6.2023.08.08.08.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 08:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691509916; x=1692114716; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gtrQ+WzacSawTVSmH5F3sN3FASDEzKyHTWVNJRZzpMc=; b=TnqQbXY3PO942AHiTdtD0ITtkI5+vVviZlJZb7E3Y6UyO50pdDudgXg+tu6LZh7mKr Eekbbex4TsvBjJIvuOKTRQoizxUvoRdd8FCp2hSn0/8zXyHzv1zqxsFzdBw17SuBn/Y/ WMyCfUkkj5+aTgsaYmuesib2SGuoXLE+IJeXGp+0vBXWMX6bGqEZ9UmEZp/y3WgCtAfz njx3d0MAOXitwmJSi1+aSyYRsHxjtwhHtlgYaGg8XVuNjMWaDCUZHxCzXDCiPMThgK1y wAq/Aadv+mDxZBKT4Oa2EA2ZWtlHoOlnGx4Uh9NMZzMFycmpVO/IKarM+u5iZ/x9HQIo o0MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691509916; x=1692114716; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gtrQ+WzacSawTVSmH5F3sN3FASDEzKyHTWVNJRZzpMc=; b=dn4p3qMv/hOXo2CdMtOGsU+FF0Lejt1kefbmnaV9q4LktaIcmWkkUzIoYPr+de7n9h RYXJo1mFoGPOoC6jsMRB/7EzgxiFQfo/f8JPMBItxanCHNyvEP173Hx1e6aDBQbR0ahm 3Z9NzjHZthXhJM/D1r1A2vrg1fXve+ru6mnVTmduUtj//EHOYkKo2yh1xYGQVtQpsDpD xx2qzlZb5iKtoq4clF+JkUa6RpQkklEj5dnRmvZZJdIzwouh/80SP7nRMXpYibkJTeIG QItRIlKF7NQBNML3rHn0fEqJ305w/9RNN6NZr+jYqq6NX9hzJjuhTIzG0VBMN5G2ujRA FdVQ== X-Gm-Message-State: AOJu0YwTBSX6ttBhpZ3EAAe4ZFvgtLYj9aFLm3pzrrg/tphcMVdEzLZL NPwKrIKT4Cpq5yhM2p9nZ23BvVj9NxvTR1QClNojKg== X-Google-Smtp-Source: AGHT+IG3h0MlNkxY/xZQ+GlM7vPUxjP3aZ/me/7etj90xYs12ANK67kptIv3SNxlU2IJsvzlPax8Pw== X-Received: by 2002:a67:f4c8:0:b0:443:ef68:1f06 with SMTP id s8-20020a67f4c8000000b00443ef681f06mr255240vsn.18.1691509916363; Tue, 08 Aug 2023 08:51:56 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, hchkuo@avery-design.com.tw, cbrowy@avery-design.com Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, alistair23@gmail.com, Alistair Francis Subject: [RFC v1 2/3] hw: nvme: ctrl: Initial support for DOE Date: Tue, 8 Aug 2023 11:51:23 -0400 Message-ID: <1a75abf2fce0683b3d1ac2522eb6965384179c20.1691509717.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::92a; envelope-from=alistair23@gmail.com; helo=mail-ua1-x92a.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1691509963111100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- hw/nvme/nvme.h | 4 ++++ include/hw/pci/pcie_doe.h | 1 + hw/nvme/ctrl.c | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index 209e8f5b4c..e0918516e3 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -20,6 +20,7 @@ =20 #include "qemu/uuid.h" #include "hw/pci/pci_device.h" +#include "hw/pci/pcie_doe.h" #include "hw/block/block.h" =20 #include "block/nvme.h" @@ -597,6 +598,9 @@ typedef struct NvmeCtrl { uint16_t vqrfap; uint16_t virfap; } next_pri_ctrl_cap; /* These override pri_ctrl_cap after reset */ + + /* DOE */ + DOECap doe_spdm; } NvmeCtrl; =20 typedef enum NvmeResetType { diff --git a/include/hw/pci/pcie_doe.h b/include/hw/pci/pcie_doe.h index 87dc17dcef..18e9492977 100644 --- a/include/hw/pci/pcie_doe.h +++ b/include/hw/pci/pcie_doe.h @@ -46,6 +46,7 @@ REG32(PCI_DOE_CAP_STATUS, 0) =20 /* PCI-SIG defined Data Object Types - r6.0 Table 6-32 */ #define PCI_SIG_DOE_DISCOVERY 0x00 +#define PCI_SIG_DOE_SPDM 0x01 =20 #define PCI_DOE_DW_SIZE_MAX (1 << 18) #define PCI_DOE_PROTOCOL_NUM_MAX 256 diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index f2e5a2fa73..ec3d5d3c29 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -202,6 +202,7 @@ #include "sysemu/block-backend.h" #include "sysemu/hostmem.h" #include "hw/pci/msix.h" +#include "hw/pci/pcie_doe.h" #include "hw/pci/pcie_sriov.h" #include "migration/vmstate.h" =20 @@ -8088,6 +8089,13 @@ static int nvme_add_pm_capability(PCIDevice *pci_dev= , uint8_t offset) return 0; } =20 +#ifdef CONFIG_LIBSPDM +static bool nvme_doe_spdm_rsp(DOECap *doe_cap) +{ + return false; +} +#endif + static bool nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) { ERRP_GUARD(); @@ -8317,6 +8325,13 @@ void nvme_attach_ns(NvmeCtrl *n, NvmeNamespace *ns) BDRV_REQUEST_MAX_BYTES / nvme_l2b(ns, 1)); } =20 +#ifdef CONFIG_LIBSPDM +static DOEProtocol doe_spdm_prot[] =3D { + { PCI_VENDOR_ID_PCI_SIG, PCI_SIG_DOE_SPDM, nvme_doe_spdm_rsp }, + { } +}; +#endif + static void nvme_realize(PCIDevice *pci_dev, Error **errp) { NvmeCtrl *n =3D NVME(pci_dev); @@ -8359,6 +8374,11 @@ static void nvme_realize(PCIDevice *pci_dev, Error *= *errp) =20 nvme_attach_ns(n, ns); } + +#ifdef CONFIG_LIBSPDM + /* DOE Initailization */ + pcie_doe_init(pci_dev, &n->doe_spdm, 0x190, doe_spdm_prot, true, 0); +#endif } =20 static void nvme_exit(PCIDevice *pci_dev) --=20 2.41.0 From nobody Tue Feb 10 18:21:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1691509953; cv=none; d=zohomail.com; s=zohoarc; b=ZAvyZIixX7q/hOBB6x31SyXj9jImehcDv6w/djPQdRgCvrBkv2Naxusr/LEXgtklzUtw2QOc0+VjZ4K1fGNw7rE4HZ50zE6j3Kxa3uynVSK35nbozD1F2OkUWkNAdoXIrg4GxGx6NzAJo8r3vXmRkfjyqNzxXnOZaMg9DfwGxzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691509953; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KyBKpY1sWkkjVeGiFnRVCoxm8adBYs+Vcpu4+GQwtPA=; b=GVtZHfM/6aTLPR300rq6EnJkHN355NtE8XwgYWMRO1u2PXhrNhqnjUC9yIJZtAT6klvwbNwJVpi+AJe1Laubm0Qgrs9JOQyRLUHhQMr4SreImulNai2+5U+aTtiILUxPcP7IlPjmukBTcI4I6Xp/cyrofyTRXSzlRgCaihBsxv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1691509953035275.3523956645097; Tue, 8 Aug 2023 08:52:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTP0F-0000gM-On; Tue, 08 Aug 2023 11:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTP0D-0000fu-L1 for qemu-devel@nongnu.org; Tue, 08 Aug 2023 11:52:09 -0400 Received: from mail-vs1-xe2d.google.com ([2607:f8b0:4864:20::e2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTP0C-00035S-8i for qemu-devel@nongnu.org; Tue, 08 Aug 2023 11:52:09 -0400 Received: by mail-vs1-xe2d.google.com with SMTP id ada2fe7eead31-4476a9e8812so2402655137.2 for ; Tue, 08 Aug 2023 08:52:07 -0700 (PDT) Received: from localhost.localdomain ([146.70.187.10]) by smtp.gmail.com with ESMTPSA id z17-20020a67ca11000000b004409e21cf23sm2013324vsk.6.2023.08.08.08.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 08:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691509927; x=1692114727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KyBKpY1sWkkjVeGiFnRVCoxm8adBYs+Vcpu4+GQwtPA=; b=DYurZkNXJyWHQ1uYfj/W1PbwEg267l6S1TEmtx4M0EEDGDYloedHB0MgAeyCEw8s0x UrNQYh2G2I35paRdO35Pa5wuTaQvIPKzJ7rYztuheLj8iShJQ2V4ZJI+lYxQc65u2pxo rDNMCDqbVg11rHH4JpB/mLOlkH7SwzJTgeuX9oOeo0IbEFBrdXrGQxlLVxJFOhdJqAGd MBS1Pc6rGliMu15Z1s28jOs0rHeJ4Y/1WaZSF2+mv+YSU2oHE4jFbWYueV5pZVyAG3wl 4dNUCI8zemiGFnRF7SZVM5jlmJP13zN/XsfWqtlrMueIVQkuqwA51VKR6g7O1ySlD9AU ulnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691509927; x=1692114727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KyBKpY1sWkkjVeGiFnRVCoxm8adBYs+Vcpu4+GQwtPA=; b=ENPcCBQocmH6UdZcxacUxkW/MVQ3weRBy4OjvgFO9ekZD3dIAWm5Xbsv9Isb5ht1wa rjhA5xM93h9DAehUrNh6LPOcu3TVn+kzHnPUtTDrb4CowV5T8xBmgof7JHJ7NjqOy0m5 7I5jsOBfbavHjOAYkVNRIvnIl414vTVx7eAeCDBIADNifeEkC7nu/CGiXg3x43vfVc/n qyLiLKXKoZrLhHjDDeygc36IxTWefrXAJmVzGDtfVG9kpPtpwPET/bmL+cXeAWuMF30Q cVKQuK4FguoZshu9kzj1pSKixeY6uYi65WDBgkbHzqKbTTuQxHMqYmmY6K0Jg66dZLwx 3A3g== X-Gm-Message-State: AOJu0YyCH9a64orR4Dc5PjOjxCpQ1cPeFjjzoRTyAofwQBSZQuNsqgv1 baQK7EzrYRaff4W5ATEA7Z60FXvb/GJ/8fSVcfCqGA== X-Google-Smtp-Source: AGHT+IGZwsrAGVGgWu3UDtJ6XPiAu2yLmWXLbUUaRzYnYbU5ru5lgs4PR3QDOgfvU8aIQtLmVxTaMQ== X-Received: by 2002:a67:de06:0:b0:447:46e7:1343 with SMTP id q6-20020a67de06000000b0044746e71343mr207986vsk.23.1691509927254; Tue, 08 Aug 2023 08:52:07 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, hchkuo@avery-design.com.tw, cbrowy@avery-design.com Cc: mst@redhat.com, marcel.apfelbaum@gmail.com, alistair23@gmail.com, Alistair Francis Subject: [RFC v1 3/3] hw: nvme: ctrl: Process SPDM requests Date: Tue, 8 Aug 2023 11:51:24 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::e2d; envelope-from=alistair23@gmail.com; helo=mail-vs1-xe2d.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1691509955094100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- hw/nvme/ctrl.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index ec3d5d3c29..a299dc7175 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -206,6 +206,11 @@ #include "hw/pci/pcie_sriov.h" #include "migration/vmstate.h" =20 +#ifdef CONFIG_LIBSPDM +#include "library/spdm_common_lib.h" +#include "library/spdm_responder_lib.h" +#endif + #include "nvme.h" #include "dif.h" #include "trace.h" @@ -8092,6 +8097,16 @@ static int nvme_add_pm_capability(PCIDevice *pci_dev= , uint8_t offset) #ifdef CONFIG_LIBSPDM static bool nvme_doe_spdm_rsp(DOECap *doe_cap) { + void *context =3D (void *)malloc(libspdm_get_context_size()); + uint32_t *session_id; + bool is_app_message; + + libspdm_init_context(context); + + libspdm_process_request(context, &session_id, &is_app_message, + doe_cap->write_mbox_len, + doe_cap->write_mbox); + return false; } #endif --=20 2.41.0