From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Wang2 Subject: [PATCH] AMD IOMMU: Fix boot output on non-iommu system Date: Fri, 25 Sep 2009 16:27:35 +0200 Message-ID: <200909251627.35737.wei.wang2@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_XNNvKkjWpH6q1K0" Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-00=_XNNvKkjWpH6q1K0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, A better boot output for non-iommu system. Thanks, Wei Signed-off-by: Wei Wang =2D-=20 AMD GmbH, Germany Operating System Research Center Legal Information: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34 85609 Dornach b. M=FCnchen Gesch=E4ftsf=FChrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis M=FCnchen Registergericht M=FCnchen, HRB Nr. 43632 --Boundary-00=_XNNvKkjWpH6q1K0 Content-Type: text/x-diff; charset="iso-8859-1"; name="fix-output.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fix-output.patch" diff -r 3a71e070e3c5 xen/drivers/passthrough/amd/pci_amd_iommu.c --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c Fri Sep 18 14:45:40 2009 +0100 +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c Fri Sep 25 16:08:20 2009 +0200 @@ -161,21 +161,15 @@ int amd_iov_detect(void) { INIT_LIST_HEAD(&amd_iommu_head); - if ( amd_iommu_detect_acpi() != 0 ) - { - AMD_IOMMU_DEBUG("Error detection\n"); - return -ENODEV; - } - - if ( !iommu_found() ) - { - printk("AMD_IOV: IOMMU not found!\n"); + if ( (amd_iommu_detect_acpi() !=0) || (iommu_found() == 0) ) + { + printk("AMD-Vi: IOMMU not found!\n"); return -ENODEV; } if ( amd_iommu_init() != 0 ) { - AMD_IOMMU_DEBUG("Error initialization\n"); + printk("Error initialization\n"); return -ENODEV; } return 0; --Boundary-00=_XNNvKkjWpH6q1K0 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_XNNvKkjWpH6q1K0--