From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: RE: [PATCH] Add lost logic for VGA initialization Date: Wed, 26 Jul 2006 13:19:52 -0600 Message-ID: <1153941592.5467.24.camel@lappy> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-e4funzFXcJ7tAx7yYU7K" Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "Zhang, Xiantao" Cc: xen-devel@lists.xensource.com, xen-ia64-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --=-e4funzFXcJ7tAx7yYU7K Content-Type: text/plain Content-Transfer-Encoding: 7bit On Wed, 2006-07-26 at 13:38 +0800, Zhang, Xiantao wrote: > Hi Alex, > With this fix and previous patches, we can boot VTi successfully with > new Qemu on xen-ia64-unstable.hg 's tip(10784). Should we make > xen-unstable.hg sync with xen-ia64-unstable.hg happen next step? Yes, I sync'd with xen-unstable.hg. There's still a build issue with the qemu files, and I've sent a patch to Christian that fixes it: http://lists.xensource.com/archives/html/xen-devel/2006-07/msg00861.html There's still some debugging left to do on xen-ia64 though. When starting a VTI domain on the xen-ia64-unstable.hg tip (cset 10809) the domain sits in the blocked state and doesn't accumulate cpu time. If I apply the attached patch (reinstating changes from xen-ia64 cset 10570), I get a little farther and can connect to the VNC session for the domain, but we never get to EFI. Thanks, Alex Signed-off-by: Alex Williamson --- --=-e4funzFXcJ7tAx7yYU7K Content-Disposition: attachment; filename=xen_ia64_cset_10570_readd.patch Content-Type: text/x-patch; name=xen_ia64_cset_10570_readd.patch; charset=utf-8 Content-Transfer-Encoding: 7bit diff -r 21918b22746e tools/ioemu/patches/ioemu-ia64 --- a/tools/ioemu/patches/ioemu-ia64 Wed Jul 26 10:49:32 2006 -0600 +++ b/tools/ioemu/patches/ioemu-ia64 Wed Jul 26 13:12:43 2006 -0600 @@ -1,7 +1,7 @@ Index: ioemu/hw/iommu.c Index: ioemu/hw/iommu.c =================================================================== ---- ioemu.orig/hw/iommu.c 2006-07-14 13:43:45.000000000 +0100 -+++ ioemu/hw/iommu.c 2006-07-26 13:34:50.039997837 +0100 +--- ioemu.orig/hw/iommu.c 2006-07-26 12:17:13.000000000 -0600 ++++ ioemu/hw/iommu.c 2006-07-26 12:17:53.000000000 -0600 @@ -82,7 +82,11 @@ #define IOPTE_VALID 0x00000002 /* IOPTE is valid */ #define IOPTE_WAZ 0x00000001 /* Write as zeros */ @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c Index: ioemu/cpu-all.h =================================================================== ---- ioemu.orig/cpu-all.h 2006-07-26 13:33:45.946834283 +0100 -+++ ioemu/cpu-all.h 2006-07-26 13:34:50.038997944 +0100 +--- ioemu.orig/cpu-all.h 2006-07-26 12:17:53.000000000 -0600 ++++ ioemu/cpu-all.h 2006-07-26 12:17:53.000000000 -0600 @@ -835,6 +835,31 @@ :"=m" (*(volatile long *)addr) :"dIr" (nr)); @@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h /* memory API */ Index: ioemu/vl.c =================================================================== ---- ioemu.orig/vl.c 2006-07-26 13:33:45.996828953 +0100 -+++ ioemu/vl.c 2006-07-26 13:34:50.044997304 +0100 +--- ioemu.orig/vl.c 2006-07-26 12:17:53.000000000 -0600 ++++ ioemu/vl.c 2006-07-26 13:02:31.000000000 -0600 @@ -5577,6 +5577,7 @@ exit(-1); } @@ -82,7 +82,7 @@ Index: ioemu/vl.c + } + + if (xc_ia64_get_pfn_list(xc_handle, domid, page_array, -+ nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){ ++ IO_PAGE_START >> PAGE_SHIFT, 1) != 1) { + fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno); + exit(-1); + } @@ -91,7 +91,7 @@ Index: ioemu/vl.c + PROT_READ|PROT_WRITE, + page_array[0]); + -+ fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n", ++ fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n", + IO_PAGE_START >> PAGE_SHIFT, page_array[0]); +#endif #else /* !CONFIG_DM */ @@ -99,8 +99,8 @@ Index: ioemu/vl.c #ifdef CONFIG_SOFTMMU Index: ioemu/target-i386-dm/exec-dm.c =================================================================== ---- ioemu.orig/target-i386-dm/exec-dm.c 2006-07-26 13:33:45.882841107 +0100 -+++ ioemu/target-i386-dm/exec-dm.c 2006-07-26 13:34:50.040997731 +0100 +--- ioemu.orig/target-i386-dm/exec-dm.c 2006-07-26 12:17:53.000000000 -0600 ++++ ioemu/target-i386-dm/exec-dm.c 2006-07-26 12:17:53.000000000 -0600 @@ -340,6 +340,23 @@ return io_mem_read[io_index >> IO_MEM_SHIFT]; } @@ -137,8 +137,8 @@ Index: ioemu/target-i386-dm/exec-dm.c len -= l; Index: ioemu/exec-all.h =================================================================== ---- ioemu.orig/exec-all.h 2006-07-26 13:33:45.861843346 +0100 -+++ ioemu/exec-all.h 2006-07-26 13:38:30.096491388 +0100 +--- ioemu.orig/exec-all.h 2006-07-26 12:17:53.000000000 -0600 ++++ ioemu/exec-all.h 2006-07-26 12:48:37.000000000 -0600 @@ -391,6 +391,15 @@ } #endif @@ -174,8 +174,8 @@ Index: ioemu/exec-all.h Index: ioemu/target-i386-dm/cpu.h =================================================================== ---- ioemu.orig/target-i386-dm/cpu.h 2006-07-26 13:33:45.882841107 +0100 -+++ ioemu/target-i386-dm/cpu.h 2006-07-26 13:34:50.040997731 +0100 +--- ioemu.orig/target-i386-dm/cpu.h 2006-07-26 12:17:53.000000000 -0600 ++++ ioemu/target-i386-dm/cpu.h 2006-07-26 12:17:53.000000000 -0600 @@ -80,7 +80,11 @@ /* helper2.c */ int main_loop(void); @@ -191,7 +191,7 @@ Index: ioemu/ia64_intrinsic.h Index: ioemu/ia64_intrinsic.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ioemu/ia64_intrinsic.h 2006-07-26 13:34:50.038997944 +0100 ++++ ioemu/ia64_intrinsic.h 2006-07-26 12:17:53.000000000 -0600 @@ -0,0 +1,276 @@ +#ifndef IA64_INTRINSIC_H +#define IA64_INTRINSIC_H diff -r 21918b22746e tools/ioemu/vl.c --- a/tools/ioemu/vl.c Wed Jul 26 10:49:32 2006 -0600 +++ b/tools/ioemu/vl.c Wed Jul 26 13:12:43 2006 -0600 @@ -5791,7 +5791,7 @@ int main(int argc, char **argv) } if (xc_ia64_get_pfn_list(xc_handle, domid, page_array, - nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){ + IO_PAGE_START >> PAGE_SHIFT, 1) != 1) { fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno); exit(-1); } @@ -5800,7 +5800,7 @@ int main(int argc, char **argv) PROT_READ|PROT_WRITE, page_array[0]); - fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n", + fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n", IO_PAGE_START >> PAGE_SHIFT, page_array[0]); #endif #else /* !CONFIG_DM */ --=-e4funzFXcJ7tAx7yYU7K 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 --=-e4funzFXcJ7tAx7yYU7K--