| <?xml version="1.0" encoding="utf-8"?><manifest revision="0fcffc7140c80810472fd2dd8ac82a7dafaff4e2"> |
| <notice>Your sources have been sync'd successfully.</notice> |
| <remote fetch="https://android.googlesource.com" name="aosp" review="https://android-review.googlesource.com"/> |
| <remote alias="cros" fetch="https://chromium.googlesource.com/" name="chromium"/> |
| <remote fetch="https://chromium.googlesource.com" name="cros" review="https://chromium-review.googlesource.com"/> |
| <default remote="cros" revision="refs/heads/master" sync-j="8"/> |
| <project name="aosp/platform/external/dbus-binding-generator" path="src/aosp/external/dbus-binding-generator" revision="0f36410cec3fe0c95afa666f17198706c7669656" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="d6d6f31b3988e21d0a5b50977ef7befedf339b55" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="5943df7448213fdf373bda6270044e1e79a88d2f" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/modp_b64" path="src/third_party/modp_b64" revision="99dc13926931cedfd2e4e582c33ef657d0645c5c" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/apmanager" path="src/aosp/system/connectivity/apmanager" revision="a9a4938a099d1bf1a87798e021791bbe2e467d00" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="5f6ff40d1e6520be789a7ae9402f46f505ad053a" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="64fc5a23a1ae487409cc585b3fbf261c553acb4e" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="ebdd3bfbecea0e5396fe318c9f8ec27507c333a1" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="941cf235c5e56eddc6e4f2de2f38bee032a4dead" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="8f325b7f28a4b3042753fb006bdbe95db98768cc" upstream="refs/heads/master"/> |
| <project name="apps/libapps" path="src/third_party/libapps" revision="0a4974376ca5fb6a1c67f9971bfa17e664ea1251" upstream="refs/heads/master"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" remote="chromium" revision="4a93e2cfc133473ae58f17374c32669eea9a8912" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/Python-Markdown" remote="chromium" revision="b08af21eb795e522e1b972cb85bff59edb1ae209" upstream="refs/heads/master"/> |
| <project name="chromium/src/tools/md_browser" remote="chromium" revision="f246a322b16c15723800ea6c6414af3a29d79ee9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="5702f0baefc0c1321374d838f8fc27c18d79a2ae"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="9eced023539d2c3f0af126bc86e03f1880f72a62" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/docs" path="docs" revision="2e4d46ab32491f64aa29f40cbf6ae03c47cadd06" upstream="refs/heads/master"/> |
| <project name="chromiumos/graphyte" path="src/platform/graphyte" revision="b2d7015c3721926cc39018e778790cd2c463534e" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/distfiles_updater" path="infra/distfiles_updater" revision="8969815234fa6a9eb6e4eebba243f829336f08b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/infra/suite_scheduler" path="infra/suite_scheduler" revision="f61a998565223c4cf6c7e1b43f2e288d94a8f08f" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/infra_virtualenv" path="infra_virtualenv" revision="704dbb824410432fcd5902ed41509f40735e7fd8" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="a7e78b4bec86bd968f5075d0f57f3919fb598ef3" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="af1f9ab329acb9498508c829774875a02cec9ecf" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="94939bd85c70707448cf9075500c8e458133ab58" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="a175282b64829a1ca736001910fb217c8fbe593c" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="e0ffc7b200000920f76a1fee90d6654b6ec00481" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="64deb4678555fde72dd7bfe49f34d60bed8952be" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="07f5d5eb201c6f5c978df8f86e9e81907df54db1" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="a2834cbe4e9cb85356e115afd4f4b2398745cf75" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/battery_updater" path="src/platform/battery_updater" revision="32463c6de8e8c98d4b1711937bc7678afc121a85" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bmpblk" path="src/platform/bmpblk" revision="fa7fda4e53dbf7ee2b155f7b8761bb50f6ebd92f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/bootcache" path="src/platform/bootcache" revision="ebe3a0995e90026433ffc62b7aeed6cad1f28694" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/btsocket" path="src/platform/btsocket" revision="1b65449a647c99556511df30b8ab660b98acce7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chameleon" path="src/platform/chameleon" revision="50e26c0020940a88729ac3f2e194c5b5d475d8db" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="2f1ee8448a886ce1abad9c0e8741582244f8ab40" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="0cb02d88617dd456aff4076cbd9b8b37fa2302fa" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="c12e11485aac8e59476a40ae3df7a78c2a54bacd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="9195ec9b239f4fd70c64531e6c4fa00774c49c5f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="b45c72abb93e4d5f09c14ddd14e7d08dcb1c3ce4" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="ebdb0a880e7b60de1ec4ddd93b8320260c3ad25d" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="5d5faf68cdb05e477f0637f517f4926a0db1394a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="04a17cb6834cf604115846f9239b55108b2928e6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="11237d5e911d769cac995e2e1ab9d16598542bc8" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/experimental" path="src/platform/experimental" revision="0c9b56092424c370eff748b25d49caceb9a18dab" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory" path="src/platform/factory" revision="da58f36d0f58e774ddb626d44e4e644ce0f2ff10" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="39dc50c15c59193776fa3d9636b0af5755594349" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="16e29dbdc5f411944ec21d0d59ac4f157fa97c70" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="da55e6cd18a13750b0fc417f8db6a310ad284231" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="5a656849c7d2b0d0ddbe0ac6d300c1e2fada0bb4" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/go-seccomp" path="src/platform/go-seccomp" revision="0280326e5bd212fcfbe3696e113730045debae74" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/google-breakpad" path="src/third_party/breakpad" revision="cc1deb44521d41125f5d617940a654c58c794325" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="a290471be8063ef1a1173d891e70ee6607d129ac" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="9cb1c512838b3513f4b0bcf02f31f05018cf77a0" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/inputcontrol" path="src/platform/inputcontrol" revision="ae0b15dc322bab9bf6d7c4fcd5f77d488766a275" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/jabra_vold" path="src/platform/jabra_vold" revision="8830911158ae632b7626d0ebe33248e66ffaeef3" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="9f7a1961eb4726211e18abd147d5a11a4ea86744" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="c7ff5188fb31541c3c6173e8171155f965760883" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="5272e812b594d10232826c4bded9c6ad7d77469a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/moblab" path="src/platform/moblab" revision="dca599879cab0dba8ed32ef3a5d1b82e26524732" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/monitor_reconfig" path="src/platform/monitor_reconfig" revision="f022d19d84f232290b596beeb26347f62442e7eb" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mosys" path="src/platform/mosys" revision="0c83f50c60b22056980328889cc9e7c81d653c07" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="17cc088dc198f626513d4154644d57553b69fefd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtplot" path="src/platform/mtplot" revision="5e4f631e633384751f582bd9db5f4d6eb2112494" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mttools" path="src/platform/mttools" revision="8e83b1936d92fa4992d6597862d10b801fbaa097" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/newblue" path="src/platform/newblue" revision="3703e8a79698c78864d3e5610341c64338f4600a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/puffin" path="src/platform/puffin" revision="2426ccf4e3558eeca0d2a7e8dd0a900ae09d245f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/punybench" path="src/platform/punybench" revision="5a230ee17756dc43ff732932dcb52899c06a4d09" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/system_api" path="src/platform/system_api" revision="6b09df23f8a968fc72956218a62302b89d5334b1" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="95a5fb7a1e4526ed8c8e641431f66f22f302cddc" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="f1eb895f7ea70ad99bbe60508fda825923c35af6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="98c46b9aed2e0a33ce23517da5102cdc59f23060" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchbot" path="src/platform/touchbot" revision="75d8f1bfbbb3dfc870fcbc22f53cd16b66ac7f23" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touchpad-tests" path="src/platform/touchpad-tests" revision="d2e7d94a834b54511ca57e6359839f9ca86d6d04" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm" path="src/third_party/tpm" revision="0cba6cadd1bea1ce3717779201d594c4c9131dc2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/tpm_lite" path="src/platform/tpm_lite" revision="066c7f963b3ef733716251b666e0af0afd03b4fe" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/uboot-env" path="src/platform/uboot-env" revision="108ebbfac4d13d11e1940216434c368384ee0c0b" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="b660356d515473a81e424410ead2cdf566159406" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="0ed732a09b5cd199e4741624437aa0a85866e3c2" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xf86-input-cmt" path="src/platform/xf86-input-cmt" revision="3f2ffc921952e57a4343463b0679d90b80b51fc7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/xorg-conf" path="src/platform/xorg-conf" revision="c72b5f688bfe853ca5d0788c90fde6149c2b6a69" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="90260658a4ecd78385a5d56b62f4fa602026efce" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="f9d41b3c36126579c60665c847834b624bf7b174" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="1a8074b548ea350eede9d5a09386810690fb5209" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/android_mtdutils" path="src/third_party/android_mtdutils" revision="9bcfc3ee238f16925e9aaa4573129784ebb397e7" upstream="chromeos"/> |
| <project name="chromiumos/third_party/arm-trusted-firmware" path="src/third_party/arm-trusted-firmware" revision="95fba14bc483055114d40e72386daf9c021177b6" upstream="refs/heads/upstream_mirror/master"> |
| <annotation name="branch-mode" value="create"/> |
| </project> |
| <project name="chromiumos/third_party/atheros" path="src/third_party/atheros" revision="52a5bdaa8930c14ee42518354de3e5ec09911c6b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/atrusctl" path="src/third_party/atrusctl" revision="0bd2504604c3e3980025e11d2b45865b6806340c" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="027b638e0fbe8f120ea012f1edf44ae140bd7f55" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="6ce372f140653c9b665910bb47a0d083dd50e0e9" upstream="refs/heads/chromeos-5.44"/> |
| <project name="chromiumos/third_party/bootstub" path="src/third_party/bootstub" revision="5ac54e8d3d305c2c6c7297e8e54d3cf7e4629b29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/broadcom" path="src/third_party/broadcom" revision="4070e7161f2f1a1a22027a744eb868500688f0b6" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cbootimage" path="src/third_party/cbootimage" revision="b7d5b2d6a6dd05874d86ee900ff441d261f9034c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/chrontel" path="src/third_party/chrontel" revision="7bcd0328d0eeef6a0539bd0ba80cd9a545e6cf4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/coreboot" path="src/third_party/coreboot" revision="adf274f63389d51eaaead3aaa78991efde742200" upstream="refs/heads/chromeos-2016.05"/> |
| <project name="chromiumos/third_party/coreboot/blobs" path="src/third_party/coreboot/3rdparty/blobs" revision="9ba07035ed0acb28902cce826ea833cf531d57c1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cryptoc" path="src/third_party/cryptoc" revision="6283eeeaf5ccebcca982d5318b36d49e7b32cb6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/cypress-tools" path="src/third_party/cypress-tools" revision="043fba1c35f89cce95f804bf6d4f01cfc23a6c21" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/daisydog" path="src/third_party/daisydog" revision="f21d857fde838f7cb141f81c49070abbdf343fce" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="904f49fd770dd559800523edd91c1226e131655d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/displaylink-updater" path="src/third_party/displaylink-updater" revision="a52808b5995fe2ed481269c8f089358d4b451d5c" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/dpkt" path="chromite/third_party/dpkt" revision="f5259728b1294412bee945df9708efba09ea9160"> |
| <annotation name="branch-mode" value="pin"/> |
| </project> |
| <project name="chromiumos/third_party/edk2" path="src/third_party/edk2" revision="0aa39d284043be61b5f1222afdffd39a5abaf3aa" upstream="refs/heads/chromeos-2014.04"/> |
| <project name="chromiumos/third_party/em100" path="src/third_party/em100" revision="6e60dbae5bf62cd0ffffb9fc5ca9ba93e831ee88" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashmap" path="src/third_party/flashmap" revision="252eda88ac16a71a84da2c934b293c07a09a0df3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="8bbb6dda237f020d9fdecc41f1c4d2f26e883f74" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gcc" path="src/third_party/gcc" revision="a2bc87ab8851051e765d60626a6997f63ddfe00e" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/gdata" path="chromite/third_party/gdata" revision="fe7e5c90a9827feb66ed446b2d297a1618b25272" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gdmwimax" path="src/third_party/gdmwimax" revision="e8236b4b2d66b1972e4f84955a238134acd7f6a1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/gobi3k-sdk" path="src/third_party/gobi3k-sdk" revision="5e5d1a65cbf855609e4d7c9c425615090a834704" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/grub2" path="src/third_party/grub2" revision="df6034c59cb2d847f9e780cf2def30c5c9b8305f" upstream="refs/heads/master"/> |
| <project groups="labtools" name="chromiumos/third_party/hdctools" path="src/third_party/hdctools" revision="4bd33843c47505c142af7c7645bab8c057ecce42" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="d829774c5994dbe35409f2a9875a7d0bde1eb61c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="5c1dbb939529300705605d1377dec9153a8d2a56" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="2eff9dc9ee49c0cb5ca9718934e5dd8108d99a97" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="a905e51dad2cc80d5551223ff186e437f80dc8f1" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="afbf7a1671398bfa62d4c6eb4fa4d38fde4c1362" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="89e98ffa9aeb1f0926afef50330446e0dbc1e3a6" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="f2e284023c1b253b92412cfb7a46406f6a18ad9c" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="bbd199f8f3dc9c2a49cfecfc7956fe7706d9f0e9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kvmtool" path="src/third_party/kvmtool" revision="9dc621e77e7e4f3c045831021b04d19997d3deb5" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libc-bench" path="src/third_party/libc-bench" revision="76793dd4b09191a78a78180012718e72d792717f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libdrm" path="src/third_party/libdrm" revision="0c7748b56694e9b00537f27bbe9edb11c78ce08f" upstream="refs/heads/chromeos-2.4.70"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="afc1b877083133dbb52958d1a9e1b621761c06ab" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="7b5fbfa86476ce1641891064b222a56bf24aff4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libresample" path="src/third_party/libresample" revision="cc9f20f439396b7d45e94b8301edd95d33f26a46" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libscrypt" path="src/third_party/libscrypt" revision="b45c53f9418a6eff2c8ed98703a55f96029304b1" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libsigrok" path="src/third_party/libsigrok" revision="199fe31115c76231746f5953271795d58679561c" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrok-cli" path="src/third_party/sigrok-cli" revision="c9edfa218e5a5972531b6f4a3ece8d33a44ae1b5" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libsigrokdecode" path="src/third_party/libsigrokdecode" revision="3279c2825684c7009775b731d0a9e37815778282" upstream="refs/heads/chromeos"/> |
| <project name="chromiumos/third_party/libv4lplugins" path="src/third_party/libv4lplugins" revision="e79d5093d0c93b9072f45415b29e12b2740db25e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="b9aa9932d0fe198195c852d3a31c650fce4d5d65" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7df860dd2389c5c9a5b2ed9ac8a7f1d48d6fed03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="b5d3741d042bde7941284303712c3790ab4e489d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/memtest" path="src/third_party/memtest" revision="3d4be6e3bfd819856e38a82e35c206fec4551851" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/arc-mesa" revision="a74a417f08a105db2835914d713fda07a9b40d41" upstream="refs/heads/arc-12.1.0-pre2"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="9baf1ff8fc06d8c986e55465f77427d416ecd710" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa-img" revision="129178893b2260df22db96327c5ca9c2ce7db046" upstream="refs/heads/mesa-img"/> |
| <project name="chromiumos/third_party/mimo-updater" path="src/third_party/mimo-updater" revision="ddfd74f6363a8cce6ebeadeb380d9c2a09d9d68c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/minifakedns" path="src/third_party/miniFakeDns" revision="6184bea119dea53da539727fe8c2a116f98cef24" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/mmc-utils" path="src/third_party/mmc-utils" revision="bcc3e2e4246431be511be3959a11cd9733bedd29" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/modemmanager-next" path="src/third_party/modemmanager-next" revision="c3cded2efc1c82a18639ae4109d6dbc2d6a95502" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/nfs-ganesha" path="src/third_party/nfs-ganesha" revision="0ca03501dfd49f8091a04f941c05a71246b24bf4" upstream="refs/heads/V2.3-stable"/> |
| <project name="chromiumos/third_party/ntirpc" path="src/third_party/ntirpc" revision="9188a4c63881f5c26283ac05132f97a408a67462" upstream="refs/heads/V1.3.3-cros"/> |
| <project name="chromiumos/third_party/opencryptoki" path="src/third_party/opencryptoki" revision="b67690aeeb4174b2253db18a9c1b19eeb219a4ef" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ply-image" path="src/third_party/ply-image" revision="6cf4e4cd968bb72ade54e423e2b97eb3a80c6de9" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/portage_tool" path="src/third_party/portage_tool" revision="3ccfed9fd25d8e3c01e5be7d737e8d478fb46f70" upstream="refs/heads/chromeos-2.2.12"/> |
| <project groups="minilayout,buildtools" name="chromiumos/third_party/pyelftools" path="chromite/third_party/pyelftools" revision="19b3e610c86fcadb837d252c794cb5e8008826ae" upstream="refs/heads/master-0.22"/> |
| <project name="chromiumos/third_party/realtek-updater" path="src/third_party/realtek-updater" revision="7e603e12fbf9d2a8aeb67f1075fe43dbfaf52f7f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/rootdev" path="src/third_party/rootdev" revision="b9b8f1de0ab9d4b0e1739d7c0dc4ec232b85a5c3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/seabios" path="src/third_party/seabios" revision="3004147dd3707e600772ec6c5d37beac7f4b8eb4" upstream="refs/heads/chromeos-2014.11.03"/> |
| <project name="chromiumos/third_party/sis-updater" path="src/third_party/sis-updater" revision="600840897bd02d32ceaa44c208aad71284d92c2d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/sysbios" path="src/third_party/sysbios" revision="33e1db34b8162de72a5e9bbbc44e6bce38978396" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegra-power-query" path="src/third_party/tegra-power-query" revision="66f1f0d949f4ca4836c1a65b622629205240e37a" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tegrastats" path="src/third_party/tegrastats" revision="1be161a89525d840e1f6d1f21b3f45645a7dedb3" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tlsdate" path="src/third_party/tlsdate" revision="8ccda0f645b65dc82f8676ce321406938a35d0b4" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="647f97831373993c1e67e8669a70e46d4c70fd4c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm-emulator" path="src/third_party/tpm-emulator" revision="310a21ef24ace14b4d6e8095172445494f54ff25" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/tpm2" path="src/third_party/tpm2" revision="cb2de5a810df1898cd3ae47d517603b8b12371c0" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="31f4933a54cce7b157619eb1dd14ea32bec39279" upstream="refs/heads/master-0.3.13"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/files" revision="cc72f5c47c758892b0f41257b0dd441a506ffdcd" upstream="refs/heads/chromeos-v2013.06"/> |
| <project name="chromiumos/third_party/u-boot" path="src/third_party/u-boot/next" revision="b30f38206f17aa73cda0a2fdaf4dc705527315ba" upstream="refs/heads/chromeos-v2015.07-rc1"/> |
| <project name="chromiumos/third_party/whining" path="src/third_party/whining" revision="bcf721d62d6a4c4c162c63714371fa4349df53bc" upstream="refs/heads/master"/> |
| <project name="external/git.kernel.org/fs/xfs/xfstests-dev" path="src/third_party/xfstests" revision="777e1d628029664705d83b16136546ce601889e3" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="external/swarming.client" path="chromite/third_party/swarming.client" remote="chromium" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="3f6478ac95edf86cd3da300c2c0d34a438f5dbeb"/> |
| <project name="platform/bootable/recovery" path="src/aosp/bootable/recovery" remote="aosp" revision="bec0d4cb9444a55028c8143ef264c21dbcca075c" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="47db46b45d266d4cb15040c3b6389a2c18f2ab59" upstream="refs/heads/master"/> |
| <project name="platform/external/libmojo" path="src/aosp/external/libmojo" remote="aosp" revision="24543f227908c2e949bb9a15b40276f59fcc9a0a" upstream="refs/heads/master"/> |
| <project name="platform/external/minijail" path="src/aosp/external/minijail" remote="aosp" revision="7151582f0b847b62ec74c600dd6b99e8a0078c75" upstream="refs/heads/master"/> |
| <project name="toolchain/binutils" path="src/aosp/toolchain/binutils" remote="aosp" revision="c80811581709b9346364e3229b888f9ad830cdf5" upstream="refs/heads/master"/> |
| <project name="toolchain/gcc" path="src/aosp/toolchain/gcc" remote="aosp" revision="32c89c19b042a12b5a1bf0153299154ea5435c03"/> |
| <project name="weave/libweave" path="src/weave/libweave" revision="fa29d8f43a37aaf4b47fd2f3c76785050d075a7d" upstream="refs/heads/master"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="master" change_id="I445e3e3894462b86f84e1c9be2b8066970f15d29" commit="2db7511e19b1782b056f97bdb6abe64a3493d106" commit_message="depot_tools: update hash to ToT We need a change in gerrit_util.py which allows our commit bot to skip GCE authentication and use .netrc instead. So update depot_tools to ToT so it includes this change. CQ-DEPEND=CL:*374269 BUG=chromium:618430 TEST=pre cq passes Change-Id: I445e3e3894462b86f84e1c9be2b8066970f15d29 Signed-off-by: Dominik Behr <dbehr@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/503572 Tested-by: Dominik Behr <dbehr@google.com> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="6" gerrit_number="503572" owner_email="dbehr@chromium.org" pass_count="0" patch_number="2" project="chromiumos/manifest" project_url="https://chromium-review.googlesource.com/chromiumos/manifest" ref="refs/changes/72/503572/2" remote="cros" total_fail_count="6"/><pending_commit branch="chromeos-4.4" change_id="I157946df11c11a2d29b8ae938b210775d3e29225" commit="9137dd9ecbde420c6e95b4adb2ba880e2df8c772" commit_message="UPSTREAM: drm/i915: Avoid use-after-free of intel_encoder in intel_dp_connector_destrpy The drm_dp_aux is associated with the intel_dp encoder and not the connector. Since the encoder is destroyed before the connector, attempting to free the drm_dp_aux from inside the connector cleanup causes a use-after-free. This was applied to the patch that CI was happy with, but in the confusion of so many series trying to make CI happy, the unready patch was plucked. Fixes: c191eca110a3 ("drm/i915: Move intel_connector->unregister to connector->early_unregister") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466411357-730-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit 996818869c9cc25581e81ff809d790651129cb4a) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I157946df11c11a2d29b8ae938b210775d3e29225 Reviewed-on: https://chromium-review.googlesource.com/460160 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460160" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/460160/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I7f55a02aee0693378cbacf7a2a8b744096f269f8" commit="d3edda7202d1aa4ce12ca9be65315bae650bacb5" commit_message="UPSTREAM: drm: Prevent NULL deref in drm_name_info() If a driver does not have a parent, or never sets the unique name for itself, then we may proceed to chase a NULL dereference through debugfs/.../name. Testcase: igt/vgem_basic/debugfs Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466448813-23340-1-git-send-email-chris@chris-wilson.co.uk (cherry picked from commit e4245ea898797f606cf2260c9c1970414b96af78) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I7f55a02aee0693378cbacf7a2a8b744096f269f8 Reviewed-on: https://chromium-review.googlesource.com/460161 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460161" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/460161/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Ib6847ff77c09019db171fcd0122938574921be86" commit="d307c3fdfae007d396bd859aeff2bd489cd86495" commit_message="UPSTREAM: drm: Only do the hw.lock cleanup in master_relase for !MODESET Another place gone where modern drivers could have hit dev->struct_mutex. To avoid too deeply nesting control flow rework it a bit. v2: Review from Chris: - remove spurious newline. - fix file_priv->master like for the !file_priv->is_master case. Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-2-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 0de4cc99c66d2a46e92cd201f7939121d9a1bb23) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ib6847ff77c09019db171fcd0122938574921be86 Reviewed-on: https://chromium-review.googlesource.com/460162 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460162" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/460162/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I2d64b52392a7dbfd2645d84d896edb3aaa11b2f8" commit="1b87fa5541a34c8930f294a997c3fa95de05dd01" commit_message="UPSTREAM: drm: Move authmagic cleanup into drm_master_release It's related, and soon authmagic will also use the master_mutex. There is an ever-so-slightly semantic change here: - authmagic will only be cleaned up for primary_client drm_minors. But it's impossible to create authmagic on render/control nodes, so this is fine. - The cleanup is moved down a bit in the release processing. Doesn't matter at all since authmagic is purely internal logic used by the core ioctl access checks, and when we're in a file's release callback no one can do ioctls any more. v2: Rebased. Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-3-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit a77316bf24f4a86482397707997ff7c951caca56) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I2d64b52392a7dbfd2645d84d896edb3aaa11b2f8 Reviewed-on: https://chromium-review.googlesource.com/460163 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460163" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/460163/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I96cdb989060c2492accdd87de11dca20faee031a" commit="265473ff9c8547b637aceaf90f6e79964ac84877" commit_message="UPSTREAM: drm: Protect authmagic with master_mutex Simplifies cleanup, and there's no reason drivers should ever care about authmagic at all - it's all handled in the core. And with that, Ladies and Gentlemen, it's time to pop the champagen and celebrate: dev->struct_mutex is now officially gone from modern drivers, and if a driver is using gem_free_object_unlocked and doesn't do anything else silly it's positively impossible to ever touch dev->struct_mutex at runtime, anywhere. Well except for the mutex_init on driver load ;-) v2: Rebased. Cc: Chris Wilson <chris@chris-wilson.co.uk> (v1) Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-4-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit d2b34ee62b409a03c6fe43c07b779983be51d017) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I96cdb989060c2492accdd87de11dca20faee031a Reviewed-on: https://chromium-review.googlesource.com/460164 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460164" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/64/460164/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I72c700b2512429ff40bca2866ded1f37c5303e3c" commit="349dbd928a20d5e0535b8263668d4e71c2263451" commit_message="UPSTREAM: drm: Mark authmagic ioctls as unlocked All protected by dev->master_mutex. And there's no driver callbacks, which means no need to sync with old dri1 horror show drivers at all. Hence safe to drop the drm legacy BKL from these paths. Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-5-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 94e86f5d90048ca9ff23803114ede3757298b7e9) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I72c700b2512429ff40bca2866ded1f37c5303e3c Reviewed-on: https://chromium-review.googlesource.com/460165 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460165" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/65/460165/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I860ae87bd32c0717eb97ab7457f7b6378817cf9d" commit="e5b6107d354213f5a0525e3eb540a24cb662782e" commit_message="UPSTREAM: drm: Mark set/drop master ioctl as unlocked. Again this is neatly protected by the dev->master_mutex now. There is a driver callback both for set and drop, but it's only used by vmwgfx. And vmwgfx has it's own solid locking for shared resources (besides dev->master_mutex), hence is all safe. Let's drop another place where the drm legacy bkl is used. Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466148814-8194-6-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit ce833ba9693ca28754c8d468a9290ce04f2fd65a) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I860ae87bd32c0717eb97ab7457f7b6378817cf9d Reviewed-on: https://chromium-review.googlesource.com/460166 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460166" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/460166/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I4b81e077ccdc0c9ac087a7bd4c8b406b66f20c24" commit="920c0c4729d15aec8b245ae9ffedd8f1b6584559" commit_message="UPSTREAM: drm: Add callbacks for late registering Like what has been done for connectors add callbacks on encoder, crtc and plane to let driver do actions after drm device registration. Correspondingly, add callbacks called before unregister drm device. version 2: add drm_modeset_register_all() and drm_modeset_unregister_all() to centralize all calls version 3: in error case unwind registers in drm_modeset_register_all fix uninitialed return value inverse order of unregistration in drm_modeset_unregister_all version 4: move function definitions in drm_crtc_internal.h remove not needed documentation Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466519829-4000-1-git-send-email-benjamin.gaignard@linaro.org (cherry picked from commit 79190ea2658a93818791335aa99969ca779161c6) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I4b81e077ccdc0c9ac087a7bd4c8b406b66f20c24 Reviewed-on: https://chromium-review.googlesource.com/460167 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460167" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/460167/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I43bfd278c9085e0f8ec08fbdd184042bee78887b" commit="0fa0d72910edee66bb762eb3d5404d55a2c6976d" commit_message="UPSTREAM: drm: Move master pointer from drm_minor to drm_device There can only be one current master, and it's for the overall device. Render/control minors don't support master-based auth at all. This simplifies the master logic a lot, at least in my eyes: All these additional pointer chases are just confusing. While doing the conversion I spotted some locking fail: - drm_lock/drm_auth check dev->master without holding the master_mutex. This is fallout from commit c996fd0b956450563454e7ccc97a82ca31f9d043 Author: Thomas Hellstrom <thellstrom@vmware.com> Date: Tue Feb 25 19:57:44 2014 +0100 drm: Protect the master management with a drm_device::master_mutex v3 but I honestly don't care one bit about those old legacy drivers using this. - debugfs name info should just grab master_mutex. - And the fbdev helper looked at it to figure out whether someone is using KMS. We just need a consistent value, so READ_ONCE. Aside: We should probably check if anyone has opened a control node too, but I guess current userspace doesn't really do that yet. v2: Balance locking, reported by Julia. v3: Rebase on top of Chris' oops fixes. Cc: Julia Lawall <julia.lawall@lip6.fr> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v2) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v2) Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466499262-18717-1-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 95c081c17f284de50eaca60d4d55643a64d39019) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I43bfd278c9085e0f8ec08fbdd184042bee78887b Reviewed-on: https://chromium-review.googlesource.com/460168 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460168" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="6" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/460168/6" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I0b1f7ad28386acc2edf7cdd0c6494ef45f69e336" commit="188e6745ff786f7a07b5d5d66eed92b3964a6393" commit_message="BACKPORT: drm: Clean up drm_crtc.h - Group declarations for separate files (drm_bridge.c, drm_edid.c) - Move declarations only used within drm.ko to drm_crtc_internal.h - drm_property_type_valid to drm_crtc.c, its only callsite Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466499262-18717-2-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 81065548aefc0edfc18f046fa5879ff233b11c0f) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Conflicts:[Tarun: "5cb8eaa22 drm/edid: Switch DDC when reading the EDID" is not needed. Ignore those changes] [Retain code introduced by "65d84c5d47 CHROMIUM: drm: add implicit in-fences to atomic V2"] include/drm/drm_crtc.h Modified: ["4281b9fe7 CHROMIUM: drm/vgem: add DRM_IOCTL_VGEM_MODE_MAP_DUMB for render nodes" introduced dumb_map_ioctl, so include the new header file to fix the build issue] drivers/gpu/drm/vgem/vgem_drv.c Change-Id: I0b1f7ad28386acc2edf7cdd0c6494ef45f69e336 Reviewed-on: https://chromium-review.googlesource.com/460169 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460169" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/460169/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Ibaf722890e9978f5653ca45e22f8518dbc287e36" commit="a4b85967b1c0709904ea6a59d641c6541a860dc1" commit_message="UPSTREAM: drm: Use dev->name as fallback for dev->unique Lots of arm drivers get this wrong and for most arm boards this is the right thing actually. And anyway with most loaders you want to chase sysfs links anyway to figure out which dri device you want. This will fix dmesg noise for rockchip and sti. Also add a fallback to driver->name for entirely virtual drivers like vgem. v2: Rebase on top of commit e112e593b215c394c0303dbf0534db0928e87967 Author: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Date: Fri Dec 11 11:20:28 2015 +0100 drm: use dev_name as default unique name in drm_dev_alloc() and simplify a bit. Plus add a comment. v3: WARN_ON(!dev->unique) as discussed with Emil. Cc: Ilia Mirkin <imirkin@alum.mit.edu> Reported-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v2) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466499262-18717-3-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 5079c4643f1f5598d4f265976e84748b3a7eefdf) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ibaf722890e9978f5653ca45e22f8518dbc287e36 Reviewed-on: https://chromium-review.googlesource.com/460170 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460170" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/70/460170/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I7fc6c474b8bb07eea20b584ec08b87c8644a9574" commit="8f9bc2da981c5093086242d827b8f07ae0e16bde" commit_message="UPSTREAM: drm: Refactor drop/set master code a bit File open/set_maseter ioctl and file close/drop_master ioctl share the same master handling code. Extract it. Note that vmwgfx's master_set callback needs to know whether the master is a new one or has been used already, so thread this through. On the close/drop side a similar parameter existed, but wasnt used. Drop it to simplify the flow. v2: Try to make it not leak so much (Emil). v3: Send out the right version ... Cc: Emil Velikov <emil.l.velikov@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1466511638-9885-1-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit d6ed682eba54915ea56315bc2e5a33fca5922997) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I7fc6c474b8bb07eea20b584ec08b87c8644a9574 Reviewed-on: https://chromium-review.googlesource.com/460171 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460171" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/71/460171/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Ib0313be2127c1845edf29b522da1bcd76088c6ee" commit="fe2cb35059dd75c31c74721b40d6d0f0354b85f5" commit_message="BACKPORT: drm: Extract drm_is_current_master Just rolling out a bit of abstraction to be able to clean up the master logic in the next step. Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit b3ac9f2591061e4470834028f563ef1fd86098cf) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Conflicts: [Tarun: Retain drm_master_relax introduced by "af06c2294 CHROMIUM: drm: Add drm_master_relax debugfs file (non-root set/drop master ioctls)" ] include/drm/drmP.h Change-Id: Ib0313be2127c1845edf29b522da1bcd76088c6ee Reviewed-on: https://chromium-review.googlesource.com/460172 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460172" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/72/460172/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I169b1a83201eeb0080315b28dad3ae42c4bc9456" commit="1588f7cb161e7d9757038f255ffb3c118797b492" commit_message="UPSTREAM: drm: Clear up master tracking booleans - is_master can be removed, we can compute this by checking allowed_master (which really just tracks whether a master struct has been allocated for this fpriv in either open or set_master), and whether the fpriv is the current master on the device. - that frees up is_master as a good replacement name for allowed_master. With that it's clear that it tracks whether the fpriv is a master (with possibly clients attached to it and authenticated against it), and that one of those fprivs with is_master set is the current master. v2: Fix kerneldoc for is_master (Emil). Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1466499262-18717-10-git-send-email-daniel.vetter@ffwll.ch (cherry picked from commit 0aae5920a84469e2bb6795f53157ea9072faef5a) from topic/drm-misc-2016-06-22 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I169b1a83201eeb0080315b28dad3ae42c4bc9456 Reviewed-on: https://chromium-review.googlesource.com/460173 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460173" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/73/460173/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I23100a02a0356f3bcddffc45c3f406e26f271ddf" commit="eadcac93791898e06b8051a10b507bcd2647be75" commit_message="UPSTREAM: drm/i915: Fix a buch of kerneldoc warnings Just a bunch of stale kerneldocs generating warnings when building the docs. Mostly function parameters so not very useful but still. v2: Tidy. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1464958937-23344-1-git-send-email-tvrtko.ursulin@linux.intel.com (cherry picked from commit 14bb2c11796d70bf20b92fa4a1459743c6afecb2) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I23100a02a0356f3bcddffc45c3f406e26f271ddf Reviewed-on: https://chromium-review.googlesource.com/460174 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460174" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/74/460174/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I48ff72c217b25c152a7bb35a3ea4475da511c109" commit="f659012c8a8466c0c177a2117be54babdab53863" commit_message="UPSTREAM: drm/i915/guc: disable GuC submission earlier during GuC (re)load When resetting and reloading the GuC, the GuC submission management code also needs to destroy and recreate the GuC client(s). Currently this is done by a separate call from the GuC loader, but really, it's just an internal detail of the submission code. So here we remove the call from the loader (which is too late, really, because the GuC has already been reloaded at this point) and put it into guc_submission_init() instead. This means that any preexisting client is destroyed *before* the GuC (re)load and then recreated after, iff the firmware was successfully loaded. If the GuC reload fails, we don't recreate the client, so fallback to execlists mode (if active) won't leak the client object (previously, the now-unusable client would have been left allocated, and leaked if the driver were unloaded). Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit 29fb72c7ad0347ab7492d633bc66dc8b5734dcc1) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I48ff72c217b25c152a7bb35a3ea4475da511c109 Reviewed-on: https://chromium-review.googlesource.com/460175 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460175" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/75/460175/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Ia26d6d0a277d0fd27d7495c47ef12b9e15fb05b9" commit="8c3c9a4fca2cb485ee26b6184860e25bb5af7684" commit_message="UPSTREAM: drm/i915: Add support for mapping an object page by page Introduced a new vm specfic callback insert_page() to program a single pte in ggtt or ppgtt. This allows us to map a single page in to the mappable aperture space. This can be iterated over to access the whole object by using space as meagre as page size. v2: Added low level rpm assertions to insert_page routines (Chris) v3: Added POSTING_READ post register write (Tvrtko) v4: Rebase (Ankit) v5: Removed wmb() and FLUSH_CTL from insert_page, caller to take care of it (Chris) v6: insert_page not working correctly without FLSH_CNTL write, added the write again. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit d6473f566417a507b9ea5b0fc44ff26d930d0e5d) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ia26d6d0a277d0fd27d7495c47ef12b9e15fb05b9 Reviewed-on: https://chromium-review.googlesource.com/460176 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460176" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/76/460176/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I21b8c9d53c54c0a3490fb597bc4f169f3c87fa03" commit="e4f2d539c76300d1fb9b9aaf879b96cc444a8ba6" commit_message="UPSTREAM: drm/i915: Introduce i915_gem_object_get_dma_address() This utility function is a companion to i915_gem_object_get_page() that uses the same cached iterator for the scatterlist to perform fast sequential lookup of the dma address associated with any page within the object. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit 341be1cd61826a8a143c2fc4cf3e418d1d5efc02) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I21b8c9d53c54c0a3490fb597bc4f169f3c87fa03 Reviewed-on: https://chromium-review.googlesource.com/460177 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460177" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/77/460177/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Id392c6690de9f43e2bc023a134713e66ee9466b9" commit="4aedf6ea35cc94e3cdc5a5f514776952d81cb61d" commit_message="UPSTREAM: drm/i915: Use insert_page for pwrite_fast In pwrite_fast, map an object page by page if obj_ggtt_pin fails. First, we try a nonblocking pin for the whole object (since that is fastest if reused), then failing that we try to grab one page in the mappable aperture. It also allows us to handle objects larger than the mappable aperture (e.g. if we need to pwrite with vGPU restricting the aperture to a measely 8MiB or something like that). v2: Pin pages before starting pwrite, Combined duplicate loops (Chris) v3: Combined loops based on local patch by Chris (Chris) v4: Added i915 wrapper function for drm_mm_insert_node_in_range (Chris) v5: Renamed wrapper function for drm_mm_insert_node_in_range (Chris) v5: Added wrapper for drm_mm_remove_node() (Chris) v6: Added get_pages call before pinning the pages (Tvrtko) Added remove_mappable_node() wrapper for drm_mm_remove_node() (Chris) v7: Added size argument for insert_mappable_node (Tvrtko) v8: Do not put_pages after pwrite, do memset of node in the wrapper function (insert_mappable_node) (Chris) v9: Rebase (Ankit) Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit 4f1959ee33c0a0a1bb22a911a162744e30ef6d97) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Id392c6690de9f43e2bc023a134713e66ee9466b9 Reviewed-on: https://chromium-review.googlesource.com/460178 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460178" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/78/460178/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Ia386066c276e6ab82e80d27f14f80f776dc0fc4c" commit="a2da41e23e9845b4523c798ea45a11609a19192a" commit_message="UPSTREAM: drm/i915: Support for pread/pwrite from/to non shmem backed objects This patch adds support for extending the pread/pwrite functionality for objects not backed by shmem. The access will be made through gtt interface. This will cover objects backed by stolen memory as well as other non-shmem backed objects. v2: Drop locks around slow_user_access, prefault the pages before access (Chris) v3: Rebased to the latest drm-intel-nightly (Ankit) v4: Moved page base & offset calculations outside the copy loop, corrected data types for size and offset variables, corrected if-else braces format (Tvrtko/kerneldocs) v5: Enabled pread/pwrite for all non-shmem backed objects including without tiling restrictions (Ankit) v6: Using pwrite_fast for non-shmem backed objects as well (Chris) v7: Updated commit message, Renamed i915_gem_gtt_read to i915_gem_gtt_copy, added pwrite slow path for non-shmem backed objects (Chris/Tvrtko) v8: Updated v7 commit message, mutex unlock around pwrite slow path for non-shmem backed objects (Tvrtko) v9: Corrected check during pread_ioctl, to avoid shmem_pread being called for non-shmem backed objects (Tvrtko) v10: Moved the write_domain check to needs_clflush and tiling mode check to pwrite_fast (Chris) v11: Use pwrite_fast fallback for all objects (shmem and non-shmem backed), call fast_user_write regardless of pagefault in previous iteration v12: Use page-by-page copy for slow user access too (Chris) v13: Handled EFAULT, Avoid use of WARN_ON, put_fence only if whole obj pinned (Chris) v14: Corrected datatypes/initializations (Tvrtko) Testcase: igt/gem_stolen, igt/gem_pread, igt/gem_pwrite Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1465548783-19712-1-git-send-email-ankitprasad.r.sharma@intel.com (cherry picked from commit b50a53715f09888a5dfd8592cecfa527db7a204f) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Ia386066c276e6ab82e80d27f14f80f776dc0fc4c Reviewed-on: https://chromium-review.googlesource.com/460179 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460179" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/79/460179/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I54b4330bf625c53b913521fe7d2c52e4941a4e93" commit="9d527a04ea594ae98c077454d032f713bc7e14f3" commit_message="UPSTREAM: drm/i915: Don't unregister fbdev's fb twice Calling drm_framebuffer_unregister_private() in intel_fbdev_destroy() is superfluous because the framebuffer will subsequently be unregistered by drm_framebuffer_free() when unreferenced in drm_framebuffer_remove(). The call is a leftover, when it was introduced by commit 362063619cf6 ("drm: revamp framebuffer cleanup interfaces"), struct intel_framebuffer was still embedded in struct intel_fbdev rather than being a pointer as it is today, and drm_framebuffer_remove() wasn't used yet. As a bonus, the ID of the framebuffer is no longer 0 in the debug log: Before: [ 39.680874] [drm:drm_mode_object_unreference] OBJ ID: 0 (3) [ 39.680878] [drm:drm_mode_object_unreference] OBJ ID: 0 (2) [ 39.680884] [drm:drm_mode_object_unreference] OBJ ID: 0 (1) After: [ 102.504649] [drm:drm_mode_object_unreference] OBJ ID: 45 (3) [ 102.504651] [drm:drm_mode_object_unreference] OBJ ID: 45 (2) [ 102.504654] [drm:drm_mode_object_unreference] OBJ ID: 45 (1) Signed-off-by: Lukas Wunner <lukas@wunner.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/5031860caad67faa0f1be5965331ef048a311a01.1465383212.git.lukas@wunner.de (cherry picked from commit 2ce0004cd019f8c3da5d7657794c261ebdd730c0) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I54b4330bf625c53b913521fe7d2c52e4941a4e93 Reviewed-on: https://chromium-review.googlesource.com/460180 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460180" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/80/460180/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I62753416141f77e62e44abfe82cb8622b765656c" commit="16642bf174e03bd1208379c82fa0e023f7596717" commit_message="UPSTREAM: drm/i915: use #defines for qemu subsystem ids Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1465821536-21312-1-git-send-email-kraxel@redhat.com (cherry picked from commit 94bb489c89c4ca7dc36bfbe50e77f26d8458e347) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I62753416141f77e62e44abfe82cb8622b765656c Reviewed-on: https://chromium-review.googlesource.com/460181 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460181" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/81/460181/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Iad1822eccabba2b530ca790ec796203315adb973" commit="c9ba4e5ad3e133a58bbf97170aa74918c7099efe" commit_message="UPSTREAM: drm/i915/guc: prefer 'dev_priv' to 'dev' for static functions Convert all static functions in i915_guc_submission.c that currently take a 'dev' pointer to take 'dev_priv' instead (there are three, guc_client_alloc(), guc_client_free(), and gem_allocate_guc_obj(). Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit 0daf556c1ba522fdaec330a4d4c93d58f2fc3695) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: Iad1822eccabba2b530ca790ec796203315adb973 Reviewed-on: https://chromium-review.googlesource.com/460182 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460182" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/82/460182/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I547bd4868cca7cad550f8201b397dfb05d54f474" commit="945018021b1006b47a9f17ea54697dd199c79281" commit_message="UPSTREAM: drm/i915/guc: prefer 'dev_priv' to 'dev' for intra-module functions There are four non-static functions in i915_guc_submission.c that take a 'dev' parameter. All are called only from GuC loader code, and can be easily converted to accept 'dev_priv' instead. Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1465579766-31595-1-git-send-email-david.s.gordon@intel.com (cherry picked from commit beffa5176fa26494039f9f83e445362494ebe908) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I547bd4868cca7cad550f8201b397dfb05d54f474 Reviewed-on: https://chromium-review.googlesource.com/460183 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460183" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/83/460183/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="I437d4d84fe368dfeca53d1288ef3be4ce2677ae4" commit="469495dc9df97e1a6996eebb005b72044ff4a60d" commit_message="UPSTREAM: drm/i915:bxt: Enable Pooled EU support This mode allows to assign EUs to pools which can process work collectively. The command to enable this mode should be issued as part of context initialization. The pooled mode is global, once enabled it has to stay the same across all contexts until HW reset hence this is sent in auxiliary golden context batch. Thanks to Mika for the preliminary review and comments. v2: explain why this is enabled in golden context, use feature flag while enabling the support (Chris) v3: Include only kernel support as userspace support is not available yet. User space clients need to know when the pooled EU feature is present and enabled on the hardware so that they can adapt work submissions. Create a new device info flag for this purpose. Set has_pooled_eu to true in the Broxton static device info - Broxton supports the feature in hardware and the driver will enable it by default. We need to add getparam ioctls to enable userspace to query availability of this feature and to retrieve min. no of eus in a pool but we will expose them once userspace support is available. Opensource users for this feature are mesa, libva and beignet. Beignet team is currently working on adding userspace support. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v2) Cc: Winiarski, Michal <michal.winiarski@intel.com> Cc: Zou, Nanhai <nanhai.zou@intel.com> Cc: Yang, Rong R <rong.r.yang@intel.com> Cc: Mika Kuoppala <mika.kuoppala@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Armin Reese <armin.c.reese@intel.com> Cc: Tim Gore <tim.gore@intel.com> Signed-off-by: Jeff McGee <jeff.mcgee@intel.com> Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com> Reviewed-by: Micha Winiarski <michal.winiarski@intel.com> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (cherry picked from commit 33e141ed1cf74cd8ef26e5f175e43e378157a649) from drm-intel-next-2016-06-20 Signed-off-by: Tarun <tarun.vyas@intel.com> BUG=b:36446508 TEST=No regressions in KBL and APL based devices Change-Id: I437d4d84fe368dfeca53d1288ef3be4ce2677ae4 Reviewed-on: https://chromium-review.googlesource.com/460184 Commit-Ready: Wayne Boyer <wayne.boyer@intel.com> Tested-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Sean Paul <seanpaul@chromium.org> " fail_count="7" gerrit_number="460184" owner_email="tarun.vyas@intel.com" pass_count="0" patch_number="7" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/84/460184/7" remote="cros" total_fail_count="10"/><pending_commit branch="chromeos-4.4" change_id="Ie9f769c1529b7232c3dbdc0c123b9973d913132b" commit="84f6779c9599e7289077f7df3cef38dccdf397f1" commit_message="UPSTREAM: mmc: sdhci: Fix strings broken across multiple lines This is a trivial patch which fixes printed strings split across two or more lines in the source. I tried to grep for some error output*, but I couldn't find it easily because it was broken across multiple lines. This patch makes my life easier. * in particular "Timeout waiting for hardware interrupt." BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Ie9f769c1529b7232c3dbdc0c123b9973d913132b Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 2e4456f08fa81b9a4804379c56c7ef02c0b0d8f0) Reviewed-on: https://chromium-review.googlesource.com/508007 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="2" gerrit_number="508007" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/07/508007/1" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I25bb969044cf5ef4ced7f0f8b57b9bc3eccbb4b4" commit="9ac05943517c5392a35f6fcd0d3e7ec7814bb9d0" commit_message="UPSTREAM: mmc: sdhci: avoid unnecessary mapping/unmapping of align buffer Unnecessarily mapping and unmapping the align buffer for SD cards is expensive: performance measurements on iMX6 show that this gives a hit of 10% on hdparm buffered disk reads. MMC/SD card IO comes from the mm/vfs which gives us page based IO, so for this case, the align buffer is not going to be used. However, we still map and unmap this buffer. Eliminate this by switching the align buffer to be a DMA coherent buffer, which needs no DMA maintenance to access the buffer. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I25bb969044cf5ef4ced7f0f8b57b9bc3eccbb4b4 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: stable@vger.kernel.org # v4.5+ Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit edd63fcc97cdb53279a7c43fa1691f5913d92793) Reviewed-on: https://chromium-review.googlesource.com/508008 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508008" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/08/508008/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="If3d2dd5aa3dbc55149f2386f78fa37db7b0014ca" commit="7b18994f6bc9b2aa92dd475eeea02935de55be45" commit_message="UPSTREAM: mmc: sdhci: plug DMA mapping leak on error If we terminate a command early, we fail to properly clean up the DMA mappings for the data part of the request. Put this clean up to the tasklet, which is the common path for finishing a request so we always clean up after ourselves. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: If3d2dd5aa3dbc55149f2386f78fa37db7b0014ca Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [ Split original patch so that it now contains only the fix ] Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: stable@vger.kernel.org # v4.5+ Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 054cedff5e025a54ceefff891c6ea42ee8b37eab) Reviewed-on: https://chromium-review.googlesource.com/508009 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508009" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/09/508009/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Iba50dcfc3dfc64c6e2ffee4421a51bfa72fe2968" commit="7fd19eb1bcd7cd38d16687d8c632213e374db74d" commit_message="UPSTREAM: mmc: sdhci: further fix for DMA unmapping in sdhci_post_req() sdhci_post_req() exists to unmap a previously mapped but already finished request, while the next request is in progress. However, the state of the SDHCI_REQ_USE_DMA flag depends on the last submitted request. This means we can end up clearing the flag due to a quirk, which then means that sdhci_post_req() fails to unmap the DMA buffer, potentially leading to data corruption. We can safely ignore the SDHCI_REQ_USE_DMA here, as testing data->host_cookie is entirely sufficient. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Iba50dcfc3dfc64c6e2ffee4421a51bfa72fe2968 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [ Re-based to apply as a separate fix ] Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: stable@vger.kernel.org # v4.5+ Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 771a3dc225815b7cc691c1ce703a3af8488e48df) Reviewed-on: https://chromium-review.googlesource.com/508010 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508010" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/10/508010/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I005c6cf597bd8b7f77fa67066d9a7fb6e897fab2" commit="94929463b8d3e9f507a7973787eacb3e73f7c938" commit_message="UPSTREAM: mmc: sdhci: allocate alignment and DMA descriptor buffer together Allocate both the alignment and DMA descriptor buffers together. The size of the alignment buffer will always be aligned to the hosts required alignment, which gives appropriate alignment to the DMA descriptors. We have a maximum of 128 segments, and a maximum alignment of 64 bits. This gives a maximum alignment buffer size of 1024 bytes. The DMA descriptors are a maximum of 12 bytes, and we allocate 128 * 2 + 1 of these, which gives a maximum DMA descriptor buffer size of 3084 bytes. This means the allocation for a 4K page sized system will be an order-1 allocation, since the resulting overall size is 4108. This is more prone to failure than page-sized allocations, but since this allocation commonly occurs at startup, the chances of failure are small. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I005c6cf597bd8b7f77fa67066d9a7fb6e897fab2 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [ Changed to check ADMA table alignment ] Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit e66e61cba1fffc53151b5303688f9c077f87104c) Reviewed-on: https://chromium-review.googlesource.com/508011 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508011" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/11/508011/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I4199e16055f7adfa9542864c5490476c9c84d3b5" commit="b38e5f8fbb55383a008522feb2cf57852be3b8db" commit_message="UPSTREAM: mmc: sdhci: clean up coding style in sdhci_adma_table_pre() BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I4199e16055f7adfa9542864c5490476c9c84d3b5 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit acc3ad13832ab1aa01bdf9b7e1d76171d1e4d060) Reviewed-on: https://chromium-review.googlesource.com/508012 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508012" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/12/508012/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I123f34c69cbefd1c70f6cf324489a07290cb23a8" commit="6690e9959fa147c00d7df88db25e5a12218a5dd7" commit_message="UPSTREAM: mmc: sdhci: avoid walking SG list for writes If we are writing data to the card, there is no point in walking the scatterlist to find out if there are any unaligned entries; this is a needless waste of CPU cycles. Avoid this by checking for a non-read tranfer first. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I123f34c69cbefd1c70f6cf324489a07290cb23a8 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 47fa961340d2181ebf1165b7651dcbb1b1029163) Reviewed-on: https://chromium-review.googlesource.com/508013 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508013" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/13/508013/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I65099f68e63655e971fc8c0b95a1e5703f0bca30" commit="6dcf808b52bcc476ae4e7efd683864dc29e04e64" commit_message="UPSTREAM: mmc: sdhci: factor out common DMA cleanup in sdhci_finish_data() sdhci_finish_data() has two paths which result in identical DMA cleanup. One is when SDHCI_USE_ADMA is clear, and the other is just before when SDHCI_USE_ADMA is set, and is performed within sdhci_adma_table_post(). Simplify the code by removing the 'else' and eliminating the duplicate inside sdhci_adma_table_post(). BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I65099f68e63655e971fc8c0b95a1e5703f0bca30 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit f55c98f7466c2e52125d6ffd69295c0158ac609a) Reviewed-on: https://chromium-review.googlesource.com/508014 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508014" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/14/508014/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Id8282108983b2f4aa556ec8d089582e2556068b0" commit="08cac5dbaf399af028ccb771969fa61a1f43c373" commit_message="UPSTREAM: mmc: sdhci: move sdhci_pre_dma_transfer() Move sdhci_pre_dma_transfer() to avoid needing to declare this function before use. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Id8282108983b2f4aa556ec8d089582e2556068b0 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 48857d9b7865c4110ecf9c57b85224a3ec84ad54) Reviewed-on: https://chromium-review.googlesource.com/508015 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508015" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/15/508015/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Ia5351eeba3482c9ca2a156bba6a82a51f9ab649c" commit="3b0977dd0a77dc66d29799f6cc9becc9bc6e2c7b" commit_message="UPSTREAM: mmc: sdhci: factor out sdhci_pre_dma_transfer() from sdhci_adma_table_pre() In sdhci_prepare_data(), when SDHCI_REQ_USE_DMA is set, there are two paths that prepare the data buffers for transfer. One is when SDHCI_USE_ADMA is set, and is located inside sdhci_adma_table_pre(). The other is when SDHCI_USE_ADMA is clear, in the else clause of the above. Factor out the call to sdhci_pre_dma_transfer() along with its error checking. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Ia5351eeba3482c9ca2a156bba6a82a51f9ab649c Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 60c647624a67f6057866b685ba20abce52e259e5) Reviewed-on: https://chromium-review.googlesource.com/508016 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508016" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/16/508016/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Id83ac3e5ab70a8d599c3ca0e94f21b6acda12a1d" commit="bf90a616f8f1ecc36b08c1e29df8f49de5062de7" commit_message="UPSTREAM: mmc: sdhci: pass the cookie into sdhci_pre_dma_transfer() Pass the desired cookie for a successful map. This is in preparation to clean up the MAPPED/GIVEN states. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Id83ac3e5ab70a8d599c3ca0e94f21b6acda12a1d Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit c0999b720c4f9c34cf10f79caf71bf8c1a246390) Reviewed-on: https://chromium-review.googlesource.com/508017 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508017" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/17/508017/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I2fb16a6defc2bc283ef50650ec708a0aabf87515" commit="38077c9aea19551c5fead97f8d6539c7ad08875d" commit_message="UPSTREAM: mmc: sdhci: always unmap a mapped data transfer in sdhci_post_req() If the host cookie indicates that the data buffers of a request are mapped at sdhci_post_req() time, always unmap the data buffers. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I2fb16a6defc2bc283ef50650ec708a0aabf87515 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit f48f039cd2d33d01ba15e92018dc18a0ea68c764) Reviewed-on: https://chromium-review.googlesource.com/508018 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508018" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/18/508018/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Id1a5fb479789782674dbb839b93bdc1874608720" commit="1c5997e4eb68209a7b369796d6665763816365da" commit_message="UPSTREAM: mmc: sdhci: clean up host cookie handling Commit d31911b9374a ("mmc: sdhci: fix dma memory leak in sdhci_pre_req()") added a complicated method to manage the DMA map state for the data transfer, but this complexity is not required. There are three states: * Unmapped * Mapped by sdhci_pre_req() * Mapped by sdhci_prepare_data() sdhci_prepare_data() needs to know when the data buffers have been successfully mapped by sdhci_pre_req(), and if so, there is no need to map them a second time. When we come to tear down the mapping, we want to know whether sdhci_post_req() will be called (which is determined by sdhci_pre_req() having been previously called) so that we can postpone the unmap operation. Hence, it makes sense to simply record when the successful DMA map happened (via COOKIE_PRE_MAPPED vs COOKIE_MAPPED) rather than having the complex mechanics involving COOKIE_MAPPED vs COOKIE_GIVEN. If a mapping is created by sdhci_prepare_data(), we must tear it down ourselves, without waiting for sdhci_post_req() (hence, the new COOKIE_MAPPED case). If the mapping is created by sdhci_pre_req() then sdhci_post_req() is responsible for tearing the mapping down. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Id1a5fb479789782674dbb839b93bdc1874608720 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 94538e51d67da97e798d379d6bcf3d386d609bfb) Reviewed-on: https://chromium-review.googlesource.com/508019 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508019" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/19/508019/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Ic8261739e1edcbe6eff5d0fb57845403aa4f7857" commit="50a3d7bd0b2c739cfa84e11288695796839ea0c6" commit_message="UPSTREAM: mmc: sdhci: cleanup DMA un-mapping The patch "mmc: sdhci: plug DMA mapping leak on error" added un-mapping logic to sdhci_tasklet_finish() where it is always called, thereby preventing the mapping leaking. Consequently the un-mapping code in sdhci_finish_data() is no longer needed. Remove it. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Ic8261739e1edcbe6eff5d0fb57845403aa4f7857 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [ Split from original "mmc: sdhci: plug DMA mapping leak on error" patch ] Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit add8913d5d73fe617fd7fa0f62f170c8ac5f313b) Reviewed-on: https://chromium-review.googlesource.com/508020 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508020" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/20/508020/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="If73075cc0e76701644a760d1e9bde411d10efa8c" commit="0f5452a3e91dcc66a44709ec7ed4d27393adc929" commit_message="UPSTREAM: mmc: sdhci: prepare DMA address/size quirk handling consolidation Prepare to consolidate the DMA address/size quirk handling into one single loop. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: If73075cc0e76701644a760d1e9bde411d10efa8c Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit a0eaf0f93f0630ac09519e27c84f88c8e41c6f8b) Reviewed-on: https://chromium-review.googlesource.com/508021 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508021" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/21/508021/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="If42b6c0b1f5d635b8f2fa652494180d14bf3d971" commit="a6d0872a0558576c7cccb6722ac7c8c2bf56b6e3" commit_message="UPSTREAM: mmc: sdhci: consolidate the DMA/ADMA size/address quicks Rather than scanning the scatterlist multiple times for each quirk, scan it once, checking for each possible quirk. This should be cheaper due to the length and offset members commonly sharing the same cache line than scanning the scatterlist multiple times. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: If42b6c0b1f5d635b8f2fa652494180d14bf3d971 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit df953925a504d3c7a2a8814143a044c14d6660c0) Reviewed-on: https://chromium-review.googlesource.com/508022 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508022" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/22/508022/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Iab6886da4889297bbb807067eb37836a6f9e24f5" commit="d36d179b7def4fc719d7b139d29e546acc7fa26b" commit_message="UPSTREAM: mmc: sdhci: further code simplication Further simplify the code in sdhci_prepare_data() - we don't set SDHCI_REQ_USE_DMA anywhere else in the driver, so there is no need to set it, and then immediately test it. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Iab6886da4889297bbb807067eb37836a6f9e24f5 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit fce1442164cff51250c8f264b3757fd76f2a955b) Reviewed-on: https://chromium-review.googlesource.com/508023 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508023" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/23/508023/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I391cbf181d608b9a75af75e7178ab94ff17bf540" commit="a4466aea724f5e75b726d61527c559b0efcd82a4" commit_message="UPSTREAM: mmc: sdhci: Set DMA mask when adding host Set the DMA mask in sdhci_add_host() after we determined the capabilities of the device. 64-bit devices in particular are given the proper mask that ensures bounce buffers are not used. Also disable DMA if no proper DMA mask can be set, as the DMA-API documentation specifies. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I391cbf181d608b9a75af75e7178ab94ff17bf540 Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 7b91369b46559dcc90e8d414e31c0257972e0cbb) Reviewed-on: https://chromium-review.googlesource.com/508024 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508024" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/24/508024/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I707f67d034893a8dade48ac1a4ab5f69c75b4e7f" commit="3daec121498fef14714cc375cc59cecdd41a00d1" commit_message="UPSTREAM: mmc: sdhci-acpi: Remove enable_dma() hook This hook was solely used to set the DMA mask, which is now done by the newly-added sdhci_set_dma_mask() function. The use of a flag to ensure the mask is only set once is a strong hint that it should not have been done there anyway. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I707f67d034893a8dade48ac1a4ab5f69c75b4e7f Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 741b48f4f39730fdf74bc5892fca2de2fe798b63) Reviewed-on: https://chromium-review.googlesource.com/508025 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508025" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/25/508025/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I2b5fead46566118ab6eee49d4c59b903c6702639" commit="1d34f32184b6217b1da7d86a6a6186ba05f3a4b8" commit_message="UPSTREAM: mmc: sdhci-pci: Do not set DMA mask in enable_dma() DMA mask will already be set by sdhci_set_dma_mask(), which is equivalent to the removed code since pci_set_dma_mask() expands to its DMA-API counterpart. There should also be no reason to set the DMA mask after probe. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: I2b5fead46566118ab6eee49d4c59b903c6702639 Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit bd9ff18bffcd1861ff0c7dc3fd06d0df2510cc42) Reviewed-on: https://chromium-review.googlesource.com/508026 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508026" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/26/508026/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Id2e67ca3487a699fee508d1e18151ca462f0cc7e" commit="92dab42ee12de549474b51cb118441800ccd2ecb" commit_message="UPSTREAM: ARM: mach-imx: sdhci-esdhc-imx: initialize DMA mask With commit 7b91369b4655 ("mmc: sdhci: Set DMA mask when adding host") DMA access got disabled for device drivers with zero DMA mask property. sdhci-esdhc-imx got blocked from DMA access by this. Hence: initialize the DMA mask to enable access again. BUG=chromium:721944 TEST=hardware_StorageFio Change-Id: Id2e67ca3487a699fee508d1e18151ca462f0cc7e Signed-off-by: Alexander Kurz <akurz@blala.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit fc26fe9c3869f02dd9dc54ff3a45c6d9d4bbbdfa) Reviewed-on: https://chromium-review.googlesource.com/508027 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="508027" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/27/508027/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I0e80455a16ac2da3a62f35e2998c70eb80f39dd5" commit="bbd5500f3286d3cf930c7e7395c25bd24e61f4b2" commit_message="UPSTREAM: spi: expose master transfer size limitation. On some SPI controllers it is not feasible to transfer arbitrary amount of data at once. When the limit on transfer size is a few kilobytes at least it makes sense to use the SPI hardware rather than reverting to gpio driver. The protocol drivers need a way to check that they do not sent overly long messages, though. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 4acad4aae10d1fa79a075b38b5c73772c44f576c) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I0e80455a16ac2da3a62f35e2998c70eb80f39dd5 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505348 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505348" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/48/505348/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I391f8e8bac7d86e149205f390974692a4408627f" commit="3d69347d877cb5ebe8dcc37210aa210474cadec1" commit_message="UPSTREAM: spi: Document max_transfer_size Fix kernel-doc warning for missing struct field notation. ..//include/linux/spi/spi.h:540: warning: No description found for parameter 'max_transfer_size' [Meaningful subject -- broonie] Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit ee7683a31683c6368a66a83c555600dfd704e543) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I391f8e8bac7d86e149205f390974692a4408627f Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505349 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505349" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/49/505349/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I369fe75555cc88b352bc729d7f8bf2c6b90a0598" commit="762eb778dca50d6486961ed9bc1be0b3efd22ace" commit_message="UPSTREAM: spi: introduce accelerated read support for spi flash devices In addition to providing direct access to SPI bus, some spi controller hardwares (like ti-qspi) provide special port (like memory mapped port) that are optimized to improve SPI flash read performance. This means the controller can automatically send the SPI signals required to read data from the SPI flash device. For this, SPI controller needs to know flash specific information like read command to use, dummy bytes and address width. Introduce spi_flash_read() interface to support accelerated read over SPI flash devices. SPI master drivers can implement this callback to support interfaces such as memory mapped read etc. m25p80 flash driver and other flash drivers can call this make use of such interfaces. The interface should only be used with SPI flashes and cannot be used with other SPI devices. Signed-off-by: Vignesh R <vigneshr@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 556351f14e74db4cd3ddde386457edce7bf0b27f) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I369fe75555cc88b352bc729d7f8bf2c6b90a0598 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505350 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505350" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/505350/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I383eac82a0372857727928d9651cbab45f59d8cb" commit="b148c639d1e8de6e4796fb7ec499374fddf96562" commit_message="UPSTREAM: spi: Add cond_resched() in main message processing loop When a controller has only PIO support it is very likely that we will run into use cases where we spend a very large amount of time consuming CPU. Code that does this should call cond_resched() every once in a while to give other tasks more of a chance to run so do that in the main SPI loop, the overhead is negligable if it's not needed. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 628269704f19fcfc765499b7158effccfc79b6cf) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I383eac82a0372857727928d9651cbab45f59d8cb Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505351 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505351" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/51/505351/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I39c567575b43f77b11bf7b2278123af58257f60a" commit="82069fdfe4c3b1cfbe20c87253bb50e53cac9602" commit_message="UPSTREAM: spi: core: Fix deadlock when sending messages The function __spi_pump_messages() is called by spi_pump_messages() and __spi_sync(). The function __spi_sync() has an argument 'bus_locked' that indicates if it is called with the SPI bus mutex held or not. If 'bus_locked' is false then __spi_sync() will acquire the mutex itself. Commit 556351f14e74 ("spi: introduce accelerated read support for spi flash devices") made a change to acquire the SPI bus mutex within __spi_pump_messages(). However, this change did not check to see if the mutex is already held. If __spi_sync() is called with the mutex held (ie. 'bus_locked' is true), then a deadlock occurs when __spi_pump_messages() is called. Fix this deadlock by passing the 'bus_locked' state from __spi_sync() to __spi_pump_messages() and only acquire the mutex if not already held. In the case where __spi_pump_messages() is called from spi_pump_messages() it is assumed that the mutex is not held and so call __spi_pump_messages() with 'bus_locked' set to false. Finally, move the unlocking of the mutex to the end of the __spi_pump_messages() function to simplify the code and only call cond_resched() if there are no errors. Fixes: 556351f14e74 ("spi: introduce accelerated read support for spi flash devices") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 49023d2e4ead0fc9e0896331037746b267d46ad4) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I39c567575b43f77b11bf7b2278123af58257f60a Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505352 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505352" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/52/505352/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic2ee83a6e3de2263017cc01f9d8cf5dbf8d798ee" commit="ee777d60ed48313a976ce84e200d4309407ba383" commit_message="UPSTREAM: spi: fix possible deadlock between internal bus locks and bus_lock_flag External users may use spi_bus_lock to get exclusive access. This will also grab the bus_lock_mutex and may therefore result in a deadlock if __spi_pump_messages also tries to get the mutex. Therefore adapt spi_pump_messages as well as spi_sync to preset the bus_locked parameter according to the master->bus_lock_flag. Fixes: 49023d2e4ead ("spi: core: Fix deadlock when sending messages") Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 24c8cd1b081286fd34340f0e1fc68a774a5a775f) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: Ic2ee83a6e3de2263017cc01f9d8cf5dbf8d798ee Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505353 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505353" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/505353/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I5419cd7d4f57ed890cf66c279a8660f5d8ddd2e2" commit="d1251dee8795e94e695e3bcc944540a210e0a93d" commit_message="UPSTREAM: spi: core: add hook flash_read_supported to spi_master If hook spi_flash_read is implemented the fast flash read feature is enabled for all devices attached to the respective master. In most cases there is just one flash chip, however there are also devices with more than one flash chip, namely some WiFi routers. Then the fast flash read feature can be used for the first chip only. OpenWRT implemented an own handling of this case, using controller_data element of spi_device to hold the information whether fast flash read can be used for a device. This patch adds hook flash_read_supported to spi_master which is used to extend spi_flash_read_supported() by checking whether the fast flash read feature can be used for a specific spi_device. If the hook is not implemented the default behavior is to allow fast flash read for all devices (if spi_flash_read is implemented). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 7ba2f2757d84eae533679306f03c93c118437a87) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I5419cd7d4f57ed890cf66c279a8660f5d8ddd2e2 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505354 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505354" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/505354/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I03e4ed60c8863c775c0e3f9f9cb1838002e5ea1d" commit="1efa21a61c45d8c1d6bbd639dbc9092c90b29a90" commit_message="UPSTREAM: mtd: devices: m25p80: add support for mmap read request Certain SPI controllers may provide accelerated hardware interface to read from m25p80 type flash devices in order to provide better read performance. SPI core supports such devices with spi_flash_read() API. Call spi_flash_read(), if supported, to make use of such interface. Signed-off-by: Vignesh R <vigneshr@ti.com> [Brian: add memset()] Signed-off-by: Brian Norris <computersforpeace@gmail.com> (cherry picked from commit 08922f644878c9163ada8df3ef9def89be1d5e90) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I03e4ed60c8863c775c0e3f9f9cb1838002e5ea1d Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505355 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505355" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/55/505355/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I3e25ec99824dcc727951c069e469b72c8f8ac6b2" commit="663063bc540576425b84b5c42aa4fcce50eebeaa" commit_message="UPSTREAM: mtd: spi-nor: change return value of read/write Change the return value of spi-nor device read and write methods to allow returning amount of data transferred and errors as read(2)/write(2) does. Also, start handling positive returns in spi_nor_read(), since we want to convert drivers to start returning the read-length both via *retlen and the return code. (We don't need to do the same transition process for spi_nor_write(), since ->write() didn't used to have a return code at all.) Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 59451e1233bd315c5379a631838a03d80e689581) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I3e25ec99824dcc727951c069e469b72c8f8ac6b2 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505356 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505356" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/505356/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ibadc6dcca4d5c692d5cb27a5f1f5673b44048b3c" commit="32aa26ad53965767409ced66358ebb10f7a8b372" commit_message="UPSTREAM: mtd: m25p80: return amount of data transferred or error in read/write Add checking of SPI transfer errors and return them from read/write functions. Also return the amount of data transferred. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 1992297b0810a42d78ec7b4de15304eb0489fd97) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: Ibadc6dcca4d5c692d5cb27a5f1f5673b44048b3c Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505357 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505357" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/505357/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I939117e3249731a843ee6a226656055c6218f3e8" commit="b7a4a2c9fb3033e170b0000b2db8868ed60dd444" commit_message="UPSTREAM: mtd: fsl-quadspi: return amount of data read/written or error Return amount of data read/written or error as read(2)/write(2) does. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit fc0d7e542a0d4193521899d15f8f4999dc295323) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I939117e3249731a843ee6a226656055c6218f3e8 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505358 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505358" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/505358/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I2334a415a22f0ca5910be847c345bd1d65c6ed2d" commit="529619ba6fd218f97b2a57f5618701c6e01eca9c" commit_message="UPSTREAM: mtd: mtk-quadspi: return amount of data transferred or error in read/write Add checking of SPI transfer errors and return them from read/write functions. Also return the amount of data transferred. Signed-off-by: Brian Norris <computersforpeace@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 78b400fde966fac6d1bc22b2960a757305215e1b) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I2334a415a22f0ca5910be847c345bd1d65c6ed2d Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505359 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505359" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/505359/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I4528b59da5a991d03b011cdd2f4c16054840bfb7" commit="f495929457b3d8ca386205236fde9a4f95de25dd" commit_message="UPSTREAM: mtd: nxp-spifi: return amount of data transferred or error in read/write Add checking of SPI transfer errors and return them from read/write functions. Also return the amount of data transferred. Signed-off-by: Brian Norris <computersforpeace@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit bc418cd2652f47a327e27f978caa3d85f9558b09) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I4528b59da5a991d03b011cdd2f4c16054840bfb7 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505360 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505360" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/505360/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I00e69abd61fb4fa43589447d49fbf7e97526dad5" commit="669fe93d7a9c62b18aafc33b4b6f774e4bf4d362" commit_message="UPSTREAM: mtd: spi-nor: check return value from write SPI NOR hardware drivers now return useful value from their write functions so check them. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 0bad7b9304d543dd7627f4cd564aea5d7338b950) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I00e69abd61fb4fa43589447d49fbf7e97526dad5 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505361 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505361" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/505361/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I84d4f0f8323a55056aebc5c57b8925214c16e58f" commit="15fea8f59014cc828b7c4800eba939ef158f6d33" commit_message="UPSTREAM: mtd: spi-nor: stop passing around retlen Do not pass retlen to hardware driver read/write functions. Update it in spi-nor generic driver instead. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 2dd087b16946cf168f401526adf26afa771bb740) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I84d4f0f8323a55056aebc5c57b8925214c16e58f Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505362 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505362" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/505362/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic1117327bf1b30a0e8fcf4ea86ebbeeeffb1b014" commit="4307cb01d8b4d4ba4cc66145260d420cfaade705" commit_message="UPSTREAM: mtd: spi-nor: simplify write loop The spi-nor write loop assumes that what is passed to the hardware driver write() is what gets written. When write() writes less than page size at once data is dropped on the floor. Check the amount of data writen and exit if it does not match requested amount. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit e5d05cbd6d8b01f08c95c427a36c66aac769af4f) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: Ic1117327bf1b30a0e8fcf4ea86ebbeeeffb1b014 Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505363 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505363" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/505363/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="If7f58b92ccfbec28bfa1aedaa2a6da3c554076db" commit="ab14286f7f02a2ae0130066cef77885a2970e38c" commit_message="UPSTREAM: mtd: spi-nor: add read loop mtdblock and ubi do not handle the situation when read returns less data than requested. Loop in spi-nor until buffer is filled or an error is returned. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Tested-by Cyrille Pitchen <cyrille.pitchen@atmel.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 26f9bcad29a6c240881bd4efc90f16a9990dd6c2) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: If7f58b92ccfbec28bfa1aedaa2a6da3c554076db Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505364 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505364" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/64/505364/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="If15203215edb29ab043b06e7d5fdad60a79911ab" commit="ca72f5fc8918c066055b31417fb4002c8b3381b7" commit_message="UPSTREAM: mtd: m25p80: read in spi_max_transfer_size chunks Take into account transfer size limitation of SPI master. Signed-off-by: Michal Suchanek <hramrach@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Michal Suchanek <hramrach@gmail.com> Tested-by: Michal Suchanek <hramrach@gmail.com> (cherry picked from git://git.infradead.org/l2-mtd.git master commit 95193796256cfce16e5d881318e15b6b04062c15) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: If15203215edb29ab043b06e7d5fdad60a79911ab Signed-off-by: Brian Norris <briannorris@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/505365 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505365" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/65/505365/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I9384a98c5b781ba25c489a027a2fd2077ef94b11" commit="bc63259c90d48b2c1b15d8b8f7f36cd062557d46" commit_message="UPSTREAM: spi: rockchip: limit transfers to (64K - 1) bytes The Rockchip SPI controller's length register only supports 16-bits, yielding a maximum length of 64KiB (the CTRLR1 register holds "length - 1"). Trying to transfer more than that (e.g., with a large SPI flash read) will cause the driver to hang. Now, it seems that while theoretically we should be able to program CTRLR1 with 0xffff, and get a 64KiB transfer, but that also seems to cause the core to choke, so stick with a maximum of 64K - 1 bytes -- i.e., 0xffff. Signed-off-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 5185a81c02d4118b11e6cb7b5fbf6f15ff7aff90) BUG=b:35573113 TEST=large SPI transfers on rk3399; e.g., `dd if=/dev/mtd0 of=/dev/null bs=128K` Change-Id: I9384a98c5b781ba25c489a027a2fd2077ef94b11 Reviewed-on: https://chromium-review.googlesource.com/505366 Commit-Ready: Brian Norris <briannorris@chromium.org> Tested-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="505366" owner_email="briannorris@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/505366/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I13710c1e25d628430b3c7d7b015eebb81046ef65" commit="a6112d70b1ab87fd4368f27a0dad5e0134ab9cfe" commit_message="UPSTREAM: soc/intel/apollolake: Enable decoding for ComA and ComB on LPC If there is an external 8250 UART, one needs to enable the appropriate address ranges before console_init() is called so that the init sequence can reach the external UART. Furthermore FSPM needs different settings for an external UART port. For this, the function fill_console_params() has to be adapted. BUG=none BRANCH=none TEST=none Change-Id: I13710c1e25d628430b3c7d7b015eebb81046ef65 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: 9e9cf270c4cbef24fb5127056b2eef4106d358ea Original-Change-Id: I62c7d0b54edd18acf793849aef352afbcaeb68b9 Original-Signed-off-by: Mario Scheithauer <mario.scheithauer@siemens.com> Original-Reviewed-on: https://review.coreboot.org/19693 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Werner Zeh <werner.zeh@siemens.com> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508769 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508769" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/69/508769/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I32e68e06a64308bf56010ce2e8e48ba42fd788b2" commit="dccdd70e9cc47a72f62c1ef4a333e26d432b6b1a" commit_message="UPSTREAM: siemens/mc_apl1: Select external 8250 UART The mainboard siemens/mc_apl1 uses an external I/O port for console output. For this reason we need to activate the 8250 LPC UART. BUG=none BRANCH=none TEST=none Change-Id: I32e68e06a64308bf56010ce2e8e48ba42fd788b2 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: ae10ec62391babdb8544af4e281b51f5e2515ff3 Original-Change-Id: Ib5616a116aec6135191bdce95f9f9566ce13d6f1 Original-Signed-off-by: Mario Scheithauer <mario.scheithauer@siemens.com> Original-Reviewed-on: https://review.coreboot.org/19694 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508770 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508770" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/70/508770/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="Ife34e1b5079eca8e51f2270439dbe05d613ed688" commit="2d2879e99085c160353ebb56ef287da705b1c4a2" commit_message="UPSTREAM: siemens/mc_apl1: Program eMMC DLL settings Program eMMC DLL settings for mc_apl1 mainboard, after that system can boot up with eMMC successfully. BUG=none BRANCH=none TEST=none Change-Id: Ife34e1b5079eca8e51f2270439dbe05d613ed688 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: c7ccb6b29fb138b1d5f6ac6f702e9e378f71e2d7 Original-Change-Id: I3d60f66ec5c7e09540ccda59f244aac6f78bf954 Original-Signed-off-by: Mario Scheithauer <mario.scheithauer@siemens.com> Original-Reviewed-on: https://review.coreboot.org/19712 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Werner Zeh <werner.zeh@siemens.com> Reviewed-on: https://chromium-review.googlesource.com/508771 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508771" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/71/508771/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I12d09cd0d25974bbaffaf444f2af4697d85c2648" commit="48ef8e8c73ea0b30b6852cbde79bda5e8475bf2b" commit_message="UPSTREAM: rockchip/rk3399: remove the delay for enabling SSC The hang was caused by deasserting the reset before, it had been delayed 20us fixing the hang issue. So we can remove this delay for now. BUG=none BRANCH=none TEST=none Change-Id: I12d09cd0d25974bbaffaf444f2af4697d85c2648 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: 2684efc49213802dcd36bd9bddd7a69851b8774a Original-Change-Id: I5545377b72eb20b59ceaaca25c78965854bfb919 Original-Signed-off-by: Caesar Wang <wxt@rock-chips.com> Original-Reviewed-on: https://review.coreboot.org/19699 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508772 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508772" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/72/508772/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I7e18b13b1403cb731aa8b5bd214bd35fd5f96637" commit="e05c957229281271a4e324999a6a114df53ad687" commit_message="UPSTREAM: rockchip/rk3399: Add MIPI driver This patch configures clock for mipi and then adds mipi driver for support innolux-p079zca mipi panel in rk3399 scarlet. BUG=none BRANCH=none TEST=none Change-Id: I7e18b13b1403cb731aa8b5bd214bd35fd5f96637 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: fe122d4dfc130be1e87b367b0dc9b39044b262bd Original-Change-Id: I02475eefb187c619c614b1cd20e97074bc8d917f Original-Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com> Original-Reviewed-on: https://review.coreboot.org/19477 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508773 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508773" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/73/508773/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I28ae05e1d3681a6012da80cf2e2dae196110559c" commit="dfb9e09a3e5e1423b544cb0228313089ef2d14ba" commit_message="UPSTREAM: google/scarlet: Enable innolux,p079zca MIPI panel TEST=Boot from scarlet, and mipi panel works Change-Id: I28ae05e1d3681a6012da80cf2e2dae196110559c Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: 36b09b8a6c3367dded5c3f0c6a1dc1d16d9a1335 Original-Change-Id: I52f8f8f966034f5273d7c2e673e5ebdd9dccf748 Original-Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com> Original-Reviewed-on: https://review.coreboot.org/19700 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508774 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508774" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/74/508774/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I82264b8a57b3cfd8be2281b7f3f32da158d0ac32" commit="8e1d4afb2473d99bf906105c8063701f7b2ada44" commit_message="UPSTREAM: intel/common/block/i2c: Add common block for I2C and use the same in SoCs In the intel/common/block * Move I2C common code from intel/common to intel/common/block. * Split the code into common, early init and post mem init stages and put it in lpss_i2c.c, i2c_early.c and i2c.c respectively. * Declare functions for getting platform specific i2c bus config and mapping bus to devfn and vice versa, that have to be implemented by SoC. In skylake/apollolake * Stop using code from soc/intel/common/lpss_i2c.c. * Remove early i2c initialization code from bootblock. * Refactor i2c.c file to implement SoC specific methods required by the I2C IP block. BUG=none BRANCH=none TEST=none Change-Id: I82264b8a57b3cfd8be2281b7f3f32da158d0ac32 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: ae6a4b6d3ca60fc697103cbdaaf5df84502f554e Original-Change-Id: I4d91a04c22e181e3a995112cce6d5f0324130b81 Original-Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com> Original-Reviewed-on: https://review.coreboot.org/19468 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508775 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508775" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/75/508775/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I507ef40b77f20c76b3178654c397a4130092240d" commit="5d750ba79426bc36dcef9516f7645b765fd3f396" commit_message="UPSTREAM: CBMEM: Add config CBMEM_TOP_BACKUP AGESA and binaryPI boards have no easy way to determine correct cbmem_top() location early enough when GFXUMA is enabled, so they will use these functions with EARLY_CBMEM_INIT as well. At the end of AmdInitPost() the decisions of UMA base and size have not been written to hardware yet. The decisions are stored inside AGESA heap object we cannot locate from coreboot proper until after AmdInitEnv(). Modify code such that weak backup functions are only defined for LATE_CBMEM_INIT; they are somewhat troublesome to handle. BUG=none BRANCH=none TEST=none Change-Id: I507ef40b77f20c76b3178654c397a4130092240d Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: a7dd6455942e17708d5d8da3e1f6c22a8f75ac2e Original-Change-Id: Ifef4f75b36bc6dee6cd56d1d9164281d9b2a4f2a Original-Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com> Original-Reviewed-on: https://review.coreboot.org/19306 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-on: https://chromium-review.googlesource.com/508776 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508776" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/76/508776/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I0510eb6bdbb7c2aa29bc882ee09088aad37b6a6e" commit="c8dfc0f54bff00529a3d538a0ee5dab5ebcab545" commit_message="UPSTREAM: AMD MTRR: Add common add_uma_resource_below_tolm() BUG=none BRANCH=none TEST=none Change-Id: I0510eb6bdbb7c2aa29bc882ee09088aad37b6a6e Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: 17bb225be7dd031b9803f33dec88e9d53e3a582f Original-Change-Id: I9eee88dc619ac5d9c77153db522a6ead65f6c9b1 Original-Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com> Original-Reviewed-on: https://review.coreboot.org/19376 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-on: https://chromium-review.googlesource.com/508777 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508777" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/77/508777/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="Ie72f645e841d758ad4a275c39111c3a785ddd883" commit="dd12b9447dcc467603ec869a08e7cc4cc8f4763c" commit_message="UPSTREAM: AGESA: Fix UMA calculations Vendorcode decides already in AMD_INIT_POST the exact location of UMA memory. To meet alignment requirements, it will extend uma_memory_size. We cannot calculate base from size and TOP_MEM1, but need to calculate size from base and TOP_MEM1 instead. Also allows selection of UmaMode==UMA_SPECIFIED to manually set amount of memory reserved for framebuffer. BUG=none BRANCH=none TEST=none Change-Id: Ie72f645e841d758ad4a275c39111c3a785ddd883 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: 61be3603f4b9f353e605d7b7c8d0d9f3b90f5636 Original-Change-Id: I2514c70a331c7fbf0056f22bf64f19c9374754c0 Original-Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com> Original-Reviewed-on: https://review.coreboot.org/19328 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://chromium-review.googlesource.com/508778 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508778" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/78/508778/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I6ab4e00cbae38bbbc6f8633a3d77944a25a6ecdc" commit="2ee6c28216ada15108a3c2b29441ac1515ef5593" commit_message="UPSTREAM: binaryPI: Fix UMA calculations Vendorcode decides already in AMD_INIT_POST the exact location of UMA memory. To meet alignment requirements, it will extend uma_memory_size. We cannot calculate base from size and TOP_MEM1, but need to calculate size from base and TOP_MEM1 instead. Also allows selection of UmaMode==UMA_SPECIFIED to manually set amount of memory reserved for framebuffer. BUG=none BRANCH=none TEST=none Change-Id: I6ab4e00cbae38bbbc6f8633a3d77944a25a6ecdc Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: e87564ffe7d0636699467b776a24adffb2f11cca Original-Change-Id: I0c375e5da0dfef6cef0c50272356cd32a87b1ff6 Original-Signed-off-by: Kysti Mlkki <kyosti.malkki@gmail.com> Original-Reviewed-on: https://review.coreboot.org/19346 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508779 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508779" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/79/508779/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-2016.05" change_id="I9b846abcdbc3b0e4777ff541dbb0ae7aa9f5f8d5" commit="2cec7c6d8a10ca53bce4fdb975ba76f2a38ce314" commit_message="UPSTREAM: uart: Fix bug in {uart8250, uart8250_mem, ns16550}_rx_byte functions We have several different UART implementations of which three support a timeout when receiving characters. In all of these three implementations there is a bug where when the timeout is hit the last received character will be returned instead of the needed 0. The problem is that the timeout variable i is decremented after it has been checked in the while-loop. That leads to the fact that when the while-loop is aborted due to a timeout i will contain 0xffffffff and not 0. Thus in turn will fool the following if-statement leading to wrong return value to the caller in this case. Therefore the caller will see a received character event if there is none. BUG=none BRANCH=none TEST=none Change-Id: I9b846abcdbc3b0e4777ff541dbb0ae7aa9f5f8d5 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: 43314ffae53b813c6a0d6e34723921316cf46f45 Original-Change-Id: I23ff531a1e729e816764f1a071484c924dcb0f85 Original-Signed-off-by: Werner Zeh <werner.zeh@siemens.com> Original-Reviewed-on: https://review.coreboot.org/19731 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508780 Commit-Ready: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> " fail_count="0" gerrit_number="508780" owner_email="pgeorgi@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/80/508780/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I2f2be43f5b68a7768c2341a022f92cefc12b88f4" commit="e3ee4d3a058dcbb9e8943ea899737060896488cf" commit_message="CHROMIUM: DROP: Revert to upstream state DROP THIS PATCH ON REBASE (together with all the old CHROMIUM drivers/firmware/google/memconsole* patches). This commit is intended to put the drivers/firmware/google tree in its upstream state to ease the review of what is being upstreamed. CQ-DEPEND=CL:483760 Change-Id: I2f2be43f5b68a7768c2341a022f92cefc12b88f4 Reviewed-on: https://chromium-review.googlesource.com/446101 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> " fail_count="0" gerrit_number="446101" owner_email="tescande@gmail.com" pass_count="0" patch_number="8" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/01/446101/8" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I76da7854dcf630a756444b79dd6e1b4c766a8647" commit="5a962e5b6f97b30280013fa48abba67a69f14ee0" commit_message="FROMLIST: firmware: google memconsole: Remove useless submenu in Kconfig This patch removes useless "Google Firmware Drivers" menu containing a menuconfig with the same name. The menuconfig is now directly under the "Firmware Drivers" entry. (am from https://patchwork.kernel.org/patch/9650153) Change-Id: I76da7854dcf630a756444b79dd6e1b4c766a8647 Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/446102 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="446102" owner_email="tescande@gmail.com" pass_count="0" patch_number="9" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/02/446102/9" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Iba2fe9746a84f1bc28e1a0e494f463c3e3020e2c" commit="b12cb60b9e44ed68796e4a414bd686a6cff96392" commit_message="FROMLIST: firmware: google memconsole: Move specific EBDA parts This patch splits memconsole.c in 2 parts. One containing the architecture-independent part and the other one conaitaining the EBDA specific part. This patch prepares the integration of coreboot support for the memconsole. (am from https://patchwork.kernel.org/patch/9650159) Change-Id: Iba2fe9746a84f1bc28e1a0e494f463c3e3020e2c Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/446103 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="446103" owner_email="tescande@gmail.com" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/03/446103/11" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I513aec01d1b2a29799e7675f8b8ea44d6d7d573e" commit="a33b0fcc1a73b2d2e6c5b40db8887cf78ff2cb1d" commit_message="FROMLIST: firmware: Add coreboot device tree binding documentation This patch adds documentation describing a device tree binding for the coreboot firmware. It is meant to be dynamically added during boot and contains address definitions for the coreboot table (a list of variable-sized descriptors providing information about various compile- and run-time generated firmware parameters) and the CBMEM area (the structure containing most run-time resident memory regions set up by coreboot). These definitions allow kernel drivers to easily access data contained in and pointed to by these regions (such as coreboot's in-memory log). (An example implementation can be seen in the following patch) (am from https://patchwork.kernel.org/patch/9650157) Change-Id: I513aec01d1b2a29799e7675f8b8ea44d6d7d573e Signed-off-by: Julius Werner <jwerner@chromium.org> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/445939 Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="445939" owner_email="tescande@gmail.com" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/39/445939/11" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Id49082c9da9b0f0fbc902ed19afb37b5a6c2af8a" commit="ead4124898ee51cfb40a61cdded67bc5da94bb18" commit_message="FROMLIST: firmware: google memconsole: Add coreboot support Coreboot (http://www.coreboot.org) allows to save the firmware console output in a memory buffer, which can be located as follows: it is part of the so called CBMEM structure, which is placed above the memory available to the kernel at a 128K boundary. This change adds support to install memconsole driver on systems manufactured by Samsung, with coreboot based BIOS. If running on such a system the driver will now try to see if a CBMEM console is present first before checking the EBDA table. This patch is a rework/split/merge of patches from the chromeos v4.4 kernel tree originaly authored by: Vadim Bendebury <vbendeb@chromium.org> Wei-Ning Huang <wnhuang@google.com> Yuji Sasaki <sasakiy@google.com> Duncan Laurie <dlaurie@chromium.org> Julius Werner <jwerner@chromium.org> (am from https://patchwork.kernel.org/patch/9650151) Change-Id: Id49082c9da9b0f0fbc902ed19afb37b5a6c2af8a Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/446104 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="446104" owner_email="tescande@gmail.com" pass_count="0" patch_number="14" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/04/446104/14" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I04423466e65c6eb2dac7cda608c0a10176619bc9" commit="592d34070865d4263c27cc83a05c50d807943b8b" commit_message="FROMLIST: firmware: google memconsole: Add ARM/ARM64 support This patch expands the Google firmware memory console driver to also work on certain device tree based platforms running coreboot, such as ARM/ARM64 Chromebooks. This patch now adds another path to find the coreboot table through the device tree. In order to find that, a second level bootloader must have installed the 'coreboot' compatible device tree node that describes its base address and size. This patch is a rework/split/merge of patches from the chromeos v4.4 kernel tree originaly authored by: Wei-Ning Huang <wnhuang@chromium.org> Julius Werner <jwerner@chromium.org> (am from https://patchwork.kernel.org/patch/9650155) Change-Id: I04423466e65c6eb2dac7cda608c0a10176619bc9 Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/446105 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="446105" owner_email="tescande@gmail.com" pass_count="0" patch_number="16" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/05/446105/16" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I7b2626b3e24acf722acf2698e9267bedae207973" commit="2a228531b0b2d0d820598a10223b62138d05758f" commit_message="FROMLIST: firmware: Google VPD: import lib_vpd source files This patch imports lib_vpd.h and vpd_decode.c from the Chromium Vital Product Data project. This library is used to parse VPD sections obtained from coreboot table entries describing Chromebook devices product data. Only the sections of type VPD_TYPE_STRING are decoded. The VPD string sections in the coreboot tables contain the type (1 byte set to 0x01 for strings), the key length, the key ascii array, the value length, and the value ascii array. The key and value arrays are not null terminated. (am from https://patchwork.kernel.org/patch/9677919) Change-Id: I7b2626b3e24acf722acf2698e9267bedae207973 Signed-off-by: Wei-Ning Huang <wnhuang@google.com> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/483759 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="483759" owner_email="tescande@gmail.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/483759/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I819e1eb596b4f2ee54da8bb3827e616b3e13d659" commit="aa288836879523a0f67aff285b641bcd176a9b89" commit_message="FROMLIST: firmware: Google VPD sysfs driver This patch introduces the Google Vital Product Data driver. This driver reads Vital Product Data from coreboot tables and then creates the corresponding sysfs entries under /sys/firmware/vpd to provide easy access for userspace programs (does not require flashrom). The sysfs is structured as follow: /sys/firmware/vpd |-- ro | |-- key1 | `-- key2 |-- ro_raw |-- rw | `-- key1 `-- rw_raw Where ro_raw and rw_raw contain the raw VPD partition. The files under ro and rw correspond to the key name in the VPD and the the file content is the value for the key. (am from https://patchwork.kernel.org/patch/9677917) Change-Id: I819e1eb596b4f2ee54da8bb3827e616b3e13d659 Signed-off-by: Wei-Ning Huang <wnhuang@google.com> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Reviewed-on: https://chromium-review.googlesource.com/483760 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="483760" owner_email="tescande@gmail.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/483760/5" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Id49359d19d25708f4cab22ceb72316b6ec9bfc3d" commit="239ccc4db26c4713755838bc720e0b63f381b3d3" commit_message="hal_adapter: add mojom definition for Camera3ErrorMsgCode BUG=b:32690003 TEST=Test with arc-camera3-hal-usb in both Chrome and Android and make sure preview works. Change-Id: Id49359d19d25708f4cab22ceb72316b6ec9bfc3d Reviewed-on: https://chromium-review.googlesource.com/505849 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@google.com> " fail_count="4" gerrit_number="505849" owner_email="jcliang@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/49/505849/3" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I24ceede0cd0d53f1d27e9e4a873823d62248f540" commit="ef957c606c04a5ca3942e8a0c0a956785a0e4ff2" commit_message="hal_adapter: add static_assert checks for mojom enums BUG=b:32690003 TEST=emerge-<board> arc-camera3 Change-Id: I24ceede0cd0d53f1d27e9e4a873823d62248f540 Reviewed-on: https://chromium-review.googlesource.com/505836 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@google.com> " fail_count="4" gerrit_number="505836" owner_email="jcliang@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/36/505836/3" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I1d90b54b10322bc9130ddeabfa2846751888fe47" commit="c14538d89283f19abd80364031ef94279edba50d" commit_message="hal_adapter: refactor mojo binding and interface templates Refactor MojoBindingDelegate and MojoInterfaceDelegate template classes and their derived classes. Move the worker threads out of the template classes and let the template classes take a task runner in their constructors. This is preparation work for supporting multiple mojo binding / inteface connections in one adapter. BUG=b:36233258, b:32690003 TEST=Make sure USB camera preview works in Chrome and Android Change-Id: I1d90b54b10322bc9130ddeabfa2846751888fe47 Reviewed-on: https://chromium-review.googlesource.com/487547 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@google.com> " fail_count="4" gerrit_number="487547" owner_email="jcliang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/47/487547/6" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I74db3c000f45ac59d1205ab7b485ebdce2eaea5c" commit="1ce6af502f4fe2e59070d12e4c08bdc11db0e715" commit_message="hal_adapter: make some of the HAL v3 API Mojo calls asynchronous Some of the HAL v3 APIs are asynchronous and non-blocking. This patch changes CameraDeviceStatusChange(), Dump(), ProcessCaptureResult(), and Notify() Mojo calls to be asynchronous to improve performance and better align with HAL v3 APIs specification. BUG=b:36233258, b:32690003 TEST=Make sure USB camera preview works in Chrome and Android Change-Id: I74db3c000f45ac59d1205ab7b485ebdce2eaea5c Reviewed-on: https://chromium-review.googlesource.com/487548 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@google.com> " fail_count="4" gerrit_number="487548" owner_email="jcliang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/48/487548/6" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I70bb85457e1a259f961a53f06479ab6fe027fbb7" commit="0cc8512ef36e2a433c2f720710f23ea1a8d83337" commit_message="hal_adapter: move callback API hooks to the adapter Originally the hooks of the callback APIs are implemented in the Mojo delegates. This patch moves the hooks to the HAL / device adapters. This is a refactor in preparation for serving multiple peers (e.g. Chrome and Android) in the HAL adapter simultaneously. BUG=b:36233258, b:32690003 TEST=Make sure USB camera preview works in Chrome and Android Change-Id: I70bb85457e1a259f961a53f06479ab6fe027fbb7 Reviewed-on: https://chromium-review.googlesource.com/487549 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@google.com> " fail_count="4" gerrit_number="487549" owner_email="jcliang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/49/487549/6" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Icb9de0539aafab33422cf1d996831761fee710cc" commit="37b016c771a4cc5338b774b50abac55b6f2ecd20" commit_message="hal_adapter: add detailed comments in mojom files BUG=b:32690003 TEST=None Change-Id: Icb9de0539aafab33422cf1d996831761fee710cc Reviewed-on: https://chromium-review.googlesource.com/505850 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="4" gerrit_number="505850" owner_email="jcliang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/50/505850/6" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I4ecec1d66bac2acdfce09d562383ef4cce31258d" commit="2d1a0955f2e83a9a3f9c8d41d29f8b18141c65da" commit_message="hal_adapter: change mojo interface for ConfigureStreams Let ConfigureStreams return int32_t and Camera3StreamConfiguration, and also remove num_streams in Camera3StreamConfiguration. BUG=b:32690003 TEST=Make sure camera preview works in Chrome and Android apps. Change-Id: I4ecec1d66bac2acdfce09d562383ef4cce31258d Reviewed-on: https://chromium-review.googlesource.com/505970 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Heng-ruey Hsu <henryhsu@google.com> " fail_count="4" gerrit_number="505970" owner_email="jcliang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/70/505970/6" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I694d6dbbd84f03b47b28be37c7d3554ecc2315ad" commit="f8e65641971111cdad34e63b65f130dad40c7c30" commit_message="usb: Implement picture taking BUG=b:24674340 TEST=open camera app and take a picture. Change-Id: I694d6dbbd84f03b47b28be37c7d3554ecc2315ad Reviewed-on: https://chromium-review.googlesource.com/455606 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="4" gerrit_number="455606" owner_email="henryhsu@chromium.org" pass_count="0" patch_number="25" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/06/455606/25" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Ibccaccc4ca7ed77ca4fd76dd1f44fbba888eb57a" commit="d4e11c8bf7022a2707329e0fee6ad8f235f4847c" commit_message="usb: Restart stream if resolution of output buffers are different Change to use GetPlaneSize and GetV4L2PixelFormat from buffer mapper. BUG=b:24674340 TEST=open camera and take a picture Change-Id: Ibccaccc4ca7ed77ca4fd76dd1f44fbba888eb57a Reviewed-on: https://chromium-review.googlesource.com/500009 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="3" gerrit_number="500009" owner_email="henryhsu@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/09/500009/6" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I5622d5f42328cf48a6099ea08d1086304a0e5955" commit="84bb118d0d53edbb3e5f9fb53dbb4cb279129974" commit_message="usb: Check unsupported format and resolution BUG=b:24674340 TEST=run arc_camera3_test Change-Id: I5622d5f42328cf48a6099ea08d1086304a0e5955 Reviewed-on: https://chromium-review.googlesource.com/502949 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="3" gerrit_number="502949" owner_email="henryhsu@chromium.org" pass_count="0" patch_number="4" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/49/502949/4" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I87bd3484c67ed7b2ef073b1413d428d01d367157" commit="8f091dff9dc40c02b2ed5da26ef32602a1d1ad87" commit_message="usb: Add skip frames after stream on Some devices may output invalid jpeg after stream on. We have to skip it. BUG=b:24674340 TEST=run arc_camera3_test Change-Id: I87bd3484c67ed7b2ef073b1413d428d01d367157 Reviewed-on: https://chromium-review.googlesource.com/502950 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="3" gerrit_number="502950" owner_email="henryhsu@chromium.org" pass_count="0" patch_number="4" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/50/502950/4" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I6a0b91e9fa268280c0ba9fab54297a11ac2cc0fe" commit="6b9a64d723f2a0f7460d796a4e8fcbd761252aef" commit_message="usb: Add necessary static metadata BUG=b:24674340 TEST=run arc_camera3_test Change-Id: I6a0b91e9fa268280c0ba9fab54297a11ac2cc0fe Reviewed-on: https://chromium-review.googlesource.com/502951 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="3" gerrit_number="502951" owner_email="henryhsu@chromium.org" pass_count="0" patch_number="4" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/51/502951/4" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I56eb1497da5994a43b77f719e237e5a12be8b07d" commit="48094cf4c54eb93b7583af4fd50ad9617399a696" commit_message="usb: Sort metadata section alphabetically BUG=b:24674340 TEST=run arc_camera3_test Change-Id: I56eb1497da5994a43b77f719e237e5a12be8b07d Reviewed-on: https://chromium-review.googlesource.com/430452 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Ricky Liang <jcliang@chromium.org> " fail_count="3" gerrit_number="430452" owner_email="henryhsu@google.com" pass_count="0" patch_number="43" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/52/430452/43" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I4746865bee7162c4dffbf37f5e8be210bf27e7fd" commit="1e0f3a7dad2bb76cb5b50b732298575d38b0a979" commit_message="UPSTREAM: zram: update documentation Several documentation changes. First, we never mentioned any errors and never required any error checks in documentation. Second, mention that there is another way to configure and manage zram devices -- zramctl, provided by util-linux. Third, add a bit of clarification on why `mem_used_max' attr is RW and correct some typos. BUG=chromium:721934 TEST=Build and boot Change-Id: I4746865bee7162c4dffbf37f5e8be210bf27e7fd Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 3657c20d8277e7ee50a26ac9cacad55a8bba901d) Reviewed-on: https://chromium-review.googlesource.com/508042 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="1" gerrit_number="508042" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/42/508042/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I1781db0293d9cc77c66f43ea84a0185c2b1bf5a4" commit="eb9ba46bff71a54ec7c2556bb778d7290c6a01c4" commit_message="UPSTREAM: zram: remove obsolete sysfs attrs We had a deprecated_attr_warn() warning for 2 years and now the time has come and we finally can do the cleanup. The plan was as follows: : per-stat sysfs attributes are considered to be deprecated. : The basic strategy is: : -- the existing RW nodes will be downgraded to WO nodes (in linux 4.11) : -- deprecated RO sysfs nodes will eventually be removed (in linux 4.11) : : The list of deprecated attributes can be found here: : Documentation/ABI/obsolete/sysfs-block-zram : : Basically, every attribute that has its own read accessible sysfs : node (e.g. num_reads) *AND* is accessible via one of the stat files : (zram<id>/stat or zram<id>/io_stat or zram<id>/mm_stat) is considered : to be deprecated. The patch also removes `obsolete/sysfs-block-zram', clean ups `testing/sysfs-block-zram' and tweaks zram.txt files. CQ-DEPEND=CL:506370 BUG=chromium:721934, chromium:721955 TEST=Build and boot Change-Id: I1781db0293d9cc77c66f43ea84a0185c2b1bf5a4 Link: http://lkml.kernel.org/r/20170118035838.11090-1-sergey.senozhatsky@gmail.com Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Acked-by: Minchan Kim <minchan@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit c87d1655c29500b459fb135258a93f8309ada9c7) Reviewed-on: https://chromium-review.googlesource.com/508043 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="2" gerrit_number="508043" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/43/508043/1" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I5f876b8bf709d7c6669c7c48bc78eafc1ce66c61" commit="e8d601edfe13d2ccf8b649f2f436a77fe266af10" commit_message="BACKPORT: zram: do not use copy_page with non-page aligned address commit d72e9a7a93e4f8e9e52491921d99e0c8aa89eb4e upstream. The copy_page is optimized memcpy for page-alinged address. If it is used with non-page aligned address, it can corrupt memory which means system corruption. With zram, it can happen with 1. 64K architecture 2. partial IO 3. slub debug Partial IO need to allocate a page and zram allocates it via kmalloc. With slub debug, kmalloc(PAGE_SIZE) doesn't return page-size aligned address. And finally, copy_page(mem, cmem) corrupts memory. So, this patch changes it to memcpy. Actuaully, we don't need to change zram_bvec_write part because zsmalloc returns page-aligned address in case of PAGE_SIZE class but it's not good to rely on the internal of zsmalloc. Note: When this patch is merged to stable, clear_page should be fixed, too. Unfortunately, recent zram removes it by "same page merge" feature so it's hard to backport this patch to -stable tree. I will handle it when I receive the mail from stable tree maintainer to merge this patch to backport. BUG=chromium:721934 TEST=Build and boot Change-Id: I5f876b8bf709d7c6669c7c48bc78eafc1ce66c61 Fixes: 42e99bd ("zram: optimize memory operations with clear_page()/copy_page()") Link: http://lkml.kernel.org/r/1492042622-12074-2-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from linux-stable from 4.4 commit 9286385a3452d7eeb01bfb94676389bba6f59ebd) Reviewed-on: https://chromium-review.googlesource.com/508044 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="2" gerrit_number="508044" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/508044/2" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="Ica1274d1709895903462f1bd1cf7125dbeadb5b1" commit="6f2d1f9234b81ba6fb7752fa3d677fbee8858dab" commit_message="BACKPORT: zram: extend zero pages to same element pages The idea is that without doing more calculations we extend zero pages to same element pages for zram. zero page is special case of same element page with zero element. 1. the test is done under android 7.0 2. startup too many applications circularly 3. sample the zero pages, same pages (none-zero element) and total pages in function page_zero_filled the result is listed as below: ZERO SAME TOTAL 36214 17842 598196 ZERO/TOTAL SAME/TOTAL (ZERO+SAME)/TOTAL ZERO/SAME AVERAGE 0.060631909 0.024990816 0.085622726 2.663825038 STDEV 0.00674612 0.005887625 0.009707034 2.115881328 MAX 0.069698422 0.030046087 0.094975336 7.56043956 MIN 0.03959586 0.007332205 0.056055193 1.928985507 from the above data, the benefit is about 2.5% and up to 3% of total swapout pages. The defect of the patch is that when we recovery a page from non-zero element the operations are low efficient for partial read. This patch extends zero_page to same_page so if there is any user to have monitored zero_pages, he will be surprised if the number is increased but it's not harmful, I believe. BUG=chromium:721934 TEST=`cat /sys/devices/virtual/block/zram0/mm_stat`, check 2nd to last entry Conflicts: drivers/block/zram/zram_drv.c Locally we have commit 9286385a3452 ("zram: do not use copy_page with non-page aligned address") from linux stable. The conlict was trivial to resolve. Change-Id: Ica1274d1709895903462f1bd1cf7125dbeadb5b1 [minchan@kernel.org: do not free same element pages in zram_meta_free] Link: http://lkml.kernel.org/r/20170207065741.GA2567@bbox Link: http://lkml.kernel.org/r/1483692145-75357-1-git-send-email-zhouxianrong@huawei.com Link: http://lkml.kernel.org/r/1486307804-27903-1-git-send-email-minchan@kernel.org Signed-off-by: zhouxianrong <zhouxianrong@huawei.com> Signed-off-by: Minchan Kim <minchan@kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 8e19d540d107ee897eb9a874844060c94e2376c0) Reviewed-on: https://chromium-review.googlesource.com/508045 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="2" gerrit_number="508045" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/45/508045/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I46478dc59f6c875b3b93db0e7e7524002b0f1496" commit="5e1f8e592c7e99893638915340e40a0e07d0d751" commit_message="metrics: Switch zram metrics to "mm_stat" if it's available The old way for reading zram metrics was deprecated. Now we need to read a file with a bunch of space-separated values. The kernel describes this file as: File /sys/block/zram<id>/mm_stat The stat file represents device's mm statistics. It consists of a single line of text and contains the following stats separated by whitespace: orig_data_size compr_data_size mem_used_total mem_limit mem_used_max zero_pages num_migrated For a while now on kernels like 4.4 we've seen a warning in dmesg at every bootup about using the old deprecated attribute. On newer upstream kernels the deprecated attribute is totally gone. NOTE that on older kernels (like 3.14) the "mm_stat" file doesn't exist, so we need to keep support for the old location too. BUG=chromium:721955 TEST=cros_run_unit_tests --board ${BOARD} --packages "metrics" TEST=Put printouts and see that metrics got read OK TEST=Boot up and no more warning in the kernel logs Change-Id: I46478dc59f6c875b3b93db0e7e7524002b0f1496 Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/506370 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="3" gerrit_number="506370" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/70/506370/2" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I0e9ddd2c2dbb4ec3ba39cd72310314fd4c465d89" commit="b0d54d691e765757077e356faebf9d85caa2992a" commit_message="UPSTREAM: zram: reduce load operation in page_same_filled In page_same_filled function, all elements in the page is compared with next index value. The current comparison routine compares the (i)th and (i+1)th values of the page. In this case, two load operaions occur for each comparison. But if we store first value of the page stores at 'val' variable and using it to compare with others, the load opearation is reduced. It reduce load operation per page by up to 64times. BUG=chromium:721934 TEST=Build and boot Change-Id: I0e9ddd2c2dbb4ec3ba39cd72310314fd4c465d89 Link: http://lkml.kernel.org/r/1488428104-7257-1-git-send-email-sangwoo2.park@lge.com Signed-off-by: Sangwoo Park <sangwoo2.park@lge.com> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit f0fe9984656604ea8effd5ff82709ff8ce1f954b) Reviewed-on: https://chromium-review.googlesource.com/508046 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="2" gerrit_number="508046" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/508046/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I5304c6ffc30cf376c05d5bfaa7e7bdb8a948b51b" commit="5572343e61ba8b31b2514cf8b8c9a3445275c5b3" commit_message="cros-board eclass: add novato Add novato board. BUG=b:36820804 BUG=chromium:721154 TEST=./setup_board; ./build_packages; ./build_image Change-Id: I5304c6ffc30cf376c05d5bfaa7e7bdb8a948b51b Reviewed-on: https://chromium-review.googlesource.com/506307 Commit-Ready: Nicolas Norvez <norvez@chromium.org> Tested-by: Nicolas Norvez <norvez@chromium.org> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="4" gerrit_number="506307" owner_email="norvez@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/07/506307/1" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Icc2afc3840b766b527894b2e49e61566421285d7" commit="e2cfe4f0386a4f88739e40f7a0e7cbded852ab2f" commit_message="chromite: add novato to chromeos_config Same configuration as newbie. BUG=b:36820804 BUG=chromium:721154 TEST=./chromeos_config_unittest CQ-DEPEND=CL:*376330 Change-Id: Icc2afc3840b766b527894b2e49e61566421285d7 Reviewed-on: https://chromium-review.googlesource.com/506549 Commit-Ready: Nicolas Norvez <norvez@chromium.org> Tested-by: Nicolas Norvez <norvez@chromium.org> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="6" gerrit_number="506549" owner_email="norvez@chromium.org" pass_count="0" patch_number="1" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/49/506549/1" remote="cros" total_fail_count="6"/><pending_commit branch="master" change_id="Ic6614df6ccf761d19d9a361adbbbca8f212162e3" commit="5c5ba75b473d5868bc04fe4ed757ee8338e77ca1" commit_message="sys-fs/fuse-exfat: drop package in chromiumos-overlay We will import a newer version of sys-fs/fuse-exfat from upstream Gentoo into portage-stable. BUG=chromium:723102 CQ-DEPEND=CL:506328 CQ-DEPEND=CL:506329 TEST=Build fuse-exfat after importing a newer version into portage-stable. Change-Id: Ic6614df6ccf761d19d9a361adbbbca8f212162e3 Reviewed-on: https://chromium-review.googlesource.com/505941 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="3" gerrit_number="505941" owner_email="benchan@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/41/505941/3" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I7b6fc974d0e0bbcba0ff54d67ec446aa0fddb605" commit="fa2c0c01efde5be13e875d49c609868fcbae21a8" commit_message="sys-fs/fuse-exfat: import 1.2.6 from upstream This CL imports fuse-exfat 1.2.6 from upstream Gentoo to replace the older version of fuse-exfat in chromiumos-overlay. The EAPI is downgraded from 6 to 5 in the ebuild. BUG=chromium:723102 CQ-DEPEND=CL:505941 CQ-DEPEND=CL:505942 TEST=Tested the following: 1. `emerge-$BOARD fuse-exfat` 2. Run platform_CrosDisksFilesystem test. 3. Insert an exFAT formatted USB drive and verify read/write operations on the drive via File.app. Change-Id: I7b6fc974d0e0bbcba0ff54d67ec446aa0fddb605 Reviewed-on: https://chromium-review.googlesource.com/506328 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="3" gerrit_number="506328" owner_email="benchan@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/28/506328/2" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I8e05fb2309673e5cabab87fadb00f5b86ca9c1c2" commit="86eb5aa3f65774287cd1b49a82d85ce319cc8a64" commit_message="sys-fs/exfat-utils: import 1.2.6 from upstream This CL imports exfat-utils 1.2.6 from upstream Gentoo to replace the older version of exfat-utils in chromiumos-overlay. The EAPI is downgraded from 6 to 5 in the ebuild. BUG=chromium:723102 CQ-DEPEND=CL:505941 CQ-DEPEND=CL:505942 TEST=Tested the following: 1. `emerge-$BOARD exfat-utils` 2. Run platform_CrosDisksFilesystem test. 3. Insert an exFAT formatted USB drive and verify read/write operations on the drive via File.app. Change-Id: I8e05fb2309673e5cabab87fadb00f5b86ca9c1c2 Reviewed-on: https://chromium-review.googlesource.com/506329 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="3" gerrit_number="506329" owner_email="benchan@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/29/506329/2" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I9569cf6644bbf4dbd1b4773c38ea9ad5ed1130c7" commit="364caedc6735ea3ade5874bf291ac0cb4021ac49" commit_message="sys-fs/exfat-utils: drop package in chromiumos-overlay We will import a newer version of sys-fs/exfat-utils from upstream Gentoo into portage-stable. BUG=chromium:723102 CQ-DEPEND=CL:506328 CQ-DEPEND=CL:506329 TEST=Build exfat-utils after importing a newer version into portage-stable. Change-Id: I9569cf6644bbf4dbd1b4773c38ea9ad5ed1130c7 Reviewed-on: https://chromium-review.googlesource.com/505942 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="3" gerrit_number="505942" owner_email="benchan@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/42/505942/3" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I1781db0293d9cc77c66f43ea84a0185c2b1bf5a4" commit="e2d4b0c76a50d8661d2a9cb79cc074ebac420916" commit_message="UPSTREAM: zram: remove obsolete sysfs attrs We had a deprecated_attr_warn() warning for 2 years and now the time has come and we finally can do the cleanup. The plan was as follows: : per-stat sysfs attributes are considered to be deprecated. : The basic strategy is: : -- the existing RW nodes will be downgraded to WO nodes (in linux 4.11) : -- deprecated RO sysfs nodes will eventually be removed (in linux 4.11) : : The list of deprecated attributes can be found here: : Documentation/ABI/obsolete/sysfs-block-zram : : Basically, every attribute that has its own read accessible sysfs : node (e.g. num_reads) *AND* is accessible via one of the stat files : (zram<id>/stat or zram<id>/io_stat or zram<id>/mm_stat) is considered : to be deprecated. The patch also removes `obsolete/sysfs-block-zram', clean ups `testing/sysfs-block-zram' and tweaks zram.txt files. CQ-DEPEND=CL:506370 BUG=chromium:721934, chromium:721955 TEST=Build and boot Change-Id: I1781db0293d9cc77c66f43ea84a0185c2b1bf5a4 Link: http://lkml.kernel.org/r/20170118035838.11090-1-sergey.senozhatsky@gmail.com Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Acked-by: Minchan Kim <minchan@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit c87d1655c29500b459fb135258a93f8309ada9c7) Reviewed-on: https://chromium-review.googlesource.com/505202 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="1" gerrit_number="505202" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/02/505202/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Ica1274d1709895903462f1bd1cf7125dbeadb5b1" commit="531f006e7c338fc36d0d3717bfa2a9639b90d417" commit_message="BACKPORT: zram: extend zero pages to same element pages The idea is that without doing more calculations we extend zero pages to same element pages for zram. zero page is special case of same element page with zero element. 1. the test is done under android 7.0 2. startup too many applications circularly 3. sample the zero pages, same pages (none-zero element) and total pages in function page_zero_filled the result is listed as below: ZERO SAME TOTAL 36214 17842 598196 ZERO/TOTAL SAME/TOTAL (ZERO+SAME)/TOTAL ZERO/SAME AVERAGE 0.060631909 0.024990816 0.085622726 2.663825038 STDEV 0.00674612 0.005887625 0.009707034 2.115881328 MAX 0.069698422 0.030046087 0.094975336 7.56043956 MIN 0.03959586 0.007332205 0.056055193 1.928985507 from the above data, the benefit is about 2.5% and up to 3% of total swapout pages. The defect of the patch is that when we recovery a page from non-zero element the operations are low efficient for partial read. This patch extends zero_page to same_page so if there is any user to have monitored zero_pages, he will be surprised if the number is increased but it's not harmful, I believe. BUG=chromium:721934 TEST=`cat /sys/devices/virtual/block/zram0/mm_stat`, check 2nd to last entry Conflicts: drivers/block/zram/zram_drv.c Locally we have commit 9286385a3452 ("zram: do not use copy_page with non-page aligned address") from linux stable. The conlict was trivial to resolve. Change-Id: Ica1274d1709895903462f1bd1cf7125dbeadb5b1 [minchan@kernel.org: do not free same element pages in zram_meta_free] Link: http://lkml.kernel.org/r/20170207065741.GA2567@bbox Link: http://lkml.kernel.org/r/1483692145-75357-1-git-send-email-zhouxianrong@huawei.com Link: http://lkml.kernel.org/r/1486307804-27903-1-git-send-email-minchan@kernel.org Signed-off-by: zhouxianrong <zhouxianrong@huawei.com> Signed-off-by: Minchan Kim <minchan@kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 8e19d540d107ee897eb9a874844060c94e2376c0) Reviewed-on: https://chromium-review.googlesource.com/505203 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="1" gerrit_number="505203" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/03/505203/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I0e9ddd2c2dbb4ec3ba39cd72310314fd4c465d89" commit="7a09eeab6b3764142b90776c9a8644e4878f4bcb" commit_message="UPSTREAM: zram: reduce load operation in page_same_filled In page_same_filled function, all elements in the page is compared with next index value. The current comparison routine compares the (i)th and (i+1)th values of the page. In this case, two load operaions occur for each comparison. But if we store first value of the page stores at 'val' variable and using it to compare with others, the load opearation is reduced. It reduce load operation per page by up to 64times. BUG=chromium:721934 TEST=Build and boot Change-Id: I0e9ddd2c2dbb4ec3ba39cd72310314fd4c465d89 Link: http://lkml.kernel.org/r/1488428104-7257-1-git-send-email-sangwoo2.park@lge.com Signed-off-by: Sangwoo Park <sangwoo2.park@lge.com> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit f0fe9984656604ea8effd5ff82709ff8ce1f954b) Reviewed-on: https://chromium-review.googlesource.com/505204 Reviewed-by: Luigi Semenzato <semenzato@chromium.org> " fail_count="1" gerrit_number="505204" owner_email="dianders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/04/505204/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Ie922580dbdaf61f03843411914b6b480d319576a" commit="91982b83fc9e5b88ef2177e62e05e245a77ec420" commit_message="CHROMIUM: kbuild: clang: Disable the 'duplicate-decl-specifier' warning clang generates plenty of these warnings in different parts of the code. They are mostly caused by container_of() and other macros which declare a "const <type> *" variable for their internal use which triggers a "duplicate 'const' specifier" warning if the <type> is already const qualified. For the above cases the warnings are only raised when -std=gnu89 is set, however this doesn't trigger the warning with gcc. The longer term solution is probably to make clang behave like gcc in this aspect, in the meantime disable the warning. BUG=chromium:702741,chromium:723720 TEST=build for gru and pyro with clang Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Change-Id: Ie922580dbdaf61f03843411914b6b480d319576a Reviewed-on: https://chromium-review.googlesource.com/506553 Commit-Ready: Douglas Anderson <dianders@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="506553" owner_email="mka@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/506553/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I784a6ae7e8e5dc2ea79c53460fdb5bf306c13b51" commit="1b5bb5096fb3871dc00d6385baeb0767c4645068" commit_message="CHROMIUM: arm64: Disable asm-operand-width warning for clang clang raises 'asm-operand-widths' warnings in inline assembly code when the size of an operand is < 64 bits and the operand width is unspecified. Most warnings are raised in macros, i.e. the datatype of the operand may vary. Most of these warnings are fixed in upstream, however we consider it isn't worth the effort/risk to backport all the necessary changes. On future CrOS kernels >= v4.13 the warning should be re-enabled. BUG=chromium:702741 TEST=build for gru with clang Change-Id: I784a6ae7e8e5dc2ea79c53460fdb5bf306c13b51 Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/506556 Commit-Ready: Douglas Anderson <dianders@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="506556" owner_email="mka@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/506556/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I2b1087926acaf6dcdec5c15b06e1a8c996ae4f8f" commit="d5cc6750422765a12155d76eebfebcd6440e3447" commit_message="CHROMIUM: x86/mce: Disable 'gcc-compat' warning for mce.c locally With the warning enabled clang generates a false positive: arch/x86/kernel/cpu/mcheck/mce.c:1928:12: error: 'break' is bound to loop, GCC binds it to switch [-Werror,-Wgcc-compat] } while (cmpxchg(&mcelog.flags, flags, 0) != flags); ^ arch/x86/include/asm/cmpxchg.h:147:2: note: expanded from macro 'cmpxchg' __cmpxchg(ptr, old, new, sizeof(*(ptr))) ^ arch/x86/include/asm/cmpxchg.h:132:2: note: expanded from macro '__cmpxchg' __raw_cmpxchg((ptr), (old), (new), (size), LOCK_PREFIX) ^ arch/x86/include/asm/cmpxchg.h:123:3: note: expanded from macro '__raw_cmpxchg' break; \ ^ The problem has been reported to upstream clang: https://bugs.llvm.org/show_bug.cgi?id=32648 BUG=chromium:709711,chromium:702741 TEST=build for pyro with clang Change-Id: I2b1087926acaf6dcdec5c15b06e1a8c996ae4f8f Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508035 Commit-Ready: Douglas Anderson <dianders@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="508035" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/35/508035/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I9e07e6aef0e95837fb40d575f60b292baaf6a4eb" commit="423aa0f9d934a7556c0fe32471186f8ba6b33c5c" commit_message="CHROMIUM: task_work: Disable 'gcc-compat' warning locally With the warning enabled clang generates a false positive when building for x86: kernel/task_work.c:101:12: error: 'break' is bound to current loop, GCC binds it to the enclosing loop [-Werror,-Wgcc-compat] } while (cmpxchg(&task->task_works, work, head) != work); ^ arch/x86/include/asm/cmpxchg.h:147:2: note: expanded from macro 'cmpxchg' __cmpxchg(ptr, old, new, sizeof(*(ptr))) ^ arch/x86/include/asm/cmpxchg.h:132:2: note: expanded from macro '__cmpxchg' __raw_cmpxchg((ptr), (old), (new), (size), LOCK_PREFIX) ^ arch/x86/include/asm/cmpxchg.h:123:3: note: expanded from macro '__raw_cmpxchg' break; \ ^ The problem has been reported to upstream clang: https://bugs.llvm.org/show_bug.cgi?id=32648 BUG=chromium:709711,chromium:702741 TEST=build for pyro with clang Change-Id: I9e07e6aef0e95837fb40d575f60b292baaf6a4eb Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508036 Commit-Ready: Douglas Anderson <dianders@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="508036" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/36/508036/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Icbc1e625f6e73e1a10b404eaac3df5228fa40fbb" commit="a03496eb58de6aabd584a5bf77fe421657d23fa8" commit_message="CHROMIUM: timekeeping: Mark timekeeping_cycles_to_ns() as __maybe_unused The function is not used in v4.4 (it is used by upstream). Adding the attribute fixes the following warning: kernel/time/timekeeping.c:321:19: error: unused function 'timekeeping_cycles_to_ns' [-Werror,-Wunused-function] BUG=chromium:702741 TEST=build with clang for gru Change-Id: Icbc1e625f6e73e1a10b404eaac3df5228fa40fbb Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508104 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="0" gerrit_number="508104" owner_email="mka@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/04/508104/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Icaf86f0fc257efc458fcdf4eeb114c0243e63123" commit="2a1a84b499fdc8597609f510e335747749b1c456" commit_message="CHROMIUM: cpuidle: governor: menu: Mark get_loadavg() as __maybe_unused Commit 4dedd9f12470 ("cpuidle: governor: menu: don't use loadavg") commented the only call to get_loadavg(), leaving it unused. Adding the attribute fixes the following warning when building with clang: drivers/cpuidle/governors/menu.c:137:19: error: unused function 'get_loadavg' [-Werror,-Wunused-function] BUG=chromium:702741 TEST=build with clang for gru Change-Id: Icaf86f0fc257efc458fcdf4eeb114c0243e63123 Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508105 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="0" gerrit_number="508105" owner_email="mka@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/05/508105/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ib14b348061a25b523e6b7db6a96993e525f40c1d" commit="8821eaa44ba7cde7409132cd2daf95f88b105f90" commit_message="CHROMIUM: MALI: Mark kbasep_jm_is_js_free() as __maybe_unused The function kbasep_jm_is_js_free() is only used in an assertion and therefore unused when debugging is not enabled. Adding the attribute fixes the following warning when building with clang: drivers/gpu/arm/midgard/backend/gpu/mali_kbase_jm_hw.c:46:19: error: unused function 'kbasep_jm_is_js_free' [-Werror,-Wunused-function] BUG=chromium:702741 TEST=build with clang for gru Change-Id: Ib14b348061a25b523e6b7db6a96993e525f40c1d Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508106 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="0" gerrit_number="508106" owner_email="mka@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/06/508106/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Iefb97691d1f295411d7b5db603d9214d41af49fd" commit="bb3be2c0efc8de1602b56b0d7c78e5ddcccb4935" commit_message="keyboard_8042: Allow scancode sets to be mutable Add an option to allow the scancode sets to be mutable. The only reason to use this is to allow a scancode to be changed at runtime, for instance to support different keyboards in one image. The side effect of this is the scancode sets are moved out of the shared RO section. BUG=b:36735408 BRANCH=none TEST=make -j buildall Change-Id: Iefb97691d1f295411d7b5db603d9214d41af49fd Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://chromium-review.googlesource.com/506717 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="1" gerrit_number="506717" owner_email="dlaurie@google.com" pass_count="0" patch_number="5" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/17/506717/5" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="Ia134db7b069d5bf10c931ee7ce66dd1ea85d3544" commit="41b8d73d9b88914ece2505f57b7fccf6fda30bc1" commit_message="eve: Enable mutable scancode for EVT boards Enable the mutable scancode sets for EVT boards and reassign the existing F13 scancode to instead send the new 0[e0 58] 1[e0 07] scancode instead. BUG=b:36735408 BRANCH=none TEST=manual testing on Eve EVT to ensure that the key that used to send F13 now sends the new scancode. Also test on P1 to ensure that the key still sends F13. Change-Id: Ia134db7b069d5bf10c931ee7ce66dd1ea85d3544 Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://chromium-review.googlesource.com/506718 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="1" gerrit_number="506718" owner_email="dlaurie@google.com" pass_count="0" patch_number="5" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/18/506718/5" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="I91b14ec360190176dba0a8e7c458b2b0ab5b6dcd" commit="aca248a42ee3dcf07322a5263094d0af25f706b0" commit_message="eve: Shut down PMIC in hibernate Instead of using EC hibernate shut down the PMIC over I2C. This will turn off the DSW rail and the EC completely. The existing wake sources are still able to wake the system. BUG=b:35647896 BRANCH=none TEST=manual testing on Eve board to ensure that wake sources that are expected to wake from G3 are still functional. (AC, power, lid) Change-Id: I91b14ec360190176dba0a8e7c458b2b0ab5b6dcd Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://chromium-review.googlesource.com/506719 Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="1" gerrit_number="506719" owner_email="dlaurie@google.com" pass_count="0" patch_number="5" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/19/506719/5" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Ic9a22ecc2337fad1683dd102fc26e81b72fd8bc3" commit="ed5202c53aa7e8bda5a9089e069de6073fc67f9e" commit_message="UPSTREAM: mmc: sdhci: move initialisation of command error member When a command is started, logically it has no error. Initialise the command's error member to zero whenever we start a command. BUG=chromium:723759 TEST=Build and boot Change-Id: Ic9a22ecc2337fad1683dd102fc26e81b72fd8bc3 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> [ Goes with "mmc: sdhci: fix command response CRC error handling" ] Cc: stable@vger.kernel.org # v4.5+ Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 96776200898cf9c1965b9f8b9a128e94bb6dce18) Reviewed-on: https://chromium-review.googlesource.com/508029 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="2" gerrit_number="508029" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/29/508029/1" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I14dba6c2808149c585a9d2b16fd0f1b3a549aae4" commit="db479cbaf8cb1c450d4575f868b0fa6afc25a695" commit_message="UPSTREAM: mmc: sdhci: clean up command error handling Avoid multiple tests while handling a command error; simplify the code. BUG=chromium:723759 TEST=Build and boot Change-Id: I14dba6c2808149c585a9d2b16fd0f1b3a549aae4 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> [ Goes with "mmc: sdhci: fix command response CRC error handling" ] Cc: stable@vger.kernel.org # v4.5+ Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit ec014cbacf6229c583cb832726ca39be1ae3d8c3) Reviewed-on: https://chromium-review.googlesource.com/508030 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="2" gerrit_number="508030" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/30/508030/1" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I1e9ed267fa1b5dbfef544794f4fcd318a2d7a130" commit="076bca240b0bce7d92dfc88d8ea968d20495b8de" commit_message="UPSTREAM: mmc: sdhci: fix command response CRC error handling When we get a response CRC error on a command, it means that the response we received back from the card was not correct. It does not mean that the card did not receive the command correctly. If the command is one which initiates a data transfer, the card can enter the data transfer state, and start sending data. Moreover, if the request contained a data phase, we do not clean this up, and this results in the driver triggering DMA API debug warnings, and also creates a race condition in the driver, between running the finish_tasklet and the data transfer interrupts, which can trigger a "Got data interrupt" state dump. Fix this by handing a response CRC error slightly differently: record the failure of the data initiating command, but allow the remainder of the request to be processed normally. This is safe as core MMC checks the status of all commands and data transfer phases of the request. If the card does not initiate a data transfer, then we should time out according to the data transfer parameters. BUG=chromium:723759 TEST=Build and boot Change-Id: I1e9ed267fa1b5dbfef544794f4fcd318a2d7a130 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> [ Fix missing parenthesis around bitwise-AND expression, and tweak subject ] Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: stable@vger.kernel.org # v4.5+ Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 71fcbda0fcddd0896c4982a484f6c8aa802d28b1) Reviewed-on: https://chromium-review.googlesource.com/508031 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="2" gerrit_number="508031" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/31/508031/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ide11193467d75cba7fed963497d1f099820b7439" commit="849aacfd328d508de0ee264bcc82130739c2fe68" commit_message="x11-libs/arc-libdrm: Fix --libdir argument For some reason, using the $(prefix) in --libdir was leading to leaving the variable unresolved (even though ./configure --help uses the same syntax when listing the default values for paths) and writing it as such to the libdrm.pc file and confusing pkg-config. Use ${prefix}, which seems to be working fine. (This problem actually affects x11-libs/arc-libpciaccess and media-libs/arc-mesa as well, however related lines in their ebuilds are going away with other patches, so fix only x11-libs/arc-libdrm now, which is blocking those other patches.) BUG=b:36540057 TEST=emerge-caroline arc-libdrm arc-mesa Change-Id: Ide11193467d75cba7fed963497d1f099820b7439 Reviewed-on: https://chromium-review.googlesource.com/505794 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="2" gerrit_number="505794" owner_email="tfiga@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/94/505794/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Id223203506d71b3966e9730f92badb461eb6cb1b" commit="a81103ee289d8eea325869a0d022bea0f214ec42" commit_message="minigbm: cros_gralloc: Use pkg-config for LIBS This changes the Makefile to use pkg-config to query for necessary library paths and names instead of hardcoding -ldrm. BUG=b:36540057 TEST=emerge-reef arc-cros-gralloc with multilib patches CQ-DEPEND=CL:505794 Change-Id: Id223203506d71b3966e9730f92badb461eb6cb1b Reviewed-on: https://chromium-review.googlesource.com/499971 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Luis Hector Chavez <lhchavez@chromium.org> " fail_count="3" gerrit_number="499971" owner_email="tfiga@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/minigbm" project_url="https://chromium-review.googlesource.com/chromiumos/platform/minigbm" ref="refs/changes/71/499971/2" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Ie7426075f5bcc73a6f1aaa4996a60c119ce4c554" commit="a8ef795d446ac60a025750e475f67afc6b05722e" commit_message="arc-toolchain-n: Uprev arc-toolchain-n for x86_64 This change: * Adds support for x86_64. * Removes all drm and gralloc-related stuff since it's not built from Android anymore. BUG=b:36540057 TEST=reef's vendor.raw.img has lib64/ CQ-DEPEND=CL:499971 Change-Id: Ie7426075f5bcc73a6f1aaa4996a60c119ce4c554 Reviewed-on: https://chromium-review.googlesource.com/492028 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Luis Hector Chavez <lhchavez@chromium.org> Reviewed-by: Tomasz Figa <tfiga@chromium.org> " fail_count="4" gerrit_number="492028" owner_email="lhchavez@chromium.org" pass_count="0" patch_number="7" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/28/492028/7" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="I8b79227f0270643405b3f0e2c423b2365e54c9da" commit="3f5aa7ee4d2ffbdbfcd6028407c1dab344b7607a" commit_message="UPSTREAM: zram: revalidate disk under init_lock Commit b4c5c60920e3 ("zram: avoid lockdep splat by revalidate_disk") moved revalidate_disk call out of init_lock to avoid lockdep false-positive splat. However, commit 08eee69fcf6b ("zram: remove init_lock in zram_make_request") removed init_lock in IO path so there is no worry about lockdep splat. So, let's restore it. This patch is needed to set BDI_CAP_STABLE_WRITES atomically in next patch. BUG=chromium:721960 TEST=Build and boot Change-Id: I8b79227f0270643405b3f0e2c423b2365e54c9da Fixes: da9556a2367c ("zram: user per-cpu compression streams") Link: http://lkml.kernel.org/r/1482366980-3782-3-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Takashi Iwai <tiwai@suse.de> Cc: Hyeoncheol Lee <cheol.lee@lge.com> Cc: <yjay.kim@lge.com> Cc: Sangseok Lee <sangseok.lee@lge.com> Cc: Hugh Dickins <hughd@google.com> Cc: Darrick J. Wong <darrick.wong@oracle.com> Cc: <stable@vger.kernel.org> [4.7+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit e7ccfc4ccb703e0f033bd4617580039898e912dd) Reviewed-on: https://chromium-review.googlesource.com/506109 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="3" gerrit_number="506109" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/09/506109/1" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-4.4" change_id="Ia0dc5cc0e2cb76a0ee52ec615b33f973d8a784d8" commit="e43e4d82403f3287d6d5751ba5fc4b3990920658" commit_message="UPSTREAM: zram: support BDI_CAP_STABLE_WRITES zram has used per-cpu stream feature from v4.7. It aims for increasing cache hit ratio of scratch buffer for compressing. Downside of that approach is that zram should ask memory space for compressed page in per-cpu context which requires stricted gfp flag which could be failed. If so, it retries to allocate memory space out of per-cpu context so it could get memory this time and compress the data again, copies it to the memory space. In this scenario, zram assumes the data should never be changed but it is not true without stable page support. So, If the data is changed under us, zram can make buffer overrun so that zsmalloc free object chain is broken so system goes crash like below https://bugzilla.suse.com/show_bug.cgi?id=997574 This patch adds BDI_CAP_STABLE_WRITES to zram for declaring "I am block device needing *stable write*". BUG=chromium:721960 TEST=Build and boot Change-Id: Ia0dc5cc0e2cb76a0ee52ec615b33f973d8a784d8 Fixes: da9556a2367c ("zram: user per-cpu compression streams") Link: http://lkml.kernel.org/r/1482366980-3782-4-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Takashi Iwai <tiwai@suse.de> Cc: Hyeoncheol Lee <cheol.lee@lge.com> Cc: <yjay.kim@lge.com> Cc: Sangseok Lee <sangseok.lee@lge.com> Cc: Hugh Dickins <hughd@google.com> Cc: Darrick J. Wong <darrick.wong@oracle.com> Cc: <stable@vger.kernel.org> [4.7+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit b09ab054b69b07077bd3292f67e777861ac796e5) Reviewed-on: https://chromium-review.googlesource.com/506110 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="3" gerrit_number="506110" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/10/506110/1" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-4.4" change_id="Ica284550bab45e05228df2aa51d07a8a961b97c4" commit="ca5f53f35d23d323923ec842117f8c818bdae26d" commit_message="UPSTREAM: zram: fix operator precedence to get offset In zram_rw_page, the logic to get offset is wrong by operator precedence (i.e., "<<" is higher than "&"). With wrong offset, zram can corrupt the user's data. This patch fixes it. BUG=chromium:721960 TEST=Build and boot Change-Id: Ica284550bab45e05228df2aa51d07a8a961b97c4 Fixes: 8c7f01025 ("zram: implement rw_page operation of zram") Link: http://lkml.kernel.org/r/1492042622-12074-1-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> (cherry picked from commit 4ca82dabc9fbf7bc5322aa54d802cb3cb7b125c5) Reviewed-on: https://chromium-review.googlesource.com/506111 Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="3" gerrit_number="506111" owner_email="dianders@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/11/506111/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Ic7a36867eff7b40c98ff23818f10f9f163efcd22" commit="db8dad8d722b40ab972d055fde600bf68fd098dd" commit_message="Set direncryption USE flag for oak BUG=None TEST=None Change-Id: Ic7a36867eff7b40c98ff23818f10f9f163efcd22 Reviewed-on: https://chromium-review.googlesource.com/506790 Commit-Ready: Daniel Kurtz <djkurtz@chromium.org> Tested-by: Bernie Thompson <bhthompson@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> " fail_count="2" gerrit_number="506790" owner_email="bhthompson@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/90/506790/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ica871c07fec857b3d1b48ca4148bc076255a8407" commit="11ce3f510f5f17e520f1eb4ab67a8f80ac833484" commit_message="Revert "Temporarily move coreboot-utils dependency back to depthcharge" This reverts commit c2ceb6c13de46b136e1f2ca8b8edcf849437484a. Reason for revert: cbmem has been fixed to no longer do illegal mmap()s with CL:506197, so we can go back to shipping it on all boards. BUG=b:37757150,b:38211793,chromium:719786 TEST=None Change-Id: Ica871c07fec857b3d1b48ca4148bc076255a8407 Reviewed-on: https://chromium-review.googlesource.com/506851 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="2" gerrit_number="506851" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/51/506851/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I8501167c6bd8bee34822c254cef7e3cb532eeb79" commit="ea892b439ae03981d9fffe36eadede8fa97a178d" commit_message="Reland "power: suspend_stress_test: Read firmware log through cbmem -1" This reverts commit cf55b25c71eb651163b7dc242aec079488e14628 by relanding commit 4220a620eabfe8fdde65563ddbe4bfca956b4095. Reason for reland: Problems with the dependent CL have been resolved. CQ-DEPEND=CL:506851 BUG=b:37757150,b:38211793,chromium:719786 Change-Id: I8501167c6bd8bee34822c254cef7e3cb532eeb79 Reviewed-on: https://chromium-review.googlesource.com/506869 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Brian Norris <briannorris@chromium.org> " fail_count="2" gerrit_number="506869" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/69/506869/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I02914ce27664f76e6f0e4fe37b96f92fd4a3373b" commit="3b73a2d736040dfecac5fb6b4cd34cc9c518bfaf" commit_message="[autotest] Make run_special_task_actions() a method BUG=chromium:707999 TEST=Run unit tests Change-Id: I02914ce27664f76e6f0e4fe37b96f92fd4a3373b Reviewed-on: https://chromium-review.googlesource.com/446885 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> " fail_count="4" gerrit_number="446885" owner_email="ayatane@chromium.org" pass_count="0" patch_number="18" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/85/446885/18" remote="cros" total_fail_count="6"/><pending_commit branch="master" change_id="I85d16ac1238b0b9f5a6b85041f2f0ca611307872" commit="8670752199ce3cd1fa0a431408c39a678fb958ee" commit_message="[autotest] Privatize sort_actionable_labels() BUG=chromium:707999 TEST=Run unit tests Change-Id: I85d16ac1238b0b9f5a6b85041f2f0ca611307872 Reviewed-on: https://chromium-review.googlesource.com/446886 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="6" gerrit_number="446886" owner_email="ayatane@chromium.org" pass_count="0" patch_number="18" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/86/446886/18" remote="cros" total_fail_count="6"/><pending_commit branch="chromeos-4.4" change_id="Ic5397904d2c543bb3d00615b02fa01b9569fba2c" commit="c196d161d8077333ba2f2575d3ce1b9c434edff3" commit_message="UPSTREAM: tracing: Use cpumask_available() to check if cpumask variable may be used This fixes the following clang warning: kernel/trace/trace.c:3231:12: warning: address of array 'iter->started' will always evaluate to 'true' [-Wpointer-bool-conversion] if (iter->started) Link: http://lkml.kernel.org/r/20170421234110.117075-1-mka@chromium.org BUG=chromium:702741 TEST=build for pyro with clang Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> (cherry picked from commit 4dbbe2d8e95c351157f292ece067f985c30c7b53) Change-Id: Ic5397904d2c543bb3d00615b02fa01b9569fba2c Reviewed-on: https://chromium-review.googlesource.com/506590 Commit-Ready: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Brian Norris <briannorris@chromium.org> " fail_count="3" gerrit_number="506590" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/90/506590/1" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-4.4" change_id="I80b7e2cbe85de9125d41eb82585a10052eae0075" commit="d920260e654e98e26ef2fffe6a486549064a9d25" commit_message="FROMLIST: netfilter: ctnetlink: Make some parameters integer to avoid enum mismatch Not all parameters passed to ctnetlink_parse_tuple() and ctnetlink_exp_dump_tuple() match the enum type in the signatures of these functions. Since this is intended change the argument type of to be an int value. Link: https://patchwork.kernel.org/patch/9688629/ BUG=chromium:702741 TEST=build for pyro with clang Change-Id: I80b7e2cbe85de9125d41eb82585a10052eae0075 Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/506591 Reviewed-by: Brian Norris <briannorris@chromium.org> " fail_count="3" gerrit_number="506591" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/91/506591/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I549214430957605ff5a302ca005eb9f0323ffb7e" commit="80e98f77e4362cfa49a2653820872ae8176b845e" commit_message="nvme: Allow NVMe to be specified by the root port As the PCI bus may change when the installed devices change allow an NVMe controller to be specified by the root port that it is connected to. BUG=b:35581264 BRANCH=none TEST=none Change-Id: I549214430957605ff5a302ca005eb9f0323ffb7e Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://chromium-review.googlesource.com/506816 Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Shelley Chen <shchen@chromium.org> " fail_count="2" gerrit_number="506816" owner_email="dlaurie@google.com" pass_count="0" patch_number="5" project="chromiumos/platform/depthcharge" project_url="https://chromium-review.googlesource.com/chromiumos/platform/depthcharge" ref="refs/changes/16/506816/5" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ic3771b1f363c1ba84f7d7d6d5f2db8b4e9b15718" commit="ee0e658b0fae9afbcdb8b66e279c1e101be0cb51" commit_message="nvme: Fix controller disable from running when it should not The need_update variable is being used to check before disabling the controller, but this doesn't really correlate to running nvme_enable_controller() or even being detected and having a valid base address. Add an enabled variable that is set after the device is detected and successfully runs nvme_enable_controller() and check that before calling nvme_disable_controller(). As part of this, move the message inside the if statement so it does not get shown if the controller was not detected properly and is therefore not running the shutdown code. BUG=b:35581264 BRANCH=none TEST=boot on system with nvme enabled but no device present and ensure it does not print the message about shutting down the controller. Change-Id: Ic3771b1f363c1ba84f7d7d6d5f2db8b4e9b15718 Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://chromium-review.googlesource.com/508089 Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Shelley Chen <shchen@chromium.org> " fail_count="2" gerrit_number="508089" owner_email="dlaurie@google.com" pass_count="0" patch_number="1" project="chromiumos/platform/depthcharge" project_url="https://chromium-review.googlesource.com/chromiumos/platform/depthcharge" ref="refs/changes/89/508089/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Id4fad2ce54fcde9b91f7929aad238954183b7df0" commit="a0faa30abdb33c00274689372cec511af8666bdf" commit_message="Disable single-finger scrolling and improve thumb filtering This change removes single-finger scrolling, i.e. scrolling by leaving one finger in place and moving another. This allows for more aggressive thumb detection, which in turn allows users to leave a finger on the touchpad for clicking while using the other hand for gestures normally. BUG=chrome-os-partner:36804690 TEST=Ran on touchtest regression suite. Added test cases where a stationary finger should be ignored. Determined the prevalence of single finger scrolling using feedback logs. See bug for details. Change-Id: Id4fad2ce54fcde9b91f7929aad238954183b7df0 Reviewed-on: https://chromium-review.googlesource.com/466617 Commit-Ready: Sean O'Brien <seobrien@chromium.org> Tested-by: Sean O'Brien <seobrien@chromium.org> Reviewed-by: Charlie Mooney <charliemooney@chromium.org> " fail_count="2" gerrit_number="466617" owner_email="seobrien@chromium.org" pass_count="0" patch_number="7" project="chromiumos/platform/gestures" project_url="https://chromium-review.googlesource.com/chromiumos/platform/gestures" ref="refs/changes/17/466617/7" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I38dbed1024c08d8c16d9b11eaaf558909b6a6279" commit="aa3d487f1a8512ddb66872377ea462cd3551b0e8" commit_message="Remove deprecated configuration parameter CQ-DEPEND=CL:466617 BUG=chrome-os-partner:36804690 TEST=Ran on touchtest regression suite with CL:466617. Change-Id: I38dbed1024c08d8c16d9b11eaaf558909b6a6279 Reviewed-on: https://chromium-review.googlesource.com/492347 Commit-Ready: Sean O'Brien <seobrien@chromium.org> Tested-by: Sean O'Brien <seobrien@chromium.org> Reviewed-by: Andrew de los Reyes <adlr@chromium.org> " fail_count="3" gerrit_number="492347" owner_email="seobrien@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/xorg-conf" project_url="https://chromium-review.googlesource.com/chromiumos/platform/xorg-conf" ref="refs/changes/47/492347/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Id4f677b2de25c62fb87297e04c652c1c3039ffca" commit="a8dbcd8ecef3145090c579697f2a6587662ae08c" commit_message="Gesture library ignores stationary fingers Added and modified tests for change in functionailty. Single-finger scrolling is removed and stationary fingers should be ignored. CQ-DEPEND=CL:466617 BUG=none TEST=none Change-Id: Id4f677b2de25c62fb87297e04c652c1c3039ffca Reviewed-on: https://chromium-review.googlesource.com/492467 Commit-Ready: Sean O'Brien <seobrien@chromium.org> Tested-by: Sean O'Brien <seobrien@chromium.org> Reviewed-by: Andrew de los Reyes <adlr@chromium.org> " fail_count="3" gerrit_number="492467" owner_email="seobrien@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/touchpad-tests" project_url="https://chromium-review.googlesource.com/chromiumos/platform/touchpad-tests" ref="refs/changes/67/492467/2" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Ia553a0c32bab224b397de3f8c61df14c71df1909" commit="9f941388897108a584e4184dc6762f1f2b34ee3d" commit_message="Remove usage of clear-framebuffer service Do not enable clear-framebuffer.service, which is removed in another CL. This is a part of the ply-image based boot splash screen, which is no longer used. BUG=chromium:691762 TEST=built/installed on device visually verified Change-Id: Ia553a0c32bab224b397de3f8c61df14c71df1909 Reviewed-on: https://chromium-review.googlesource.com/503428 Commit-Ready: Drew Davenport <ddavenport@chromium.org> Tested-by: Drew Davenport <ddavenport@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="2" gerrit_number="503428" owner_email="ddavenport@chromium.org" pass_count="0" patch_number="4" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/28/503428/4" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="Ide2f6271e223997e824e9d6dccf60261b77e8c01" commit="586f15f2bf4b7935bc2c800ec104670191504b6d" commit_message="Remove unneeded clear-framebuffer service ply-image is no longer used for boot splash screen BUG=chromium:691762 TEST=installed on device and visually confirmed CQ-DEPEND=CL:503428 Change-Id: Ide2f6271e223997e824e9d6dccf60261b77e8c01 Reviewed-on: https://chromium-review.googlesource.com/503471 Commit-Ready: Drew Davenport <ddavenport@chromium.org> Tested-by: Drew Davenport <ddavenport@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="2" gerrit_number="503471" owner_email="ddavenport@chromium.org" pass_count="0" patch_number="3" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/71/503471/3" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-4.4" change_id="Iadc8ed956a5487c2b5e5cf1d72f753c58cc25806" commit="9886798cf0518ca620ef56ad704472777fd24d8a" commit_message="UPSTREAM: nfsd4: minor NFSv2/v3 write decoding cleanup commit db44bac41bbfc0c0d9dd943092d8bded3c9db19b upstream. Use a couple shortcuts that will simplify a following bugfix. (Minor backporting required to account for a change from f34b95689d2c "The NFSv2/NFSv3 server does not handle zero length WRITE requests correctly".) Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Andrey Ulanov <andreyu@google.com> (cherry picked from git.kernel.org stable/linux-stable.git commit 35e13333c217f0255a1e657ce075f0f72bc6383c) BUG=b:38261521 TEST=None Change-Id: Iadc8ed956a5487c2b5e5cf1d72f753c58cc25806 Reviewed-on: https://chromium-review.googlesource.com/505167 Commit-Ready: Andrey Ulanov <andreyu@google.com> Tested-by: Guenter Roeck <groeck@chromium.org> Tested-by: Andrey Ulanov <andreyu@google.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="3" gerrit_number="505167" owner_email="andreyu@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/67/505167/1" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-4.4" change_id="Iba805f76c8e0f6d98374f877f8bfd36ea8dc5718" commit="22055151cac19b315cad7d992bcbfc06be886fe0" commit_message="UPSTREAM: nfsd: stricter decoding of write-like NFSv2/v3 ops The NFSv2/v3 code does not systematically check whether we decode past the end of the buffer. This generally appears to be harmless, but there are a few places where we do arithmetic on the pointers involved and don't account for the possibility that a length could be negative. Add checks to catch these. Reported-by: Tuomas Haanp <thaan@synopsys.com> Reported-by: Ari Kauppi <ari@synopsys.com> Reviewed-by: NeilBrown <neilb@suse.com> Cc: stable@vger.kernel.org Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Andrey Ulanov <andreyu@google.com> (cherry picked from commit 13bf9fbff0e5e099e2b6f003a0ab8ae145436309) BUG=b:38261521 TEST=None Change-Id: Iba805f76c8e0f6d98374f877f8bfd36ea8dc5718 Reviewed-on: https://chromium-review.googlesource.com/505168 Commit-Ready: Andrey Ulanov <andreyu@google.com> Tested-by: Guenter Roeck <groeck@chromium.org> Tested-by: Andrey Ulanov <andreyu@google.com> Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="3" gerrit_number="505168" owner_email="andreyu@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/68/505168/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Id8f8fa02f84320600e79116cbad8b4f562f35810" commit="be8e7f47d2f3c79c8178e8d52744576c3e664081" commit_message="eclass: cros-firmware: Create firmware updater script only if available. Some testing scripts are relying on existence of chromeos-firmwareupdate to decide if it should extract information from it; the new chromeos-firmware-null is now always creating an empty updater if image files are not specified. It seems more reasonable to prevent creating empty updater instead of changing the test logic in all other test scripts. BUG=None TEST=emerge-$BOARD chromeos-firmware-null Change-Id: Id8f8fa02f84320600e79116cbad8b4f562f35810 Reviewed-on: https://chromium-review.googlesource.com/505976 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="6" gerrit_number="505976" owner_email="hungte@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/76/505976/3" remote="cros" total_fail_count="6"/><pending_commit branch="master" change_id="I462d2d58430456ca19a2df0bf517ea2afc6d7e62" commit="436b7829ad9519f001d998c794b97731c7b4c069" commit_message="chromeos-base/chromeos-firmware-null: Uprev ebuild version. Not sure why, commit queue didn't uprev chromeos-firmware-null properly when we change to cros_workon ebuild files; it creates a 0.0.1-r1 file while the previous generated one was 0.0.2-r1. Manually delete 0.0.2-r1 and uprev 0.0.1-r1 to 0.0.3-r1 to make sure the new ebuild will be used. BUG=None TEST=emerge-$BOARD chromeos-firmware-null Change-Id: I462d2d58430456ca19a2df0bf517ea2afc6d7e62 Reviewed-on: https://chromium-review.googlesource.com/505889 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="5" gerrit_number="505889" owner_email="hungte@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/89/505889/1" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="I159bbc4054cb333da8808c19b8d08935d6ac12eb" commit="fb865c98d1de68f6e387affb7d547f5880a5e962" commit_message="shill: fully qualify shill::Logging namespace in macros Macros are not bound to any namespace, so we should use fully qualified namespaces in macros to avoid surprises. BUG=None TEST=Run unit tests. TEST=Manually observe shill logs in /var/log/net.log on a device. Change-Id: I159bbc4054cb333da8808c19b8d08935d6ac12eb Reviewed-on: https://chromium-review.googlesource.com/506799 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> " fail_count="3" gerrit_number="506799" owner_email="benchan@chromium.org" pass_count="0" patch_number="1" project="aosp/platform/system/connectivity/shill" project_url="https://chromium-review.googlesource.com/aosp/platform/system/connectivity/shill" ref="refs/changes/99/506799/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I562e56919b05dd0a50a255ca70fc3cbaf428971b" commit="906f219e0d1ddc72728f087a1029279eb29e14a5" commit_message="shill: mark several getters as a const method This CL marks several getters (e.g. GetRpcIdentifier) in various classes as a const method as they don't need to change the object state. By marking them as a const method, we can potentially change the related definitions of shill::Logging::ObjectID() to take a const pointer to the associated object. BUG=None TEST=Run unit tests. Change-Id: I562e56919b05dd0a50a255ca70fc3cbaf428971b Reviewed-on: https://chromium-review.googlesource.com/508052 Commit-Ready: Ben Chan <benchan@chromium.org> Tested-by: Ben Chan <benchan@chromium.org> Reviewed-by: Eric Caruso <ejcaruso@chromium.org> " fail_count="2" gerrit_number="508052" owner_email="benchan@chromium.org" pass_count="0" patch_number="1" project="aosp/platform/system/connectivity/shill" project_url="https://chromium-review.googlesource.com/aosp/platform/system/connectivity/shill" ref="refs/changes/52/508052/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I240ce0a05d11cfdb2e9b9737492db7a775364beb" commit="6b563f924cc84202ad948b272b5d071830d592df" commit_message="tools: Change scripts calling make_factory_package to use new args. The make_factory_package has changed its parameters to match new factory bundle names. Scripts using make_factory_package should use the new argument names. BUG=None TEST=None Change-Id: I240ce0a05d11cfdb2e9b9737492db7a775364beb Reviewed-on: https://chromium-review.googlesource.com/508571 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Yong Hong <yhong@chromium.org> " fail_count="0" gerrit_number="508571" owner_email="hungte@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/71/508571/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="If18f636fbafcf2b678126e7d61c931b79a0b5cec" commit="667d5c85e222c305fbabb305b7a3f225d110c440" commit_message="setup: Fix make_factory_package when not using --cros_payload. For legacy memento-based Mini-Omaha server, we still need the memento related scripts and libraries. BUG=None TEST=None Change-Id: If18f636fbafcf2b678126e7d61c931b79a0b5cec Reviewed-on: https://chromium-review.googlesource.com/508550 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Yong Hong <yhong@chromium.org> " fail_count="0" gerrit_number="508550" owner_email="hungte@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/50/508550/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I7630713aa670f34b5f38d7a6d16b7fee36db76ee" commit="c4af43f9351a0f6731248aeb4f811f595a4a237d" commit_message="pyxinput: Remove X11 remnants Delete pyxinput from the dep list as all boards support freon now. BUG=chromium:655820 TEST=build_package, code search Code search of pyxinput usage: https://cs.corp.google.com/search/?q=pyxinput&m=100&det=matsel&sq=package:%5Echromeos_(internal%7Cpublic)$&type=cs https://cs.corp.google.com/search/?q=xi2reader&m=100&det=matsel&sq=package:%5Echromeos_(internal%7Cpublic)$&type=cs CQ-DEPEND=Id63a4517a6df8f9efb8a5d0824a0ee0cf78e51d8 Change-Id: I7630713aa670f34b5f38d7a6d16b7fee36db76ee Reviewed-on: https://chromium-review.googlesource.com/506451 Commit-Ready: Po-Hsien Wang <pwang@chromium.org> Tested-by: Po-Hsien Wang <pwang@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> " fail_count="2" gerrit_number="506451" owner_email="pwang@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/51/506451/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Id63a4517a6df8f9efb8a5d0824a0ee0cf78e51d8" commit="a3fc8c6845d06f6d9a7d5009d00a416c3ae425f3" commit_message="pyxinput: Remove X11 remnants Delete pyxinput package as all boards support freon. BUG=chromium:655820 TEST=build_package, code search Code search of pyxinput usage: https://cs.corp.google.com/search/?q=pyxinput&m=100&det=matsel&sq=package:%5Echromeos_(internal%7Cpublic)$&type=cs https://cs.corp.google.com/search/?q=xi2reader&m=100&det=matsel&sq=package:%5Echromeos_(internal%7Cpublic)$&type=cs CQ-DEPEND=I7630713aa670f34b5f38d7a6d16b7fee36db76ee Change-Id: Id63a4517a6df8f9efb8a5d0824a0ee0cf78e51d8 Reviewed-on: https://chromium-review.googlesource.com/506368 Commit-Ready: Po-Hsien Wang <pwang@chromium.org> Tested-by: Po-Hsien Wang <pwang@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> " fail_count="2" gerrit_number="506368" owner_email="pwang@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/68/506368/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I7c3253618b8a82dd057d469d4f6b77c21b8b1011" commit="9e9c8dd9f7604dd044da44e18561062fd9e50262" commit_message="Fix Synaptics touch FW updating typo It looks like a linebreak "\" was accidentally removed from chromeos-touch-update.conf and it broke FW updating for Synaptics devices. This CL adds the "\" back in and should fix updating for these effected machines. BUG=b:38395353 TEST=built on Lulu builder and the logs showed a FW update working Change-Id: I7c3253618b8a82dd057d469d4f6b77c21b8b1011 Signed-off-by: Charlie Mooney <charliemooney@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508165 Reviewed-by: Jingkui Wang <jkwang@google.com> " fail_count="0" gerrit_number="508165" owner_email="charliemooney@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/touch_updater" project_url="https://chromium-review.googlesource.com/chromiumos/platform/touch_updater" ref="refs/changes/65/508165/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.10" change_id="I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5" commit="b983143a2a7d4c8ba748010005d42dd3a1678e50" commit_message="FROMLIST: drivers: char: mem: Check for address space wraparound with mmap() /dev/mem currently allows mmap() mappings that wrap around the end of the physical address space, which should probably be illegal. It circumvents the existing STRICT_DEVMEM permission check because the loop immediately terminates (as the start address is already higher than the end address). On the x86_64 architecture it will then cause a panic (from the BUG(start >= end) in arch/x86/mm/pat.c:reserve_memtype()). This patch adds an explicit check to make sure offset + size will not wrap around in the physical address type. Signed-off-by: Julius Werner <jwerner@chromium.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from b299cde245 in gregkh/char-misc.git/char-misc-linus) BUG=b:38211793 Change-Id: I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5 Reviewed-on: https://chromium-review.googlesource.com/508829 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> " fail_count="0" gerrit_number="508829" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/29/508829/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I4f0b1dba4fa82eaa164f07d435ad839d5bf73659" commit="c5eea2cfd84fb3deeafbfc6a56ee62e1f96a22e0" commit_message="multilib.eclass: fix cross-compiling multilib ebuilds Current code assumes that CBUILD is always the same as CHOST, however it is desirable to allow cross compiling into multilib sysroots, where obviously the assumed condition does not hold anymore. To fix this, let's override CBUILD only if original CHOST and CBUILD are equal, i.e. we are not cross-compiling. [tfiga: Cherry pick from upstream portage repository.] (cherry picked from commit 9aae1e787fb4ce16eb7a0a0a338b801aa4c482b8) BUG=b:36540057 TEST=emerge-reef arc-libpciaccess Change-Id: I4f0b1dba4fa82eaa164f07d435ad839d5bf73659 Reviewed-on: https://chromium-review.googlesource.com/486459 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="1" gerrit_number="486459" owner_email="tfiga@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/59/486459/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I8a0e7b98b39e94e0ba7ad655c170b0b24bbce028" commit="f4e34864bd497bf5532b7035ff5bab5fb92d1efe" commit_message="FROMGIT: r8152: Remove unused function usb_ocp_read() The function is not used, removing it fixes the following warning when building with clang: drivers/net/usb/r8152.c:825:5: error: unused function 'usb_ocp_read' [-Werror,-Wunused-function] BUG=chromium:702741 TEST=build with clang for pyro Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from git.kernel.orgd davem/net-next master commit db646cc0aefbc5da0b9699ed40d4402e01245f57) Change-Id: I8a0e7b98b39e94e0ba7ad655c170b0b24bbce028 Reviewed-on: https://chromium-review.googlesource.com/508444 Commit-Ready: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="508444" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/44/508444/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ifa9093d9feccece0e2a638b3a39b838f61a058aa" commit="1860e251b49e65ba2f14e58508ed93ddec8c3344" commit_message="Fix udev rule for huddly updater - Fix concatenated minijail0 options - Specify the permission for bootloader mode PID: 0x0010 BUG=chromium:710302 TEST=Build package for Guado board. Execution permission on CFM. Change-Id: Ifa9093d9feccece0e2a638b3a39b838f61a058aa Reviewed-on: https://chromium-review.googlesource.com/508278 Commit-Ready: Jiwoong Lee <porce@chromium.org> Tested-by: Jiwoong Lee <porce@chromium.org> Reviewed-by: Simon Que <sque@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="508278" owner_email="porce@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/huddly-updater" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/huddly-updater" ref="refs/changes/78/508278/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I7445629ca9b83baf6a0b4d9552de3cb3d04513f8" commit="0d0f27594c6b2a5b76634678e1439e551ce5cd66" commit_message="cbuildbot_launch: Use constants.py to find REEXEC versions. In unittests, using hardcoded reexec versions falls out of date when versions are updated, but we really want to check the behavior when working with the latest version of cbuildbot. So... use the same constants that define the 'latest' version. BUG=None TEST=Ran unittests. Change-Id: I7445629ca9b83baf6a0b4d9552de3cb3d04513f8 Reviewed-on: https://chromium-review.googlesource.com/506558 Commit-Ready: Don Garrett <dgarrett@chromium.org> Tested-by: Don Garrett <dgarrett@chromium.org> Reviewed-by: Paul Hobbs <phobbs@google.com> " fail_count="2" gerrit_number="506558" owner_email="dgarrett@chromium.org" pass_count="0" patch_number="1" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/58/506558/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I264b0070ec67a6a82159956acb5864fde62199b5" commit="8c54535a7cc70196c56248e0aae752ec1cc649de" commit_message="lakitu: systemd: Apply network config for all NICs Instead of matching interface name, match Driver=virtio_net, as all GCE NICs are using virtio. Also, drop the name "default" as a true default network should not have a [Match] section. BUG=b:34715285 TEST=trybot for regression TEST=On a GCE VM with multiple NICs, all is managed by the new network file. RELEASE_NOTE=None Change-Id: I264b0070ec67a6a82159956acb5864fde62199b5 Reviewed-on: https://chromium-review.googlesource.com/508226 Commit-Ready: Daniel Wang <wonderfly@google.com> Tested-by: Daniel Wang <wonderfly@google.com> Reviewed-by: Andrey Ulanov <andreyu@google.com> " fail_count="0" gerrit_number="508226" owner_email="wonderfly@google.com" pass_count="0" patch_number="1" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/26/508226/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.8" change_id="I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5" commit="daf53d298f3c12523909a4b03312d2254fbdf09e" commit_message="FROMLIST: drivers: char: mem: Check for address space wraparound with mmap() /dev/mem currently allows mmap() mappings that wrap around the end of the physical address space, which should probably be illegal. It circumvents the existing STRICT_DEVMEM permission check because the loop immediately terminates (as the start address is already higher than the end address). On the x86_64 architecture it will then cause a panic (from the BUG(start >= end) in arch/x86/mm/pat.c:reserve_memtype()). This patch adds an explicit check to make sure offset + size will not wrap around in the physical address type. Signed-off-by: Julius Werner <jwerner@chromium.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from b299cde245 in gregkh/char-misc.git/char-misc-linus) BUG=b:38211793 Change-Id: I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5 Reviewed-on: https://chromium-review.googlesource.com/508225 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> " fail_count="0" gerrit_number="508225" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/25/508225/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I62ba1405f1482949fa6c8f91df5fa213ddd82c49" commit="174e0f34837c7773c6c8996c21ba1a8f6cdf1560" commit_message="autotest: add a fallback html file when AFE is not working BUG=chromium:714279 TEST=Blow away the afe on a test server, load the afe page. Change-Id: I62ba1405f1482949fa6c8f91df5fa213ddd82c49 Reviewed-on: https://chromium-review.googlesource.com/506308 Commit-Ready: Shuqian Zhao <shuqianz@chromium.org> Tested-by: Shuqian Zhao <shuqianz@chromium.org> Reviewed-by: Aviv Keshet <akeshet@chromium.org> " fail_count="1" gerrit_number="506308" owner_email="shuqianz@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/08/506308/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.18" change_id="I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5" commit="c900069d0d493639279ee64a017e7b7c62d328c6" commit_message="FROMLIST: drivers: char: mem: Check for address space wraparound with mmap() /dev/mem currently allows mmap() mappings that wrap around the end of the physical address space, which should probably be illegal. It circumvents the existing STRICT_DEVMEM permission check because the loop immediately terminates (as the start address is already higher than the end address). On the x86_64 architecture it will then cause a panic (from the BUG(start >= end) in arch/x86/mm/pat.c:reserve_memtype()). This patch adds an explicit check to make sure offset + size will not wrap around in the physical address type. Signed-off-by: Julius Werner <jwerner@chromium.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from b299cde245 in gregkh/char-misc.git/char-misc-linus) BUG=b:38211793 Change-Id: I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5 Reviewed-on: https://chromium-review.googlesource.com/508066 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> " fail_count="0" gerrit_number="508066" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/66/508066/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic41fcbe3a5c000282552c7322b5ab18ebb203cd2" commit="3a61a5d5671e58f27512eb8c9ff95a7ca1ac5efa" commit_message="servo_v4: Added support for HW board ID and limit on VBUS voltage The first two versions of servo_v4 (red and blue) have the TPD2E001 ESD between VBUS and CC1/CC2. This part has a breakdown min voltage of 11V. Therefore for these versions of servo_v4, need to limit VBUS to less than the default 20V value. This CL adds support to read two board ID gpios attached to the gpio expansion part. The max VBUS voltage is limited to 9V for red/blue and allowed to be 20V for black. BUG=b:38351574 BRANCH=servo_v4 TEST=Manual Modified a servo_v4 to add the 2 new pullup resistors. Tested with this unit and with a unit that does not have the pullups. Verified that without the pullups the version ID reads a 0 and the max VBUS voltage that will be requested by the CHG port is 9V. Wih the modified servo_v4, verified that the version reads 3 and the CHG port will request up to 20V. Change-Id: Ic41fcbe3a5c000282552c7322b5ab18ebb203cd2 Signed-off-by: Scott Collyer <scollyer@google.com> Reviewed-on: https://chromium-review.googlesource.com/507027 Commit-Ready: Scott Collyer <scollyer@chromium.org> Tested-by: Scott Collyer <scollyer@chromium.org> Reviewed-by: Nick Sanders <nsanders@chromium.org> " fail_count="1" gerrit_number="507027" owner_email="scollyer@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/27/507027/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I5dffb6ea756c258bdb0b11cd1cd107318e2d5438" commit="115e34c8dd95e2c53011f40babe5d3faf74a3742" commit_message="[autotest] Improve deprecation warnings Example output: $ ./site_utils/deployment/deploy.py -h WARNING:py.warnings:/usr/local/google/home/ayatane/src/chromiumos/src/third_party/autotest/files/server/lib/status_history.py:43: APIDeprecationWarning: (NOT AN ERROR) autotest_lib.client.common_lib.site_utils is deprecated; please file a fixit bug: https://bugs.chromium.org/p/chromium/issues/entry?labels=Pri-3%2CType-Bug%2CHotlist-Fixit&description=Please+paste+the+warning+message+below%0A&components=Infra%3EClient%3EChromeOS&summary=Deprecated+use+of+autotest_lib.client.common_lib.site_utils from autotest_lib.client.common_lib import site_utils BUG=chromium:716077 TEST=Run site_utils/deployment/deploy.py -h Change-Id: I5dffb6ea756c258bdb0b11cd1cd107318e2d5438 Reviewed-on: https://chromium-review.googlesource.com/489683 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="0" gerrit_number="489683" owner_email="ayatane@chromium.org" pass_count="0" patch_number="5" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/83/489683/5" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I29b3ed5807d56c761fcbe38b1e23105a671dacc5" commit="82f289d23a7ec4c289364a31ba19a566719b3844" commit_message="Add new arm_trusted_firmware_uprev script After long discussion we have decided to change the way the ARM Trusted Firmware repository is handled from manifest pinning to a master branch that is fast-forwarded directly to new upstream commits through direct git pushes. This is supposed to improve trybot compatibility, among other things. This script is intended to make that fast-forwarding as brain-dead simple as possible for all the firmware developers who'll have to do it regularly. It will automatically find the new upstream commit and push the appropriate branches. It also includes an automated system of saving older known-good HEADs in branches named prev1 through prev5 to make it easy for sheriffs to revert a bad push without rewriting history if necessary (by changing the manifest to temporarily point to a prev branch). BUG=chromium:630016 TEST=Run script, get git push Change-Id: I29b3ed5807d56c761fcbe38b1e23105a671dacc5 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/497126 Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="3" gerrit_number="497126" owner_email="jwerner@chromium.org" pass_count="0" patch_number="6" project="chromiumos/platform/crosutils" project_url="https://chromium-review.googlesource.com/chromiumos/platform/crosutils" ref="refs/changes/26/497126/6" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I2f4b52ce1896480289f5305ee387a879a4a26ecf" commit="6f8428f6b0052f6ae92deed1918ded60b974ca09" commit_message="[autotest] Handle tiem_utils call for None input BUG=chromium:722477 TEST=None Change-Id: I2f4b52ce1896480289f5305ee387a879a4a26ecf Reviewed-on: https://chromium-review.googlesource.com/505940 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Dan Shi <dshi@google.com> Reviewed-by: Benjamin Peake <bpeake@chromium.org> Reviewed-by: Chris Ching <chingcodes@chromium.org> " fail_count="4" gerrit_number="505940" owner_email="dshi@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/40/505940/1" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I6eb173c239ad4043b701c8964b1c422b2afc10b7" commit="e6a55c6b7ad5fbb2a817c25de1a0f6e349bd3669" commit_message="[autotest] Force host_scheduler to use metadata_reporter metadata_reporter uploads metadata in bulk and in a separate thread. This change allows host_scheduler to use metadata_reporter if it's running. If the reporter is not running, it will still upload the data using UDP, which may lead to package lost. Also replace the email alert with metrics data. BUG=None TEST=run host_scheduler locally and run test, confirm the data is uploaded. Change-Id: I6eb173c239ad4043b701c8964b1c422b2afc10b7 Reviewed-on: https://chromium-review.googlesource.com/502716 Commit-Ready: Dan Shi <dshi@google.com> Tested-by: Dan Shi <dshi@google.com> Reviewed-by: Dan Shi <dshi@google.com> " fail_count="3" gerrit_number="502716" owner_email="dshi@google.com" pass_count="0" patch_number="6" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/16/502716/6" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I0f1409c4a10f5ccaf3d5303d6b315ae4c0f08c47" commit="1632b2b6b8fb678b2c2a3ecec443b0bcf8535c64" commit_message="system_api: use '-fPIC' for libsystem_api-chaps-protos.a libsystem_api-chaps-protos.a is linked into a shared library, so we should build it with -fPIC instead of -fPIE. BUG=chromium:722464 TEST=cbuildbot amd64-generic-asan, it builds fine. Change-Id: I0f1409c4a10f5ccaf3d5303d6b315ae4c0f08c47 Reviewed-on: https://chromium-review.googlesource.com/506033 Commit-Ready: Yunlian Jiang <yunlian@chromium.org> Tested-by: Yunlian Jiang <yunlian@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="3" gerrit_number="506033" owner_email="yunlian@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/system_api" project_url="https://chromium-review.googlesource.com/chromiumos/platform/system_api" ref="refs/changes/33/506033/1" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-4.4" change_id="I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5" commit="c9c0309982b8db6c32ee279cfdb69495fd71cea4" commit_message="FROMLIST: drivers: char: mem: Check for address space wraparound with mmap() /dev/mem currently allows mmap() mappings that wrap around the end of the physical address space, which should probably be illegal. It circumvents the existing STRICT_DEVMEM permission check because the loop immediately terminates (as the start address is already higher than the end address). On the x86_64 architecture it will then cause a panic (from the BUG(start >= end) in arch/x86/mm/pat.c:reserve_memtype()). This patch adds an explicit check to make sure offset + size will not wrap around in the physical address type. Signed-off-by: Julius Werner <jwerner@chromium.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from b299cde245 in gregkh/char-misc.git/char-misc-linus) BUG=b:38211793 Change-Id: I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5 Reviewed-on: https://chromium-review.googlesource.com/508263 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> " fail_count="0" gerrit_number="508263" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/63/508263/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.14" change_id="I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5" commit="ed8ab24f141b728d10fcc1d26daeff5e27644ab0" commit_message="FROMLIST: drivers: char: mem: Check for address space wraparound with mmap() /dev/mem currently allows mmap() mappings that wrap around the end of the physical address space, which should probably be illegal. It circumvents the existing STRICT_DEVMEM permission check because the loop immediately terminates (as the start address is already higher than the end address). On the x86_64 architecture it will then cause a panic (from the BUG(start >= end) in arch/x86/mm/pat.c:reserve_memtype()). This patch adds an explicit check to make sure offset + size will not wrap around in the physical address type. Signed-off-by: Julius Werner <jwerner@chromium.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from b299cde245 in gregkh/char-misc.git/char-misc-linus) BUG=b:38211793 Change-Id: I4b476f4a8e88139dc39c84b4408fa6dd383aa2a5 Reviewed-on: https://chromium-review.googlesource.com/508849 Commit-Ready: Julius Werner <jwerner@chromium.org> Tested-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> " fail_count="0" gerrit_number="508849" owner_email="jwerner@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/49/508849/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic3fb5a3e8a96cefbd90626be68df64458bf3d589" commit="f69fb2fe02485c0385c6386c711357d94e2304ed" commit_message="Avoid duplicated health display entries with same ID on the page. BUG=chromium:724173 TEST=Manually Change-Id: Ic3fb5a3e8a96cefbd90626be68df64458bf3d589 Reviewed-on: https://chromium-review.googlesource.com/508809 Commit-Ready: Michael Tang <ntang@chromium.org> Tested-by: Michael Tang <ntang@chromium.org> Reviewed-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Michael Tang <ntang@chromium.org> " fail_count="0" gerrit_number="508809" owner_email="ntang@chromium.org" pass_count="0" patch_number="2" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/09/508809/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I0e890baf9a408134b8b2995228e2a256ab6db7be" commit="784d62d846e05ddcd767a48e0414a6f8dbea2a60" commit_message="[moblab] Harden get_moblab_id against race conditions. Hard to reproduce report of errors when getting the moblab id - most likely caused by two version of gs_offloader starting at the same time trying to write to the moblab home directory. Improve error handling to count for this possiblity. TEST=manual tests BUG=chromium:723865 Change-Id: I0e890baf9a408134b8b2995228e2a256ab6db7be Reviewed-on: https://chromium-review.googlesource.com/508223 Commit-Ready: Keith Haddow <haddowk@chromium.org> Tested-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Michael Tang <ntang@chromium.org> " fail_count="0" gerrit_number="508223" owner_email="haddowk@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/23/508223/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Id80791f62d38a7d4f09b1938ac812f365ebd7c8d" commit="eb354dacc4c23124e544140287ed5af9e1d42d51" commit_message="[autotest] Merge scheduler/drone_utility BUG=chromium:672727 TEST=None Change-Id: Id80791f62d38a7d4f09b1938ac812f365ebd7c8d Reviewed-on: https://chromium-review.googlesource.com/438670 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="1" gerrit_number="438670" owner_email="ayatane@chromium.org" pass_count="0" patch_number="35" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/70/438670/35" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I8b4888b148c5512f57bd1181da01db1ef1e694ce" commit="4a3e2fdf885af76496eef32880d87b923dd6235c" commit_message="midis: Add code for Device Added/Removed Notification Tells all clients that a MIDI device has been added/removed. BUG=chromium:701005 TEST=cros_run_unit_tests --board veyron_minnie --packages "midis" Change-Id: I8b4888b148c5512f57bd1181da01db1ef1e694ce Reviewed-on: https://chromium-review.googlesource.com/493798 Commit-Ready: Prashant Malani <pmalani@google.com> Tested-by: Prashant Malani <pmalani@google.com> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> " fail_count="1" gerrit_number="493798" owner_email="pmalani@google.com" pass_count="0" patch_number="5" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/98/493798/5" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I074da68ae8b0243dbea9408521b00e3d25a116fa" commit="4f68516c5446a35b6a8ba9029249a2e889f724f6" commit_message="lakitu: Add docker-credential-gcr and its dependencies This cl added the docker-credential-gcr package. It is an advanced version of the dockercfg_update.sh script. It helps Docker to make authenticated requests to GCR's repositories. This cl also created dev-go directory. All third party library packages shoud go there. They will be installed to /usr/lib/gopath. BUG=b:32435832 TEST=Successfully pull private image from gcr.io/ RELEASE_NOTE=Added support for docker-credential-gcr (https://github.com/GoogleCloudPlatform/docker-credential-gcr) Change-Id: I074da68ae8b0243dbea9408521b00e3d25a116fa Reviewed-on: https://chromium-review.googlesource.com/502027 Commit-Ready: Ke Wu <mikewu@google.com> Tested-by: Ke Wu <mikewu@google.com> Reviewed-by: Aditya Kali <adityakali@google.com> " fail_count="0" gerrit_number="502027" owner_email="mikewu@google.com" pass_count="0" patch_number="4" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/27/502027/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I3797a0e77315e8baf6f481f31c44b889ac6d098a" commit="af1d667db66235faffefd48bb827bcc1cecc0e9e" commit_message="image_signing: ensure_secure_kernelparams.sh: use loopback devices for speed Rather than read out the whole kernel partition just to dump the kernel config, set the image up via a loopback device and read from there. BRANCH=None BUG=chromium:714598 TEST=signing images still works Change-Id: I3797a0e77315e8baf6f481f31c44b889ac6d098a Reviewed-on: https://chromium-review.googlesource.com/505475 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: David Riley <davidriley@chromium.org> " fail_count="2" gerrit_number="505475" owner_email="vapier@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/vboot_reference" project_url="https://chromium-review.googlesource.com/chromiumos/platform/vboot_reference" ref="refs/changes/75/505475/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I561eb27d946da91f42861cea2628b401a590f75a" commit="8ce980755992ad30605f7b5e5613823ab34bfc20" commit_message="net-vpn/openvpn: Upgrade to v2.4.2 from upstream This fixes a couple of security issues found during an audit: https://ostif.org/the-openvpn-2-4-0-audit-by-ostif-and-quarkslab-results/ BUG=chromium:716913 TEST=manually connect to test server TEST=autotests Change-Id: I561eb27d946da91f42861cea2628b401a590f75a Reviewed-on: https://chromium-review.googlesource.com/505929 Commit-Ready: Kevin Cernekee <cernekee@chromium.org> Tested-by: Kevin Cernekee <cernekee@chromium.org> Reviewed-by: Mattias Nissler <mnissler@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="8" gerrit_number="505929" owner_email="cernekee@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/29/505929/1" remote="cros" total_fail_count="8"/><pending_commit branch="master" change_id="I33dd1e77c6fd9e8d4dc603f44d32fcbf3c8475a6" commit="98f409dbd52513cc15a05bf1a2b12d0d5e720a82" commit_message="Changing moblab user from root to moblab BUG=None TEST=moblab_tunnel -u moblab3 Change-Id: I33dd1e77c6fd9e8d4dc603f44d32fcbf3c8475a6 Reviewed-on: https://chromium-review.googlesource.com/506427 Commit-Ready: Tyler Reid <twreid@google.com> Tested-by: Tyler Reid <twreid@google.com> Reviewed-by: danny chan <dchan@chromium.org> " fail_count="3" gerrit_number="506427" owner_email="twreid@google.com" pass_count="0" patch_number="1" project="chromiumos/platform/crostestutils" project_url="https://chromium-review.googlesource.com/chromiumos/platform/crostestutils" ref="refs/changes/27/506427/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I078f6074afb2b0bd92dbd3d45c4d48a676c3962a" commit="ac3bfd1c2297770199a5ac8b2a77beac725eea40" commit_message="[moblab] Set CROS_CACHE variable so gs_offloader can find gsutil. gs_offloader has moved to using the gsutil that chromite uses, to be able to find the binary the CROS_CACHE directory must be set otherwise the default location is in /tmp which is mounted as noexec on moblab. BUG=chromium:722976 TEST=None Change-Id: I078f6074afb2b0bd92dbd3d45c4d48a676c3962a Reviewed-on: https://chromium-review.googlesource.com/506773 Commit-Ready: Keith Haddow <haddowk@chromium.org> Tested-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Michael Tang <ntang@chromium.org> " fail_count="1" gerrit_number="506773" owner_email="haddowk@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/73/506773/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I994cb3253e4a1f39338310ad5c4ca47c6cd84296" commit="e6108317db93017c14c9c3a6bbeba269659c22b0" commit_message="login: Clean up orphaned containers prior to cryptohome unmounting This change changes the order of reaping orphaned containers to happen prior to cryptohome unmounting. This avoids having stale mounts. BUG=b:38097492 TEST=killall -9 session_manager # No cryptohomed complaints about stale mounts. Change-Id: I994cb3253e4a1f39338310ad5c4ca47c6cd84296 Reviewed-on: https://chromium-review.googlesource.com/506950 Commit-Ready: Luis Hector Chavez <lhchavez@chromium.org> Tested-by: Luis Hector Chavez <lhchavez@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="2" gerrit_number="506950" owner_email="lhchavez@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/50/506950/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I77d20533b5fed5df0bc35de1f23bede235952aea" commit="f6044b0abd7f9fb04a48cbf030fa82725ed5cc74" commit_message="shill: Fix incorrect callback usage shill tries to schedule a callback to route_query_timeout_callback_ (which doesn't get initialized) instead of neighbor_request_timeout_callback_ (which does get initialized). This results in a crash. Use the correct variable so this works correctly. BUG=chromium:722809 TEST=manually connect to an affected network Change-Id: I77d20533b5fed5df0bc35de1f23bede235952aea Reviewed-on: https://chromium-review.googlesource.com/507070 Commit-Ready: Kevin Cernekee <cernekee@chromium.org> Tested-by: Kevin Cernekee <cernekee@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="4" gerrit_number="507070" owner_email="cernekee@chromium.org" pass_count="0" patch_number="1" project="aosp/platform/system/connectivity/shill" project_url="https://chromium-review.googlesource.com/aosp/platform/system/connectivity/shill" ref="refs/changes/70/507070/1" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Ib753fb341baa944d1e113d09aff19b1f9f2a9ec7" commit="91d6f36aa57c2ed369cd511d29d610d3f65e4f3f" commit_message="fizz: Use root port to address PCIe NVMe BUG=b:38348767,b:37486021 BRANCH=None TEST=Ensure can boot from NVMe Change-Id: Ib753fb341baa944d1e113d09aff19b1f9f2a9ec7 Signed-off-by: Shelley Chen <shchen@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/507708 Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Duncan Laurie <dlaurie@google.com> " fail_count="1" gerrit_number="507708" owner_email="shchen@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/depthcharge" project_url="https://chromium-review.googlesource.com/chromiumos/platform/depthcharge" ref="refs/changes/08/507708/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I1d3f4c1d863721fbcff009dde0429043c85b27ea" commit="d83714af923994352073e4e125a5dc4872ad427e" commit_message="[HACK] libusb: build w/gcc Clang build causes libusb to break, add a build exception for libusb to use gcc. TODO(cmtrice): fix libusb under clang and revert this change. BUG=chromium:723145 TEST=rebuild libusb in sdk and `sudo servod` no longer crashes Change-Id: I1d3f4c1d863721fbcff009dde0429043c85b27ea Reviewed-on: https://chromium-review.googlesource.com/508253 Commit-Ready: Caroline Tice <cmtice@chromium.org> Tested-by: YH Lin <yueherngl@chromium.org> Tested-by: Bernie Thompson <bhthompson@chromium.org> Reviewed-by: Caroline Tice <cmtice@chromium.org> Reviewed-by: YH Lin <yueherngl@chromium.org> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="2" gerrit_number="508253" owner_email="nsanders@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/53/508253/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I09a62a69d9f201b2dc261838cc9b4425fe3a8dc1" commit="10b5449112de810dfb7f758cfa672bdf589c93b8" commit_message="power_button: Allow PB to be idle at power-on This change adds CONFIG_POWER_BUTTON_INIT_IDLE. When it's set, the system starts with the power button state idle. It means when the board boots from power-off, it stays at G3. BUG=b:37536389 BRANCH=none TEST=Power on Fizz. Verify it stays at G3. Verify it boots by pressing power button. Change-Id: I09a62a69d9f201b2dc261838cc9b4425fe3a8dc1 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/486945 Reviewed-by: Duncan Laurie <dlaurie@google.com> " fail_count="1" gerrit_number="486945" owner_email="dnojiri@chromium.org" pass_count="0" patch_number="24" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/45/486945/24" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I42047a295044fcc80d3749c4c2527729533ad7cb" commit="eb6cc64d07381cc34d2c6993d0a6f06566589ee4" commit_message="debugd: Add Atmel debug logs to chrome://system Previously when an Atmel touchscreen or touchpad got bad reference readings the only way for Atmel engineers to get those readings and tweak their firmware to mitigate the issue they would have to get the system and reproduce the error themselves with a test image so they can run their atmel_tools.sh script. This is posing a difficulty for us right now for a few ongoing bugs with Atmel touchscreen on Kevin/Caroline and touchpad on Samus because we have no reliable repro. It seems that only time & chance factor in. We have lots of feedback reports but the Atmel Engineers need these "reference" and "delta" readings to progress on this issue. As such, this CL adds in 4 new entries to chrome://system and thereby the feedback reports sent by users. atmel_ts_refs, atmel_ts_deltas, atmel_tp_refs, atmel_tp_deltas These values pull the "reference" and "delta" readings off any Atmel touchscreens and touchpads that may be connected to the device. The reference readings are essentially baseline capacitance values across the touch sensor. The delta values are the difference between the current capacitance values and those references at the time the command is run. As such, these are quite safe data and should not be personally identifiable or anything like that. It simply tells the Atmel engineers a little more about how the touch controller got confused. BUG=b:37777693 TEST=emerged and deployed debugd onto a Samus (which has both an Atmel touchscreen and touchpad). I was able to get the values by querying debugd over dbus (dbus-send --system --type=method_call --print-reply --dest=org.chromium.debugd /org/chromium/debugd org.chromium.debugd.GetLog string:"atmel_ts_refs") for all the 4 new entries. Similarly, directing chrome to chrome://system showed all four as well. On a Snappy (no Atmel touch devices at all) the entries were empty as expected. CQ-DEPEND=CL:493829 Change-Id: I42047a295044fcc80d3749c4c2527729533ad7cb Signed-off-by: Charlie Mooney <charliemooney@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/493612 Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org> " fail_count="1" gerrit_number="493612" owner_email="charliemooney@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/12/493612/1" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I8eba0b9c910cec190569fe4406a4cfb325c6e403" commit="c46b13eeab4b098804ec92e058928074f0f1627b" commit_message="FROMGIT: fs: compat: Remove warning from COMPATIBLE_IOCTL cmd in COMPATIBLE_IOCTL is always a u32, so cast it so there isn't a warning about an overflow in XFORM. BUG=chromium:702741 TEST=build with clang for pyro From: Mark Charlebois <charlebm@gmail.com> Signed-off-by: Mark Charlebois <charlebm@gmail.com> Signed-off-by: Behan Webster <behanw@converseincode.com> Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> (cherry picked from git.kernel.org viro/vfs for-next commit 9280cdd6fe5b8287a726d24cc1d558b96c8491d7) Change-Id: I8eba0b9c910cec190569fe4406a4cfb325c6e403 Reviewed-on: https://chromium-review.googlesource.com/497272 Commit-Ready: Matthias Kaehlcke <mka@chromium.org> Tested-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Guenter Roeck <groeck@chromium.org> " fail_count="2" gerrit_number="497272" owner_email="mka@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/72/497272/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ib8b75e3d794d91d1fea9a42260d4e00c853e1854" commit="2d901f561e605b5814a88b5778ff6e27a31f753a" commit_message="Backing up the EC FW incase EC Sync fails from BIOS BUG=None TEST=Ran FW corrupt tests against terra and panther. Change-Id: Ib8b75e3d794d91d1fea9a42260d4e00c853e1854 Reviewed-on: https://chromium-review.googlesource.com/499153 Commit-Ready: Tyler Reid <twreid@google.com> Tested-by: Tyler Reid <twreid@google.com> Reviewed-by: Wai-Hong Tam <waihong@google.com> " fail_count="8" gerrit_number="499153" owner_email="twreid@google.com" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/53/499153/2" remote="cros" total_fail_count="8"/><pending_commit branch="chromeos-4.4" change_id="I6a1beede790ba616ba5f74aa049dec1906e613f3" commit="aefcdd702ee425bf12694542388411a9408652d7" commit_message="CHROMIUM: drm/rockchip: Rework locking of rockchip_drm_wait_vact_end() Currently the entire function is protected by vop->lock mutex, due to historical needs to prevent VOP power state change during the wait taking place. The wait has two primary callers: - PSR state transition - since the big rework, it is no longer possible for PSR state transition to happen during an atomic commit, which is the only way a VOP power transition can be done, - DMC notifier - we register it at the end of vop_crtc_enable() and unregister it at the beginning of vop_crtc_disable(). In addition, the register, unregister and notification itself are all mutually exclusive, so there is no way for the notifier to be called during a VOP state transition either. Given the above, we do not need the vop->lock mutex to protect from VOP power transitions anymore. However, as a side effect, the mutex was also preventing several waiters from waiting for vact_end at the same time, which was actually incorrect, because the waiter that called rockchip_drm_wait_vact_end() later needed to wait for the first waiter first and only then for next vact_end to happen, resulting in a wait for two intervals in total. To make everything behave properly as well we cannot simply remove the mutex, but we also need to allow several waiters to wait at the same time. This patch does it by reference counting the line end interrupt enable and using a wait queue instead of completion to wait for the nearest incoming line end interrupt. In addition to the above, a false lockdep warning about possible circular locking dependency is removed, since the affected lock is no longer present. BUG=chromium:719610 TEST=enable lockdep, no more this warning: [ 6.620072] ====================================================== [ 6.626245] [ INFO: possible circular locking dependency detected ] [ 6.632505] 4.4.64 #129 Not tainted [ 6.635988] ------------------------------------------------------- [ 6.642246] kworker/0:1H/166 is trying to acquire lock: [ 6.647463] (&vop->vop_lock){+.+.+.}, at: [<ffffffc000613ad8>] rockchip_drm_wait_vact_end+0x48/0x334 [ 6.656735] [ 6.656735] but task is already holding lock: [ 6.662559] (&ddrclk->lock){+.+...}, at: [<ffffffc000809a68>] rockchip_ddrclk_set_rate_func+0x6c/0x13c [ 6.671998] [ 6.671998] which lock already depends on the new lock. TEST=play with the UI without observing "line flag interrupt did not arrive" errors in kernel log Fixes: 23d14682a155 ("CHROMIUM: drm/rockchip: add mutex vop lock") Change-Id: I6a1beede790ba616ba5f74aa049dec1906e613f3 Signed-off-by: Tomasz Figa <tfiga@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/500109 Commit-Ready: Douglas Anderson <dianders@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> " fail_count="3" gerrit_number="500109" owner_email="jeffy.chen@rock-chips.com" pass_count="0" patch_number="5" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/09/500109/5" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I08b466b12cd70bda9a1ba9ddde165610973ef209" commit="388e50e817ff5b3be46ea38a549abafd7aa64e22" commit_message="camera_V4L2: Only test 1600x1200 for internal camera BUG=chromium:718278 TEST=test_that ${BOARD} camera_V4L2 Change-Id: I08b466b12cd70bda9a1ba9ddde165610973ef209 Reviewed-on: https://chromium-review.googlesource.com/501618 Commit-Ready: Heng-ruey Hsu <henryhsu@google.com> Tested-by: Heng-ruey Hsu <henryhsu@google.com> Reviewed-by: Wu-cheng Li <wuchengli@chromium.org> " fail_count="7" gerrit_number="501618" owner_email="henryhsu@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/18/501618/2" remote="cros" total_fail_count="7"/><pending_commit branch="chromeos-4.4" change_id="I2e553bfdfbb11597f3517651c50e2007858e5e3d" commit="ff8eade29476e2d1a6c9d19f7744be39a72b2952" commit_message="CHROMIUM: Input: atmel_mxt_ts - register interrupt before input device We need to register interrupt before registering input device, otherwise clients may try calling into mxt_open() which does enable_irq() and disable_irq() on not-yet-registered IRQ. BUG=chromium:705557 TEST=Booted Kevin a few times, touchpad/touchscreen work, no spew in dmesg. Change-Id: I2e553bfdfbb11597f3517651c50e2007858e5e3d Signed-off-by: Dmitry Torokhov <dtor@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/503614 Commit-Ready: Douglas Anderson <dianders@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="3" gerrit_number="503614" owner_email="dtor@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/14/503614/3" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Id7014b7de170cb3324c45d43fbf04ebe48a69f5e" commit="44c3a4c13d64ae79cea7f7d4d8ce03b9bd742140" commit_message="it83xx: ec2i: move 'ec2i_setting' to header file of chip This enum can be included in common. BUG=none BRANCH=none TEST=build boards: it83xx_evb and reef_it8320 Signed-off-by: Dino Li <Dino.Li@ite.com.tw> Change-Id: Id7014b7de170cb3324c45d43fbf04ebe48a69f5e Reviewed-on: https://chromium-review.googlesource.com/505864 Commit-Ready: Dino Li <Dino.Li@ite.com.tw> Tested-by: Dino Li <Dino.Li@ite.com.tw> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> " fail_count="0" gerrit_number="505864" owner_email="Dino.Li@ite.com.tw" pass_count="0" patch_number="2" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/64/505864/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="If759fff5029ad865d82fd0785fae522784cab0cd" commit="76ae72363bc3b6797f8cb475334552e63942fcb9" commit_message="Removed LOOP test that was redundant to SOFTLOCK. The platform_KernelErrorPaths.LOOP test began failing on platforms that had been upgraded past kernel 3.10. To debug this, I ran the raw command 'echo LOOP > /sys/kernel/debug/provoke-crash/DIRECT' on 3.10 and post 3.10 platforms. On 3.10 and before platforms, the user process (bash) is never pre-empted. I verified this via cat /proc/[pid]/status The nonvoluntary_ctxt_switches value remains constant since the process is never being pre-empted. However, on 3.14 and later platforms, the user process is continually pre-empted. This was also verified by the nonvoluntary_ctxt_switches value. Additionally, top correctly reports the high cpu usage because the scheduled is able to perform the appropriate bookkeeping during context switches. Given the behavior change, the potential solution here would be to disable pre-emption prior to entering the infinite loop in lkdtm.c. However, there is already a test for this (SOFTLOCKUP) where pre-emption is disabled and then an infinite loop is entered. For this reason, we're simply removing the test, since it's no longer applicable. BUG=b:35583500 TEST=verified on rikku (3.14) and butterfly (3.8) platforms Change-Id: If759fff5029ad865d82fd0785fae522784cab0cd Reviewed-on: https://chromium-review.googlesource.com/506438 Commit-Ready: C Shapiro <shapiroc@google.com> Tested-by: C Shapiro <shapiroc@google.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jason Clinton <jclinton@chromium.org> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="1" gerrit_number="506438" owner_email="shapiroc@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/38/506438/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="Id7bdda7f935cf10535a63c95075a0d91966269ba" commit="940a66c28239d8faa6eb58fe3b2f3d1a8d332905" commit_message="help2man: upgraded package to upstream Upgraded sys-apps/help2man to version 1.46.6 on amd64, arm, x86 BUG=chromium:710112 TEST=cbuildbot --remote -g 506617 amd64-generic-no-vmtest-pre-cq x86-generic-no-vmtest-pre-cq arm-generic-pre-cq Change-Id: Id7bdda7f935cf10535a63c95075a0d91966269ba Reviewed-on: https://chromium-review.googlesource.com/506617 Commit-Ready: C Shapiro <shapiroc@google.com> Tested-by: C Shapiro <shapiroc@google.com> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="1" gerrit_number="506617" owner_email="shapiroc@google.com" pass_count="0" patch_number="2" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/17/506617/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-2016.05" change_id="I0c70f2c7c844d9199b9098783c24a6a0460263cc" commit="0ebae00261dc0cb7ff5082cc08bb8be1606ae24d" commit_message="Revert "Revert "UPSTREAM: mb/google/eve: switch touchpad devicetree to i2c-hid and cros_ec i2c device"" This reverts commit 6434755b964854122949af887b965142115e026e. Revert the revert to get the touchpad ID ready for the new touchpad firmware again. BUG=b:35581264 BRANCH=none TEST=none Change-Id: I0c70f2c7c844d9199b9098783c24a6a0460263cc Signed-off-by: Duncan Laurie <dlaurie@google.com> Reviewed-on: https://chromium-review.googlesource.com/506785 Reviewed-by: Furquan Shaikh <furquan@chromium.org> " fail_count="2" gerrit_number="506785" owner_email="dlaurie@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/coreboot" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/coreboot" ref="refs/changes/85/506785/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I98f9f2acbe776e118de76fe24ac4b0ab23e6ea73" commit="5a8a2cecb1744df0e98b2635baa0b01b1c7d53a6" commit_message="libcxx: remove USE=libunwind. It seems llvm-libunwind and libgcc has some symbol conflict. To workaournd that, we should remove the libunwind dependency from libcxx and libcxxabi. BUG=chromium:723354 TEST=armv7a-cros-linux-gnueabi-clang++ -static a.cc --stdlib=libc++ armv7a-cros-linux-gnueabi-clang++ a.cc --stdlib=libc++ Change-Id: I98f9f2acbe776e118de76fe24ac4b0ab23e6ea73 Reviewed-on: https://chromium-review.googlesource.com/508050 Commit-Ready: Manoj Gupta <manojgupta@chromium.org> Tested-by: Yunlian Jiang <yunlian@chromium.org> Reviewed-by: Manoj Gupta <manojgupta@chromium.org> Reviewed-by: Bailey Forrest <bcf@chromium.org> " fail_count="1" gerrit_number="508050" owner_email="yunlian@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/50/508050/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I21ec7c6cd62f9b711a58ae0fcd28fb4db86c0192" commit="e1bbea56ff2f4e4308f3109ff7a2bca44044bcd1" commit_message="CRAS: cras_router - Audio routing using cras Routes from user selected input to user selected output to create closed loop testing environment. Now functions as a command line program with options. Seperate commit from cras_test_helper. DSP will be on seperate commit after discussing exactly where to put the change. Select input/output now removed from router as it is now done with python on the front end. BUG=None TEST=ran file to/from various outputs/inputs on samus Change-Id: I21ec7c6cd62f9b711a58ae0fcd28fb4db86c0192 Reviewed-on: https://chromium-review.googlesource.com/358130 Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org> Tested-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org> " fail_count="0" gerrit_number="358130" owner_email="qchaseb@google.com" pass_count="0" patch_number="17" project="chromiumos/third_party/adhd" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/adhd" ref="refs/changes/30/358130/17" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I34d530cee187eb4aa42705e91bcfc3464a8960c5" commit="c6b77f98d555291364391c15be2f0094ab0a2657" commit_message="CRAS: audio_test_gui - UI for audio test tool Python script that uses cherrypy framework to run GUI for audio testing tool. Tool allows for user to select their input and output source on the GUI and sets those nodes using the cras_test_client. If the user chooses to run a loop through test then a subprocess runs the cras_router program in the background. BUG=None TEST=ran various times on samus with various options set Change-Id: I34d530cee187eb4aa42705e91bcfc3464a8960c5 Reviewed-on: https://chromium-review.googlesource.com/372321 Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org> Tested-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org> " fail_count="0" gerrit_number="372321" owner_email="qchaseb@google.com" pass_count="0" patch_number="4" project="chromiumos/third_party/adhd" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/adhd" ref="refs/changes/21/372321/4" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ia7adf72267c831ce22b6e85f652d4a0d8b808876" commit="8d5dfae0323a7a04ffac3601d79e10b58e338c50" commit_message="pytest: Simplify stylus test with touch_monitor module With new touch_monitor module, we can simplify stylus test and let developers focus more on test logic. CQ-DEPEND=CL:424276 BUG=none TEST=manually Change-Id: Ia7adf72267c831ce22b6e85f652d4a0d8b808876 Reviewed-on: https://chromium-review.googlesource.com/448300 Commit-Ready: Youcheng Syu <youcheng@chromium.org> Tested-by: Youcheng Syu <youcheng@chromium.org> Reviewed-by: Pi-Hsun Shih <pihsun@chromium.org> Reviewed-by: Ting Shen <phoenixshen@chromium.org> " fail_count="0" gerrit_number="448300" owner_email="youcheng@chromium.org" pass_count="0" patch_number="5" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/00/448300/5" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I03ad9c538ce17aec2dc56904e5b977dd136dc909" commit="b604e14a5d9c4404517e671ab636434b5960a45d" commit_message="Add SENSOR_CROP_ROTATE_SCALE metadata SENSOR_CROP_ROTATE_SCALE will be used to notify HAL about whether crop-rotate-scale is needed and the degrees to rotate. I also migrated all the other metadata keys in android to make the metadata list here up-to-date. BUG=b:36205473 TEST=Can compile. Change-Id: I03ad9c538ce17aec2dc56904e5b977dd136dc909 Reviewed-on: https://chromium-review.googlesource.com/461777 Commit-Ready: Sheng-hao Tsao <shenghao@google.com> Tested-by: Sheng-hao Tsao <shenghao@google.com> Reviewed-by: Wu-cheng Li <wuchengli@chromium.org> " fail_count="2" gerrit_number="461777" owner_email="shenghao@google.com" pass_count="0" patch_number="10" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/77/461777/10" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I3d107578607082783abb07d99650d413befe534e" commit="654f983d86141381c72d8ce6dd52d53fc529ce5d" commit_message="updater4: Replace "STABLE" by new RO+RW based simplified logic. The Stable ID can be deprecated since we have now introduced "having different RO and RW inside one updater". All "RW compatibility" stuff can be removed. The new logic is: --mode=autoupdate: If WP=1, update RW/inactive. If WP=0, and RO not changed, update RW/inactive. If WP=0, and RO changed, do --mode=recovery --mode=recovery: If WP=1, update RW/A and RW/B. If WP=0, update whole image (including RW/A, RW/B, and RO). BUG=chromium:705414 TEST=chromeos-firmwareupdate --mode=autoupdate # RO diff, WP=0, see recovery. chromeos-firmwareupdate --mode=autoupdate # RO diff, WP=1, see autoupdate. chromeos-firmwareupdate --mode=recovery # RO diff, WP=0, see RO+RW. chromeos-firmwareupdate --mode=recovery # RO diff, WP=1, see RW A/B. Change-Id: I3d107578607082783abb07d99650d413befe534e Reviewed-on: https://chromium-review.googlesource.com/479183 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> " fail_count="5" gerrit_number="479183" owner_email="hungte@chromium.org" pass_count="0" patch_number="13" project="chromiumos/platform/firmware" project_url="https://chromium-review.googlesource.com/chromiumos/platform/firmware" ref="refs/changes/83/479183/13" remote="cros" total_fail_count="5"/><pending_commit branch="chromeos-3.8" change_id="Ie19daad8ac6444211919a4a88566dfe8eb75d27a" commit="f7481db70f92a34b8cfceec92f69a03addc4cac8" commit_message="drm/evdi: Synchronize minor diffrences between evdi Update with changes from evdi from github.com/DisplayLink/evdi Also removed minor differences between chromeos kernels from 3.8 to 4.4 BUG=None TEST=compiled on all kernels. Tested on link Change-Id: Ie19daad8ac6444211919a4a88566dfe8eb75d27a Signed-off-by: Lukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-on: https://chromium-review.googlesource.com/483401 Commit-Ready: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Tested-by: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> " fail_count="0" gerrit_number="483401" owner_email="lukasz.spintzyk@displaylink.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/01/483401/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.10" change_id="I904fb11e9ce9524b89d0cdbd62ddf9e6f7bb1dcd" commit="d453d18041de23f05c07f28ffa8b44f2b150a679" commit_message="drm/evdi: Synchronize minor diffrences between evdi Update with changes from evdi from github.com/DisplayLink/evdi Also removed minor differences between chromeos kernels from 3.8 to 4.4 BUG=None TEST=compiled on all kernels. Tested on sentry Change-Id: I904fb11e9ce9524b89d0cdbd62ddf9e6f7bb1dcd Signed-off-by: Lukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-on: https://chromium-review.googlesource.com/483402 Commit-Ready: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Tested-by: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> " fail_count="0" gerrit_number="483402" owner_email="lukasz.spintzyk@displaylink.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/02/483402/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.14" change_id="I6d0fe9b4b45c067bb6fe87f29865c1cde960ac49" commit="2d311b455c0c33eeb1b7b66c797d36177d588441" commit_message="drm/evdi: Synchronize minor diffrences between evdi Update with changes from evdi from github.com/DisplayLink/evdi Also removed minor differences between chromeos kernels from 3.8 to 4.4 BUG=None TEST=compiled on all kernels. Tested on lulu Change-Id: I6d0fe9b4b45c067bb6fe87f29865c1cde960ac49 Signed-off-by: Lukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-on: https://chromium-review.googlesource.com/483499 Commit-Ready: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Tested-by: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> " fail_count="0" gerrit_number="483499" owner_email="lukasz.spintzyk@displaylink.com" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/99/483499/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic7ca14c7c217725376223ccaaf0f0bbc53d77499" commit="6004992a9b16b9cf7b193f74326fb0ea1682587b" commit_message="drm/evdi: Synchronize minor diffrences between evdi Update with changes from evdi from github.com/DisplayLink/evdi Also removed minor differences between chromeos kernels from 3.8 to 4.4 BUG=None TEST=compiled on all kernels. Tested on kevin Change-Id: Ic7ca14c7c217725376223ccaaf0f0bbc53d77499 Signed-off-by: Lukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-on: https://chromium-review.googlesource.com/483519 Commit-Ready: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Tested-by: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> " fail_count="0" gerrit_number="483519" owner_email="lukasz.spintzyk@displaylink.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/19/483519/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I29bb3aadd6472757071b0d90bf20455e4b10f200" commit="54c03bb35504e4fdb279787f5f2ca50c2057d1a4" commit_message="login: Remove unused DevicePolicyService member variable BUG=chromium:295504 TEST=covered by existing tests Change-Id: I29bb3aadd6472757071b0d90bf20455e4b10f200 Reviewed-on: https://chromium-review.googlesource.com/493306 Commit-Ready: Thiemo Nagel <tnagel@chromium.org> Tested-by: Thiemo Nagel <tnagel@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="0" gerrit_number="493306" owner_email="tnagel@chromium.org" pass_count="0" patch_number="4" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/06/493306/4" remote="cros" total_fail_count="12"/><pending_commit branch="master" change_id="I74d06a006a3fc0b6bcdc9f8137c02f5b8319973e" commit="7e3252ec902032b532b793879e0f969f33d6da31" commit_message="use asan-setup-env intead of clang-setup-env. We finished llvm migration, so there is no need to keep USE=clang. This CL cleans up the ebuilds that uses clang. BUG=chromium:718083 TEST=cbuildbot chromiumos-sdk amd64-generic-asan falco-release kevin-release daisy-release Change-Id: I74d06a006a3fc0b6bcdc9f8137c02f5b8319973e Reviewed-on: https://chromium-review.googlesource.com/498692 Commit-Ready: Manoj Gupta <manojgupta@chromium.org> Tested-by: Yunlian Jiang <yunlian@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="2" gerrit_number="498692" owner_email="yunlian@chromium.org" pass_count="0" patch_number="7" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/92/498692/7" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I4791eacf8982c488bc33c11c66fd476924479fe3" commit="8ac2af40421767b48d0abeaa35557797a5e893a6" commit_message="cryptohome: Skip known open failures. We know that one pattern of unrecoverable ecryptfs corruption used to happen. Skip the files since they are no longer recoverable and not readable. The paths of skipped files are stored in the user's home directory so that we can attempt to help the user restore their system at a later time. BUG=chromium:719761 BUG=b:37729571 TEST=cros_workon_make --test chromeos-base/cryptohome TEST=manually cryptohome --action=mount_ex --user=<mail> --key_label=foo --create --ecryptfs cryptohome --action=status dd if=/dev/zero of=/home/user/<shou>/unko bs=1M count=100 dd if=/dev/zero of=/home/.shadow/<shou>/vault/user/ECRYPTFS_FNEK_ENCRYPTED.xxxx \ bs=1M count=3 head /home/.shadow/<shou>/mount/user/unko # observe kernel error and EIO cryptohome --action=unmount --user=<mail> logged in, migrate. Observe "Found file that cannot be opened with EIO, skipping /home/.shadow/<shou>/temporary_mount/user/unko" log message in /var/log/messages and a successful migration. Change-Id: I4791eacf8982c488bc33c11c66fd476924479fe3 Reviewed-on: https://chromium-review.googlesource.com/499948 Commit-Ready: Junichi Uekawa <uekawa@chromium.org> Tested-by: Dan Spaid <dspaid@chromium.org> Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org> " fail_count="5" gerrit_number="499948" owner_email="uekawa@chromium.org" pass_count="0" patch_number="7" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/48/499948/7" remote="cros" total_fail_count="7"/><pending_commit branch="master" change_id="I188941f5969b64c0902a3c98fec1fbc6516b1017" commit="a8f42b9d32e569dccb31ffc0c6e3971a7c09f536" commit_message="Audio: bind digit keys after playing wav file. If press any digit key while or even before hearing the output sound, the current task will end and start next task, but this time playing wav file may doesn't finish. This may cause the device remains busy and next channel can not output sound. So bind digit keys after playing wav file. BUG=b:38299866 TEST=Manually Change-Id: I188941f5969b64c0902a3c98fec1fbc6516b1017 Reviewed-on: https://chromium-review.googlesource.com/507023 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Queue: Loop Wu <Loop_Wu@asus.com> Tested-by: Loop Wu <Loop_Wu@asus.com> (cherry picked from commit 2a92555c75db8c1595e23f731528905529891dbc) Reviewed-on: https://chromium-review.googlesource.com/508570 Commit-Ready: Loop Wu <Loop_Wu@asus.com> " fail_count="0" gerrit_number="508570" owner_email="Loop_Wu@asus.com" pass_count="0" patch_number="2" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/70/508570/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I9fa67d04ef1713bc1568f85c0de83fc2f4c08544" commit="f343d3dca294c70655ac3e7d17eff5f51a69162f" commit_message="drm/evdi: Synchronize minor diffrences between evdi Update with changes from evdi from github.com/DisplayLink/evdi Also removed minor differences between chromeos kernels from 3.8 to 4.4 BUG=None TEST=compiled on all kernels. Tested on chell Change-Id: I9fa67d04ef1713bc1568f85c0de83fc2f4c08544 Signed-off-by: Lukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-on: https://chromium-review.googlesource.com/483440 Commit-Ready: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Tested-by: Łukasz Spintzyk <lukasz.spintzyk@displaylink.com> Reviewed-by: Dominik Behr <dbehr@chromium.org> " fail_count="0" gerrit_number="483440" owner_email="lukasz.spintzyk@displaylink.com" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/40/483440/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I609e49a685b2017b3f7f055b56ab53a4849bad4d" commit="1bee99214cd6abebc03100ed9e80af18fec57105" commit_message="[sysmon] Report prod hosts by hostname The hostname and data_center are formatted the same way as ts_mon to simplify queries. BUG=chromium:716682 TEST=Run bin/run_tests chromite.scripts.sysmon Change-Id: I609e49a685b2017b3f7f055b56ab53a4849bad4d Reviewed-on: https://chromium-review.googlesource.com/496747 Commit-Ready: Allen Li <ayatane@chromium.org> Tested-by: Allen Li <ayatane@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="1" gerrit_number="496747" owner_email="ayatane@chromium.org" pass_count="0" patch_number="3" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/47/496747/3" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="If8b5d82e17730dfb8b7a6a7e49090d16777fc044" commit="2f68d225e2787ee4a2f16c1b54b79a2a0e4d5b4a" commit_message="quipper: remove comment referencing Makefile.external Now that the makefile fetches testdata from the network, `make -f Makefile.external` will fail from within the ebuild. BUG=None TEST=comment-only change Change-Id: If8b5d82e17730dfb8b7a6a7e49090d16777fc044 Reviewed-on: https://chromium-review.googlesource.com/497247 Commit-Ready: Chong Jiang <chongjiang@chromium.org> Tested-by: Chong Jiang <chongjiang@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="9" gerrit_number="497247" owner_email="chongjiang@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/47/497247/2" remote="cros" total_fail_count="9"/><pending_commit branch="master" change_id="Ibf927e218b0c491234252f50a5189d9a248bda5c" commit="0b1d12ce397a237eebad8048a5eebcc1c3ff3530" commit_message="autotest: remove annoying deprecated function. I got sick of seeing deprecation messages for cros_version_to_label every time I ran test that. Removing out of frustration since this appears to be simple. BUG=None TEST=Ran test_that, it still worked. Change-Id: Ibf927e218b0c491234252f50a5189d9a248bda5c Reviewed-on: https://chromium-review.googlesource.com/498028 Commit-Ready: Justin TerAvest <teravest@chromium.org> Tested-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Allen Li <ayatane@chromium.org> " fail_count="6" gerrit_number="498028" owner_email="teravest@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/28/498028/1" remote="cros" total_fail_count="6"/><pending_commit branch="master" change_id="Id9a7693f9f54ab22e944472b0d76259e87bab184" commit="210c09032ee28010171d5bdb6cd1d0e162fcc373" commit_message="debugd: minor cleanup Changing some comments, fixing a misplaced pointer asterisk, and adding the leading slash to the ObjectManager path in the service config. BUG=None TEST=emerge Change-Id: Id9a7693f9f54ab22e944472b0d76259e87bab184 Reviewed-on: https://chromium-review.googlesource.com/500428 Commit-Ready: Eric Caruso <ejcaruso@chromium.org> Tested-by: Eric Caruso <ejcaruso@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="10" gerrit_number="500428" owner_email="ejcaruso@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/28/500428/1" remote="cros" total_fail_count="10"/><pending_commit branch="master" change_id="Ib8fd689d346adc36caa579522f86d062868f934a" commit="29c26532d07bcf37c8c6245f066dfd35215dae80" commit_message="debugd: Collect vmlog files in log_tool. metrics_daemon now writes details about VM behavior to log files in /var/log/vmlog. This change ensures that they're picked up by debugd for debugging. There's no sensitive information in these files; just summaries of the overall level of swap and page fault activity. BUG=chromium:709662 TEST=Built the debugd package Change-Id: Ib8fd689d346adc36caa579522f86d062868f934a Reviewed-on: https://chromium-review.googlesource.com/503608 Commit-Ready: Justin TerAvest <teravest@chromium.org> Tested-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org> Reviewed-by: Sonny Rao <sonnyrao@chromium.org> " fail_count="1" gerrit_number="503608" owner_email="teravest@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/08/503608/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I748316a636b53ae0e710e0604cb6bf32099abe47" commit="4f8ddde71c8dc8f2033cf21648d8220a09645c49" commit_message="system_api: Install login_manager protobuf bindings BUG=b:37989086 TEST=build and flash locally, run ARC Change-Id: I748316a636b53ae0e710e0604cb6bf32099abe47 Reviewed-on: https://chromium-review.googlesource.com/505172 Commit-Ready: Xiaohui Chen <xiaohuic@chromium.org> Tested-by: Xiaohui Chen <xiaohuic@chromium.org> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org> " fail_count="3" gerrit_number="505172" owner_email="xiaohuic@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/72/505172/3" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Ib02691f51cd1efcd76b6ba08be6329fa61b413e5" commit="b9b2883ac0cf108633e75d0c4c75ea53ab1c51a5" commit_message="goofy: create status_monitor plugin. Create and move status info related code into Goofy plugin. BUG=chromium:658151 TEST=make test Change-Id: Ib02691f51cd1efcd76b6ba08be6329fa61b413e5 Reviewed-on: https://chromium-review.googlesource.com/505838 Commit-Ready: Shun-Hsing Ou <shunhsingou@chromium.org> Tested-by: Shun-Hsing Ou <shunhsingou@chromium.org> Reviewed-by: Shun-Hsing Ou <shunhsingou@chromium.org> " fail_count="0" gerrit_number="505838" owner_email="shunhsingou@chromium.org" pass_count="0" patch_number="9" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/38/505838/9" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="I225f4e7a605f953d5a93590cdb155e186e170c93" commit="464e669be88b05c7d40ebfba22f562db1c2b37d9" commit_message="chaps: remove redirect mode This is legacy code that was used to help transition to chaps. Now, it has no users, so it's not worth keeping the implementation around. BUG=None TEST=unit tests Change-Id: I225f4e7a605f953d5a93590cdb155e186e170c93 Reviewed-on: https://chromium-review.googlesource.com/506573 Commit-Ready: Eric Caruso <ejcaruso@chromium.org> Tested-by: Eric Caruso <ejcaruso@chromium.org> Reviewed-by: David Drysdale <drysdale@google.com> Reviewed-by: Andrey Pronin <apronin@chromium.org> " fail_count="1" gerrit_number="506573" owner_email="ejcaruso@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/73/506573/2" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I08504ddf568ce0cb2e73fe05c4013ebd92dc3240" commit="2493921a4701aa6a0d9b3278ed138e30eab0fd86" commit_message="Update FreeType to 2.8 from 2.7.1+patches (e432ebf) A few notable changes include: - Autohinting support for a number of "small" scripts - Variable font support fixes (e.g. MVAR/HVAR/VVAR handling, CFF2, instance namining) - Sanitizer issue fixes - Allow linear scaling for unhinted rendering (crbug.com/696356) The first one will allow us to use autohints for more fonts. Changlog: https://chromium.googlesource.com/chromium/src/third_party/freetype2/+log/e432ebf..a12a344 BUG=chromium:722589,chromium:696356,chromium:716995 TEST=emerge-{x86-alex,amd64-generic,daisy} freetype succeeds. TEST=cbuildbot chromiumos-sdk TEST=cbuildbot amd64-generic-full x86-generic-full arm-generic-full TEST=manual/visual: WebUI rendering and web page rendering do not have any noticeable regression. (they can be slightly different). Change-Id: I08504ddf568ce0cb2e73fe05c4013ebd92dc3240 Reviewed-on: https://chromium-review.googlesource.com/506850 Commit-Ready: Jungshik Shin <jshin@chromium.org> Tested-by: Jungshik Shin <jshin@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="506850" owner_email="jshin@chromium.org" pass_count="0" patch_number="3" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/50/506850/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Id71bb9f53afdf6aa2cb00ab9eaed93c5489665a7" commit="3162568280bf66d6ccacc944e09002570a9fdff4" commit_message="CHROMIUM: drm/mediatek: fix usage of crtcs array in drm_atomic_state Commit 786802952737 ("UPSTREAM: drm: Consolidate crtc arrays in drm_atomic_state") redefined the drm_atomic_state crtcs variable to be an array of the newly created __drm_crtcs_state struct instead of just an array of raw struct drm_crtc pointers. However, it didn't also fix up the existing user of this field in mtk_drm_drv.c. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Fixes: 786802952737 ("UPSTREAM: drm: Consolidate crtc arrays in drm_atomic_state") BUG=b:38355967 TEST=emerge-rowan chromeos-kernel-4_4 Change-Id: Id71bb9f53afdf6aa2cb00ab9eaed93c5489665a7 Reviewed-on: https://chromium-review.googlesource.com/508369 Commit-Ready: Daniel Kurtz <djkurtz@chromium.org> Tested-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Bibby Hsieh <bibby.hsieh@mediatek.com> Reviewed-by: Patrick Berny <pberny@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> " fail_count="0" gerrit_number="508369" owner_email="djkurtz@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/69/508369/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ia63e43e664df0a66089841076f05c91c0893b7b0" commit="d1793d113e4d5abbf53465bfdbf5eb12a3ecaf7f" commit_message="Do not check redundant output params. The redundant output params will be removed. Checking those param is just unnecessary. So remove them. BUG=chromium:720240 TEST=Ran edited tests locally. Ran bots. Change-Id: Ia63e43e664df0a66089841076f05c91c0893b7b0 Reviewed-on: https://chromium-review.googlesource.com/508493 Commit-Ready: Hidehiko Abe <hidehiko@chromium.org> Tested-by: Hidehiko Abe <hidehiko@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> " fail_count="0" gerrit_number="508493" owner_email="hidehiko@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/93/508493/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Idd2e310e2abe406e217536ff3a63d6ba8f64386c" commit="ce95687dae78b97bebafd9c17bf881293b891655" commit_message="Update libpng to 1.6.27 Use the upstream ebuild, but change EAPI to 5 and use epatch instead of eapply. BUG=chromium:697394 TEST=manual - http://unicode.org/emoji/charts/emoji-zwj-sequences.html shows color emoji. TEST=`emerge-{x86-alex,amd64-generic,daisy} libpng freetype` succeeds. TEST=cbuildbot chromiumos-sdk TEST=cbuildbot amd64-generic-full x86-generic-full arm-generic-full Change-Id: Idd2e310e2abe406e217536ff3a63d6ba8f64386c Reviewed-on: https://chromium-review.googlesource.com/450853 Commit-Ready: Jungshik Shin <jshin@chromium.org> Tested-by: Jungshik Shin <jshin@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="7" gerrit_number="450853" owner_email="jshin@chromium.org" pass_count="0" patch_number="4" project="chromiumos/overlays/portage-stable" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/portage-stable" ref="refs/changes/53/450853/4" remote="cros" total_fail_count="7"/><pending_commit branch="master" change_id="I25e82b6eda46208ffe6cc49bdc1f131187523089" commit="70bd0855b6608f952664083954d101ce76ae6034" commit_message="utils.is_freon: Remove X11 remnants Remove utils.is_freon usage from related files before is_freon cleanup. BUG=chromium:655820 TEST=test_that Change-Id: I25e82b6eda46208ffe6cc49bdc1f131187523089 Reviewed-on: https://chromium-review.googlesource.com/493876 Commit-Ready: Po-Hsien Wang <pwang@chromium.org> Tested-by: Ilja H. Friedel <ihf@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> " fail_count="1" gerrit_number="493876" owner_email="pwang@chromium.org" pass_count="0" patch_number="6" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/76/493876/6" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I659957742b9942277856aacccd3c3f1c6e33d223" commit="c5367fee87dbdee469ff731f0f12ceda46032b95" commit_message="audio_CrasSanity: Remove dependency on network We want to make this test simple and clear on what issue to catch. Instead of fetch and play audio/video files, open a local url and execute javascript to generate sound so this test won't fail on network problems. This also makes the test run faster. BUG=chromium:717823 TEST=test_that -b squawks audio_CrasSanity Change-Id: I659957742b9942277856aacccd3c3f1c6e33d223 Reviewed-on: https://chromium-review.googlesource.com/494408 Commit-Ready: Qiang Xu <warx@chromium.org> Tested-by: Hsinyu Chao <hychao@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org> " fail_count="5" gerrit_number="494408" owner_email="hychao@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/08/494408/1" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="I5ff8044dd9d5a0de97d6186c2e890a4355b70405" commit="73285fb492c98e3a510b175e2dae02e7fe89b6f0" commit_message="dev-lang/go: use tc-getTARGET_CC/CXX to get the cross compilers. For Go cross compilers (cross-x86_64-cros-linux-gnu/go and cross-armv7a-cros-linux-gnueabi/go), when CC is set to clang: 1) We need to build the bootstrap compiler (Go 1.4) with host clang. 2) We need to cross-compile Cgo parts of the standard library with the appropriate cross-clang. 3) We need to embed the name of the cross-clang into the installed compiler wrappers, so Cgo code in other packages also uses the appropriate cross-clang. BUG=chromium:674175 TEST='sudo emerge dev-lang/go' works. TEST='sudo emerge cross-x86_64-cros-linux-gnu/go' works. TEST='sudo emerge cross-armv7a-cros-linux-gnueabi/go' works. TEST='sudo CC=gcc CXX=g++ emerge dev-lang/go' works. TEST='sudo CC=gcc CXX=g++ emerge cross-x86_64-cros-linux-gnu/go' works. TEST='sudo CC=gcc CXX=g++ emerge cross-armv7a-cros-linux-gnueabi/go' works. TEST='sudo CC=clang CXX=clang++ emerge dev-lang/go' works. TEST='sudo CC=clang CXX=clang++ emerge cross-x86_64-cros-linux-gnu/go' works. TEST='sudo CC=clang CXX=clang++ emerge cross-armv7a-cros-linux-gnueabi/go' works. Change-Id: I5ff8044dd9d5a0de97d6186c2e890a4355b70405 Reviewed-on: https://chromium-review.googlesource.com/498147 Commit-Ready: Rahul Chaudhry <rahulchaudhry@chromium.org> Tested-by: Rahul Chaudhry <rahulchaudhry@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="2" gerrit_number="498147" owner_email="rahulchaudhry@chromium.org" pass_count="0" patch_number="5" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/47/498147/5" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ice346a1b13db0081810b9f787de143c92d7c244b" commit="7edfd385eeb93d192c9e0f32a284103b138e6c7f" commit_message="Do not abort HWTests for passed builds. If the old builds passed successfully, do not trigger AbortHWTests on the old builds in _AbortPreviousHWTestSuites. BUG=chromium:720212 TEST=run_tests Change-Id: Ice346a1b13db0081810b9f787de143c92d7c244b Reviewed-on: https://chromium-review.googlesource.com/505277 Commit-Ready: Ningning Xia <nxia@chromium.org> Tested-by: Ningning Xia <nxia@chromium.org> Reviewed-by: Aviv Keshet <akeshet@chromium.org> " fail_count="2" gerrit_number="505277" owner_email="nxia@chromium.org" pass_count="0" patch_number="1" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/77/505277/1" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ifdba8917dc24d3c8f6bbad58447f8034fe0141e4" commit="a705501172989ec4118b247e6fa1e2f6fa9a4fde" commit_message="sys-devel/binutils: update -9999 ebuild. A recent change (https://chromium-review.googlesource.com/#/c/482475) modified binutils-2.25.51 ebuild but didn't make the corresponding change in the -9999 ebuild. BUG=chromium:674175 TEST=None Change-Id: Ifdba8917dc24d3c8f6bbad58447f8034fe0141e4 Reviewed-on: https://chromium-review.googlesource.com/505335 Commit-Ready: Rahul Chaudhry <rahulchaudhry@chromium.org> Tested-by: Rahul Chaudhry <rahulchaudhry@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="3" gerrit_number="505335" owner_email="rahulchaudhry@chromium.org" pass_count="0" patch_number="2" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/35/505335/2" remote="cros" total_fail_count="3"/><pending_commit branch="arc-12.1.0-pre2" change_id="I8da28d1b283044bb3c2fa30817d1825cae587ede" commit="05bc57cc77d2acfd4d3555697558044394d72702" commit_message="FROMLIST: egl: Partially revert 23c86c74, fix eglMakeCurrent Fixes regressions in Android CtsVerifier.apk on Intel Chrome OS devices due to incorrect error handling in eglMakeCurrent. See below on how to confirm the regression is fixed. This partially reverts commit 23c86c74cc450a23848b85cfe914376caede1cdf Author: Chad Versace <chadversary@chromium.org> Subject: egl: Emit error when EGLSurface is lost The bad commit added the error handling below. #2 and #3 were right, but #1 was wrong. 1. eglMakeCurrent emits EGL_BAD_CURRENT_SURFACE if the calling thread has unflushed commands and either previous surface is no longer valid. 2. eglMakeCurrent emits EGL_BAD_NATIVE_WINDOW if either new surface is no longer valid. 3. eglSwapBuffers emits EGL_BAD_NATIVE_WINDOW if the swapped surface is no longer valid. Whe I wrote the bad commit, I misunderstood the EGL spec language for #1. The correct behavior is, if I understand correctly now: - Assume a bound EGLSurface is no longer valid. - Assume the bound EGLContext has unflushed commands. - The app calls eglMakeCurrent. The spec requires eglMakeCurrent to implicitly flush. After flushing, eglMakeCurrent emits EGL_BAD_CURRENT_SURFACE and does *not* alter the thread's current bindings. - If the app calls eglMakeCurrent again, and the app inserts no commands into the GL command stream between the two eglMakeCurrent calls, then this second eglMakeCurrent succeeds without emitting an error. How to confirm this fixes the regression: Download android-cts-verifier-7.1_r5-linux_x86-x86.zip from source.android.com, unpack, and `adb install CtsVerifier.apk`. Run test "Projection Cube". Click the Pass button (a green checkmark). Then run test "Projection Widget". Confirm that widgets are visible and that logcat does not complain about eglMakeCurrent failure. Then confirm there are no regressions in the cts-traded module that commit 263243b1 fixed: cts-tf > run cts --skip-preconditions --skip-device-info \ -m CtsCameraTestCases \ -t android.hardware.camera2.cts.RobustnessTest Tested with Chrome OS board "reef". BUG=b:38210858 TEST=See section "How to confirm..." above. Cc: "17.1" <mesa-stable@lists.freedesktop.org> Cc: Tomasz Figa <tfiga@chromium.org> Cc: Nicolas Boichat <drinkcat@chromium.org> Cc: Emil Velikov <emil.velikov@collabora.com> Fixes: 23c86c74 (egl: Emit error when EGLSurface is lost) (am from https://patchwork.freedesktop.org/patch/156502/) Archived-at: https://lists.freedesktop.org/archives/mesa-dev/2017-May/155759.html Change-Id: I8da28d1b283044bb3c2fa30817d1825cae587ede Reviewed-on: https://chromium-review.googlesource.com/506460 Commit-Ready: Chad Versace <chadversary@chromium.org> Tested-by: Chad Versace <chadversary@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> " fail_count="0" gerrit_number="506460" owner_email="chadversary@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/mesa" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/mesa" ref="refs/changes/60/506460/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I9f135d94f0fde7f851836cfca757ae9e57a0ccd8" commit="41a1ec9867552dda2376ac081c5b4f6ce879c24d" commit_message="[Bluetooth] Removing stress_500 test Removing bluetooth_AdapterPairing.mouse.stress_500 from bluetooth_stress suite. We intend this to be a "manual" test only as it takes ~9 hours to run. BUG=None TEST=None Change-Id: I9f135d94f0fde7f851836cfca757ae9e57a0ccd8 Reviewed-on: https://chromium-review.googlesource.com/506620 Commit-Ready: Ruchi Jahagirdar <rjahagir@chromium.org> Tested-by: Ruchi Jahagirdar <rjahagir@chromium.org> Reviewed-by: Ruchi Jahagirdar <rjahagir@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Miao-chen Chou <mcchou@chromium.org> " fail_count="3" gerrit_number="506620" owner_email="rjahagir@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/20/506620/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="Ief60023f898e862f10f3a62b0b3975b8c7e8f318" commit="3e090008cfd7cfa8ccbf524375bfeea107b98a76" commit_message="Update Harfbuzz to 1.4.6 A few notable changes since 1.4.2 - Support for Grantha marks that may be used in Tamil - A few sanitizer issues are fixed - Adlam is routed through Arabic shaper; fixes joined Adlam rendering - Variable font: Implement MVAR table for hb-ot This will sync CrOS with Chromium on other platforms. Still using a locally modified version of ebuild because EAPI=6 is not supported and flag-o-matic eclass is not available. BUG=chromium:712163 TEST=emerge-{x86-alex,amd64-generic,daisy} harfbuzz TEST=cbuildbot chromiumos-sdk TEST=cbuildbot amd64-generic-full x86-generic-full arm-generic-full Change-Id: Ief60023f898e862f10f3a62b0b3975b8c7e8f318 Reviewed-on: https://chromium-review.googlesource.com/506849 Commit-Ready: Jungshik Shin <jshin@chromium.org> Tested-by: Jungshik Shin <jshin@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org> " fail_count="0" gerrit_number="506849" owner_email="jshin@chromium.org" pass_count="0" patch_number="1" project="chromiumos/overlays/chromiumos-overlay" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/chromiumos-overlay" ref="refs/changes/49/506849/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I82be599e59500854cf816836d78978ccec744445" commit="62cd7dab602728f3fbbe55eb9887269ae503d45b" commit_message="rowan: Add to kernel 4.4 pre-cq config In order to prevent further breaking changes sneaking in from other platforms, adding rowan-pre-cq to COMMIT-QUEUE.ini. BUG=b:38355967 TEST=None Change-Id: I82be599e59500854cf816836d78978ccec744445 Signed-off-by: Patrick Berny <pberny@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/508090 Reviewed-by: Bernie Thompson <bhthompson@chromium.org> " fail_count="0" gerrit_number="508090" owner_email="pberny@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/90/508090/3" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I25e27fde2a1a7a895d18d118a770b78bae80424a" commit="5501c3251636e2e2409962cfdd7e04efe4d0f369" commit_message="[moblab] Replace site_utils with calls to utils. TEST=manual test on moblab and unit tests BUG=chromium:723905 Change-Id: I25e27fde2a1a7a895d18d118a770b78bae80424a Reviewed-on: https://chromium-review.googlesource.com/508180 Commit-Ready: Keith Haddow <haddowk@chromium.org> Tested-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Keith Haddow <haddowk@chromium.org> Reviewed-by: Michael Tang <ntang@chromium.org> " fail_count="1" gerrit_number="508180" owner_email="haddowk@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/80/508180/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I01c6f2a1674e4ee0e25410b438419d4aec70a244" commit="1604049bf62a10cfce1d4bc666f4e1e27d65313a" commit_message="cheets_StartAndroid.py: Report of running time Report the running time to chrome perf dashboard. BUG=None TEST=test_that cheets_StartAndroid Change-Id: I01c6f2a1674e4ee0e25410b438419d4aec70a244 Reviewed-on: https://chromium-review.googlesource.com/508232 Commit-Ready: Po-Hsien Wang <pwang@chromium.org> Tested-by: Po-Hsien Wang <pwang@chromium.org> Reviewed-by: Ilja H. Friedel <ihf@chromium.org> " fail_count="2" gerrit_number="508232" owner_email="pwang@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/32/508232/2" remote="cros" total_fail_count="2"/><pending_commit branch="master" change_id="Ie3f320d27e48dd0612eeff35b6dc79828010c95f" commit="5d1c880bed85c62296529fba466dd710ede4535d" commit_message="[autotest] Add a model for the hqe index table. Added a model to afe/models.py for the new table host_queue_entry_start_time_index. BUG=chromium:704997 TEST=None Change-Id: Ie3f320d27e48dd0612eeff35b6dc79828010c95f Reviewed-on: https://chromium-review.googlesource.com/508471 Commit-Ready: Paul Hobbs <phobbs@google.com> Tested-by: Paul Hobbs <phobbs@google.com> Reviewed-by: Aviv Keshet <akeshet@chromium.org> " fail_count="0" gerrit_number="508471" owner_email="phobbs@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/71/508471/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ie114826447b16181447dd9d41c6dc5428a4c59ac" commit="4b4e9572c3f38673aa9b800d5da0246d38430ed5" commit_message="Add the version polling mechanism for displaylink FW updater BUG=chromium:706485 TEST=build image for guado with this change verify that MIMO and CrOS box are still working properly. In addition, start the updater without any parameter, the firmware version of the attached displaylink devices should be displayed. Change-Id: Ie114826447b16181447dd9d41c6dc5428a4c59ac Reviewed-on: https://chromium-review.googlesource.com/491646 Commit-Ready: Jen-Chieh Huang <jenchiehhuang@chromium.org> Tested-by: Jen-Chieh Huang <jenchiehhuang@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jiwoong Lee <porce@chromium.org> " fail_count="0" gerrit_number="491646" owner_email="jenchiehhuang@chromium.org" pass_count="0" patch_number="7" project="chromiumos/third_party/mimo-updater" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/mimo-updater" ref="refs/changes/46/491646/7" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic374105c614a39d0b442b6b0eff9deba9afa3851" commit="de154eb119636aa5bbe0a266451e32a519653042" commit_message="[Autotest] Adding BT address for chameleon boards Adding BT MAC Addresses for chameleon boards in Atlantis lab BUG=chromium:695736 TEST=None Change-Id: Ic374105c614a39d0b442b6b0eff9deba9afa3851 Reviewed-on: https://chromium-review.googlesource.com/505215 Commit-Ready: Ruchi Jahagirdar <rjahagir@chromium.org> Tested-by: Ruchi Jahagirdar <rjahagir@chromium.org> Reviewed-by: Ruchi Jahagirdar <rjahagir@chromium.org> Reviewed-by: Kalin Stoyanov <kalin@chromium.org> " fail_count="4" gerrit_number="505215" owner_email="rjahagir@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/15/505215/1" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="I8f6ab0c915314d73e5da30bbdcb8ff8a8ea62ffe" commit="8df72bb7f39d5787bc0b8591ac61698bbf5f1837" commit_message="security_AccountsBaseline: Add cfm-firmware-updaters user/group The cfm-firmware-updaters user/group was added in: https://chromium-review.googlesource.com/c/493792/ The autotest is updated in order to allow the presence of this user/group. BUG=chromium:706485 TEST=local build Change-Id: I8f6ab0c915314d73e5da30bbdcb8ff8a8ea62ffe Reviewed-on: https://chromium-review.googlesource.com/506526 Commit-Ready: Simon Que <sque@chromium.org> Tested-by: Zhongze Hu <frankhu@google.com> Reviewed-by: Simon Que <sque@chromium.org> " fail_count="3" gerrit_number="506526" owner_email="frankhu@google.com" pass_count="0" patch_number="1" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/26/506526/1" remote="cros" total_fail_count="3"/><pending_commit branch="master" change_id="I9d70abe39d1e2cf22ac9f4e354bd97715d709471" commit="851c76525cc064a21e45c616c312cd0f0d57dc28" commit_message="[Autotest] Improve input playback emulation cleanup. Currently, killing emulation during a test followed by emulating a different input (only happens in the touch_MouseScroll test), does not work on 4.4 devices. The count of existing devices happens before the old device is completely removed. Handle emulation cleanup by checking that the number of devices went down, just as we check that the number of devices goes up after emulating a new device. TEST=ran it BUG=chromium:723861 Change-Id: I9d70abe39d1e2cf22ac9f4e354bd97715d709471 Reviewed-on: https://chromium-review.googlesource.com/508213 Commit-Ready: Katherine Threlkeld <kathrelkeld@chromium.org> Tested-by: Katherine Threlkeld <kathrelkeld@chromium.org> Reviewed-by: Ruchi Jahagirdar <rjahagir@chromium.org> Reviewed-by: Kalin Stoyanov <kalin@chromium.org> " fail_count="1" gerrit_number="508213" owner_email="kathrelkeld@chromium.org" pass_count="0" patch_number="3" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/13/508213/3" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I36f212b1ea066b60401d828774fc6f49aa3911d3" commit="0a7248acd46ac3f19e61be42d4359da07a547f25" commit_message="lakitu: upgrade kubernetes to v1.6.3 BUG=None TEST=trybots RELEASE_NOTE=Kubernetes upgraded to v1.6.3 Change-Id: I36f212b1ea066b60401d828774fc6f49aa3911d3 Reviewed-on: https://chromium-review.googlesource.com/508240 Commit-Ready: Aditya Kali <adityakali@google.com> Tested-by: Aditya Kali <adityakali@google.com> Reviewed-by: Amey Deshpande <ameyd@google.com> " fail_count="0" gerrit_number="508240" owner_email="adityakali@google.com" pass_count="0" patch_number="1" project="chromiumos/overlays/board-overlays" project_url="https://chromium-review.googlesource.com/chromiumos/overlays/board-overlays" ref="refs/changes/40/508240/1" remote="cros" total_fail_count="0"/><lkgm version="9562.0.0-rc5"/></manifest> |
