svn commit: r364093 - in stable/12/sys/dev: mpr mps

[Alexander Motin]

Author: mav
Date: Tue Aug 11 00:41:48 2020
New Revision: 364093
URL: https://svnweb.freebsd.org/changeset/base/364093

Log:
  MFC r363852: 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.

Modified:
  stable/12/sys/dev/mpr/mpr_sas.c
  stable/12/sys/dev/mps/mps_sas.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mpr/mpr_sas.c
==============================================================================
--- stable/12/sys/dev/mpr/mpr_sas.c	Tue Aug 11 00:26:45 2020	(r364092)
+++ stable/12/sys/dev/mpr/mpr_sas.c	Tue Aug 11 00:41:48 2020	(r364093)
@@ -534,7 +534,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: stable/12/sys/dev/mps/mps_sas.c
==============================================================================
--- stable/12/sys/dev/mps/mps_sas.c	Tue Aug 11 00:26:45 2020	(r364092)
+++ stable/12/sys/dev/mps/mps_sas.c	Tue Aug 11 00:41:48 2020	(r364093)
@@ -531,7 +531,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;