cam_debug_probe.diff

diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index c716183aae61..7638f0445278 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -40,3 +40,8 @@ include		"std.qcom"
 include		"std.rockchip"
 include		"std.virt"
 include		"std.xilinx"
+
+# Add CAMDEBUG stuff
+options		CAMDEBUG
+#options		CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH|CAM_DEBUG_TRACE)
+options		CAM_DEBUG_FLAGS=CAM_DEBUG_PROBE
diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c
index 88aa1197cc6c..ba13b1f4bc20 100644
--- a/sys/cam/nvme/nvme_xpt.c
+++ b/sys/cam/nvme/nvme_xpt.c
@@ -260,7 +260,7 @@ nvme_probe_start(struct cam_periph *periph, union ccb *start_ccb)
 	nvme_probe_softc *softc;
 	lun_id_t lun;
 
-	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("nvme_probe_start\n"));
+	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("nvme_probe_start\n"));
 
 	softc = (nvme_probe_softc *)periph->softc;
 	nvmeio = &start_ccb->nvmeio;
@@ -313,7 +313,7 @@ nvme_probe_done(struct cam_periph *periph, union ccb *done_ccb)
 	u_int32_t  priority;
 	int found = 1, e, g, len;
 
-	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("nvme_probe_done\n"));
+	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_PROBE, ("nvme_probe_done\n"));
 
 	softc = (nvme_probe_softc *)periph->softc;
 	path = done_ccb->ccb_h.path;
@@ -531,7 +531,7 @@ nvme_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	struct cam_periph *old_periph;
 	int lock;
 
-	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("nvme_scan_lun\n"));
+	CAM_DEBUG(path, CAM_DEBUG_PROBE, ("nvme_scan_lun\n"));
 
 	xpt_path_inq(&cpi, path);
 
@@ -544,7 +544,7 @@ nvme_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	}
 
 	if (xpt_path_lun_id(path) == CAM_LUN_WILDCARD) {
-		CAM_DEBUG(path, CAM_DEBUG_TRACE, ("nvme_scan_lun ignoring bus\n"));
+		CAM_DEBUG(path, CAM_DEBUG_PROBE, ("nvme_scan_lun ignoring bus\n"));
 		request_ccb->ccb_h.status = CAM_REQ_CMP;	/* XXX signal error ? */
 		xpt_done(request_ccb);
 		return;
@@ -561,16 +561,16 @@ nvme_scan_lun(struct cam_periph *periph, struct cam_path *path,
 			TAILQ_INSERT_TAIL(&softc->request_ccbs,
 				&request_ccb->ccb_h, periph_links.tqe);
 			softc->restart = 1;
-			CAM_DEBUG(path, CAM_DEBUG_TRACE,
+			CAM_DEBUG(path, CAM_DEBUG_PROBE,
 			    ("restarting nvme_probe device\n"));
 		} else {
 			request_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
-			CAM_DEBUG(path, CAM_DEBUG_TRACE,
+			CAM_DEBUG(path, CAM_DEBUG_PROBE,
 			    ("Failing to restart nvme_probe device\n"));
 			xpt_done(request_ccb);
 		}
 	} else {
-		CAM_DEBUG(path, CAM_DEBUG_TRACE,
+		CAM_DEBUG(path, CAM_DEBUG_PROBE,
 		    ("Adding nvme_probe device\n"));
 		status = cam_periph_alloc(nvme_probe_register, NULL, nvme_probe_cleanup,
 					  nvme_probe_start, "nvme_probe",
@@ -739,7 +739,7 @@ nvme_dev_advinfo(union ccb *start_ccb)
 static void
 nvme_action(union ccb *start_ccb)
 {
-	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE,
+	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_PROBE,
 	    ("nvme_action: func= %#x\n", start_ccb->ccb_h.func_code));
 
 	switch (start_ccb->ccb_h.func_code) {

I think that's good

LGTM, please proceed with generating the image.

https://people.freebsd.org/~lwhsu/gce/disk-camdebug-probe.tar.gz