Revert "nda: Filter non-storage nvme drives"
This reverts commit b40205855e. There's an
aparent path lifetime issue in it that needs to be investigated.
Sponsored by: Netflix
This commit is contained in:
@@ -49,7 +49,6 @@
|
|||||||
#include <sys/sbuf.h>
|
#include <sys/sbuf.h>
|
||||||
#include <geom/geom.h>
|
#include <geom/geom.h>
|
||||||
#include <geom/geom_disk.h>
|
#include <geom/geom_disk.h>
|
||||||
#include <dev/pci/pcireg.h>
|
|
||||||
#endif /* _KERNEL */
|
#endif /* _KERNEL */
|
||||||
|
|
||||||
#ifndef _KERNEL
|
#ifndef _KERNEL
|
||||||
@@ -732,7 +731,6 @@ ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
|
|||||||
switch (code) {
|
switch (code) {
|
||||||
case AC_FOUND_DEVICE:
|
case AC_FOUND_DEVICE:
|
||||||
{
|
{
|
||||||
struct ccb_pathinq cpi;
|
|
||||||
struct ccb_getdev *cgd;
|
struct ccb_getdev *cgd;
|
||||||
cam_status status;
|
cam_status status;
|
||||||
|
|
||||||
@@ -743,18 +741,6 @@ ndaasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
|
|||||||
if (cgd->protocol != PROTO_NVME)
|
if (cgd->protocol != PROTO_NVME)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/*
|
|
||||||
* For PCIe cards, filter all the cards whose programming
|
|
||||||
* interface doesn't conform to the NVMe storage spec. This
|
|
||||||
* allows the nvme controller to attach to more than just
|
|
||||||
* storage cards that use the nvme model.
|
|
||||||
*/
|
|
||||||
xpt_path_inq(&cpi, cgd->ccb_h.path);
|
|
||||||
if (cpi.transport == XPORT_NVME &&
|
|
||||||
cpi.xport_specific.nvme.progif !=
|
|
||||||
PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate a peripheral instance for
|
* Allocate a peripheral instance for
|
||||||
* this device and start the probe
|
* this device and start the probe
|
||||||
|
|||||||
Reference in New Issue
Block a user