On Wed, Feb 18, 2009 at 08:41:43AM +0000, Keir Fraser wrote:
> On 18/02/2009 08:31, "Zhang, Xiantao" <xiantao.zh...@intel.com> wrote:
>
> >>> Signed-off-by: Xiantao Zhang <xiantao.zh...@intel.com>
> >>> Acked-by: Isaku Yamahata <yamah...@valinux.co.jp>
> >>
> >> Applied, but it's actually broken the ia64 build due to missing
> >> asm-ia64/msi.h. Someone needs to fix that.
> >
> > I have sent the patch to Isaku, and he will fix it in xen-ia64-unstable.hg
> > to
> > later. Thanks!
>
> Isaku: please get me to pull from the ia64 tree again asap, as our automated
> tests depend on a successful ia64 build.
Then, please commit the attached patch from Xiantao
to xen-devel.hg directly which I suppose is faster than pulling
from ia64.
--
yamahata
# HG changeset patch
# User xiantao.zh...@intel.com
# Date 1234925881 -28800
# Node ID 162a4dab79e4ba119faea63c41ec94978caccc6b
# Parent 66b5e1edeec64b30f53ed8529d5ad7197e6a8a73
ia64: Fix the missing msi.h by accident, and enhance the check
for one BUG_ON.
Signed-off-by: Xiantao Zhang <xiantao.zh...@intel.com>
diff -r 66b5e1edeec6 -r 162a4dab79e4 xen/drivers/passthrough/vtd/ia64/vtd.c
--- a/xen/drivers/passthrough/vtd/ia64/vtd.c Wed Feb 18 10:44:46 2009 +0800
+++ b/xen/drivers/passthrough/vtd/ia64/vtd.c Wed Feb 18 10:58:01 2009 +0800
@@ -141,6 +141,7 @@ static int do_dom0_iommu_mapping(unsigne
void iommu_set_dom0_mapping(struct domain *d)
{
- BUG_ON(d != dom0);
+ if (dom0)
+ BUG_ON(d != dom0);
efi_memmap_walk(do_dom0_iommu_mapping, d);
}
diff -r 09a6fa059b37 -r 66b5e1edeec6 xen/include/asm-ia64/msi.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-ia64/msi.h Wed Feb 18 10:44:46 2009 +0800
@@ -0,0 +1,20 @@
+#ifndef __ASM_MSI_H
+#define __ASM_MSI_H
+
+/*
+ * MSI Defined Data Structures
+ */
+#define MSI_ADDRESS_HEADER 0xfee
+#define MSI_ADDRESS_HEADER_SHIFT 12
+#define MSI_ADDRESS_HEADER_MASK 0xfff000
+#define MSI_ADDRESS_DEST_ID_MASK 0xfff0000f
+#define MSI_TARGET_CPU_MASK 0xff
+#define MSI_TARGET_CPU_SHIFT 4
+#define MSI_DELIVERY_MODE 0
+#define MSI_LEVEL_MODE 1 /* Edge always assert */
+#define MSI_TRIGGER_MODE 0 /* MSI is edge sensitive */
+#define MSI_PHYSICAL_MODE 0
+#define MSI_LOGICAL_MODE 1
+#define MSI_REDIRECTION_HINT_MODE 0
+
+#endif /* __ASM_MSI_H */
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@lists.xensource.com
http://lists.xensource.com/xen-ia64-devel
