Re: [PATCH 2/5] PCI: Add mask bit definition for MSI-X table

["Michael S. Tsirkin" <mst@redhat.com>]

On Thu, Nov 04, 2010 at 02:15:18PM +0800, Sheng Yang wrote:
> Then we can use it instead of magic number 1.
> 
> Cc: Matthew Wilcox <willy@linux.intel.com>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Cc: linux-pci@vger.kernel.org
> Signed-off-by: Sheng Yang <sheng@linux.intel.com>

Looks good to me

> ---
>  drivers/pci/msi.c        |    4 ++--
>  include/linux/pci_regs.h |    1 +
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
> index 69b7be3..673e7dc 100644
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@ -158,7 +158,7 @@ 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 &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT;
>  	mask_bits |= flag;
>  	writel(mask_bits, desc->mask_base + offset);
>  
> @@ -185,7 +185,7 @@ static void msi_set_mask_bit(unsigned irq, u32 flag)
>  
>  void mask_msi_irq(unsigned int irq)
>  {
> -	msi_set_mask_bit(irq, 1);
> +	msi_set_mask_bit(irq, PCI_MSIX_ENTRY_CTRL_MASKBIT);
>  }
>  
>  void unmask_msi_irq(unsigned int irq)
> diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
> index acfc224..ff51632 100644
> --- a/include/linux/pci_regs.h
> +++ b/include/linux/pci_regs.h
> @@ -313,6 +313,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

minor alignment issue

>  /* CompactPCI Hotswap Register */
>  
> -- 
> 1.7.0.1