Skip to content

Commit

Permalink
kernel: bcm2835-sdhost: Clear HBLC for PIO mode
Browse files Browse the repository at this point in the history
kernel: BCM270X_DT: I2S needs function Alt2
See: raspberrypi/linux#1046

kernel: vchiq_arm: Two cacheing fixes
See: raspberrypi/firmware#443

kernel: BCM270X_DT: Overlay for the Fen Logic VGA666 board

firmware: arm_loader: Increase stack and ensure icache flush is done before threads in execute multi

firmware: arm_loader: Switch to vpu queues and more profile logging

firmware: clocks: Allow arm to be overclocked to 1.6GHz

firmware: gpioman: Don't force all pin pulls to their defaults

firmware: arm_loader: Fix length on get palette mailbox call
See: raspberrypi/linux#1026

firmware: vchiq: Better error handling
firmware: vchiq: Make fragment size vary with cache line size
See: raspberrypi/firmware#443
  • Loading branch information
popcornmix committed Jul 8, 2015
1 parent 19debde commit d4945b3
Show file tree
Hide file tree
Showing 89 changed files with 72 additions and 29 deletions.
Binary file modified bcm2708-rpi-b-plus.dtb
Binary file not shown.
Binary file modified bcm2708-rpi-b.dtb
Binary file not shown.
Binary file modified bcm2708-rpi-cm.dtb
Binary file not shown.
Binary file modified bcm2709-rpi-2-b.dtb
Binary file not shown.
Binary file modified fixup.dat
Binary file not shown.
Binary file modified fixup_cd.dat
Binary file not shown.
Binary file modified fixup_db.dat
Binary file not shown.
Binary file modified fixup_x.dat
Binary file not shown.
2 changes: 1 addition & 1 deletion git_hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8d8e1baf06ada6b25e133a2704ddd6e2f5567dd8
5d5a5ceb829329f490dd1c5cb634da66ef5d0f92
Binary file modified kernel.img
Binary file not shown.
Binary file modified kernel7.img
Binary file not shown.
2 changes: 1 addition & 1 deletion overlays/README
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ Params: overclock_50 Clock (in MHz) to use when the MMC framework
force_pio Disable DMA support (default off)

pio_limit Number of blocks above which to use DMA
(default 2)
(default 1)

debug Enable debug output (default off)

Expand Down
Binary file modified start.elf
Binary file not shown.
Binary file modified start_cd.elf
Binary file not shown.
Binary file modified start_db.elf
Binary file not shown.
Binary file modified start_x.elf
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_check_frame_int
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_datagram_receiver
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_datagram_sender
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_dump_pktfile
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_rtp_decoder
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_stream_client
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_stream_server
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_test
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_test_bits
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_test_uri
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/containers_uri_pipe
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/raspistill
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/raspivid
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/raspividyuv
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/raspiyuv
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/bin/vchiq_test
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libEGL.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libEGL_static.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libGLESv2.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libGLESv2_static.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libWFC.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libcontainers.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libdebug_sym_static.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libkhrn_client.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libkhrn_static.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libvcfiled_check.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libvchiq_arm.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libvchostif.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libvcilcs.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libvcos.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/libvmcs_rpc_client.a
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_asf.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_avi.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_binary.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_flv.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_mkv.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_mp4.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_mpga.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_ps.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_qsynth.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_raw_video.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_rcv.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_rtp.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_rtsp.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_rv9.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_simple.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/reader_wav.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/writer_avi.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/writer_binary.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/writer_dummy.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/writer_mp4.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/writer_raw_video.so
Binary file not shown.
Binary file modified vc/hardfp/opt/vc/lib/plugins/writer_simple.so
Binary file not shown.
97 changes: 70 additions & 27 deletions vc/sdk/opt/vc/include/KHR/khrplatform.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/

/* Platform-specific types and definitions.
* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $
*
/* Khronos platform-specific types and definitions.
*
* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
*
* Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos
* group so that they can be included in future versions of this file.
Expand All @@ -37,19 +38,19 @@
* A predefined template which fills in some of the bug fields can be
* reached using http://tinyurl.com/khrplatform-h-bugreport, but you
* must create a Bugzilla login first.
*
*
*
* See the Implementer's Guidelines for information about where this file
* should be located on your system.
* should be located on your system and for more details of its use:
* http://www.khronos.org/registry/implementers_guide.pdf
*
*
* This file should be included as
* #include <KHR/khrplatform.h>
* by the Khronos API header file that uses its types and defines.
* by Khronos client API header files that use its types and defines.
*
* The types in this file should only be used to define API-specific types.
* Types defined in this file:
* The types in khrplatform.h should only be used to define API-specific types.
*
* Types defined in khrplatform.h:
* khronos_int8_t signed 8 bit
* khronos_uint8_t unsigned 8 bit
* khronos_int16_t signed 16 bit
Expand All @@ -67,43 +68,54 @@
* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
* nanoseconds
* khronos_stime_nanoseconds_t signed time interval in nanoseconds
* khronos_boolean_enum_t enumerated boolean type. This should
* only be used as a base type when a client API's boolean type is
* an enum. Client APIs which use an integer or other type for
* booleans cannot use this as the base type for their boolean.
*
* Tokens defined in khrplatform.h:
*
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
*
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
*
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
*
* Macros defined in this file:
* Calling convention macros defined in this file:
* KHRONOS_APICALL
* KHRONOS_APIENTRY
* KHRONOS_APIATTRIBUTES
*
* These may be used in function prototypes as:
*
* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
* int arg1,
* int arg2) KHRONOS_APIATTRIBUTES;
*/

#if 0
#include "interface/khronos/common/khrn_client_mangle.h"
#endif

/*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL
*-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype.
*/
#ifndef KHAPI
#define KHAPI extern
#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
# define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C
#else
# define KHRONOS_APICALL
#endif
#define KHRONOS_APICALL KHAPI

/*-------------------------------------------------------------------------
* Definition of KHRONOS_APIENTRY
*-------------------------------------------------------------------------
* This follows the return type of the function and precedes the function
* name in the function prototype.
*/
#ifndef KHRONOS_APIENTRY
#define KHRONOS_APIENTRY
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
/* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall
#else
# define KHRONOS_APIENTRY
#endif

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -222,10 +234,23 @@ typedef signed char khronos_int8_t;
typedef unsigned char khronos_uint8_t;
typedef signed short int khronos_int16_t;
typedef unsigned short int khronos_uint16_t;

/*
* Types that differ between LLP64 and LP64 architectures - in LLP64,
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
* to be the only LLP64 architecture in current use.
*/
#ifdef _WIN64
typedef signed long long int khronos_intptr_t;
typedef unsigned long long int khronos_uintptr_t;
typedef signed long long int khronos_ssize_t;
typedef unsigned long long int khronos_usize_t;
#else
typedef signed long int khronos_intptr_t;
typedef unsigned long int khronos_uintptr_t;
typedef signed long int khronos_ssize_t;
typedef unsigned long int khronos_usize_t;
#endif

#if KHRONOS_SUPPORT_FLOAT
/*
Expand All @@ -237,16 +262,34 @@ typedef float khronos_float_t;
#if KHRONOS_SUPPORT_INT64
/* Time types
*
* These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals
* These types can be used to represent a time interval in nanoseconds or
* an absolute Unadjusted System Time. Unadjusted System Time is the number
* of nanoseconds since some arbitrary system event (e.g. since the last
* time the system booted). The Unadjusted System Time is an unsigned
* 64 bit value that wraps back to 0 every 584 years. Time intervals
* may be either signed or unsigned.
*/
typedef khronos_uint64_t khronos_utime_nanoseconds_t;
typedef khronos_int64_t khronos_stime_nanoseconds_t;
#endif

/*
* Dummy value used to pad enum types to 32 bits.
*/
#ifndef KHRONOS_MAX_ENUM
#define KHRONOS_MAX_ENUM 0x7FFFFFFF
#endif

/*
* Enumerated boolean type
*
* Values other than zero should be considered to be true. Therefore
* comparisons should not be made against KHRONOS_TRUE.
*/
typedef enum {
KHRONOS_FALSE = 0,
KHRONOS_TRUE = 1,
KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
} khronos_boolean_enum_t;

#endif /* __khrplatform_h_ */
Binary file modified vc/softfp/opt/vc/bin/raspistill
Binary file not shown.
Binary file modified vc/softfp/opt/vc/bin/raspivid
Binary file not shown.
Binary file modified vc/softfp/opt/vc/bin/raspividyuv
Binary file not shown.
Binary file modified vc/softfp/opt/vc/bin/raspiyuv
Binary file not shown.
Binary file modified vc/softfp/opt/vc/bin/vchiq_test
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libEGL.so
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libEGL_static.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libGLESv2.so
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libGLESv2_static.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libWFC.so
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libdebug_sym_static.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libkhrn_client.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libkhrn_static.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libvcfiled_check.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libvchiq_arm.so
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libvchostif.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libvcilcs.a
Binary file not shown.
Binary file modified vc/softfp/opt/vc/lib/libvmcs_rpc_client.a
Binary file not shown.

5 comments on commit d4945b3

@AndrewFromMelbourne
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did the vga666 overlay get left out? I see it in the commit comment and I see the changes in the kernel, but it appears vga666-overlay.dtb didn't make it into the commit.

@pelwell
Copy link
Collaborator

@pelwell pelwell commented on d4945b3 Jul 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It didn't make it into the raspberrypi/firmware repo either, despite being included in the commit message there as well.

Perhaps there is a race condition - the vga666 commit only hit the tree at 17:27, and the firmware was pushed at 18:36, so it was probably close to the wire.

@ifermon
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This release broke motion for me. Got kernel panics. Motion stated in the grey screen (video served on 8080) that it was unable to open device (/dev/video0). Validated that device existed and motion log did not mention issues with device, it said that it was unable to use the video format (8). Running rasbian on an un-overclocked (non-overclocked?) rPi v2. Everything updated / upgraded. Using the pi camera module. Rolled back and everything worked fine, but I'm happy to roll back forward to break it again and do some debugging, just let me know if I can help. Rolled back to 19debde. Apologies if this is the wrong place to put this.

@popcornmix
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ifermon can you open a github issue - comments on commits tend to get lost.
It's not immediately obvious if this is a kernel or firmware commit, but the vchiq change looks like the most likely candidate. Create the issue here:
https://github.com/raspberrypi/linux/issues

@ifermon
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.