Re: [Qemu-devel] [PATCH v2 9/9] msi: Move PCI_MSI_PENDING_32/64 into pci_regs.h

[Michael S. Tsirkin]

On Wed, Jun 08, 2011 at 06:21:52PM +0200, Jan Kiszka wrote:
> Signed-off-by: Jan Kiszka <address@hidden>

pci_regs.h from linux does not have these
this is why we keep them in msi.c

address@hidden linux-2.6]$ grep PCI_MSI_ include/linux/pci_regs.h 
#define PCI_MSI_FLAGS           2       /* Various flags */
#define  PCI_MSI_FLAGS_64BIT    0x80    /* 64-bit addresses allowed */
#define  PCI_MSI_FLAGS_QSIZE    0x70    /* Message queue size configured
*/
#define  PCI_MSI_FLAGS_QMASK    0x0e    /* Maximum queue size available
*/
#define  PCI_MSI_FLAGS_ENABLE   0x01    /* MSI feature enabled */
#define  PCI_MSI_FLAGS_MASKBIT  0x100   /* 64-bit mask bits allowed */
#define PCI_MSI_RFU             3       /* Rest of capability flags */
#define PCI_MSI_ADDRESS_LO      4       /* Lower 32 bits */
#define PCI_MSI_ADDRESS_HI      8       /* Upper 32 bits (if
PCI_MSI_FLAGS_64BIT set) */
#define PCI_MSI_DATA_32         8       /* 16 bits of data for 32-bit
devices */
#define PCI_MSI_MASK_32         12      /* Mask bits register for 32-bit
devices */
#define PCI_MSI_DATA_64         12      /* 16 bits of data for 64-bit
devices */
#define PCI_MSI_MASK_64         16      /* Mask bits register for 64-bit
devices */


If you want to move them, please send them upstream we'll merge when
they are there.

> ---
>  hw/msi.c      |    4 ----
>  hw/pci_regs.h |    2 ++
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/msi.c b/hw/msi.c
> index e23f5df..d548939 100644
> --- a/hw/msi.c
> +++ b/hw/msi.c
> @@ -21,10 +21,6 @@
>  #include "msi.h"
>  #include "range.h"
>  
> -/* Eventually those constants should go to Linux pci_regs.h */
> -#define PCI_MSI_PENDING_32      0x10
> -#define PCI_MSI_PENDING_64      0x14
> -
>  /* PCI_MSI_ADDRESS_LO */
>  #define PCI_MSI_ADDRESS_LO_MASK         (~0x3)
>  
> diff --git a/hw/pci_regs.h b/hw/pci_regs.h
> index c17c22f..002ed2e 100644
> --- a/hw/pci_regs.h
> +++ b/hw/pci_regs.h
> @@ -297,8 +297,10 @@
>  #define PCI_MSI_ADDRESS_HI   8       /* Upper 32 bits (if 
> PCI_MSI_FLAGS_64BIT set) */
>  #define PCI_MSI_DATA_32              8       /* 16 bits of data for 32-bit 
> devices */
>  #define PCI_MSI_MASK_32              12      /* Mask bits register for 
> 32-bit devices */
> +#define PCI_MSI_PENDING_32      16      /* Pending bits register for 32-bit 
> devices */
>  #define PCI_MSI_DATA_64              12      /* 16 bits of data for 64-bit 
> devices */
>  #define PCI_MSI_MASK_64              16      /* Mask bits register for 
> 64-bit devices */
> +#define PCI_MSI_PENDING_64      20      /* Pending bits register for 64-bit 
> devices */
>  
>  /* MSI-X registers */
>  #define PCI_MSIX_CTRL           2       /* Message control */
> -- 
> 1.7.1