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

Commit 787ab6e9 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

aacraid: do not activate events on non-SRC adapters 



Only SRC-based adapters support the AifReqEvent function, so there is no
point in trying to activate it on older, non-SRC based adapters.  Doing
so lead to crashes on older adapters.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.com>
Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAaditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7ebd67e0

drivers/scsi/aacraid/aacraid.h

+5 −0
Original line number Diff line number Diff line
@@ -620,6 +620,11 @@ struct aac_driver_ident 
 */

#define AAC_QUIRK_SCSI_32	0x0020



/*

 * SRC based adapters support the AifReqEvent functions

 */

#define AAC_QUIRK_SRC 0x0040



/*

 *	The adapter interface specs all queues to be located in the same

 *	physically contiguous block. The host structure that defines the

drivers/scsi/aacraid/linit.c

+6 −5
Original line number Diff line number Diff line
@@ -236,10 +236,10 @@ static struct aac_driver_ident aac_drivers[] = { 
	{ aac_rx_init, "aacraid",  "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Catch All */

	{ aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Rocket Catch All */

	{ aac_nark_init, "aacraid", "ADAPTEC ", "RAID           ", 2 }, /* Adaptec NEMER/ARK Catch All */

	{ aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 6 (Tupelo) */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 7 (Denali) */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec PMC Series 8 */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec PMC Series 9 */

	{ aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 6 (Tupelo) */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 7 (Denali) */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC }, /* Adaptec PMC Series 8 */

	{ aac_srcv_init, "aacraid", "ADAPTEC ", "RAID            ", 2, AAC_QUIRK_SRC } /* Adaptec PMC Series 9 */

};



/**
@@ -1299,6 +1299,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	else

		shost->this_id = shost->max_id;



	if (aac_drivers[index].quirks & AAC_QUIRK_SRC)

		aac_intr_normal(aac, 0, 2, 0, NULL);



	/*