svn commit: r363852 - in head/sys/dev: mpr mps

[Alexander Motin]

Author: mav
Date: Tue Aug  4 19:27:03 2020
New Revision: 363852
URL: https://svnweb.freebsd.org/changeset/base/363852

Log:
  Remove extra memset() left after r342388.
  
  This memset() wiped MPI2_FUNCTION_SCSI_TASK_MGMT set by mprsas_alloc_tm(),
  that broke target reset on device removal, making later re-insertion into
  the same slot impossible, since firmware was still waiting for the driver
  to finish with the removed device.
  
  MFC after:	1 week
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/dev/mpr/mpr_sas.c
  head/sys/dev/mps/mps_sas.c

Modified: head/sys/dev/mpr/mpr_sas.c
==============================================================================
--- head/sys/dev/mpr/mpr_sas.c	Tue Aug  4 19:06:25 2020	(r363851)
+++ head/sys/dev/mpr/mpr_sas.c	Tue Aug  4 19:27:03 2020	(r363852)
@@ -515,7 +515,6 @@ mprsas_prepare_remove(struct mprsas_softc *sassc, uint
 	mprsas_rescan_target(sc, targ);
 
 	req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)tm->cm_req;
-	memset(req, 0, sizeof(*req));
 	req->DevHandle = htole16(targ->handle);
 	req->TaskType = MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET;
 

Modified: head/sys/dev/mps/mps_sas.c
==============================================================================
--- head/sys/dev/mps/mps_sas.c	Tue Aug  4 19:06:25 2020	(r363851)
+++ head/sys/dev/mps/mps_sas.c	Tue Aug  4 19:27:03 2020	(r363852)
@@ -515,7 +515,6 @@ mpssas_prepare_remove(struct mpssas_softc *sassc, uint
 	mpssas_rescan_target(sc, targ);
 
 	req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)cm->cm_req;
-	memset(req, 0, sizeof(*req));
 	req->DevHandle = htole16(targ->handle);
 	req->TaskType = MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET;