The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=eae0210cdd2e22c2eb9bc652f2136b3386a663a4
commit eae0210cdd2e22c2eb9bc652f2136b3386a663a4 Author: WanpengQian <[email protected]> AuthorDate: 2022-08-14 15:26:42 +0000 Commit: Chuck Tuffli <[email protected]> CommitDate: 2022-08-14 16:59:36 +0000 bhyve: Fix Number of Power States Supported value Summary: Set Number of Power States Supported to indicate 1 power state. Keep the Power State Descriptor data structures as zero to indicate "Not reported". Test Plan: Within FreeBSD/Linux guests, list the number of power states and check the Max Power value. Reviewed By: markj, chuck MFC after: 2 weeks Signed-off-by: Wanpeng Qian <[email protected]> Differential Revision: https://reviews.freebsd.org/D32657 --- usr.sbin/bhyve/pci_nvme.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 38102beb0152..93edd96a0d0d 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -550,7 +550,11 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) (1 << NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT); cd->lpa = 0; /* TODO: support some simple things like SMART */ cd->elpe = 0; /* max error log page entries */ - cd->npss = 1; /* number of power states support */ + /* + * Report a single power state (zero-based value) + * power_state[] values are left as zero to indicate "Not reported" + */ + cd->npss = 0; /* Warning Composite Temperature Threshold */ cd->wctemp = 0x0157; @@ -579,8 +583,6 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; - - cd->power_state[0].mp = 10; } /*
