| Message ID | 1523930112-7402-1-git-send-email-wxu@cnexlabs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 4/17/18 3:55 AM, Wei Xu wrote: > Add a new lightnvm quirk to identify CNEX’s Granby controller. > > Signed-off-by: Wei Xu <wxu@cnexlabs.com> > --- > drivers/nvme/host/pci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index cb73bc8..9419e88 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -2529,6 +2529,8 @@ static const struct pci_device_id nvme_id_table[] = { > .driver_data = NVME_QUIRK_LIGHTNVM, }, > { PCI_DEVICE(0x1d1d, 0x2807), /* CNEX WL */ > .driver_data = NVME_QUIRK_LIGHTNVM, }, > + { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */ > + .driver_data = NVME_QUIRK_LIGHTNVM, }, > { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, > { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, > { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, > Looks good to me. Reviewed-by: Matias Bjørling <mb@lightnvm.io> Keith, when convenient can you pick this up for 4.18?
> On 17 Apr 2018, at 03.55, Wei Xu <wxu@cnexlabs.com> wrote: > > Add a new lightnvm quirk to identify CNEX’s Granby controller. > > Signed-off-by: Wei Xu <wxu@cnexlabs.com> > --- > drivers/nvme/host/pci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index cb73bc8..9419e88 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -2529,6 +2529,8 @@ static const struct pci_device_id nvme_id_table[] = { > .driver_data = NVME_QUIRK_LIGHTNVM, }, > { PCI_DEVICE(0x1d1d, 0x2807), /* CNEX WL */ > .driver_data = NVME_QUIRK_LIGHTNVM, }, > + { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */ > + .driver_data = NVME_QUIRK_LIGHTNVM, }, > { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, > { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, > { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, > -- > 2.7.4 Reviewed-by: Javier González <javier@cnexlabs.com>
On Tue, Apr 17, 2018 at 08:16:25AM +0200, Matias Bjørling wrote: > On 4/17/18 3:55 AM, Wei Xu wrote: > > Add a new lightnvm quirk to identify CNEX’s Granby controller. > > > > Signed-off-by: Wei Xu <wxu@cnexlabs.com> > > --- > > drivers/nvme/host/pci.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > > index cb73bc8..9419e88 100644 > > --- a/drivers/nvme/host/pci.c > > +++ b/drivers/nvme/host/pci.c > > @@ -2529,6 +2529,8 @@ static const struct pci_device_id nvme_id_table[] = { > > .driver_data = NVME_QUIRK_LIGHTNVM, }, > > { PCI_DEVICE(0x1d1d, 0x2807), /* CNEX WL */ > > .driver_data = NVME_QUIRK_LIGHTNVM, }, > > + { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */ > > + .driver_data = NVME_QUIRK_LIGHTNVM, }, > > { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, > > { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, > > { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, > > > > Looks good to me. > > Reviewed-by: Matias Bjørling <mb@lightnvm.io> > > Keith, when convenient can you pick this up for 4.18? This looks safe for 4.17-rc2, no? Unless you want to wait for the next release.
On 4/17/18 4:09 PM, Keith Busch wrote: > On Tue, Apr 17, 2018 at 08:16:25AM +0200, Matias Bjørling wrote: >> On 4/17/18 3:55 AM, Wei Xu wrote: >>> Add a new lightnvm quirk to identify CNEX’s Granby controller. >>> >>> Signed-off-by: Wei Xu <wxu@cnexlabs.com> >>> --- >>> drivers/nvme/host/pci.c | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c >>> index cb73bc8..9419e88 100644 >>> --- a/drivers/nvme/host/pci.c >>> +++ b/drivers/nvme/host/pci.c >>> @@ -2529,6 +2529,8 @@ static const struct pci_device_id nvme_id_table[] = { >>> .driver_data = NVME_QUIRK_LIGHTNVM, }, >>> { PCI_DEVICE(0x1d1d, 0x2807), /* CNEX WL */ >>> .driver_data = NVME_QUIRK_LIGHTNVM, }, >>> + { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */ >>> + .driver_data = NVME_QUIRK_LIGHTNVM, }, >>> { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, >>> { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, >>> { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, >>> >> >> Looks good to me. >> >> Reviewed-by: Matias Bjørling <mb@lightnvm.io> >> >> Keith, when convenient can you pick this up for 4.18? > > This looks safe for 4.17-rc2, no? Unless you want to wait for the next > release. It should wait for the next release, it's not a fix.
On Tue, Apr 17, 2018 at 04:15:38PM -0600, Jens Axboe wrote: > >> Looks good to me. > >> > >> Reviewed-by: Matias Bjørling <mb@lightnvm.io> > >> > >> Keith, when convenient can you pick this up for 4.18? > > > > This looks safe for 4.17-rc2, no? Unless you want to wait for the next > > release. > > It should wait for the next release, it's not a fix. Okay, queued up for the next release. I'll wait a few more rc's before posting the nvme-4.18 branch.
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index cb73bc8..9419e88 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2529,6 +2529,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_LIGHTNVM, }, { PCI_DEVICE(0x1d1d, 0x2807), /* CNEX WL */ .driver_data = NVME_QUIRK_LIGHTNVM, }, + { PCI_DEVICE(0x1d1d, 0x2601), /* CNEX Granby */ + .driver_data = NVME_QUIRK_LIGHTNVM, }, { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
Add a new lightnvm quirk to identify CNEX’s Granby controller. Signed-off-by: Wei Xu <wxu@cnexlabs.com> --- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)