hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

camcontrol: Enable WITH_NVME unconditionally

Browse Source 
MK_NVME is no longer marked broken for any platforms, so just include
support for it always as we do for ATA and SCSI.

Reviewed by:	emaste
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D44841
This commit is contained in:
John Baldwin 2024-04-23 11:46:53 -07:00
parent f48643d376
commit 2b676a66c0
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/camcontrol/Makefile
View File

@ -14,14 +14,12 @@ SRCS+= progress.c
SRCS+= timestamp.c SRCS+= timestamp.c
SRCS+= util.c SRCS+= util.c
SRCS+= zone.c SRCS+= zone.c
.if ${MK_NVME} != "no"
.PATH: ${SRCTOP}/sbin/nvmecontrol .PATH: ${SRCTOP}/sbin/nvmecontrol
CFLAGS+= -I${SRCTOP}/sbin/nvmecontrol -DWITH_NVME CFLAGS+= -I${SRCTOP}/sbin/nvmecontrol
SRCS+= identify_ext.c SRCS+= identify_ext.c
SRCS+= nc_util.c SRCS+= nc_util.c
.PATH: ${SRCTOP}/sys/dev/nvme .PATH: ${SRCTOP}/sys/dev/nvme
SRCS+= nvme_util.c SRCS+= nvme_util.c
.endif
# This is verboten # This is verboten
.if ${MACHINE_CPUARCH} == "arm" .if ${MACHINE_CPUARCH} == "arm"
WARNS?= 3 WARNS?= 3

14
sbin/camcontrol/camcontrol.c
View File

@ -60,9 +60,7 @@
#include <cam/mmc/mmc_all.h> #include <cam/mmc/mmc_all.h>
#include <camlib.h> #include <camlib.h>
#include "camcontrol.h" #include "camcontrol.h"
#ifdef WITH_NVME
#include "nvmecontrol_ext.h" #include "nvmecontrol_ext.h"
#endif
typedef enum { typedef enum {
CAM_CMD_NONE, CAM_CMD_NONE,
@ -278,9 +276,7 @@ static int print_dev_ata(struct device_match_result *dev_result, char *tmpstr);
static int print_dev_semb(struct device_match_result *dev_result, char *tmpstr); static int print_dev_semb(struct device_match_result *dev_result, char *tmpstr);
static int print_dev_mmcsd(struct device_match_result *dev_result, static int print_dev_mmcsd(struct device_match_result *dev_result,
char *tmpstr); char *tmpstr);
#ifdef WITH_NVME
static int print_dev_nvme(struct device_match_result *dev_result, char *tmpstr); static int print_dev_nvme(struct device_match_result *dev_result, char *tmpstr);
#endif
static int requestsense(struct cam_device *device, int argc, char **argv, static int requestsense(struct cam_device *device, int argc, char **argv,
char *combinedopt, int task_attr, int retry_count, char *combinedopt, int task_attr, int retry_count,
int timeout); int timeout);
@ -600,14 +596,12 @@ getdevtree(int argc, char **argv, char *combinedopt)
skip_device = 1; skip_device = 1;
break; break;
} }
#ifdef WITH_NVME
} else if (dev_result->protocol == PROTO_NVME) { } else if (dev_result->protocol == PROTO_NVME) {
if (print_dev_nvme(dev_result, if (print_dev_nvme(dev_result,
&tmpstr[0]) != 0) { &tmpstr[0]) != 0) {
skip_device = 1; skip_device = 1;
break; break;
} }
#endif
} else { } else {
sprintf(tmpstr, "<>"); sprintf(tmpstr, "<>");
} }
@ -781,7 +775,6 @@ print_dev_mmcsd(struct device_match_result *dev_result, char *tmpstr)
return (0); return (0);
} }
#ifdef WITH_NVME
static int static int
nvme_get_cdata(struct cam_device *dev, struct nvme_controller_data *cdata) nvme_get_cdata(struct cam_device *dev, struct nvme_controller_data *cdata)
{ {
@ -843,7 +836,6 @@ print_dev_nvme(struct device_match_result *dev_result, char *tmpstr)
cam_close_device(dev); cam_close_device(dev);
return (0); return (0);
} }
#endif
static int static int
requestsense(struct cam_device *device, int argc, char **argv, requestsense(struct cam_device *device, int argc, char **argv,
@ -2489,7 +2481,6 @@ ataidentify(struct cam_device *device, int retry_count, int timeout)
return (0); return (0);
} }
#ifdef WITH_NVME
static int static int
nvmeidentify(struct cam_device *device, int retry_count __unused, int timeout __unused) nvmeidentify(struct cam_device *device, int retry_count __unused, int timeout __unused)
{ {
@ -2501,12 +2492,10 @@ nvmeidentify(struct cam_device *device, int retry_count __unused, int timeout __
return (0); return (0);
} }
#endif
static int static int
identify(struct cam_device *device, int retry_count, int timeout) identify(struct cam_device *device, int retry_count, int timeout)
{ {
#ifdef WITH_NVME
struct ccb_pathinq cpi; struct ccb_pathinq cpi;
if (get_cpi(device, &cpi) != 0) { if (get_cpi(device, &cpi) != 0) {
@ -2517,7 +2506,6 @@ identify(struct cam_device *device, int retry_count, int timeout)
if (cpi.protocol == PROTO_NVME) { if (cpi.protocol == PROTO_NVME) {
return (nvmeidentify(device, retry_count, timeout)); return (nvmeidentify(device, retry_count, timeout));
} }
#endif
return (ataidentify(device, retry_count, timeout)); return (ataidentify(device, retry_count, timeout));
} }
@ -5410,7 +5398,6 @@ cts_print(struct cam_device *device, struct ccb_trans_settings *cts)
"enabled" : "disabled"); "enabled" : "disabled");
} }
} }
#ifdef WITH_NVME
if (cts->protocol == PROTO_NVME) { if (cts->protocol == PROTO_NVME) {
struct ccb_trans_settings_nvme *nvmex = struct ccb_trans_settings_nvme *nvmex =
&cts->xport_specific.nvme; &cts->xport_specific.nvme;
@ -5427,7 +5414,6 @@ cts_print(struct cam_device *device, struct ccb_trans_settings *cts)
nvmex->speed, nvmex->max_speed); nvmex->speed, nvmex->max_speed);
} }
} }
#endif
} }
/* /*