aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/mps
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/mps')
-rw-r--r--sys/dev/mps/mps.c1
-rw-r--r--sys/dev/mps/mps_config.c1
-rw-r--r--sys/dev/mps/mps_mapping.c1
-rw-r--r--sys/dev/mps/mps_pci.c1
-rw-r--r--sys/dev/mps/mps_sas.c10
-rw-r--r--sys/dev/mps/mps_sas_lsi.c2
-rw-r--r--sys/dev/mps/mps_table.c1
-rw-r--r--sys/dev/mps/mps_user.c1
8 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c
index 357eacf28925..cb82045356fc 100644
--- a/sys/dev/mps/mps.c
+++ b/sys/dev/mps/mps.c
@@ -30,7 +30,6 @@
* Avago Technologies (LSI) MPT-Fusion Host Adapter FreeBSD
*/
-#include <sys/cdefs.h>
/* Communications core for Avago Technologies (LSI) MPT2 */
/* TODO Move headers to mpsvar */
diff --git a/sys/dev/mps/mps_config.c b/sys/dev/mps/mps_config.c
index 47f9fe573a2b..cfb96c3e9bee 100644
--- a/sys/dev/mps/mps_config.c
+++ b/sys/dev/mps/mps_config.c
@@ -29,7 +29,6 @@
* Avago Technologies (LSI) MPT-Fusion Host Adapter FreeBSD
*/
-#include <sys/cdefs.h>
/* TODO Move headers to mpsvar */
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/dev/mps/mps_mapping.c b/sys/dev/mps/mps_mapping.c
index 25d17d575970..9e069a3a924d 100644
--- a/sys/dev/mps/mps_mapping.c
+++ b/sys/dev/mps/mps_mapping.c
@@ -29,7 +29,6 @@
* Avago Technologies (LSI) MPT-Fusion Host Adapter FreeBSD
*/
-#include <sys/cdefs.h>
/* TODO Move headers to mpsvar */
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c
index 7a0c577eb72a..8855c186754a 100644
--- a/sys/dev/mps/mps_pci.c
+++ b/sys/dev/mps/mps_pci.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/* PCI/PCI-X/PCIe bus interface for the Avago Tech (LSI) MPT2 controllers */
/* TODO Move headers to mpsvar */
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
index fa0f817ed67b..fb591391f6a5 100644
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -30,7 +30,6 @@
* Avago Technologies (LSI) MPT-Fusion Host Adapter FreeBSD
*/
-#include <sys/cdefs.h>
/* Communications core for Avago Technologies (LSI) MPT2 */
/* TODO Move headers to mpsvar */
@@ -81,6 +80,12 @@
#include <dev/mps/mps_table.h>
#include <dev/mps/mps_sas.h>
+#include <sys/sdt.h>
+
+/* SDT Probes */
+SDT_PROBE_DEFINE4(cam, , mps, complete, "union ccb *",
+ "struct mps_command *", "u_int", "u32");
+
/*
* static array to check SCSI OpCode for EEDP protection bits
*/
@@ -2077,6 +2082,9 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
sc->SSU_refcount--;
}
+ SDT_PROBE4(cam, , mps, complete, ccb, cm, sassc->flags,
+ sc->mapping_table[target_id].device_info);
+
/* Take the fast path to completion */
if (cm->cm_reply == NULL) {
if (mpssas_get_ccbstatus(ccb) == CAM_REQ_INPROG) {
diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c
index 42119b5c0a43..bcde5d69a021 100644
--- a/sys/dev/mps/mps_sas_lsi.c
+++ b/sys/dev/mps/mps_sas_lsi.c
@@ -29,7 +29,6 @@
* Avago Technologies (LSI) MPT-Fusion Host Adapter FreeBSD
*/
-#include <sys/cdefs.h>
/* Communications core for Avago Technologies (LSI) MPT2 */
/* TODO Move headers to mpsvar */
@@ -1153,7 +1152,6 @@ mpssas_SSU_to_SATA_devices(struct mps_softc *sc, int howto)
/*start*/FALSE,
/*load/eject*/0,
/*immediate*/FALSE,
- /*power_condition*/SSS_PC_START_VALID,
MPS_SENSE_LEN,
/*timeout*/10000);
xpt_action(ccb);
diff --git a/sys/dev/mps/mps_table.c b/sys/dev/mps/mps_table.c
index f2c6ed9b88c3..e97583ffa3f8 100644
--- a/sys/dev/mps/mps_table.c
+++ b/sys/dev/mps/mps_table.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/* Debugging tables for MPT2 */
/* TODO Move headers to mpsvar */
diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c
index 01edcbed2609..619eea6e9c69 100644
--- a/sys/dev/mps/mps_user.c
+++ b/sys/dev/mps/mps_user.c
@@ -60,7 +60,6 @@
* Avago Technologies (LSI) MPT-Fusion Host Adapter FreeBSD
*/
-#include <sys/cdefs.h>
/* TODO Move headers to mpsvar */
#include <sys/types.h>
#include <sys/param.h>