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

Commit a7e2c642 authored by Raghava Aditya Renukunta's avatar Raghava Aditya Renukunta Committed by Martin K. Petersen
Browse files

scsi: aacraid: Fix sync fibs time out on controller reset 



After controller shutdown, all sync fibs time out due to not knowing
about the switch to INT-x mode

Fixed by replacing aac_src_access_devreg() to aac_set_intx_mode() call.

Cc: stable@vger.kernel.org
Fixes: 495c0217 (aacraid: MSI-x support)
Signed-off-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: default avatarDavid Carroll <David.Carroll@microsemi.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 30202e06

drivers/scsi/aacraid/aacraid.h

+1 −0
Original line number Diff line number Diff line
@@ -2639,6 +2639,7 @@ void aac_hba_callback(void *context, struct fib *fibptr); 
#define fib_data(fibctx) ((void *)(fibctx)->hw_fib_va->data)

struct aac_dev *aac_init_adapter(struct aac_dev *dev);

void aac_src_access_devreg(struct aac_dev *dev, int mode);

void aac_set_intx_mode(struct aac_dev *dev);

int aac_get_config_status(struct aac_dev *dev, int commit_flag);

int aac_get_containers(struct aac_dev *dev);

int aac_scsi_cmd(struct scsi_cmnd *cmd);

drivers/scsi/aacraid/comminit.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ int aac_send_shutdown(struct aac_dev * dev) 
	     dev->pdev->device == PMC_DEVICE_S8 ||

	     dev->pdev->device == PMC_DEVICE_S9) &&

	     dev->msi_enabled)

		aac_src_access_devreg(dev, AAC_ENABLE_INTX);

		aac_set_intx_mode(dev);

	return status;

}

drivers/scsi/aacraid/src.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static int aac_srcv_ioremap(struct aac_dev *dev, u32 size) 
	return 0;

}



static void aac_set_intx_mode(struct aac_dev *dev)

void aac_set_intx_mode(struct aac_dev *dev)

{

	if (dev->msi_enabled) {

		aac_src_access_devreg(dev, AAC_ENABLE_INTX);