Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 4 messages Sep 18, 2013

lore
Share & tools
lore
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here are three fixes for the upcoming RCs and release. Once is a new branch, but has zero impact on existing boards, so I've gone ahead and added it for this upcoming release. The other two are bug fixes.

[PATCH 1/3] linux-yocto/3.8: add haswell-wc board config and branch

Bumping the meta branch SRCREV to import the following board support:

meta: add haswell-wc bsp for Intel Haswell Platform (Walnut Canyon CRB) scc and config files

[PATCH 2/3] linux-yocto/3.10: mips configuration changes

Updating the 3.10 SRCREV to import the following MIPS configuration changes

4f689aa meta: remove ftrace/ftrace-disable feature
3058d81 mips: have the mips BSPs disable function tracing instead of ftrace 935f43f meta: add ftrace/ftrace-function-tracer-disable feature 0d72a03 mti-malta64: Default to support o32 and n32 userspace binaries

The first three changes improve the ftrace disabling fragments, to allow tracepoints and ftrace to be enabled, while only disabling dynamic ftrace. This allows tools that required tracepoints (like lttng) to be built against MIPS.

The mti-malta64 change adds n32 and o32 support to the default configuration to support a broader range of userspace binaries.

[YOCTO #5215]

[PATCH 3/3] linux-yocto/3.10: fix long perf compile times

perf's builtin-sched.c triggers extremly long build times on some architectures due to gcc 4.7+ var-tracking functionality.

To fix this, we can cherry pick the 3.12 commit:

f36f83f94 [perf sched: Move struct perf_sched definition out of cmd_sched()]

With this change build times are reduced from 15 to 20 minutes for qemuarm to:

     real    2m19.940s
     user    1m35.438s
     sys     0m11.165s

For kernel's that are not carrying this patch, the following can be added to the perf recipe to also fix the issue:

       +++ b/meta/recipes-kernel/perf/perf.bb
       @@ -68,6 +68,7 @@ EXTRA_OEMAKE = \
		       CC="${CC}" \
		       AR="${AR}" \
		       perfexecdir=${libexecdir} \
       +               EXTRA_CFLAGS="-fno-var-tracking" \
		       NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \

Cheers,

Bruce

The following changes since commit 99b41732458871080cfa7a9bad3f8dfe03e026be:

perf: Add LDFLAGS to allow build of old kernels without patching (2013-09-18 17:54:42 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
linux-yocto/3.8: add haswell-wc board config and branch linux-yocto/3.10: mips configuration changes linux-yocto/3.10: fix long perf compile times

 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb    |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb  |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      |   16 ++++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.8.bb       |    2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/3 linux-yocto/3.8: add haswell-wc board config and branch

Bumping the meta branch SRCREV to import the following board support:

meta: add haswell-wc bsp for Intel Haswell Platform (Walnut Canyon CRB) scc and config files

Signed-off-by Ong Boon Leong <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.8.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +1 -1
index f1327d5..a55a197 100644
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
 SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
+SRCREV_meta ?= "dfeaae26b811cb006f3013a1be7bb2de54d9c015"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb +1 -1
index 5c53207..03723de 100644
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.8.13"
 KMETA = "meta"
 
 SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
+SRCREV_meta ?= "dfeaae26b811cb006f3013a1be7bb2de54d9c015"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +1 -1
index 4a2ddea..a921a0f 100644
@@ -10,7 +10,7 @@ SRCREV_machine_qemuppc ?= "698eada61d9385b42dd117858b943655b565084b"
 SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
 SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
 SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
+SRCREV_meta ?= "dfeaae26b811cb006f3013a1be7bb2de54d9c015"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 linux-yocto/3.10: mips configuration changes

In reply to Bruce Ashfield

Updating the 3.10 SRCREV to import the following MIPS configuration changes

4f689aa meta: remove ftrace/ftrace-disable feature
3058d81 mips: have the mips BSPs disable function tracing instead of ftrace 935f43f meta: add ftrace/ftrace-function-tracer-disable feature 0d72a03 mti-malta64: Default to support o32 and n32 userspace binaries

The first three changes improve the ftrace disabling fragments, to allow tracepoints and ftrace to be enabled, while only disabling dynamic ftrace. This allows tools that required tracepoints (like lttng) to be built against MIPS.

The mti-malta64 change adds n32 and o32 support to the default configuration to support a broader range of userspace binaries.

[YOCTO #5215]

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +1 -1
index 1a2870c..65fb5f0 100644
@@ -5,7 +5,7 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "4de6b6b24c44ef644b46405a85c550128d4a779a"
 SRCREV_machine_qemuppc ?= "24a1786e5ed0d479638af5738375e396bf4c922c"
-SRCREV_meta ?= "285f93bf942e8f6fa678ffc6cc53696ed5400718"
+SRCREV_meta ?= "4f689aa30a2c9cf5dceb2fa3696d2cb208ee9173"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index f9009c1..4b33f3c 100644
@@ -10,7 +10,7 @@ LINUX_VERSION ?= "3.10.11"
 KMETA = "meta"
 
 SRCREV_machine ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
-SRCREV_meta ?= "285f93bf942e8f6fa678ffc6cc53696ed5400718"
+SRCREV_meta ?= "4f689aa30a2c9cf5dceb2fa3696d2cb208ee9173"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_3.10.bb +1 -1
index 77fa3db..3e8b476 100644
@@ -10,7 +10,7 @@ SRCREV_machine_qemux86 ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
 SRCREV_machine_qemux86-64 ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
 SRCREV_machine_qemumips64 ?= "6b3a777e3724d30ba03d88d75698fa0734c5a73f"
 SRCREV_machine ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
-SRCREV_meta ?= "285f93bf942e8f6fa678ffc6cc53696ed5400718"
+SRCREV_meta ?= "4f689aa30a2c9cf5dceb2fa3696d2cb208ee9173"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/3 linux-yocto/3.10: fix long perf compile times

In reply to Bruce Ashfield

perf's builtin-sched.c triggers extremly long build times on some architectures due to gcc 4.7+ var-tracking functionality.

To fix this, we can cherry pick the 3.12 commit:

f36f83f94 [perf sched: Move struct perf_sched definition out of cmd_sched()]

With this change build times are reduced from 15 to 20 minutes for qemuarm to:

  real    2m19.940s
  user    1m35.438s
  sys     0m11.165s

For kernel's that are not carrying this patch, the following can be added to the perf recipe to also fix the issue:

    +++ b/meta/recipes-kernel/perf/perf.bb
    @@ -68,6 +68,7 @@ EXTRA_OEMAKE = \
		    CC="${CC}" \
		    AR="${AR}" \
		    perfexecdir=${libexecdir} \
    +               EXTRA_CFLAGS="-fno-var-tracking" \
		    NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |    4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      |   14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +2 -2
index 65fb5f0..b6ad4d4 100644
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-SRCREV_machine ?= "4de6b6b24c44ef644b46405a85c550128d4a779a"
-SRCREV_machine_qemuppc ?= "24a1786e5ed0d479638af5738375e396bf4c922c"
+SRCREV_machine ?= "f1e003e9441f0366d7b9a2209ef3108438745ea3"
+SRCREV_machine_qemuppc ?= "12be459359d5b20dbf856aa3649304c6f618d420"
 SRCREV_meta ?= "4f689aa30a2c9cf5dceb2fa3696d2cb208ee9173"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +1 -1
index 4b33f3c..15ae4c5 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.11"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
+SRCREV_machine ?= "e1aa804148370cda6f85640281af156ffa007d52"
 SRCREV_meta ?= "4f689aa30a2c9cf5dceb2fa3696d2cb208ee9173"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.10.bb +7 -7
index 3e8b476..5dea36f 100644
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH_DEFAULT = "standard/base"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
-SRCREV_machine_qemuarm ?= "4901b46258e7195bd4d4ff14a618a2cb71395bf3"
-SRCREV_machine_qemumips  ?= "bc6be45f32ef091ff13b16ba0f74f611232e5d21"
-SRCREV_machine_qemuppc ?= "789d821269f0496e95ed953f2d1126c4eb39c591"
-SRCREV_machine_qemux86 ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
-SRCREV_machine_qemux86-64 ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
-SRCREV_machine_qemumips64 ?= "6b3a777e3724d30ba03d88d75698fa0734c5a73f"
-SRCREV_machine ?= "702040ac7c7ec66a29b4d147665ccdd0ff015577"
+SRCREV_machine_qemuarm ?= "aa1fa3cec7bd6e47f29acc5b5fbffddc16569883"
+SRCREV_machine_qemumips  ?= "5b908fd12f60de1e51e932c5df477a49b0ab2b40"
+SRCREV_machine_qemuppc ?= "e80029ac30022c554e916ed438435ecc03cc2cea"
+SRCREV_machine_qemux86 ?= "e1aa804148370cda6f85640281af156ffa007d52"
+SRCREV_machine_qemux86-64 ?= "e1aa804148370cda6f85640281af156ffa007d52"
+SRCREV_machine_qemumips64 ?= "6973844d304411893420a7e57545edc4dc854bd7"
+SRCREV_machine ?= "e1aa804148370cda6f85640281af156ffa007d52"
 SRCREV_meta ?= "4f689aa30a2c9cf5dceb2fa3696d2cb208ee9173"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4