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

Commit 9504a923 authored by Hans Verkuil's avatar Hans Verkuil Committed by James Bottomley
Browse files

[SCSI] pm80xx: fix Adaptec 71605H hang 



The IO command size is 128 bytes for these new controllers as opposed to 64
for the old 8001 controller.

The Adaptec out-of-tree driver did this correctly. After comparing the two
this turned out to be the crucial difference.

So don't hardcode the IO command size, instead use pm8001_ha->iomb_size as
that is the correct value for both old and new controllers.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarAnand Kumar Santhanam <AnandKumar.Santhanam@pmcs.com>
Acked-by: default avatarJack Wang <xjtuwjp@gmail.com>
Cc: stable@vger.kernel.org      # for v3.10 and up
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b5dc3c48

drivers/scsi/pm8001/pm8001_hwi.c

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) 
	pm8001_ha->main_cfg_tbl.pm8001_tbl.fatal_err_interrupt		= 0x01;

	for (i = 0; i < PM8001_MAX_INB_NUM; i++) {

		pm8001_ha->inbnd_q_tbl[i].element_pri_size_cnt	=

			PM8001_MPI_QUEUE | (64 << 16) | (0x00<<30);

			PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x00<<30);

		pm8001_ha->inbnd_q_tbl[i].upper_base_addr	=

			pm8001_ha->memoryMap.region[IB + i].phys_addr_hi;

		pm8001_ha->inbnd_q_tbl[i].lower_base_addr	=
@@ -247,7 +247,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) 
	}

	for (i = 0; i < PM8001_MAX_OUTB_NUM; i++) {

		pm8001_ha->outbnd_q_tbl[i].element_size_cnt	=

			PM8001_MPI_QUEUE | (64 << 16) | (0x01<<30);

			PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x01<<30);

		pm8001_ha->outbnd_q_tbl[i].upper_base_addr	=

			pm8001_ha->memoryMap.region[OB + i].phys_addr_hi;

		pm8001_ha->outbnd_q_tbl[i].lower_base_addr	=

drivers/scsi/pm8001/pm80xx_hwi.c

+2 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) 


	for (i = 0; i < PM8001_MAX_SPCV_INB_NUM; i++) {

		pm8001_ha->inbnd_q_tbl[i].element_pri_size_cnt	=

			PM8001_MPI_QUEUE | (64 << 16) | (0x00<<30);

			PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x00<<30);

		pm8001_ha->inbnd_q_tbl[i].upper_base_addr	=

			pm8001_ha->memoryMap.region[IB + i].phys_addr_hi;

		pm8001_ha->inbnd_q_tbl[i].lower_base_addr	=
@@ -301,7 +301,7 @@ static void init_default_table_values(struct pm8001_hba_info *pm8001_ha) 
	}

	for (i = 0; i < PM8001_MAX_SPCV_OUTB_NUM; i++) {

		pm8001_ha->outbnd_q_tbl[i].element_size_cnt	=

			PM8001_MPI_QUEUE | (64 << 16) | (0x01<<30);

			PM8001_MPI_QUEUE | (pm8001_ha->iomb_size << 16) | (0x01<<30);

		pm8001_ha->outbnd_q_tbl[i].upper_base_addr	=

			pm8001_ha->memoryMap.region[OB + i].phys_addr_hi;

		pm8001_ha->outbnd_q_tbl[i].lower_base_addr	=