diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-11-02 22:45:33 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-03 16:54:43 +0000 |
| commit | 089dc30e11a5bbd10bf6bebea6aa0ac2173bc9a3 (patch) | |
| tree | 5fd59662d0f1ea5f6befe9aad0e8263be35d6e26 /meta | |
| parent | 5135d7c88bd1c50b7462d3f219d778e4a33b2995 (diff) | |
| download | openembedded-core-089dc30e11a5bbd10bf6bebea6aa0ac2173bc9a3.tar.gz openembedded-core-089dc30e11a5bbd10bf6bebea6aa0ac2173bc9a3.tar.bz2 openembedded-core-089dc30e11a5bbd10bf6bebea6aa0ac2173bc9a3.zip | |
linux-yocto/4.12: ide:ide-cd: fix kernel panic resulting from missing scsi_req_init
Integrating a backport of upstream commit:
ide:ide-cd: fix kernel panic resulting from missing scsi_req_init
commit 79d73346ac05bc31 upstream
Since we split the scsi_request out of struct request, while the
standard prep_rq_fn builds 10 byte cmds, it missed to invoke
scsi_req_init() to initialize certain fields of a scsi_request
structure (.__cmd[], .cmd, .cmd_len and .sense_len but no other
members of struct scsi_request).
An example panic on virtual machines (qemu/virtualbox) to boot
from IDE cdrom:
...
[ 8.754381] Call Trace:
[ 8.755419] blk_peek_request+0x182/0x2e0
[ 8.755863] blk_fetch_request+0x1c/0x40
[ 8.756148] ? ktime_get+0x40/0xa0
[ 8.756385] do_ide_request+0x37d/0x660
[ 8.756704] ? cfq_group_service_tree_add+0x98/0xc0
[ 8.757011] ? cfq_service_tree_add+0x1e5/0x2c0
[ 8.757313] ? ktime_get+0x40/0xa0
[ 8.757544] __blk_run_queue+0x3d/0x60
[ 8.757837] queue_unplugged+0x2f/0xc0
[ 8.758088] blk_flush_plug_list+0x1f4/0x240
[ 8.758362] blk_finish_plug+0x2c/0x40
...
[ 8.770906] RIP: ide_cdrom_prep_fn+0x63/0x180 RSP: ffff92aec018bae8
[ 8.772329] ---[ end trace 6408481e551a85c9 ]---
...
Fixes: 82ed4db499b8 ("block: split scsi_request out of struct request")
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
[bva: modified for 4.12 context]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index 0a60fc53aa..983c1cc758 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "f792c32d8f19a31874ec40c033f36ef250e596ae" +SRCREV_machine ?= "2143b758ad622a73c7c0b3fc8890b81000187635" SRCREV_meta ?= "cebe198870d781829bd997a188cc34d9f7a61023" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index c7f1b8dc81..658ecc0d6d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.12.14" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "26c1863a744836d9171dff262b864cb67f4d537c" +SRCREV_machine ?= "9cc6b0ae1aad7312e85ac4134398f81c0140de33" SRCREV_meta ?= "cebe198870d781829bd997a188cc34d9f7a61023" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index 1bdb0db3c8..a7dd763513 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb @@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "afd1340d4b7c2180ee0e5dbf79499fedf1a023a6" -SRCREV_machine_qemuarm64 ?= "26c1863a744836d9171dff262b864cb67f4d537c" -SRCREV_machine_qemumips ?= "6d0052275c433f5a66282ad9f53525a7b6d36dfd" -SRCREV_machine_qemuppc ?= "26c1863a744836d9171dff262b864cb67f4d537c" -SRCREV_machine_qemux86 ?= "26c1863a744836d9171dff262b864cb67f4d537c" -SRCREV_machine_qemux86-64 ?= "26c1863a744836d9171dff262b864cb67f4d537c" -SRCREV_machine_qemumips64 ?= "c8adcd782e648cb70780443ee90e2f56e2209c5a" -SRCREV_machine ?= "26c1863a744836d9171dff262b864cb67f4d537c" +SRCREV_machine_qemuarm ?= "03489013c6844bf3f911e51c5b8cd3bd5c1dc6e9" +SRCREV_machine_qemuarm64 ?= "9cc6b0ae1aad7312e85ac4134398f81c0140de33" +SRCREV_machine_qemumips ?= "c22264e2e3340eb8affa9a9fc0b86decb2be26c6" +SRCREV_machine_qemuppc ?= "9cc6b0ae1aad7312e85ac4134398f81c0140de33" +SRCREV_machine_qemux86 ?= "9cc6b0ae1aad7312e85ac4134398f81c0140de33" +SRCREV_machine_qemux86-64 ?= "9cc6b0ae1aad7312e85ac4134398f81c0140de33" +SRCREV_machine_qemumips64 ?= "ead3f1c16e85d1b1074acdd13084b5cdf1104e23" +SRCREV_machine ?= "9cc6b0ae1aad7312e85ac4134398f81c0140de33" SRCREV_meta ?= "cebe198870d781829bd997a188cc34d9f7a61023" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |