Skip to content

Commit 294080e

Browse files
Ajish Koshymartinkpetersen
authored andcommitted
scsi: pm80xx: Mask and unmask upper interrupt vectors 32-63
When upper inbound and outbound queues 32-63 are enabled, we see upper vectors 32-63 in interrupt service routine. We need corresponding registers to handle masking and unmasking of these upper interrupts. To achieve this, we use registers MSGU_ODMR_U(0x34) to mask and MSGU_ODMR_CLR_U(0x3C) to unmask the interrupts. In these registers bit 0-31 represents interrupt vectors 32-63. Link: https://lore.kernel.org/r/20220411064603.668448-2-Ajish.Koshy@microchip.com Fixes: 05c6c02 ("scsi: pm80xx: Increase number of supported queues") Reviewed-by: John Garry <john.garry@huawei.com> Acked-by: Jack Wang <jinpu.wang@ionos.com> Signed-off-by: Ajish Koshy <Ajish.Koshy@microchip.com> Signed-off-by: Viswas G <Viswas.G@microchip.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent f19fe8f commit 294080e

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

drivers/scsi/pm8001/pm80xx_hwi.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,10 +1727,11 @@ static void
17271727
pm80xx_chip_interrupt_enable(struct pm8001_hba_info *pm8001_ha, u8 vec)
17281728
{
17291729
#ifdef PM8001_USE_MSIX
1730-
u32 mask;
1731-
mask = (u32)(1 << vec);
1732-
1733-
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_CLR, (u32)(mask & 0xFFFFFFFF));
1730+
if (vec < 32)
1731+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_CLR, 1U << vec);
1732+
else
1733+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_CLR_U,
1734+
1U << (vec - 32));
17341735
return;
17351736
#endif
17361737
pm80xx_chip_intx_interrupt_enable(pm8001_ha);
@@ -1746,12 +1747,15 @@ static void
17461747
pm80xx_chip_interrupt_disable(struct pm8001_hba_info *pm8001_ha, u8 vec)
17471748
{
17481749
#ifdef PM8001_USE_MSIX
1749-
u32 mask;
1750-
if (vec == 0xFF)
1751-
mask = 0xFFFFFFFF;
1750+
if (vec == 0xFF) {
1751+
/* disable all vectors 0-31, 32-63 */
1752+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, 0xFFFFFFFF);
1753+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_U, 0xFFFFFFFF);
1754+
} else if (vec < 32)
1755+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, 1U << vec);
17521756
else
1753-
mask = (u32)(1 << vec);
1754-
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR, (u32)(mask & 0xFFFFFFFF));
1757+
pm8001_cw32(pm8001_ha, 0, MSGU_ODMR_U,
1758+
1U << (vec - 32));
17551759
return;
17561760
#endif
17571761
pm80xx_chip_intx_interrupt_disable(pm8001_ha);

0 commit comments

Comments
 (0)