On Sep 7 11:37, Dr. David Alan Gilbert wrote:
> * Philippe Mathieu-Daudé (phi...@redhat.com) wrote:
> > +David in case
> >
> > On 9/4/20 4:19 PM, Klaus Jensen wrote:
> > > From: Klaus Jensen <k.jen...@samsung.com>
> > >
> > > There are two reasons for changing this:
> > >
> > > 1. The nvme device currently uses an internal Intel device id.
> > >
> > > 2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
> > > support multiple namespaces" the controller device no longer has
> > > the quirks that the Linux kernel think it has.
> > >
> > > As the quirks are applied based on pci vendor and device id, change
> > > them to get rid of the quirks.
> > >
> > > To keep backward compatibility, add a new 'x-use-intel-id' parameter to
> > > the nvme device to force use of the Intel vendor and device id. This is
> > > off by default but add a compat property to set this for 5.1 machines
> > > and older.
> >
> > So now what happens if you start a 5.1 machine with a recent kernel?
> > Simply the kernel will use unnecessary quirks, or are there more
> > changes in behavior?
>
> Seems reasonable to me...but...
>
> > >
> > > Signed-off-by: Klaus Jensen <k.jen...@samsung.com>
> > > Reviewed-by: Keith Busch <kbu...@kernel.org>
> > > Reviewed-by: Maxim Levitsky <mlevi...@redhat.com>
> > > ---
> > > hw/block/nvme.c | 12 ++++++++++--
> > > hw/block/nvme.h | 1 +
> > > hw/core/machine.c | 1 +
> > > 3 files changed, 12 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> > > index 453d3a89d475..8018f8679366 100644
> > > --- a/hw/block/nvme.c
> > > +++ b/hw/block/nvme.c
> > > @@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice
> > > *pci_dev, Error **errp)
> > >
> > > pci_conf[PCI_INTERRUPT_PIN] = 1;
> > > pci_config_set_prog_interface(pci_conf, 0x2);
> > > +
> > > + if (n->params.use_intel_id) {
> > > + pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
> > > + pci_config_set_device_id(pci_conf, 0x5846);
>
> Wasn't that magic number 5845 down there ?
> Argh! My first version of this just bumbed the intel device id and it got left there. Good find! Thank you!
signature.asc
Description: PGP signature
