Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b32ece0f authored by Don Brace's avatar Don Brace Committed by Martin K. Petersen
Browse files

scsi: hpsa: correct call to hpsa_do_reset 



calling fill_cmd() using a MACRO definition not handled in switch
statement causes BUG() to be called.

Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8794ee0c

drivers/scsi/hpsa.c

+1 −1
Original line number Diff line number Diff line
@@ -6017,7 +6017,7 @@ static int hpsa_send_reset_as_abort_ioaccel2(struct ctlr_info *h, 
			"Reset as abort: Resetting physical device at scsi3addr 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

			psa[0], psa[1], psa[2], psa[3],

			psa[4], psa[5], psa[6], psa[7]);

	rc = hpsa_do_reset(h, dev, psa, HPSA_RESET_TYPE_TARGET, reply_queue);

	rc = hpsa_do_reset(h, dev, psa, HPSA_PHYS_TARGET_RESET, reply_queue);

	if (rc != 0) {

		dev_warn(&h->pdev->dev,

			"Reset as abort: Failed on physical device at scsi3addr 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

drivers/scsi/hpsa.h

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ struct offline_device_entry { 
#define HPSA_DEVICE_RESET_MSG 1

#define HPSA_RESET_TYPE_CONTROLLER 0x00

#define HPSA_RESET_TYPE_BUS 0x01

#define HPSA_RESET_TYPE_TARGET 0x03

#define HPSA_RESET_TYPE_LUN 0x04

#define HPSA_PHYS_TARGET_RESET 0x99 /* not defined by cciss spec */

#define HPSA_MSG_SEND_RETRY_LIMIT 10