Skip to content

Commit 09a710d

Browse files
ffainellibjorn-helgaas
authored andcommitted
PCI: brcmstb: Do not use __GENMASK
Define the legacy MSI interrupt bitmask as well as the non-legacy interrupt bitmask using GENMASK and then use them in brcm_msi_set_regs() in place of __GENMASK(). Link: https://lore.kernel.org/r/20211122190459.3189616-1-f.fainelli@gmail.com Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
1 parent bf73258 commit 09a710d

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@
144144
#define BRCM_INT_PCI_MSI_NR 32
145145
#define BRCM_INT_PCI_MSI_LEGACY_NR 8
146146
#define BRCM_INT_PCI_MSI_SHIFT 0
147+
#define BRCM_INT_PCI_MSI_MASK GENMASK(BRCM_INT_PCI_MSI_NR - 1, 0)
148+
#define BRCM_INT_PCI_MSI_LEGACY_MASK GENMASK(31, \
149+
32 - BRCM_INT_PCI_MSI_LEGACY_NR)
147150

148151
/* MSI target addresses */
149152
#define BRCM_MSI_TARGET_ADDR_LT_4GB 0x0fffffffcULL
@@ -618,7 +621,8 @@ static void brcm_msi_remove(struct brcm_pcie *pcie)
618621

619622
static void brcm_msi_set_regs(struct brcm_msi *msi)
620623
{
621-
u32 val = __GENMASK(31, msi->legacy_shift);
624+
u32 val = msi->legacy ? BRCM_INT_PCI_MSI_LEGACY_MASK :
625+
BRCM_INT_PCI_MSI_MASK;
622626

623627
writel(val, msi->intr_base + MSI_INT_MASK_CLR);
624628
writel(val, msi->intr_base + MSI_INT_CLR);

0 commit comments

Comments
 (0)