Hi Bart,
> On Oct 14, 2015, at 10:33 AM, Bart Van Assche <bart.vanass...@sandisk.com>
> wrote:
>
> On 10/14/2015 08:57 AM, Himanshu Madhani wrote:
>> This patch fixes rwlock recursion introduced for ISP82XX by
>> commit 8dfa4b5a ("qla2xxx: Fix sparse annotations")
>
> Hello Himanshu,
>
> Would it be possible to test whether the (untested) patch below also fixes
> the observed rwlock recursion ?
>
> Thanks,
>
> Bart.
>
>
>
> [PATCH] qla2xxx: Fix rwlock recursion
>
> Fixes: 8dfa4b5a9b44 ("qla2xxx: Fix sparse annotation")
> Signed-off-by: Bart Van Assche <bart.vanass...@sandisk.com>
> Reported-by: Himanshu Madhani <himanshu.madh...@qlogic.com>
> Cc: Giridhar Malavali <giridhar.malav...@qlogic.com>
> ---
> drivers/scsi/qla2xxx/qla_nx.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
> index eb0cc54..b6b4cfd 100644
> --- a/drivers/scsi/qla2xxx/qla_nx.c
> +++ b/drivers/scsi/qla2xxx/qla_nx.c
> @@ -433,7 +433,7 @@ qla82xx_pci_get_crb_addr_2M(struct qla_hw_data *ha, ulong
> off_in,
> if (off_in < QLA82XX_PCI_CRBSPACE)
> return -1;
>
> - *off_out = (void __iomem *)(off_in - QLA82XX_PCI_CRBSPACE);
> + off_in -= QLA82XX_PCI_CRBSPACE;
>
> /* Try direct map */
> m = &crb_128M_2M_map[CRB_BLK(off_in)].sub_block[CRB_SUBBLK(off_in)];
> @@ -443,6 +443,7 @@ qla82xx_pci_get_crb_addr_2M(struct qla_hw_data *ha, ulong
> off_in,
> return 0;
> }
> /* Not in direct map, use crb window */
> + *off_out = (void __iomem *)off_in;
> return 1;
> }
>
This change also resolved rwlock recursion on the driver load. Will perform
some more basic sanity and report if there are issues seen.
> --
> 2.1.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
