Fix gl failure when 64b target on 32b host, Edwin, Apr6, 2012

PATCH Applied [email protected] 2 participants 4 messages Apr 6, 2012 – Apr 10, 2012

lore

Share & tools

lore

[email protected]

author

2012-04-06 08:28 UTC #0 lore raw

cover Fix gl failure when 64b target on 32b host, Edwin, Apr6, 2012

From: Zhai Edwin <[email protected]>

All,
This patch fix gl failure when 64b target on 32b host. Pls. help to review. Thanks,
Edwin

The following changes since commit 190f6d791d51aaa4cfb9f1cf932bc205ff674fb5:

runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:47 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/fix2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix2

Zhai Edwin (1):
qemu: Fix gl failure from 64b target on 32b host

 .../qemu/qemu-0.15.1/opengl-args-copy-fix.patch    |   66 ++++++++++++++++++++
 meta/recipes-devtools/qemu/qemu_0.15.1.bb          |    1 +
 2 files changed, 67 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch

Signature · 1 line

1.7.5.4

[email protected]

author

2012-04-06 08:28 UTC #1 lore raw

PATCH 1/1 qemu: Fix gl failure from 64b target on 32b host

From: Zhai Edwin <[email protected]>

Data from 64b target is truncated by 32b host. This patch makes type of data buf in host same as target.

[YOCTO #2221] got fixed.

Signed-off-by Zhai Edwin <[email protected]>

---
 .../qemu/qemu-0.15.1/opengl-args-copy-fix.patch    |   66 ++++++++++++++++++++
 meta/recipes-devtools/qemu/qemu_0.15.1.bb          |    1 +
 2 files changed, 67 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch

meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch new file +66 -0

new file mode 100644
index 0000000..ddf4e4a
@@ -0,0 +1,66 @@
+This patch fix GL application failure from 64b target on 32b host
+
+64b target produce 64b args buffer, but qemu parse it as 32b and get wrong
+data. To avoid this, the type of args buffer in qemu should be same as target,
+that is, target_phys_addr_t. The only potential issue is that we need copy
+the data in buffer one by one, or else data corruption when 32b/64b for
+target/host combination. 
+
+Upstream-Status: Inappropriate [other] - depends on qemu gl patch
+
+Signed-off-by: Zhai Edwin <[email protected]>
+
+Index: qemu-0.15.1/target-i386/opengl_func.h
+===================================================================
+--- qemu-0.15.1.orig/target-i386/opengl_func.h	2012-04-06 10:00:08.000000000 +0800
++++ qemu-0.15.1/target-i386/opengl_func.h	2012-04-06 10:47:38.000000000 +0800
+@@ -25,10 +25,10 @@
+ #include "mesa_gl.h"
+ #include "mesa_glext.h"
+ 
+-/* Argument list are internally of a type that can hold a target pointer
+- * or a host pointer. If 32b target runs on 64b host, it should be big enough
+- * to hold host pointer */
+-typedef long unsigned int arg_t;
++/* Argument list are internally of a type that point to a buffer passed from
++ * target. It should have same type as target, so that we can support 32b
++ * target on 64b host, and vice versa */
++typedef target_phys_addr_t arg_t;
+ 
+ enum {
+     TYPE_NONE,
+Index: qemu-0.15.1/Makefile.target
+===================================================================
+--- qemu-0.15.1.orig/Makefile.target	2012-04-06 10:00:08.000000000 +0800
++++ qemu-0.15.1/Makefile.target	2012-04-06 10:00:08.000000000 +0800
+@@ -128,7 +128,7 @@
+ gl_beginend.h: ../target-i386/beginend_funcs.sh
+ 	$< > $@
+ opengl_exec.o : opengl_exec.c server_stub.c gl_func.h opengl_func.h gl_beginend.h
+-	$(CC) $(GL_CFLAGS) $(DEFINES) -c -o $@ $< -I. -I../target-i386
++	$(CC) $(GL_CFLAGS) $(DEFINES) -c -o $@ $< -I.. -I. -I../fpu -I../target-i386 -DNEED_CPU_H
+ 
+ #########################################################
+ # Linux user emulator target
+Index: qemu-0.15.1/target-i386/opengl_exec.c
+===================================================================
+--- qemu-0.15.1.orig/target-i386/opengl_exec.c	2012-04-06 10:00:08.000000000 +0800
++++ qemu-0.15.1/target-i386/opengl_exec.c	2012-04-06 10:39:22.000000000 +0800
+@@ -37,16 +37,12 @@
+ #include <mesa_gl.h>
+ #include <mesa_glx.h>
+ 
+-// TODO
+-typedef long unsigned int target_phys_addr_t;
+-
++#include "exec.h"
+ #include "opengl_func.h"
+ 
+ #include "mesa_glu.h"
+ #include "mesa_mipmap.c"
+ 
+-#include "../qemu-common.h"
+-
+ //#define SYSTEMATIC_ERROR_CHECK
+ #define BUFFER_BEGINEND
+ #define glGetError() 0

meta/recipes-devtools/qemu/qemu_0.15.1.bb +1 -0

index 3a4ef32..d01e79d 100644
@@ -29,6 +29,7 @@ QEMUGLPATCHES = "\
     file://enable-i386-linux-user.patch \
     file://qemugl-fix.patch \
     file://opengl-sdl-fix.patch \
+    file://opengl-args-copy-fix.patch \
     "
 
 SRC_URI_append_virtclass-native = "\

Signature · 1 line

1.7.5.4

Saul Wold

2012-04-07 20:22 UTC #2 lore raw

Re: [PATCH 1/1] qemu: Fix gl failure from 64b target on 32b host

Quoted 91 lines · On 04/06/2012 01:04 AM, [email protected] wrote:

From: Zhai Edwin<[email protected]>

Data from 64b target is truncated by 32b host. This patch makes type of data buf in host same as target.

[YOCTO #2221] got fixed.

Signed-off-by Zhai Edwin<[email protected]>

---
  .../qemu/qemu-0.15.1/opengl-args-copy-fix.patch    |   66 ++++++++++++++++++++
  meta/recipes-devtools/qemu/qemu_0.15.1.bb          |    1 +
  2 files changed, 67 insertions(+), 0 deletions(-)

create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch

meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch new file +66 -0

new file mode 100644
index 0000000..ddf4e4a
@@ -0,0 +1,66 @@
+This patch fix GL application failure from 64b target on 32b host
+
+64b target produce 64b args buffer, but qemu parse it as 32b and get wrong
+data. To avoid this, the type of args buffer in qemu should be same as target,
+that is, target_phys_addr_t. The only potential issue is that we need copy
+the data in buffer one by one, or else data corruption when 32b/64b for
+target/host combination.
+
+Upstream-Status: Inappropriate [other] - depends on qemu gl patch
+
+Signed-off-by: Zhai Edwin<[email protected]>
+
+Index: qemu-0.15.1/target-i386/opengl_func.h
+===================================================================
+--- qemu-0.15.1.orig/target-i386/opengl_func.h	2012-04-06 10:00:08.000000000 +0800
++++ qemu-0.15.1/target-i386/opengl_func.h	2012-04-06 10:47:38.000000000 +0800
+@@ -25,10 +25,10 @@
+ #include "mesa_gl.h"
+ #include "mesa_glext.h"
+
+-/* Argument list are internally of a type that can hold a target pointer
+- * or a host pointer. If 32b target runs on 64b host, it should be big enough
+- * to hold host pointer */
+-typedef long unsigned int arg_t;
++/* Argument list are internally of a type that point to a buffer passed from
++ * target. It should have same type as target, so that we can support 32b
++ * target on 64b host, and vice versa */
++typedef target_phys_addr_t arg_t;
+
+ enum {
+     TYPE_NONE,
+Index: qemu-0.15.1/Makefile.target
+===================================================================
+--- qemu-0.15.1.orig/Makefile.target	2012-04-06 10:00:08.000000000 +0800
++++ qemu-0.15.1/Makefile.target	2012-04-06 10:00:08.000000000 +0800
+@@ -128,7 +128,7 @@
+ gl_beginend.h: ../target-i386/beginend_funcs.sh
+ 	$<  >  $@
+ opengl_exec.o : opengl_exec.c server_stub.c gl_func.h opengl_func.h gl_beginend.h
+-	$(CC) $(GL_CFLAGS) $(DEFINES) -c -o $@ $<  -I. -I../target-i386
++	$(CC) $(GL_CFLAGS) $(DEFINES) -c -o $@ $<  -I.. -I. -I../fpu -I../target-i386 -DNEED_CPU_H
+
+ #########################################################
+ # Linux user emulator target
+Index: qemu-0.15.1/target-i386/opengl_exec.c
+===================================================================
+--- qemu-0.15.1.orig/target-i386/opengl_exec.c	2012-04-06 10:00:08.000000000 +0800
++++ qemu-0.15.1/target-i386/opengl_exec.c	2012-04-06 10:39:22.000000000 +0800
+@@ -37,16 +37,12 @@
+ #include<mesa_gl.h>
+ #include<mesa_glx.h>
+
+-// TODO
+-typedef long unsigned int target_phys_addr_t;
+-
++#include "exec.h"
+ #include "opengl_func.h"
+
+ #include "mesa_glu.h"
+ #include "mesa_mipmap.c"
+
+-#include "../qemu-common.h"
+-
+ //#define SYSTEMATIC_ERROR_CHECK
+ #define BUFFER_BEGINEND
+ #define glGetError() 0

meta/recipes-devtools/qemu/qemu_0.15.1.bb +0 -0

index 3a4ef32..d01e79d 100644

meta/recipes-devtools/qemu/qemu_0.15.1.bb QEMUGLPATCHES = "\ · line 35

Quoted 7 lines

meta/recipes-devtools/qemu/qemu_0.15.1.bb +1 -0

@@ -29,6 +29,7 @@ QEMUGLPATCHES = "\
      file://enable-i386-linux-user.patch \
      file://qemugl-fix.patch \
      file://opengl-sdl-fix.patch \
+    file://opengl-args-copy-fix.patch \
      "
 
  SRC_URI_append_virtclass-native = "\

Needs a PR bump, which I added for testing.

Sau!

Saul Wold

Applied

2012-04-10 15:36 UTC #3 lore raw

In reply to [email protected]

Quoted 15 lines · On 04/06/2012 01:04 AM, [email protected] wrote:

From: Zhai Edwin<[email protected]>
All,
This patch fix gl failure when 64b target on 32b host. Pls. help to review. Thanks,
Edwin
The following changes since commit 190f6d791d51aaa4cfb9f1cf932bc205ff674fb5:
   runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:47 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib gzhai/fix2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix2

Quoted 8 lines

Zhai Edwin (1):
qemu: Fix gl failure from 64b target on 32b host
  .../qemu/qemu-0.15.1/opengl-args-copy-fix.patch    |   66 ++++++++++++++++++++
  meta/recipes-devtools/qemu/qemu_0.15.1.bb          |    1 +
  2 files changed, 67 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/opengl-args-copy-fix.patch

Merged into OE-Core

Thanks
Sau!