svn commit: r328666 - stable/11/sys/dev/nvme

[Warner Losh]

On Thu, Feb 1, 2018 at 8:45 AM, Alexander Motin <mav at freebsd.org> wrote:

> On 01.02.2018 10:35, Warner Losh wrote:
> > I'd been specifically not MFC'ing the NVME stuff because I wasn't sure
> > that its ABI had jelled yet....
> >
> > Be sure to merge everything because there's 0 support for anything but
> > the tip of -current for the NVME CAM stuff.
>
> Sure, as much as ABI permit.  I just found that we need some of recent
> head changes for some NVMe devices to work, and then found that the code
> in area was not merged for a year.  I don't like random cherry-picking,


There was an ABI breakage in -current that was fixed with this stuff, but
if everything is merged, we should be 100% ABI compatible. Please let me
know if you think that's not the case.

Warner

> On Thu, Feb 1, 2018 at 8:32 AM, Alexander Motin <mav at freebsd.org
> > <mailto:mav at freebsd.org>> wrote:
> >
> >     Author: mav
> >     Date: Thu Feb  1 15:32:48 2018
> >     New Revision: 328666
> >     URL: https://svnweb.freebsd.org/changeset/base/328666
> >     <https://svnweb.freebsd.org/changeset/base/328666>
> >
> >     Log:
> >       MFC r303466: Kill a few stray debug printfs.
> >
> >     Modified:
> >       stable/11/sys/dev/nvme/nvme_sim.c
> >     Directory Properties:
> >       stable/11/   (props changed)
> >
> >     Modified: stable/11/sys/dev/nvme/nvme_sim.c
> >     ============================================================
> ==================
> >     --- stable/11/sys/dev/nvme/nvme_sim.c   Thu Feb  1 15:32:14 2018
> >         (r328665)
> >     +++ stable/11/sys/dev/nvme/nvme_sim.c   Thu Feb  1 15:32:48 2018
> >         (r328666)
> >     @@ -133,8 +133,6 @@ nvme_sim_action(struct cam_sim *sim, union ccb
> *ccb)
> >             ns = sim2ns(sim);
> >             ctrlr = sim2ctrlr(sim);
> >
> >     -       printf("Sim action: ctrlr %p ns %p\n", ctrlr, ns);
> >     -
> >             mtx_assert(&ctrlr->lock, MA_OWNED);
> >
> >             switch (ccb->ccb_h.func_code) {
> >     @@ -310,8 +308,6 @@ nvme_sim_new_ns(struct nvme_namespace *ns, void
> >     *sc_ar
> >
> >             sc->s_ns = ns;
> >
> >     -       printf("Our SIM's softc %p ctrlr %p ns %p\n", sc, ctrlr, ns);
> >     -
> >             /*
> >              * XXX this is creating one bus per ns, but it should be one
> >              * XXX target per controller, and one LUN per namespace.
> >     @@ -349,7 +345,6 @@ nvme_sim_new_ns(struct nvme_namespace *ns, void
> >     *sc_ar
> >             sc->s_path->device->nvme_cdata =
> nvme_ctrlr_get_data(ns->ctrlr);
> >
> >      /* Scan bus */
> >     -       printf("Initiate rescan of the bus\n");
> >             nvme_sim_rescan_target(ctrlr, sc->s_path);
> >
> >             mtx_unlock(&ctrlr->lock);
> >
> >
>
> --
> Alexander Motin
>