diff options
| author | Jim Harris <jimharris@FreeBSD.org> | 2012-08-21 22:28:14 +0000 |
|---|---|---|
| committer | Jim Harris <jimharris@FreeBSD.org> | 2012-08-21 22:28:14 +0000 |
| commit | 3e0a9f1ff2d7872d0679f4dad84cbbede8dc86ea (patch) | |
| tree | 723083404d26c6424568aa0b517da6334f74dc2b /sys/dev/isci/scil | |
| parent | 87a74dd6e3a8bceb019edca887df16763ca0ee39 (diff) | |
Notes
Diffstat (limited to 'sys/dev/isci/scil')
| -rw-r--r-- | sys/dev/isci/scil/sati_unmap.c | 4 | ||||
| -rw-r--r-- | sys/dev/isci/scil/scif_sas_sati_binding.h | 11 | ||||
| -rw-r--r-- | sys/dev/isci/scil/scif_sas_stp_io_request.c | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/sys/dev/isci/scil/sati_unmap.c b/sys/dev/isci/scil/sati_unmap.c index cc8327b3bc25..4cd6e9c41952 100644 --- a/sys/dev/isci/scil/sati_unmap.c +++ b/sys/dev/isci/scil/sati_unmap.c @@ -335,8 +335,8 @@ SATI_STATUS sati_unmap_initial_processing( sati_scsi_sense_data_construct( sequence, scsi_io, - SCSI_STATUS_CHECK_CONDITION, - SCSI_SENSE_ABORTED_COMMAND, + SCSI_STATUS_BUSY, + SCSI_SENSE_NO_SENSE, SCSI_ASC_NO_ADDITIONAL_SENSE, SCSI_ASCQ_NO_ADDITIONAL_SENSE ); diff --git a/sys/dev/isci/scil/scif_sas_sati_binding.h b/sys/dev/isci/scil/scif_sas_sati_binding.h index 99c94333a78b..329efd7794f9 100644 --- a/sys/dev/isci/scil/scif_sas_sati_binding.h +++ b/sys/dev/isci/scil/scif_sas_sati_binding.h @@ -183,22 +183,16 @@ extern "C" { { \ SCIF_SAS_REQUEST_T* fw_request = (SCIF_SAS_REQUEST_T*)scsi_io; \ SCI_PHYSICAL_MEMORY_DESCRIPTOR_T mde; \ - SCI_PHYSICAL_ADDRESS phys_addr; \ mde.virtual_address = NULL; \ - sci_cb_make_physical_address(mde.physical_address, 0, 0); \ sci_base_mde_construct( \ &mde, 4, length, SCI_MDE_ATTRIBUTE_PHYSICALLY_CONTIGUOUS \ ); \ scif_cb_controller_allocate_memory( \ fw_request->device->domain->controller, &mde \ ); \ - scic_cb_io_request_get_physical_address(fw_request->device->domain->controller, \ - NULL, \ - mde.virtual_address, \ - &phys_addr); \ *(virt_address) = mde.virtual_address; \ - *(phys_address_low) = sci_cb_physical_address_lower(phys_addr); \ - *(phys_address_high) = sci_cb_physical_address_upper(phys_addr); \ + *(phys_address_low) = sci_cb_physical_address_lower(mde.physical_address); \ + *(phys_address_high) = sci_cb_physical_address_upper(mde.physical_address); \ } #define sati_cb_free_dma_buffer(scsi_io, virt_address) \ @@ -206,7 +200,6 @@ extern "C" { SCIF_SAS_REQUEST_T* fw_request = (SCIF_SAS_REQUEST_T*)scsi_io; \ SCI_PHYSICAL_MEMORY_DESCRIPTOR_T mde; \ mde.virtual_address = virt_address; \ - sci_cb_make_physical_address(mde.physical_address, 0, 0); \ sci_base_mde_construct( \ &mde, 4, 0, SCI_MDE_ATTRIBUTE_PHYSICALLY_CONTIGUOUS \ ); \ diff --git a/sys/dev/isci/scil/scif_sas_stp_io_request.c b/sys/dev/isci/scil/scif_sas_stp_io_request.c index 36910bd70962..cca50c64f969 100644 --- a/sys/dev/isci/scil/scif_sas_stp_io_request.c +++ b/sys/dev/isci/scil/scif_sas_stp_io_request.c @@ -171,6 +171,8 @@ SCI_STATUS scif_sas_stp_io_request_constructed_complete_handler( ); } + sati_sequence_terminate(&fw_io->parent.stp.sequence, fw_io, fw_io); + return SCI_SUCCESS; } /** |