From nobody Tue Jun 20 09:52:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlhl43SGrz4gRF2; Tue, 20 Jun 2023 09:52:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlhl36R17z3JGW; Tue, 20 Jun 2023 09:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R15fueIe+/mW/Q+LChTkKSrcjKW2aaWKWJVx2bdHHjU=; b=Mz027IylFAnQwDtPafXxS3IbmVLiqMbtLk1ZXedN3RxOx9TiGVbJIG1gmLqWLNuG9+2J0C r+930e4dgrg9AFmTXvbppYw9oCmexfVitANStnnDDqJ492PVdaZNa2Kww3wjWQ0Z+p0Ovh ZG3SkZu9KnmIJOj78CFT+q0sQEnAhAF5Cb8s74ZsoQfalZWCvw2l9u1PT2p/k+Lh/u+1+s ULlDS9asGGQ0nitffVntkmUYTGM1l6QsRzvChYoftPXeO6eQ7DxfA8mdOEmxxwaVREa15g Hx3xDg8Q/kgwBZPqR7gpj9iajGnjb4ir8T8Qd+ETbPPbKfJhJcgInxeax+6ECg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687254767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R15fueIe+/mW/Q+LChTkKSrcjKW2aaWKWJVx2bdHHjU=; b=lCaEhDXwt6sAdRPhmuZBCMdnGf0SippQ7/GPaK1T9dR183pQ3vJ9h3lICBe6FsL40VYmut gZtx8/geblSE68wili1IBtVj0fg7nv8gEsHhKP4/Ise65H60Mr76GQehg8TdX+d0VUhEwV 1JgYl+pIeM60aTAhjxs0J8xljnVm2sbm6WJVGQmak2SASNDS/OziZyfg22s4Xi9bgjFQg+ XIFfE6V5zdKKoSBX3JTnxzemDYvpT5/k+SUjSpdGaThY7Cep8Jp9f0CSoJUHurKyGdfBnV T1JNWQtT/+fNX1znorQ74yzGlh4WxrRzon/ZJHLL3OUwdZToDXdKoxNoj7yAhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687254767; a=rsa-sha256; cv=none; b=S4MNDri5ZuPyN8LK8tf2YHR+graq7Gd7ovAupT0aDUNBxMAqhcFCXetu9/KfY+VKTHU0N0 TczZKyT9CSaF/xchrU38PmJDlkWWwV9sxnjlSxqu2yPf5vTp6NijEqHzXzoPF9Bxjj9whM wNKQE0D2M/d3LUoiVbac6IPfGwMC+Ivc8E3hlXAlH+7iJaUxzskXrm8RI+bjiZYe20+Ae/ 7j0TJ+BKQ3PU3tn67OD8IuiFO7/GgrSJjI9q+YE2lgfH4klUONgoJg2yj4+A5E8a4ex1WN jfhvZzLrlHsAk4w9jNJNCMIH73IODyRPz8BNkum/GCSyPEBY1ynULUcgPKLL8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qlhl35CQ5ztpx; Tue, 20 Jun 2023 09:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35K9qlga098781; Tue, 20 Jun 2023 09:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35K9qlOD098780; Tue, 20 Jun 2023 09:52:47 GMT (envelope-from git) Date: Tue, 20 Jun 2023 09:52:47 GMT Message-Id: <202306200952.35K9qlOD098780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 35c8063ab1de - main - bhyve: dos2unix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35c8063ab1dec62bf9ff36c0f75d92c32f021462 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=35c8063ab1dec62bf9ff36c0f75d92c32f021462 commit 35c8063ab1dec62bf9ff36c0f75d92c32f021462 Author: Corvin Köhne AuthorDate: 2023-06-20 09:47:42 +0000 Commit: Corvin Köhne CommitDate: 2023-06-20 09:52:43 +0000 bhyve: dos2unix tpm_intf.h was incorrectly committed with dos line endings. Fixes: 0917f925b46e3142c4373d1591bf22014d0f338e ("bhyve: add basic CRB interface for TPM devices") MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG --- usr.sbin/bhyve/tpm_intf.h | 76 +++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h index 020743c0c3f1..0bfecf9206d4 100644 --- a/usr.sbin/bhyve/tpm_intf.h +++ b/usr.sbin/bhyve/tpm_intf.h @@ -1,38 +1,38 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG - * Author: Corvin Köhne - */ - -#pragma once - -#include - -#include "config.h" -#include "tpm_device.h" -#include "tpm_emul.h" - -#define TPM_INTF_TYPE_FIFO_PTP 0x0 -#define TPM_INTF_TYPE_CRB 0x1 -#define TPM_INTF_TYPE_FIFO_TIS 0xF - -#define TPM_INTF_VERSION_FIFO 0 -#define TPM_INTF_VERSION_CRB 1 - -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_4 0 -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_8 1 -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_32 2 -#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_64 3 - -#define TPM_INTF_SELECTOR_FIFO 0 -#define TPM_INTF_SELECTOR_CRB 1 - -struct tpm_intf { - const char *name; - - int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); - void (*deinit)(void *sc); - int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); -}; -#define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x) +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#pragma once + +#include + +#include "config.h" +#include "tpm_device.h" +#include "tpm_emul.h" + +#define TPM_INTF_TYPE_FIFO_PTP 0x0 +#define TPM_INTF_TYPE_CRB 0x1 +#define TPM_INTF_TYPE_FIFO_TIS 0xF + +#define TPM_INTF_VERSION_FIFO 0 +#define TPM_INTF_VERSION_CRB 1 + +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_4 0 +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_8 1 +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_32 2 +#define TPM_INTF_CAP_CRB_DATA_XFER_SIZE_64 3 + +#define TPM_INTF_SELECTOR_FIFO 0 +#define TPM_INTF_SELECTOR_CRB 1 + +struct tpm_intf { + const char *name; + + int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); + void (*deinit)(void *sc); + int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); +}; +#define TPM_INTF_SET(x) DATA_SET(tpm_intf_set, x)