kernel: vfpmodule: fix unsupported VFP11 instructions in kernel mode

See: raspberrypi/linux#859 kernel: dwc_otg: fix summarize urb->actual_length for isochronous transfers See: raspberrypi/linux#903 firmware: gpuserv: Add new vchiq service for executing vpu and qpu jobs firmware: Revert Redo CEC code cleanup 12: CEC init @ HPD See: #739 firmware: IL video_encode: Fix lockup with minimise fragmentation See: #728
raspberrypi · Feb 13, 2017 · e552624 · e552624
1 parent 1af015c
commit e552624
Show file tree

Hide file tree

Showing 33 changed files with 31,260 additions and 31,076 deletions.
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup_cd.dat b/boot/fixup_cd.dat
diff --git a/boot/fixup_db.dat b/boot/fixup_db.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/kernel7.img b/boot/kernel7.img
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_db.elf b/boot/start_db.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/extra/System.map b/extra/System.map
diff --git a/extra/System7.map b/extra/System7.map
diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-7ddf96fbb7d637b79b449c7bd1c8d35f00571e4b
+3273ed969add6d80fcaacc9a1756b6f544c8194a
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 4.4.48+ (dc4@dc4-XPS13-9333) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611) ) #962 Fri Feb 10 16:17:10 GMT 2017
+Linux version 4.4.48+ (dc4@dc4-XPS13-9333) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611) ) #964 Mon Feb 13 16:50:25 GMT 2017
diff --git a/extra/uname_string7 b/extra/uname_string7
@@ -1 +1 @@
-Linux version 4.4.48-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611) ) #962 SMP Fri Feb 10 16:25:08 GMT 2017
+Linux version 4.4.48-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.9.3 (crosstool-NG crosstool-ng-1.22.0-88-g8460611) ) #964 SMP Mon Feb 13 16:57:51 GMT 2017
diff --git a/hardfp/opt/vc/include/interface/vmcs_host/vc_vchi_gpuserv.h b/hardfp/opt/vc/include/interface/vmcs_host/vc_vchi_gpuserv.h
@@ -0,0 +1,92 @@
+/*
+Copyright (c) 2016, Raspberry Pi (Trading) Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef VC_VCHI_GPUSERV_H
+#define VC_VCHI_GPUSERV_H
+#include "interface/vchiq_arm/vchiq.h"
+
+// these go in command word of gpu_job_s
+// EXECUTE_VPU and EXECUTE_QPU are valid from host
+enum { EXECUTE_NONE, EXECUTE_VPU, EXECUTE_QPU, EXECUTE_SYNC };
+
+struct vpu_job_s {
+   // these are function address and parameters for vpu job
+   uint32_t q[7];
+   uint32_t dummy[21];
+};
+
+struct qpu_job_s {
+   // parameters for qpu job
+   uint32_t jobs;
+   uint32_t noflush;
+   uint32_t timeout;
+   uint32_t dummy;
+   uint32_t control[12][2];
+};
+
+struct sync_job_s {
+   // parameters for syncjob
+   // bit 0 set means wait for preceding vpu jobs to complete
+   // bit 1 set means wait for preceding qpu jobs to complete
+   uint32_t mask;
+   uint32_t dummy[27];
+};
+
+struct gpu_callback_s {
+  // callback to call when complete (can be NULL)
+  void (*func)();
+  void *cookie;
+};
+
+struct gpu_internal_s {
+   void *message;
+   int refcount;
+};
+
+struct gpu_job_s {
+  // from enum above
+  uint32_t command;
+  // qpu or vpu jobs
+  union {
+    struct vpu_job_s v;
+    struct qpu_job_s q;
+    struct sync_job_s s;
+  } u;
+  // callback function to call when complete
+  struct gpu_callback_s callback;
+  // for internal use - leave as zero
+  struct gpu_internal_s internal;
+};
+
+/* Initialise gpu service. Returns its interface number. This initialises
+   the host side of the interface, it does not send anything to VideoCore. */
+
+VCHPRE_ int32_t VCHPOST_ vc_gpuserv_init(void);
+
+VCHPRE_ int32_t VCHPOST_ vc_gpuserv_execute_code(int num_jobs, struct gpu_job_s jobs[]);
+
+#endif
diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/hardfp/opt/vc/lib/libdebug_sym_static.a b/hardfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a
diff --git a/hardfp/opt/vc/lib/libvcilcs.a b/hardfp/opt/vc/lib/libvcilcs.a
diff --git a/opt/vc/include/interface/vmcs_host/vc_vchi_gpuserv.h b/opt/vc/include/interface/vmcs_host/vc_vchi_gpuserv.h
@@ -0,0 +1,92 @@
+/*
+Copyright (c) 2016, Raspberry Pi (Trading) Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef VC_VCHI_GPUSERV_H
+#define VC_VCHI_GPUSERV_H
+#include "interface/vchiq_arm/vchiq.h"
+
+// these go in command word of gpu_job_s
+// EXECUTE_VPU and EXECUTE_QPU are valid from host
+enum { EXECUTE_NONE, EXECUTE_VPU, EXECUTE_QPU, EXECUTE_SYNC };
+
+struct vpu_job_s {
+   // these are function address and parameters for vpu job
+   uint32_t q[7];
+   uint32_t dummy[21];
+};
+
+struct qpu_job_s {
+   // parameters for qpu job
+   uint32_t jobs;
+   uint32_t noflush;
+   uint32_t timeout;
+   uint32_t dummy;
+   uint32_t control[12][2];
+};
+
+struct sync_job_s {
+   // parameters for syncjob
+   // bit 0 set means wait for preceding vpu jobs to complete
+   // bit 1 set means wait for preceding qpu jobs to complete
+   uint32_t mask;
+   uint32_t dummy[27];
+};
+
+struct gpu_callback_s {
+  // callback to call when complete (can be NULL)
+  void (*func)();
+  void *cookie;
+};
+
+struct gpu_internal_s {
+   void *message;
+   int refcount;
+};
+
+struct gpu_job_s {
+  // from enum above
+  uint32_t command;
+  // qpu or vpu jobs
+  union {
+    struct vpu_job_s v;
+    struct qpu_job_s q;
+    struct sync_job_s s;
+  } u;
+  // callback function to call when complete
+  struct gpu_callback_s callback;
+  // for internal use - leave as zero
+  struct gpu_internal_s internal;
+};
+
+/* Initialise gpu service. Returns its interface number. This initialises
+   the host side of the interface, it does not send anything to VideoCore. */
+
+VCHPRE_ int32_t VCHPOST_ vc_gpuserv_init(void);
+
+VCHPRE_ int32_t VCHPOST_ vc_gpuserv_execute_code(int num_jobs, struct gpu_job_s jobs[]);
+
+#endif
diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a
diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a
diff --git a/opt/vc/lib/libdebug_sym_static.a b/opt/vc/lib/libdebug_sym_static.a
diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a
diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a
diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a
diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a
diff --git a/opt/vc/lib/libvcilcs.a b/opt/vc/lib/libvcilcs.a