From: Christoph Egger Subject: [PATCH][HVM] stdvga: handle 64bit io operations Date: Fri, 16 May 2008 15:23:13 +0200 Message-ID: <200805161523.13952.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_BrYLIRKQ6t2XHJY" Return-path: 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=_BrYLIRKQ6t2XHJY Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi! In struct ioreq are the "addr", "size", "count" and "data" 64bit fields. So handle 64bit operations in stdvga instead of throwing away the upper 32b= its=20 (see attached patch). This fixes some noisy xen messages like "invalid io size: 8". Signed-off-by: Christoph Egger =2D-=20 AMD Saxony, Dresden, Germany Operating System Research Center Legal Information: AMD Saxony Limited Liability Company & Co. KG Sitz (Gesch=E4ftsanschrift): Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland Registergericht Dresden: HRA 4896 vertretungsberechtigter Komplement=E4r: AMD Saxony LLC (Sitz Wilmington, Delaware, USA) Gesch=E4ftsf=FChrer der AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy --Boundary-00=_BrYLIRKQ6t2XHJY Content-Type: text/x-diff; charset="iso-8859-1"; name="hvm_stdvga.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="hvm_stdvga.diff" diff -r d0817f08599a xen/arch/x86/hvm/stdvga.c --- a/xen/arch/x86/hvm/stdvga.c Fri May 16 09:37:19 2008 +0100 +++ b/xen/arch/x86/hvm/stdvga.c Fri May 16 15:13:19 2008 +0200 @@ -271,9 +271,9 @@ static uint8_t stdvga_mem_readb(uint64_t return ret; } -static uint32_t stdvga_mem_read(uint32_t addr, uint32_t size) +static uint64_t stdvga_mem_read(uint64_t addr, uint64_t size) { - uint32_t data = 0; + uint64_t data = 0; switch ( size ) { @@ -293,8 +293,19 @@ static uint32_t stdvga_mem_read(uint32_t data |= stdvga_mem_readb(addr + 3) << 24; break; + case 8: + data = (uint64_t)(stdvga_mem_readb(addr)); + data |= (uint64_t)(stdvga_mem_readb(addr + 1)) << 8; + data |= (uint64_t)(stdvga_mem_readb(addr + 2)) << 16; + data |= (uint64_t)(stdvga_mem_readb(addr + 3)) << 24; + data |= (uint64_t)(stdvga_mem_readb(addr + 4)) << 32; + data |= (uint64_t)(stdvga_mem_readb(addr + 5)) << 40; + data |= (uint64_t)(stdvga_mem_readb(addr + 6)) << 48; + data |= (uint64_t)(stdvga_mem_readb(addr + 7)) << 56; + break; + default: - gdprintk(XENLOG_WARNING, "invalid io size:%d\n", size); + gdprintk(XENLOG_WARNING, "invalid io size: %"PRId64"\n", size); break; } @@ -409,7 +420,7 @@ static void stdvga_mem_writeb(uint64_t a } } -static void stdvga_mem_write(uint32_t addr, uint32_t data, uint32_t size) +static void stdvga_mem_write(uint64_t addr, uint64_t data, uint64_t size) { /* Intercept mmio write */ switch ( size ) @@ -430,8 +441,19 @@ static void stdvga_mem_write(uint32_t ad stdvga_mem_writeb(addr+3, (data >> 24) & 0xff); break; + case 8: + stdvga_mem_writeb(addr+0, (data >> 0) & 0xff); + stdvga_mem_writeb(addr+1, (data >> 8) & 0xff); + stdvga_mem_writeb(addr+2, (data >> 16) & 0xff); + stdvga_mem_writeb(addr+3, (data >> 24) & 0xff); + stdvga_mem_writeb(addr+4, (data >> 32) & 0xff); + stdvga_mem_writeb(addr+5, (data >> 40) & 0xff); + stdvga_mem_writeb(addr+6, (data >> 48) & 0xff); + stdvga_mem_writeb(addr+7, (data >> 56) & 0xff); + break; + default: - gdprintk(XENLOG_WARNING, "invalid io size:%d\n", size); + gdprintk(XENLOG_WARNING, "invalid io size: %"PRId64"\n", size); break; } } @@ -447,7 +469,7 @@ static int mmio_move(struct hvm_hw_stdvg { if ( p->dir == IOREQ_READ ) { - uint32_t addr = p->addr, data = p->data, tmp; + uint64_t addr = p->addr, data = p->data, tmp; for ( i = 0; i < p->count; i++ ) { tmp = stdvga_mem_read(addr, p->size); --Boundary-00=_BrYLIRKQ6t2XHJY 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=_BrYLIRKQ6t2XHJY--