ia64/xen-unstable

changeset 19226:247023fb724c

ia64: Fix the missing msi.h by accident, and enhance the check
for one BUG_ON.

Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Feb 18 08:53:52 2009 +0000 (2009-02-18)
parents 7fe15a0ee3d8
children 08da408254c6
files xen/drivers/passthrough/vtd/ia64/vtd.c xen/include/asm-ia64/msi.h
line diff
     1.1 --- a/xen/drivers/passthrough/vtd/ia64/vtd.c	Tue Feb 17 11:20:18 2009 +0000
     1.2 +++ b/xen/drivers/passthrough/vtd/ia64/vtd.c	Wed Feb 18 08:53:52 2009 +0000
     1.3 @@ -141,6 +141,7 @@ static int do_dom0_iommu_mapping(unsigne
     1.4  
     1.5  void iommu_set_dom0_mapping(struct domain *d)
     1.6  {
     1.7 -	BUG_ON(d != dom0);
     1.8 +	if (dom0)
     1.9 +	    BUG_ON(d != dom0);
    1.10  	efi_memmap_walk(do_dom0_iommu_mapping, d);
    1.11  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xen/include/asm-ia64/msi.h	Wed Feb 18 08:53:52 2009 +0000
     2.3 @@ -0,0 +1,20 @@
     2.4 +#ifndef __ASM_MSI_H
     2.5 +#define __ASM_MSI_H
     2.6 +
     2.7 +/*
     2.8 + * MSI Defined Data Structures
     2.9 + */
    2.10 +#define MSI_ADDRESS_HEADER		0xfee
    2.11 +#define MSI_ADDRESS_HEADER_SHIFT	12
    2.12 +#define MSI_ADDRESS_HEADER_MASK		0xfff000
    2.13 +#define MSI_ADDRESS_DEST_ID_MASK	0xfff0000f
    2.14 +#define MSI_TARGET_CPU_MASK		0xff
    2.15 +#define MSI_TARGET_CPU_SHIFT		4
    2.16 +#define MSI_DELIVERY_MODE		0
    2.17 +#define MSI_LEVEL_MODE			1	/* Edge always assert */
    2.18 +#define MSI_TRIGGER_MODE		0	/* MSI is edge sensitive */
    2.19 +#define MSI_PHYSICAL_MODE		0
    2.20 +#define MSI_LOGICAL_MODE		1
    2.21 +#define MSI_REDIRECTION_HINT_MODE	0
    2.22 +
    2.23 +#endif /* __ASM_MSI_H */