From nobody Fri Apr 14 14:00:49 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 4PydQB1RPDz45JJs; Fri, 14 Apr 2023 14:00:50 +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 4PydQ96X1fz3Jl2; Fri, 14 Apr 2023 14:00:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480850; 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=358kJdcwHasSealdLepGuvc7YNbrfcR7nIJxuLL6LzU=; b=D4rIdkzKU2g8M+cxhIjHLKhRNAgJtkWfWTHn8PSz8ZaZ6hudVtPBRmUdYR2ly0fPUcUMYy 0D4WRw70XReFMibumMlgBZuVGRw/mzsHKPCZcPqVUEtX93pHaW75NEeZz/dPjRI33Na2B5 3CtGe8+wuVn9VVhRXP5GilCJqWk9U5mbGrU/oddh67TeV9t08viS7AMMcCGJJQwcn8pCIR Ub2eRozxTC0iinC9XSm8IMGRZBIQ7xzpWevcplAHlxNs4xfB01o9wWlD3HGcKB59FhGReV ycNaF2A6JgHeuciRk0yUBjCGtZa1sIVR/KBVleBAM/J9SkODLvtlA/hMzJPF3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480850; 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=358kJdcwHasSealdLepGuvc7YNbrfcR7nIJxuLL6LzU=; b=WGt008tNqGu7cOFGaEosTaQXOli6BjN3ImMDiK//OFzvTY2a5SCxjrGOcCNQX2Blo1jzvW LCkuhJnavyruQlLG6sf5eX8OoxkFsK/iCr21REJMznojVw/xqK2z+s3AJ1jpsXDKgwN9ur tmEiSeHgfPDo50GBBjr5xkdoV1vIZZCrAy5YZ6hpSKJn03/DP8cUCEh16AhwfhxkniGynY 40Q3N1MhSICUAlQEYlOQ3LyAnjFUnRcn0I2tcUX1ASQNvhTHaxLtBNm50mVQNWDIOZznts sNBkFJ0DzBAkaXN1/EouzB3wdGNm12e/sTqeUZ7ApB3bOveq672AAP6f35e4rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480850; a=rsa-sha256; cv=none; b=U4xhssmNalbhmofjVsSRZ/tKmS3uv0/GTeuCIE2iRiXOLw5s5VBEpTn2FDf/nWjRQiT68s Oxikh7H5N5fGLqLg4tSH6F6FmuKJFBXQsKBhWEYhuyVKicP7EUCuqPT4or06/PgxNIcX1W s5duFz28t+iMd647Q4gJPuHAEWkjAAzIZp+WeV9wH3kx/H7qYBQlk5n5kVz6TEm8XwtotH Bk8KS/HpqVp5Dl5ZYOgl+41Qn3Svvopi5wIwl7nUvokTUDPHf5ZexQDCwgJg4XAIukUvi8 +KFUbYJWewoqAOd6yIygQSSWXSt7qVuagdL3QlOpfPlfZA0kNUF+0WJwCtBbHQ== 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 4PydQ95VPwzRgv; Fri, 14 Apr 2023 14:00:49 +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 33EE0nP9083626; Fri, 14 Apr 2023 14:00:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0npD083625; Fri, 14 Apr 2023 14:00:49 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:49 GMT Message-Id: <202304141400.33EE0npD083625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: b2c50bb934fb - main - xen/efi: make Xen PV EFI clock optional 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e commit b2c50bb934fb1dab793c74b5d1f1eb9a5c41221e Author: Elliott Mitchell AuthorDate: 2021-02-19 04:19:20 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:47 +0000 xen/efi: make Xen PV EFI clock optional The present implementation is only for x86. Other architectures need adjustments for querying presence of EFI. Xen's EFI support is also quite troublesome on non-x86. This is being slowly remedied, but until in better shape the EFI clock functionality should be disabled. Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D31065 --- sys/amd64/conf/GENERIC | 1 + sys/amd64/conf/MINIMAL | 1 + sys/amd64/conf/NOTES | 1 + sys/conf/files | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 6073f9716d3e..7133c128de50 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -383,6 +383,7 @@ device hyperv # HyperV drivers # NOTE: XENHVM depends on xenpci and xentimer. # They must be added or removed together. options XENHVM # Xen HVM kernel infrastructure +device xenefi # Xen EFI timer device device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index fdafeed46eef..e4d2d0febe94 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -147,6 +147,7 @@ device kvm_clock # KVM paravirtual clock driver # NOTE: XENHVM depends on xenpci and xentimer. # They must be added or removed together. options XENHVM # Xen HVM kernel infrastructure +device xenefi # Xen EFI timer device device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index e568842f2830..ef0f7076633f 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -505,6 +505,7 @@ device hvhid # HyperV HID device # Xen HVM Guest Optimizations options XENHVM # Xen HVM kernel infrastructure +device xenefi # Xen EFI timer device device xenpci # Xen HVM Hypervisor services driver device xentimer # Xen x86 PV timer device diff --git a/sys/conf/files b/sys/conf/files index ff840dce1355..9800c016532c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3486,7 +3486,7 @@ dev/xen/bus/xenpv.c optional xenhvm dev/xen/console/xen_console.c optional xenhvm dev/xen/control/control.c optional xenhvm dev/xen/cpu/xen_acpi_cpu.c optional xenhvm -dev/xen/efi/pvefi.c optional xenhvm efirt +dev/xen/efi/pvefi.c optional xenhvm xenefi efirt dev/xen/grant_table/grant_table.c optional xenhvm dev/xen/netback/netback.c optional xenhvm dev/xen/netfront/netfront.c optional xenhvm