linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 9 messages Apr 2, 2016

lore

Share & tools

lore

Bruce Ashfield

author

2016-04-02 00:09 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard,

Here's another set of 4.1 and 4.4 kernel updates. The majority are routine backports, and have passed my sanity build and boot testing.

As part of this, I've also bumped linux-yocto-dev to v4.6-rc1. x86, mips and powerpc are passing sanity. perf had an issue on powerpc, but that is sorted out in the linux-yocto tree. qemuarm is has a boot issue, but I'm pushing out the tree while we work on the issues, since it is the best way to get more eyes on the problem.

There's also the revert of the x86 32bit PAT workaround, since with the mainline set of 7 patches that were the result of the problem report .. work as advertised and I was able to build and boot sato.

And finally, there's a minor tweak to the branch handling that fixes something reported by Steve Sakoman when a specific branch is being forced as the build branch. This always used to work, but in the simplification of the routines when the SRCREV validation of the fetcher came in .. I managed to drop it.

Cheers,

Bruce

The following changes since commit 7dcb4c41272e8f611eabea991fa30df79b9e48e3:

bitbake: toaster: tests Migrate landing page tests to Selenium (2016-04-01 07:14:59 +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 (8):
linux-yocto/4.1: telemetry and dmaengine backports linux-yocto/4.4: gpio-pca953x: add PCAL9535 interrupt support linux-yocto/4.1: ahci: backport AHCI runtime PM
linux-yocto-dev: bump to v4.6-rcX
Revert "linux-yocto: Work around PAT issue on qemux86" linux-yocto/4.4: fix PAT for 32bit x86 linux-yocto/4.4: UVC: Add support for R200 depth camera
kernel-yocto: enforce SRC_URI specified branch

 meta/classes/kernel-yocto.bbclass                  |  11 +++
 meta/recipes-kernel/linux/linux-yocto-dev.bb       |   2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb    |   2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb    |   2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb  |   2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb  |   2 +-
 .../linux-yocto/0001-Fix-qemux86-pat-issue.patch   | 100 ---------------------
 meta/recipes-kernel/linux/linux-yocto_4.1.bb       |  16 ++--
 meta/recipes-kernel/linux/linux-yocto_4.4.bb       |  18 ++--
 9 files changed, 32 insertions(+), 123 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto/0001-Fix-qemux86-pat-issue.patch

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #1 lore raw

PATCH 1/8 linux-yocto/4.1: telemetry and dmaengine backports

Backports to support Broxton and Apollo lake:

96c0e80f4007 dmaengine: idma64: clear LLP_[SD]_EN bits in last descriptor 3b2dbd1cadbf dmaengine: idma64: use local variable to index descriptor d61599f94946 dmaengine: idma64: convert idma64_hw_desc_fill() to return void 9c9f37533789 dmaengine: idma64: set maximum allowed segment size for DMA 9d55c9523aa5 dmaengine: idma64: drop IRQ enable / disable in handler f80e3f3f87c5 dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq() 216429c319aa dmaengine: idma64: make better performance on pause / resume 2f982603b358 dmaengine: idma64: this is not DesignWare a7f7ee3a6a91 dmaengine: idma64: useless use of min_t() 3c8f2fcd2dfd dmaengine: idma64: convert to __ffs()
b452447dce9f dmaengine: idma64: improve residue estimation 849fdbe687a8 dmaengine: add a driver for Intel integrated DMA 64-bit 0038e6a4798e intel_punit_ipc: add NULL check for input parameters 4bd7fc987da6 platform:x86: Add Intel telemetry platform device 472c405dd66d intel_pmc_ipc: update acpi resource structure for Punit e1754195568b MAINTAINERS: Combine multiple telemetry entries 14d8e14aca6d intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs 8724677a6b60 platform:x86: Add Intel Telemetry Debugfs interfaces d503a325c0ee platform:x86: Add Intel telemetry platform driver 255a8ac345e7 platform/x86: Add Intel Telemetry Core Driver c475943802b5 platform:x86: add Intel P-Unit mailbox IPC driver c2f1b2c7282c MAINTAINERS: Add maintainership for MIC drivers 7d389b483d32 surface pro 3: Add support driver for Surface Pro 3 buttons

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1

index 48f9f08957bc..468358b08a4b 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "23325988c373852d75515cfa9582681a036d1bfd"
+SRCREV_machine ?= "7ffcde760a73f672bccb1c43130667d30ba7195c"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \

meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +1 -1

index 13c30c70cbf0..12f572cc405e 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "afaf425e796c6b72c10e869ea6ad20295033f956"
+SRCREV_machine ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_4.1.bb +8 -8

index 2841aa211cc8..5f0559f0683d 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "4f8fe4c56eb352573a19b797d2c4d1b1f4e38831"
-SRCREV_machine_qemuarm64 ?= "afaf425e796c6b72c10e869ea6ad20295033f956"
-SRCREV_machine_qemumips ?= "85f5c8b85364ea8e7f8d47a492c7047bfd9aa963"
-SRCREV_machine_qemuppc ?= "afaf425e796c6b72c10e869ea6ad20295033f956"
-SRCREV_machine_qemux86 ?= "afaf425e796c6b72c10e869ea6ad20295033f956"
-SRCREV_machine_qemux86-64 ?= "afaf425e796c6b72c10e869ea6ad20295033f956"
-SRCREV_machine_qemumips64 ?= "8ac723e2fb023bd3b168d3fb914c09797bc20ed4"
-SRCREV_machine ?= "afaf425e796c6b72c10e869ea6ad20295033f956"
+SRCREV_machine_qemuarm ?= "ecabd4f1cf9b1e6279943c8e93eff58095296fb6"
+SRCREV_machine_qemuarm64 ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
+SRCREV_machine_qemumips ?= "8fd9efe95598ddf89ec432a967a38f02b2906a8b"
+SRCREV_machine_qemuppc ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
+SRCREV_machine_qemux86 ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
+SRCREV_machine_qemux86-64 ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
+SRCREV_machine_qemumips64 ?= "cb16b5365e26e106d56a6f8ed23eb8b57905ecf8"
+SRCREV_machine ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #2 lore raw

PATCH 2/8 linux-yocto/4.4: gpio-pca953x: add PCAL9535 interrupt support

In reply to Bruce Ashfield

Reverting two previous gpio commits to allow the application of proper upstream ready patches to add this support:

08943f2bbd50 gpio-pca953x: add "drive" property a517d5b72e76 gpio: pca953x: provide GPIO base based on _UID c91063f44368 gpio-pca953x: add PCAL9535 interrupt support 58f3c9f0ac6d Revert "gpio-pca953x: add "drive" property" 7abbd5fec15d Revert "gpio: pca953x: provide GPIO base based on _UID"

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1

index 48025c48af02..e6a03928b9b0 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "5ff13cb449701bfeb30ea4a0c4c0b86dc680e219"
+SRCREV_machine ?= "56434a6d9850fd3642bab5cab63d22c6f56d2eae"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \

meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +1 -1

index 7583f8019f07..2b7e1cb4d723 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.4.3"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "c43425f73287757a166d74464fddf1f5389c9f59"
+SRCREV_machine ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_4.4.bb +8 -8

index 3d6991e8998a..49038caf943e 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "19185ca77bc28b0198868f65d6c6c2a92a7ee24c"
-SRCREV_machine_qemuarm64 ?= "c43425f73287757a166d74464fddf1f5389c9f59"
-SRCREV_machine_qemumips ?= "0921347362bc9a4f63a62774a68a1b013cdfc5c4"
-SRCREV_machine_qemuppc ?= "c43425f73287757a166d74464fddf1f5389c9f59"
-SRCREV_machine_qemux86 ?= "c43425f73287757a166d74464fddf1f5389c9f59"
-SRCREV_machine_qemux86-64 ?= "c43425f73287757a166d74464fddf1f5389c9f59"
-SRCREV_machine_qemumips64 ?= "b09e103786fc1a0622e89bac9df4254e6cb96baa"
-SRCREV_machine ?= "c43425f73287757a166d74464fddf1f5389c9f59"
+SRCREV_machine_qemuarm ?= "03f244ec7482dbc1c924af73a317dd3d12f00132"
+SRCREV_machine_qemuarm64 ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
+SRCREV_machine_qemumips ?= "4cd732b14cf4bdb51b7b565783bbc2ce5ab9a943"
+SRCREV_machine_qemuppc ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
+SRCREV_machine_qemux86 ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
+SRCREV_machine_qemux86-64 ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
+SRCREV_machine_qemumips64 ?= "699473bc2476afa85e47833f0f47aaf44a799257"
+SRCREV_machine ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #3 lore raw

PATCH 3/8 linux-yocto/4.1: ahci: backport AHCI runtime PM

In reply to Bruce Ashfield

enabling AHCI runtime PM support via the following commits:

f5b08e95bc03 ahci: Add runtime PM support for the host controller e05e05973f39 ahci: Add functions to manage runtime PM of AHCI ports 558571930e2d ahci: Convert driver to use modern PM hooks 4a2c2074f209 ahci: Cache host controller version
21641413456c scsi: Drop runtime PM usage count after host is added 254ab69f652d scsi: Set request queue runtime PM status back to active on resume 61c02cb167ed block: Add blk_set_runtime_active()
7bcfbac98f3c ahci: Store irq number in struct ahci_host_priv a5a093b7f6e4 ahci: Move interrupt enablement code to a separate function

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +1 -1

index 468358b08a4b..304b0dd2ef0e 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "7ffcde760a73f672bccb1c43130667d30ba7195c"
+SRCREV_machine ?= "8380fdf86b5d1ff542153e647f2ded0026a91852"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \

meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +1 -1

index 12f572cc405e..4c79bfdcbeb5 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.18"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
+SRCREV_machine ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_4.1.bb +8 -8

index 5f0559f0683d..5682b66a1240 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "ecabd4f1cf9b1e6279943c8e93eff58095296fb6"
-SRCREV_machine_qemuarm64 ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
-SRCREV_machine_qemumips ?= "8fd9efe95598ddf89ec432a967a38f02b2906a8b"
-SRCREV_machine_qemuppc ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
-SRCREV_machine_qemux86 ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
-SRCREV_machine_qemux86-64 ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
-SRCREV_machine_qemumips64 ?= "cb16b5365e26e106d56a6f8ed23eb8b57905ecf8"
-SRCREV_machine ?= "96c0e80f4007cce8d4f559a23f7a22da156ccbe2"
+SRCREV_machine_qemuarm ?= "75d5fa3b94efe0eb2101946d51015ce5bdc126cf"
+SRCREV_machine_qemuarm64 ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
+SRCREV_machine_qemumips ?= "5b7969dfff341c7d81b3726e0bb100cafa1cbfa1"
+SRCREV_machine_qemuppc ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
+SRCREV_machine_qemux86 ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
+SRCREV_machine_qemux86-64 ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
+SRCREV_machine_qemumips64 ?= "a3a35132a724752464ee13b10432cbdb2a110404"
+SRCREV_machine ?= "f5b08e95bc03f9819fa9d7ff57c698fbe2c16cc5"
 SRCREV_meta ?= "b9023d4c8fbbb854c26f158a079a5f54dd61964d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #4 lore raw

PATCH 4/8 linux-yocto-dev: bump to v4.6-rcX

In reply to Bruce Ashfield

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-kernel/linux/linux-yocto-dev.bb +1 -1

index 694e6bde95d5..30852634535e 100644
@@ -36,7 +36,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
 SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 
-LINUX_VERSION ?= "4.4-rc+"
+LINUX_VERSION ?= "4.6-rc+"
 LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #5 lore raw

PATCH 5/8 Revert "linux-yocto: Work around PAT issue on qemux86"

In reply to Bruce Ashfield

This reverts commit 94abdb2eea610b174064978d2fb8354a6231fc0c.

Signed-off-by Bruce Ashfield <[email protected]>

---
 .../linux-yocto/0001-Fix-qemux86-pat-issue.patch   | 100 ---------------------
 meta/recipes-kernel/linux/linux-yocto_4.4.bb       |   2 -
 2 files changed, 102 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto/0001-Fix-qemux86-pat-issue.patch

meta/recipes-kernel/linux/linux-yocto/0001-Fix-qemux86-pat-issue.patch deleted +0 ~~-100~~

deleted file mode 100644
index 367d9b4ace1b..000000000000
@@ -1,100 +0,0 @@
-From 9bfb2c711f66fc8eb6482f5ca6ea33c2ec1d792f Mon Sep 17 00:00:00 2001
-From: Richard Purdie <[email protected]>
-Date: Sat, 13 Feb 2016 17:36:23 +0000
-Subject: [PATCH] Fix qemux86 pat issue
-
-on qemux86, X doesn't start and there is
-a backtrace in the logs:
-
-x86/PAT: Xorg:705 map pfn expected mapping type uncached-minus for [mem 0xfd000000-0xfdffffff], got write-combining
-------------[ cut here ]------------
-WARNING: CPU: 0 PID: 705 at /media/build1/poky/build/tmp/work-shared/qemux86/kernel-source/arch/x86/mm/pat.c:985 untrack_pfn+0xaf/0xc0()
-Modules linked in: uvesafb
-CPU: 0 PID: 705 Comm: Xorg Not tainted 4.4.1-yocto-standard #1
-Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.8.2-0-g33fbe13 by qemu-project.org 04/01/2014
- 00000000 00000000 cf14dd78 c1397ab2 00000000 cf14dda8 c1051477 c1aa4f6c
- 00000000 000002c1 c1a9fa4c 000003d9 c104b98f c104b98f cf244000 b6355000
- 00000000 cf14ddb8 c1051552 00000009 00000000 cf14dde0 c104b98f cf14ddd0
-Call Trace:
- [<c1397ab2>] dump_stack+0x4b/0x79
- [<c1051477>] warn_slowpath_common+0x87/0xc0
- [<c104b98f>] ? untrack_pfn+0xaf/0xc0
- [<c104b98f>] ? untrack_pfn+0xaf/0xc0
- [<c1051552>] warn_slowpath_null+0x22/0x30
- [<c104b98f>] untrack_pfn+0xaf/0xc0
- [<c104d54c>] ? kmap_atomic_prot+0x3c/0xf0
- [<c114e17f>] unmap_single_vma+0x4ef/0x500
- [<c114f007>] unmap_vmas+0x37/0x50
- [<c1154f8f>] exit_mmap+0x5f/0xf0
- [<c104eedd>] mmput+0x2d/0xb0
- [<c105009c>] copy_process+0xd2c/0x13c0
- [<c1050892>] _do_fork+0x82/0x340
- [<c105f2d1>] ? SyS_rt_sigaction+0x51/0xa0
- [<c1050c3c>] SyS_clone+0x2c/0x30
- [<c1001a03>] do_syscall_32_irqs_on+0x53/0xb0
- [<c189a94a>] entry_INT80_32+0x2a/0x2a
----[ end trace be3e0a61097feddc ]---
-x86/PAT: Xorg:705 map pfn expected mapping type uncached-minus for [mem 0xfd000000-0xfdffffff], got write-combining
-
-The entry in question is setup by uvesafb which in its
-uvesafb_ioremap() function calls ioremap_wc().
-
-It appears that Xorg mmaps this from userspace, then later does a
-fork() to execute a utility. At this point, when creating the vmas for
-the new process, the pat code says "eeek!" as the protection mode for
-the new vmas don't match the old one, returns -EINVAL, the process dies
-and X goes with it.
-
-There are a few hammers we can hit this with, we can boot with "nopat"
-option which makes the problem go away, or turn off CONFIG_X86_PAT. No
-surprises there. Changing uvesafb to use mtrr=0 doesn't help since the
-ioremap_wc call still happens.
-
-The real issue is the "expected mapping type uncached-minus for got
-write-combining" message, it all goes wrong from there.
-
-Upon looking at the code and scratching my head for a long while, I
-notice that there are two ways of representing the protection mode
-data, "enum page_cache_mode" and "pgprot_t & _PAGE_CACHE_MASK".
-
-The exact meaning of pgprot_t depends on which CPU you're running,
-older CPUs have errata meaning only a small number of bits can be used.
-The exact mapping table is determined by __cachemode2pte_tbl and is
-updated at boot by calls from update_cache_mode_entry().
-
-The result of this if you map enum -> pgprot_t, then try to do pgprot_t
--> enum, you can get different values since its not a 1:1 mapping.
-
-This means the comparison in reserve_pfn_range() where it does "pcm !=
-want_pcm" isn't correct and can trigger even in cases where there isn't
-a problem.
-
-This can be "fixed" by doing cachemode2protval(pcm) !=
-cachemode2protval(want_pcm) and checking whether the protection bits
-match, rather than the enum values, since in reality this is what we
-really care about. With that change, X boots up just fine.
-
-We don't see this on qemux86-64 since that has more PAT bits working
-and hence the values map correctly.
-
-Signed-off-by: Richard Purdie <[email protected]>
----
- arch/x86/mm/pat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index 031782e..11064fb 100644
---- a/arch/x86/mm/pat.c
-+++ b/arch/x86/mm/pat.c
-@@ -833,7 +833,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
- 	if (ret)
- 		return ret;
- 
--	if (pcm != want_pcm) {
-+	if (cachemode2protval(pcm) != cachemode2protval(want_pcm)) {
- 		if (strict_prot ||
- 		    !is_new_memtype_allowed(paddr, size, want_pcm, pcm)) {
- 			free_memtype(paddr, paddr + size);
--- 
-2.5.0
-

meta/recipes-kernel/linux/linux-yocto_4.4.bb +0 -2

index 49038caf943e..5280777f80c0 100644
@@ -40,5 +40,3 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
 KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
-
-SRC_URI_append = " file://0001-Fix-qemux86-pat-issue.patch"

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #6 lore raw

PATCH 6/8 linux-yocto/4.4: fix PAT for 32bit x86

In reply to Bruce Ashfield

Integrating the following mainline destined commits to fix PAT issues with 32bit x86 and qemu:

bc22b90fb583 x86/pat: Document the PAT initialization sequence c534b1ec1991 x86/xen, pat: Remove PAT table init code from Xen cd47692e804f x86/mtrr: Fix PAT init handling when MTRR is disabled 039434bdc165 x86/mtrr: Fix Xorg crashes in Qemu sessions c08196e8064c x86/mm/pat: Replace cpu_has_pat with boot_cpu_has() 6928fce8c766 x86/mm/pat: Add pat_disable() interface 3163c8d5468d x86/mm/pat: Add support of non-default PAT MSR setting

With this change applied, we once again have working graphics and no special work arounds.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1

index e6a03928b9b0..a3b743b1d984 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "56434a6d9850fd3642bab5cab63d22c6f56d2eae"
+SRCREV_machine ?= "1970b2704b881effa78c3e5f79c0fd3bff1fd028"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \

meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +1 -1

index 2b7e1cb4d723..67e261c6a6c6 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.4.3"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
+SRCREV_machine ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_4.4.bb +8 -8

index 5280777f80c0..0494564a5bdb 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "03f244ec7482dbc1c924af73a317dd3d12f00132"
-SRCREV_machine_qemuarm64 ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
-SRCREV_machine_qemumips ?= "4cd732b14cf4bdb51b7b565783bbc2ce5ab9a943"
-SRCREV_machine_qemuppc ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
-SRCREV_machine_qemux86 ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
-SRCREV_machine_qemux86-64 ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
-SRCREV_machine_qemumips64 ?= "699473bc2476afa85e47833f0f47aaf44a799257"
-SRCREV_machine ?= "08943f2bbd507f8b7f5ef101ccc4755cbec79aad"
+SRCREV_machine_qemuarm ?= "8abee78b727ce6a4df262d1befcbecfa26742ae0"
+SRCREV_machine_qemuarm64 ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
+SRCREV_machine_qemumips ?= "475e28c3240610c26ee0b7866dc0ce701d0c27e1"
+SRCREV_machine_qemuppc ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
+SRCREV_machine_qemux86 ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
+SRCREV_machine_qemux86-64 ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
+SRCREV_machine_qemumips64 ?= "8d34fd84b9c53507b3d10a4a44294c479237319c"
+SRCREV_machine ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #7 lore raw

PATCH 7/8 linux-yocto/4.4: UVC: Add support for R200 depth camera

In reply to Bruce Ashfield

Integrating the following commit:

[
Add support for Intel R200 depth camera in uvc driver. This includes adding new uvc GUIDs for the new pixel formats, adding new V4L pixel format definition to user api headers, and updating the uvc driver GUID-to-4cc tables with the new formats.

Tested-by Greenberg, Aviv D <[email protected]>

Signed-off-by Aviv Greenberg <[email protected]>

Signed-off-by Sakari Ailus <[email protected]>

Signed-off-by Guennadi Liakhovetski <[email protected]>

Signed-off-by Mauro Carvalho Chehab <[email protected]>

Signed-off-by Saul Wold <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

]

Signed-off-by Saul Wold <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +1 -1

index a3b743b1d984..87b46e48c5ea 100644
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "1970b2704b881effa78c3e5f79c0fd3bff1fd028"
+SRCREV_machine ?= "8611de4e967b16bd5b63714045329d621ee744d0"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \

meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +1 -1

index 67e261c6a6c6..9446da989371 100644
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.4.3"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
+SRCREV_machine ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_4.4.bb +8 -8

index 0494564a5bdb..7aeb7c35db23 100644
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "8abee78b727ce6a4df262d1befcbecfa26742ae0"
-SRCREV_machine_qemuarm64 ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
-SRCREV_machine_qemumips ?= "475e28c3240610c26ee0b7866dc0ce701d0c27e1"
-SRCREV_machine_qemuppc ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
-SRCREV_machine_qemux86 ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
-SRCREV_machine_qemux86-64 ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
-SRCREV_machine_qemumips64 ?= "8d34fd84b9c53507b3d10a4a44294c479237319c"
-SRCREV_machine ?= "bc22b90fb5834ead65c31ca0d1e117239d4b545d"
+SRCREV_machine_qemuarm ?= "8809b2c36a60829bb9a7c3b04cdf42e95d8e93ae"
+SRCREV_machine_qemuarm64 ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
+SRCREV_machine_qemumips ?= "6a62ed62536c0f50050e24ee385b9e3965d43c97"
+SRCREV_machine_qemuppc ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
+SRCREV_machine_qemux86 ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
+SRCREV_machine_qemux86-64 ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
+SRCREV_machine_qemumips64 ?= "c61be23279c09c6906571de734b583dc7eacedc6"
+SRCREV_machine ?= "73481a3abd4ee49c1cf5561fea997275f535098e"
 SRCREV_meta ?= "770996a263e22562c81f48fde0f0dc647156abce"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \

Signature · 1 line

2.5.0

Bruce Ashfield

author

2016-04-02 00:09 UTC #8 lore raw

PATCH 8/8 kernel-yocto: enforce SRC_URI specified branch

In reply to Bruce Ashfield

During the simplication and cleanup of branches and kernel meta data handling, the ability to force build a branch that didn't match the meta data was dropped.

There are valid uses cases when a different branch should be built (testing, development, etc), so we restore the capability with this change.

If after the kernel meta data is processed the current branch does not match the SRC_URI specified branch, a warning is generated about the impending branch switch and that the user should double check that they are building what they expect.

WARNING: After meta data application, the kernel tree branch is standard/base. The
WARNING: SRC_URI specified branch standard/gt. The branch will be forced to standard/gt,
WARNING: but this means the board meta data (.scc files) do not match the SRC_URI specification.
WARNING: The meta data and branch standard/gt should be inspected to ensure the proper
WARNING: kernel is being built.

Reported-by Steve Sakoman" <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/classes/kernel-yocto.bbclass | 11 +++++++++++
 1 file changed, 11 insertions(+)

meta/classes/kernel-yocto.bbclass +11 -0

index 6a6a3a31d904..f86b3ef011a3 100644
@@ -170,6 +170,17 @@ do_patch() {
 		fi
 	fi
 
+        current_branch=`git rev-parse --abbrev-ref HEAD`
+        machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
+        if [ "${current_branch}" != "${machine_branch}" ]; then
+            bbwarn "After meta data application, the kernel tree branch is ${current_branch}. The"
+            bbwarn "SRC_URI specified branch ${machine_branch}. The branch will be forced to ${machine_branch},"
+            bbwarn "but this means the board meta data (.scc files) do not match the SRC_URI specification."
+            bbwarn "The meta data and branch ${machine_branch} should be inspected to ensure the proper"
+            bbwarn "kernel is being built."
+            git checkout -f ${machine_branch}
+        fi
+
 	if [ "${machine_srcrev}" != "AUTOINC" ]; then
 		if ! [ "$(git rev-parse --verify ${machine_srcrev}~0)" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then
 			bberror "SRCREV ${machine_srcrev} was specified, but is not reachable"

Signature · 1 line

2.5.0