Skip to content

Commit 7d4e2a4

Browse files
committed
Revert "do not adverstise Doorbell Buffer support for now (#1023)"
This reverts commit d6cd957.
1 parent e25e56e commit 7d4e2a4

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

lib/propolis/src/hw/nvme/admin.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ impl NvmeCtrl {
463463
}
464464
}
465465

466-
#[allow(dead_code)]
467466
pub(super) fn acmd_doorbell_buf_cfg(
468467
&mut self,
469468
cmd: &cmds::DoorbellBufCfgCmd,

lib/propolis/src/hw/nvme/mod.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -844,9 +844,8 @@ impl PciNvme {
844844
nn: 1,
845845
// bit 0 indicates volatile write cache is present
846846
vwc: 1,
847-
// bit 8 indicates Doorbell Buffer support. Theoretically supported,
848-
// but disabled for Propolis issue #1008.
849-
oacs: (0 << 8),
847+
// bit 8 indicates Doorbell Buffer support
848+
oacs: (1 << 8),
850849
..Default::default()
851850
};
852851

@@ -1340,16 +1339,8 @@ impl PciNvme {
13401339
// this can detect it and stop posting async events.
13411340
cmds::Completion::generic_err(bits::STS_INVAL_OPC).dnr()
13421341
}
1343-
AdminCmd::DoorbellBufCfg(_cmd) => {
1344-
// XXX: issue #1008 suggests that Doorbell Buffer support
1345-
// can end up with guest disks in a state that *looks like*
1346-
// we've failed to notify after writing a completion. While
1347-
// we're debugging this, we hide Doorbell Buffer support
1348-
// from OACS. Instead, treat this the same as an
1349-
// `AdminCmd::Unknown`.
1350-
1351-
// state.acmd_doorbell_buf_cfg(&cmd)
1352-
cmds::Completion::generic_err(bits::STS_INTERNAL_ERR)
1342+
AdminCmd::DoorbellBufCfg(cmd) => {
1343+
state.acmd_doorbell_buf_cfg(&cmd)
13531344
}
13541345
AdminCmd::Unknown(_) => {
13551346
cmds::Completion::generic_err(bits::STS_INTERNAL_ERR)

0 commit comments

Comments
 (0)