Page MenuHomeFreeBSD
Files F144482459

D53922.1774898821.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D53922.1774898821.diff
View Options

diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -1024,6 +1024,7 @@
/* start/stop */ startstop,
/* load_eject */ loadeject,
/* immediate */ 0,
+ /* power_condition */ SSS_PC_START_VALID,
/* sense_len */ SSD_FULL_SIZE,
/* timeout */ timeout ? timeout : 120000);
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -1791,6 +1791,7 @@
/*start*/TRUE,
/*load/eject*/le,
/*immediate*/FALSE,
+ /*power_condition*/SSS_PC_START_VALID,
SSD_FULL_SIZE,
/*timeout*/50000);
break;
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -4326,7 +4326,8 @@
void scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries,
void (*cbfcnp)(struct cam_periph *, union ccb *),
uint8_t tag_action, int start, int load_eject,
- int immediate, uint8_t sense_len, uint32_t timeout);
+ int immediate, uint8_t power_condition, uint8_t sense_len,
+ uint32_t timeout);
void scsi_read_attribute(struct ccb_scsiio *csio, uint32_t retries,
void (*cbfcnp)(struct cam_periph *, union ccb *),
uint8_t tag_action, uint8_t service_action,
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -8984,7 +8984,8 @@
scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries,
void (*cbfcnp)(struct cam_periph *, union ccb *),
uint8_t tag_action, int start, int load_eject,
- int immediate, uint8_t sense_len, uint32_t timeout)
+ int immediate, uint8_t power_condition, uint8_t sense_len,
+ uint32_t timeout)
{
struct scsi_start_stop_unit *scsi_cmd;
int extra_flags = 0;
@@ -8999,6 +9000,7 @@
}
if (load_eject != 0)
scsi_cmd->how |= SSS_LOEJ;
+ scsi_cmd->how |= power_condition;
if (immediate != 0)
scsi_cmd->byte2 |= SSS_IMMED;
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -3406,6 +3406,7 @@
/* start */ TRUE,
/* load_eject */ load,
/* immediate */ FALSE,
+ /* power_condition */ SSS_PC_START_VALID,
/* sense_len */ SSD_FULL_SIZE,
/* timeout */ 50000);
@@ -3434,6 +3435,7 @@
/* start */ FALSE,
/* load_eject */ eject,
/* immediate */ FALSE,
+ /* power_condition */ SSS_PC_START_VALID,
/* sense_len */ SSD_FULL_SIZE,
/* timeout */ 50000);
diff --git a/sys/dev/mpr/mpr_sas_lsi.c b/sys/dev/mpr/mpr_sas_lsi.c
--- a/sys/dev/mpr/mpr_sas_lsi.c
+++ b/sys/dev/mpr/mpr_sas_lsi.c
@@ -1517,6 +1517,7 @@
/*start*/FALSE,
/*load/eject*/0,
/*immediate*/FALSE,
+ /*power_condition*/SSS_PC_START_VALID,
MPR_SENSE_LEN,
/*timeout*/10000);
xpt_action(ccb);
diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c
--- a/sys/dev/mps/mps_sas_lsi.c
+++ b/sys/dev/mps/mps_sas_lsi.c
@@ -1153,6 +1153,7 @@
/*start*/FALSE,
/*load/eject*/0,
/*immediate*/FALSE,
+ /*power_condition*/SSS_PC_START_VALID,
MPS_SENSE_LEN,
/*timeout*/10000);
xpt_action(ccb);

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 7:27 PM (2 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28231839
Default Alt Text
D53922.1774898821.diff (3 KB)

Event Timeline