Commit 8d805286 authored by Sheng Yang's avatar Sheng Yang Committed by Jesse Barnes
Browse files

PCI: Add mask bit definition for MSI-X table 



Then we can use it instead of magic number 1.

Reviewed-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 00aaaef9

drivers/pci/msi.c

+3 −2
Original line number Diff line number Diff line
@@ -168,8 +168,9 @@ static u32 __msix_mask_irq(struct msi_desc *desc, u32 flag) 
	u32 mask_bits = desc->masked;

	unsigned offset = desc->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +

						PCI_MSIX_ENTRY_VECTOR_CTRL;

	mask_bits &= ~1;

	mask_bits |= flag;

	mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT;

	if (flag)

		mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT;

	writel(mask_bits, desc->mask_base + offset);



	return mask_bits;

include/linux/pci_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ 
#define  PCI_MSIX_ENTRY_UPPER_ADDR	4

#define  PCI_MSIX_ENTRY_DATA		8

#define  PCI_MSIX_ENTRY_VECTOR_CTRL	12

#define   PCI_MSIX_ENTRY_CTRL_MASKBIT	1



/* CompactPCI Hotswap Register */

CRA Git | Maintained and supported by SUSTech CRA and CCSE