From nobody Mon Nov 14 08:25:58 2022 X-Original-To: dev-commits-src-branches@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 4N9j7W0GwXz4hRmF; Mon, 14 Nov 2022 08:25:59 +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 4N9j7V6s47z4btJ; Mon, 14 Nov 2022 08:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668414359; 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=+yVUHfRK65lburB8OlBc+iwnNv8ZdkAgkC3kQE8mYPo=; b=BND7VdXex/JTxFNVKlpE8iUU/tK7jVJTZ5WBqNm5NEj6OhZjdKJItboaDhcwnBblVOZKry DdWf/CGm3kPBUcdNDJBzTXdEWZv4rkb4maj5wsqi/PJ6EcC4RBksxoWiS0VUW8iqR4WlT5 6XRoUCo/mZIl13wubNFoNadglIGXz2eZGa3rQc1enxP5F3UUlG1CQ9vQDD/IT5NJ9eux1s 9xTvDtns92lNsdjns6NOKtXN2jdTE9CTP1vhKcPRErx22UeKAWl9TbZq3APt+AlndALWOm 5ILGuzlWD6TU3quKadnQ7UkaLRjgzYngrrByF6Rhd6PjOLTPbt0hS2o2CZfrZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668414359; 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=+yVUHfRK65lburB8OlBc+iwnNv8ZdkAgkC3kQE8mYPo=; b=rIdPOCfw4KBYU0u5RshB/kV2Mhhth+mFW50CgdHZN64nkafPAkQ0LJZ8ft1eFivwW++ylt 2BBBcnDIIRzsDPOSfecTMITu/pcxWwpoQjZaAbjOLphTZ9EY31IeFOkIwiENaE5DlYtlmE oT4AUxgPo+2+vqD+MQoNFphsy5SNdo1NgLnFY54TrDkaNJ74DpY5tpufDY8AFUgjR06p7n jAGYHB++fJyb5xbCjQcNmRfexADLdy6EBTEo1vBaKpc/b94eRhmNhlk3NJ1yHpoZm58mcJ Sd3dPxZNLvCPSn53SXayvdrSKzxBxzRrRQiiFNs0IveO85SCjBFd0l2eCa7UxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668414359; a=rsa-sha256; cv=none; b=NZ2ROwsapM8Q4AxgUbNXlXSH69jzaT3ujLmfgu0WFkAU/DFRDRw7CqHoxnUhxBKPJz1hlo 8x2SnuvZggYHixBfYCMlVo2jZpJK7QvO5Ow73kiifsvC58tL9Xdw2cxaZD9UKFUxWLKVMW caLqiIa2mz+UPjV/mPPp3aomJbzKk4s1A6H5IQ5eKKKRRmy1qMLpl0SfAMyIv58bjuveYC sKiLE5SxaLOFXae6QvWsrr+Hk5ghvb3lrJ7D1NeLoZUoMOW6/a6Rpw6QBCPjfFDSYe4/EP 3ga3yBRsKeI/SyREa/vSHdob4ddh5iWnxSLpA0HzOnBSHPX5U0d2V7aDzqZiaA== 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 4N9j7V5vqvzZfq; Mon, 14 Nov 2022 08:25:58 +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 2AE8Pwxu084336; Mon, 14 Nov 2022 08:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AE8PwwA084335; Mon, 14 Nov 2022 08:25:58 GMT (envelope-from git) Date: Mon, 14 Nov 2022 08:25:58 GMT Message-Id: <202211140825.2AE8PwwA084335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 839b6e33089b - stable/13 - bhyve nvme: Fix Active Firmware Info List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 839b6e33089bee5873cf3fcd402260aa4d405f49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=839b6e33089bee5873cf3fcd402260aa4d405f49 commit 839b6e33089bee5873cf3fcd402260aa4d405f49 Author: WanpengQian AuthorDate: 2022-08-14 15:28:05 +0000 Commit: Corvin Köhne CommitDate: 2022-11-14 08:23:03 +0000 bhyve nvme: Fix Active Firmware Info Summary: Currently Active Firmware Info is not initialized. Fix is to initialize the Active Firmware Info to Slot 1. Test Plan: Within FreeBSD/Linux guests, show the Firmware Logpage to confirm. Reviewed By: chuck MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D32658 (cherry picked from commit 3cae10048d27f805d7fc909b123ddee34be0268e) --- usr.sbin/bhyve/pci_nvme.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 98410b92039c..15d6ae777cc6 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -695,6 +695,11 @@ pci_nvme_init_logpages(struct pci_nvme_softc *sc) sc->health_log.temperature = NVME_TEMPERATURE; sc->health_log.available_spare = 100; sc->health_log.available_spare_threshold = 10; + + /* Set Active Firmware Info to slot 1 */ + sc->fw_log.afi = (1 << NVME_FIRMWARE_PAGE_AFI_SLOT_SHIFT); + memcpy(&sc->fw_log.revision[0], sc->ctrldata.fr, + sizeof(sc->fw_log.revision[0])); } static void