Paul Gotmaker pointed out that a last minute merge to the 4.8 kernel
has the potential to hard hang a kernel when VM debugging is enabled:
https://lkml.org/lkml/2016/10/4/1
He also pointed out the fix for it in commit 21f54dda
[Using BUG_ON() as an assert() is _never_ acceptable].
While that fix will loop through -stable into 4.8.1, that will
likely be too late for our release. So I've cherry picked the
change to make it available.
(From OE-Core rev: eb4b39d5ffbe93d363b05c57196bdac61fa09c59)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Before standard/intel/* was created in the 4.1 and 4.4 kernel trees,
some patches were merged to standard/base to add features/support for
intel platforms.
While this isn't entirely bad, there have been some compile issues
reported in some configurations. Since we don't need these commits
on standard/base, we can relocate them to make standard/base upstream
clean.
This commit removes those patches from standard/base, and restores
then to the standard/intel/* branches.
(From OE-Core rev: 2c19e6378697141992c9bd7ff2bd4d57a4f9fe9b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the common-pc* configuration to have the following mmc
configs available by default:
meta/common-pc-64: use mmc-sdhci feature
meta/common-pc: use mmc-sdhci feature
meta: add mmc/mmc-sdhci feature
meta: add mmc/mmc-block feature
meta: add mmc/base feature
(From OE-Core rev: 024ee2f47ebac39438f87069d48f5e34c9c81891)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ensure that the kernel_version_sanity_check task runs after all source
modifications are complete, including any that are introduced during the
kernel_metadata task. This also avoids any race condition issues when
kernel_version_sanity_check and kernel_metadata tasks are running at the
same time.
(From OE-Core rev: ac1b2fd1b1a76125a8cf45130c22fb66eb018555)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This check ensures that when the PREFERRED_PROVIDER for virtual/kernel
changes, the previous instances gets removed correctly so when the new
instance installs files into the shared area there is not an overlap of
old and new.
[YOCTO #10278]
(From OE-Core rev: 6b67018c2c0229a91fbc55c6aafb86781caf2499)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Paul Gortmaker has made the preempt-rt patch available for the
4.8 kernel.
This commit merges his queue to standard/preempt-rt/rebase, which
will be kept up to date with a clean history, and it also makes
it available in standard/preempt-rt/base, which will be kept fast
forward for board support.
(From OE-Core rev: b475bb88cc5d6700b4fadff1b2bb43a376492c7b)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The LINUX_VERSION was previously updated to 4.1.32, but the
SRCREVs for the actual content were missed. This gets our actual
version and the PV back in sync.
We also update the meta data to fix configuration audit warnings
from the beaglebone builds.
(From OE-Core rev: 255adfaddec0dc44db619bf8726cd7804c09400d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
squash with 4.1
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The kernel being built should match what the recipe claims it is
building. This function ensures that happens by comparing the version
information in the kernel's Makefile to the PV the recipe is using.
v2 changes:
* Match against PV instead of LINUX_VERSION
* Match against EXTRAVERSION as well (e.g., -rc4)
* Cleaned up version string building
Fixes [YOCTO #6767].
(From OE-Core rev: ec467cfaea5c8cf22c61daa8845c2e4e96449512)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The SRCREVs were previously updated to -rc5, but the LINUX_VERSION
was missed. As such, we are building and booting -rc5, but all the
packaging says -rc4.
Worth a quick update while we wait for -rc6
(From OE-Core rev: ea2f99161a22ae2e9eefd3b337c9af7704c33e37)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating the following patch:
[
We try to make this change a generic extension, but it is
actually for a corner case. When a VM (qemu) gets a very limited
cpu bandwidth from host, which could be under a heavy load, the
existing 5000 ms timeout could occur and trigger error messages
in the task function's callers.
This change adds a new timeout parameter so that we can tweak
the value as a workaround or for troubleshooting purposes. In
the infinite wait case, A warning message is printed at 5000ms
interval.
In real world, the current 5 sec is generous enough for a video
request in my opinion, so this change could not be very useful.
Upstream Status: Inappropriate
Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
]
(From OE-Core rev: 872a83be6e86005f6426c90073ece56de4534ac0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some of the meta-data from the 4.4 kernel was missing from the 4.8
branch. This resulted in some functionality drops and also a size/time
increase in the kernel build (due to debug being turned on).
With this resync, we now have the missing config restored.
(From OE-Core rev: eb0b4f05f89ae014953492ea7bc0afc9fef1abce)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We enabled HW_RANDOM_VIRTIO for the 4.4+ kernels, but it is also needed
for 4.1 to ensure that VMs have sufficient entropy. Without this entropy
networking on qemuppc starves and triggers intermittent errors.
(From OE-Core rev: 89457aae92cf8748d8fbad2509f78f54a6b8fac1)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating a series to expliclity set the quark build to 32 bits
and avoid 64 bit x86 defaults.
We also have a series of commits that fix configuration warnings on
x86 platforms:
intel-quark.cfg: Explicitly disable CONFIG_64BIT
common-pc-drivers.cfg: Remove I2O configs
features: Fix dependencies and =m vs =y discrepancies for corei7
intel-core2-32.cfg: Explicitly disable CONFIG_64BIT
features: Add 6lowpan feature and add it where necessary
(From OE-Core rev: cd20f6b1f0e20caa5c0aee0263fd9eb21c3566e9)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4.7+ requires a device tree for the arm versatile family of platforms.
We add the definition to our 4.8 linux-yocto recipes so we can continue
to boot!
(From OE-Core rev: 8c5cf8193441814e46b7e118655b4e622f785ce5)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating the following commits to address configuration warnings for
intel-corei7-64 and intel-core2-32:
features: Fix dependencies and =m vs =y discrepancies for corei7
intel-core2-32.cfg: Explicitly disable CONFIG_64BIT
(From OE-Core rev: b2a4e07390834fa41fe35d1124ac2a0cd6692524)
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 4.4 kernel to v4.4.18 and the 4.1 kernel to v4.1.30.
We also tweak the configuration with the following commits to remove
warnings being generated from the 4.4 kernel (due to options being
dropped from the final .config):
features: Create mfd-intel-lpss feature and use where appropriate
features/iio: Set IIO_BUFFER_CB to =m instead of =y
features: Add 6lowpan feature and add it where necessary
Tested on qemux86, qemuppc, qemumips and qemuarm.
(From OE-Core rev: 18c6fb387aa6a15de514030c4a7c04dac9c68869)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The existing kernel patching scripts don't like () in patch names, since they
are detected as function calls. Although the scripts will be updated to avoid
this error, it is worthwhile fixing the patch names in the meantime.
(From OE-Core rev: de7e4da0c7abf5dcd8b95ec993e70041475603c2)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating the following configuration changes:
features: usb-net: provide more coverage on USB network devices
features: broxton: enable iTCO watchdog support
features: broxton: enable iSMT support
features: broxton: enable LPC bridge function for Intel ICH and SCH
(From OE-Core rev: 02165c6bd9da6ac3a34eabe17d3a068afb6b1727)
Signed-off-by: Bruce Ashfield <bruce@zedd.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There was an issue with a netfilter backport in 4.1.28-stable. To
address it, we backport the -stable fix:
netfilter: x_tables: fix stable backport
Stable-4.1 backport of mainline commit 364723410175 ("netfilter:
x_tables: validate targets of jumps") doesn't handle correctly the fact
that 4.1 kernel is missing commit 482cfc318559 ("netfilter: xtables:
avoid percpu ruleset duplication") so that t->entries is still a per-cpu
array in find_jump_target().
Use the same fix as e.g. stable-3.14 backport.
Fixes: 8163327a3a92 ("netfilter: x_tables: validate targets of jumps")
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
(From OE-Core rev: c009297d44df98ba103ee267e40ffdbc837e411f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The v4.1.28 -stable update broke the build for some ppc and mips
platforms. We fix the errors by backporting a missing commit for
ppc:
powerpc/tm: Abort syscalls in active transactions
And by reverting a commit for mips (rather than backporting more
changes to -mm):
Revert "MIPS: Reserve nosave data for hibernation"
(From OE-Core rev: 02a1d6eb52b78c7fdcfe2a64e427488e6dd9ce4d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating the following two commits:
44af90071620 4.1.28 Fix bad backport of 8f182270dfec "mm/swap.c: flush lru pvecs on compound page arrival"
99c37e1500a6 i2c: ismt: Add Intel DNV PCI ID
And the following two meta-data changes:
afbc6bd00e6f bsp/axxiaarm64: Enable Axxia NCR and PEI drivers
6a2047c00450 common-pc: enforce 32 bit
(From OE-Core rev: d52e523b28cc95a741039018d76fa4c1a947a40f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It was pointed out that the 4.4 version of -rt was lagging. I had done
the work some time ago, but didn't complete the testing effort.
I've now built and booted this on x86 and built it for ARM.
Two branches are available: standard/preempt-rt/base and standard/preempt-rt/rebase.
(From OE-Core rev: bb2ac258a80590a1c965b5da939d6531b3f2098a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating two changes to the 4.4 kernel:
mousedev: fix warning err caused by __cpu_to_le16p()
mousedev: fix warning err caused by __cpu_to_le16p()
following warning msg is found when compiling the kernel for qemumips:
.../drivers/input/mousedev.c:749:15: warning: passing argument 1 of
'__cpu_to_le16p' from incompatible pointer type [-Wincompatible-pointer-types]
convert the function's parameter to (__u16 *) to fix this warning.
Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com>
printk.scc: don't include kernel-debug.scc
There is no need to include kernel-debug.scc into printk.scc as
options from printk.cfg don't depend on CONFIG_DEBUG* options from
kernel-debug.cfg
Moreover, enabling CONFIG_DEBUG* options makes kernel much bigger,
increases build time and consumed a lot of additional disk space.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
(From OE-Core rev: 711274efbbf9a750a740065c1a538217a4f3fba3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating the following changes, that resolve issues with previous
functionality merges:
ddab24299940 mei: drop wr_msg from the mei_dev structure
26e282c0686e lx-dialog: fix merge issues
(From OE-Core rev: 84dbace51d86efcaa50c1b0cbc4d44ac884f26fc)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The use of the ${AUTOREV} variable means bitbake would always re-parse the
recipe. This isn't desirable when its disabled so undo the always parsing
flag in this case.
(From OE-Core rev: f1fce69766576ab62bfc5919af2af04028180950)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This recipe no longer functions after this change, revert it.
This reverts commit 3e0137113e.
(From OE-Core rev: 5e8cf6e568ab90365894478a272b5c28dc941031)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We are experimenting some issues in the Autobuilder infraestructure
possible due to high I/O loads, in order to provide more information
about intervals of times in printk enable by default debug/printk.scc
on qemu development images.
[YOCTO #9299]
(From OE-Core rev: dfa8be08aa6e7ad6dbc615df8875dc2ac1ac8946)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Integrating the following commits to tweak the default configuration
for powerclamp and gpio:
features/thermal: make INTEL_POWERCLAMP driver built as module
gpio: disable Intel PMIC gpio
(From OE-Core rev: b5541c3db22fbe8b4e0389b5937cbb5ae0284f00)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backporting upstream mei changes, and two pwm changes from
Mika Westerberg's pwm-4.4 branch:
pwm: lpss: Prevent on_time_div overflow on lower frequencies
pwm: lpss: fix base_unit calculation for PWM frequency
mei: don't use wake_up_interruptible for wr_ctrl
mei: fix waiting for wr_ctrl for corner cases.
mei: don't clean control queues on notify request timeout
mei: drop global me_client_index
mei: do not pin module if cldrv->probe() failed
mei: bus: use scnprintf in *_show
mei: fix format string in debug prints
mei: fix double freeing of a cb during link reset
mei: wd: drop AGAIN the watchdog code from the core mei driver
mei: split amthif client init from end of clients enumeration
mei: hbm: send immediate reply flag in enum request
mei: bus: run rescan on me_clients list change
mei: drop reserved host client ids
mei: hbm: warn about fw-initiated disconnect
mei: fixed address clients for the new platforms
mei: fill file pointer in read cb for fixed address client
mei: discard replies from unconnected fixed address clients
mei: clean write queues and wake waiters on disconnect
mei: wake blocked write on link reset
mei: drop superfluous closing bracket from write traces
mei: bus: fix notification event delivery
mei: bus: fix RX event scheduling
mei: amthif: interrupt reader on link reset
mei: amthif: use rx_wait queue also for amthif client
mei: amthif: drop parameter validation from mei_amthif_write
mei: amthif: replace amthif_rd_complete_list with rd_completed
mei: amthif: allow only one request at a time
mei: rename variable names 'file_object' to fp
mei: constify struct file pointer
mei: amthif: don't drop read packets on timeout
mei: amthif: don't copy from an empty buffer
mei: call stop on failed char device register
mei: fix possible integer overflow issue
mei: debugfs: allow hbm features list dump in earlier stages
mei: debugfs: adjust active clients print buffer
mei: trace pci configuration space io
watchdog: mei_wdt: re-register device on event
watchdog: mei_wdt: register wd device only if required
mei: bus: whitelist the watchdog client
watchdog: mei_wdt: add status debugfs entry
watchdog: mei_wdt: implement MEI iAMT watchdog driver
mei: wd: drop the watchdog code from the core mei driver
mei: drop nfc leftovers from the mei driver
mei: always copy the read buffer if data is ready
mei: prevent queuing new flow control credit.
mei: bus: remove redundant uuid string in debug messages
(From OE-Core rev: a525872906afbd76d8b3e1c53a5b8da3ffda81ee)
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Merging the following configuration changes into the 4.1 and
4.4 linux-yocto kernel meta data:
mei.cfg: mei driver is no longer in staging
bsp/intel-common: add keyboard-gpio to intel-common-drivers
features/thermal: Enable Intel PMIC thermal feature
broxton: Enable USB Type C feature for broxton
(From OE-Core rev: 5218a27645b57f0d38d9b17bcb2f41e3e04c0d67)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backporting the following mainline changes to the 4.1 and 4.4
kernels:
device property: Avoid potential dereferences of invalid pointers
device property: convert to use match_string() helper
lib/string: introduce match_string() helper
device property: fix for a case of use-after-free
device property: fwnode->secondary may contain ERR_PTR(-ENODEV)
xhci: harden xhci_find_next_ext_cap against device removal
xhci: rework xhci extended capability list parsing functions
xhci: parse xhci protocol speed ID list for usb 3.1 usage
extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
extcon: Remove optional print_name() function pointer of extcon_dev
extcon: Update the prototype of extcon_register_notifier() with enum extcon
extcon: Use capital letter for the name of external connectors
extcon: Use the unique id for external connector instead of string
extcon: Remove the optional name of extcon device
extcon: adc-jack: Remove the unneeded num_cables field
extcon: Alter MHL-TA cable name to TA cable name
extcon: Unify the dock device names on max8997/77693
extcon: Unify the jig cable names on rt8973 and max14577/77693/77843
extcon: Fix the checkpatch warning and minor coding style issue
extcon: Add extcon_get_edev_name() API to get the extcon device name
extcon: Modify the device name as extcon[X] for sysfs
extcon: Add manufactor name of each extcon device
And the following config change:
mei.cfg: Add CONFIG_INTEL_MEI_TXE=m
(From OE-Core rev: a04c634adc3d073701ecf2576fe9dd0cf8ace629)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
