Skip to content

hw/block/nvme: misc cmb/pmr patches and bump to v1.4

Klaus Jensen qemu-devel 3 versions – Applied

Status from this message: Applied to nvme-next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest12 patches 7 repliesApplied
  2. v212 patches 21 repliesSuperseded
  3. v13 patches 1 replySuperseded

Changes in v3 from the cover letter

~~~~~~~~~~~~~~

- Fix a masking bug in "hw/block/nvme: fix 64 bit register hi/lo split writes" (Minwoo)
- Restore a deleted comment in "hw/block/nvme: remove redundant zeroing of PMR registers" (Minwoo)
- Restore the 'legacy-cmb' parameter from v1 to allow the device to exhibit the v1.3 CMB behavior.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/12hw/block/nvme: add size to mmio read/write trace eventshw/block/nvme.c hw/block/trace-events+4 -40 replies
2/12hw/block/nvme: fix 64 bit register hi/lo split writeshw/block/nvme.c+6 -40 replies
3/12hw/block/nvme: indicate CMB support through controller capabilities registerhw/block/nvme.c include/block/nvme.h+8 -30 replies
4/12hw/block/nvme: move msix table and pba to BAR 0hw/block/nvme.c hw/block/nvme.h+22 -20 replies
5/12hw/block/nvme: allow cmb and pmr to coexisthw/block/nvme.c+8 -90 replies
6/12hw/block/nvme: rename PMR/CMB shift/mask fieldsinclude/block/nvme.h+8 -80 replies
7/12hw/block/nvme: remove redundant zeroing of PMR registershw/block/nvme.c+0 -341 reply
8/12hw/block/nvme: disable PMR at boot uphw/block/nvme.c+12 -20 replies
9/12hw/block/nvme: add PMR RDS/WDS supporthw/block/nvme.c hw/block/nvme.h include/block/nvme.h+107 -220 replies
10/12hw/block/nvme: move cmb logic to v1.4hw/block/nvme.c hw/block/nvme.h hw/block/trace-events +1 more+182 -383 replies
11/12hw/block/nvme: bump to v1.4hw/block/nvme.c include/block/nvme.h+5 -30 replies
12/12hw/block/nvme: lift cmb restrictionshw/block/nvme.c+2 -311 reply

Reviews trailers per patch

8 of 12 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMinwoo ImMaxim LevitskyKeith Busch
SeriesR-b
1/12R-b
2/12
3/12R-b R-b
4/12R-b T-b
5/12R-b
6/12R-b
7/12R-b
8/12
9/12
10/12R-b
11/12
12/12R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/12] hw/block/nvme: misc cmb/pmr patches and bump to v1.4

From: Klaus Jensen <[email protected]>

This is a resend of "hw/block/nvme: allow cmb and pmr to coexist" with some more PMR work added (PMR RDS/WDS support).

This includes a resurrection of Andrzej's series[1] from back July.

Andrzej's main patch basically moved the CMB from BAR 2 into an offset in BAR 4 (located after the MSI-X table and PBA). Having an offset on the CMB causes a bunch of calculations related to address mapping to change.

So, since I couldn't get the patch to apply cleanly I took a stab at implementing the suggestion I originally came up with: simply move the MSI-X table and PBA from BAR 4 into BAR 0 (up-aligned to a 4 KiB boundary after the main NVMe controller registers). This way we can keep the CMB at offset zero in its own BAR and free up BAR 4 for use by PMR. This makes the patch simpler and does not impact any of the existing address mapping code.

[1]: https://lore.kernel.org/qemu-devel/[email protected]/

Changes for v3
~~~~~~~~~~~~~~

- Fix a masking bug in "hw/block/nvme: fix 64 bit register hi/lo split writes" (Minwoo)
- Restore a deleted comment in "hw/block/nvme: remove redundant zeroing of PMR registers" (Minwoo)
- Restore the 'legacy-cmb' parameter from v1 to allow the device to exhibit the v1.3 CMB behavior.

Changes for v2
~~~~~~~~~~~~~~

- Rebased on nvme-next
- Added a fix for 64 bit register hi/lo split writes
- Added the patches from "hw/block/nvme: cmb enhancements and bump to v1.4" to the back of this.
- As suggested by Keith, I removed "legacy CMB" support - the patch now exclusively bumps the support to the "v1.4 variant", so the linux kernel nvme gang have to get their game on ;)

Andrzej Jakowski (1):
hw/block/nvme: indicate CMB support through controller capabilities
register

Klaus Jensen (9):
hw/block/nvme: add size to mmio read/write trace events hw/block/nvme: fix 64 bit register hi/lo split writes hw/block/nvme: move msix table and pba to BAR 0 hw/block/nvme: allow cmb and pmr to coexist hw/block/nvme: rename PMR/CMB shift/mask fields hw/block/nvme: remove redundant zeroing of PMR registers hw/block/nvme: disable PMR at boot up hw/block/nvme: bump to v1.4
hw/block/nvme: lift cmb restrictions

Naveen Nagar (1):
hw/block/nvme: add PMR RDS/WDS support

Padmakar Kalghatgi (1):
hw/block/nvme: move cmb logic to v1.4

 hw/block/nvme.h       |  17 +-
 include/block/nvme.h  | 125 +++++++++++++--
 hw/block/nvme.c       | 350 +++++++++++++++++++++++++++---------------
 hw/block/trace-events |   6 +-
 4 files changed, 351 insertions(+), 147 deletions(-)
Signature · 1 line
2.30.0