Commit 04846b5b authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Jesse Barnes
Browse files

PCI MSI: Remove unused/obsolete macros and definitions 



Impact: cleanup, spec compliance

This patch does:

 - Remove unused msi/msix_enable/disable macros.
   User should use msi/msix_set_enable() functions instead.

 - Remove unused msix_mask/unmask/pending macros.
   These macros are useless because they are not based on any of
   the PCI Local Bus Specifications properly.
   It seems that they were written based on a draft of PCI spec,
   and that the draft was the MSI-X ECN that underwent membership
   review in September 2002.
   (* In the draft, the size of a entry in MSI-X table was 64bit,
      containing 32bit message data and DWORD aligned lower address
      plus a pending bit and a mask bit.(30+1+1bit)  The higher
      address was placed in MSI-X capability structure and shared
      by all entries.)

 - Remove PCI_MSIX_FLAGS_BITMASK.
   This definition also come from the draft ECN.

Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 07a2039b

drivers/pci/msi.h

+1 −7
Original line number Diff line number Diff line
@@ -19,18 +19,12 @@ 
	( (is64bit == 1) ? base+PCI_MSI_DATA_64 : base+PCI_MSI_DATA_32 )

#define msi_mask_bits_reg(base, is64bit) \

	( (is64bit == 1) ? base+PCI_MSI_MASK_BIT : base+PCI_MSI_MASK_BIT-4)

#define msi_disable(control)		control &= ~PCI_MSI_FLAGS_ENABLE

#define is_64bit_address(control)	(!!(control & PCI_MSI_FLAGS_64BIT))

#define is_mask_bit_support(control)	(!!(control & PCI_MSI_FLAGS_MASKBIT))



#define msix_table_offset_reg(base)	(base + 0x04)

#define msix_pba_offset_reg(base)	(base + 0x08)

#define msix_enable(control)	 	control |= PCI_MSIX_FLAGS_ENABLE

#define msix_disable(control)	 	control &= ~PCI_MSIX_FLAGS_ENABLE

#define msix_table_size(control) 	((control & PCI_MSIX_FLAGS_QSIZE)+1)

#define multi_msix_capable		msix_table_size

#define msix_unmask(address)	 	(address & ~PCI_MSIX_FLAGS_BITMASK)

#define msix_mask(address)		(address | PCI_MSIX_FLAGS_BITMASK)

#define msix_is_pending(address) 	(address & PCI_MSIX_FLAGS_PENDMASK)

#define multi_msix_capable(control)	msix_table_size((control))



#endif /* MSI_H */

include/linux/pci_regs.h

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ 
#define  PCI_MSIX_FLAGS_ENABLE	(1 << 15)

#define  PCI_MSIX_FLAGS_MASKALL	(1 << 14)

#define PCI_MSIX_FLAGS_BIRMASK	(7 << 0)

#define PCI_MSIX_FLAGS_BITMASK	(1 << 0)



/* CompactPCI Hotswap Register */

CRA Git | Maintained and supported by SUSTech CRA and CCSE