| <?xml version="1.0" encoding="utf-8"?><manifest revision="e4e8450a0343d4d9d00cdd9219b1a1d9dcfacdd7"> |
| <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"/> |
| <remote fetch="https://weave.googlesource.com" name="weave" review="https://weave-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="275101a142d7d9c195c9c08a5af40ef9d070edd7" 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="c3f34a3eed92e804017c0eaf9a9c69fd2f39d2ec" 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="7d73b68d83b5320647e3786d8e3eda11367a91c5" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="3d8e6ae763671ec2e7160e0cb93cf358865f7851" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="90a81a566bded63bd4ef2e67f8359b1723c59947" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="8cc601b71ab568edbd8e43d307547aef6ff5ba2c" 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="08bad433afb899ba4a36a98c52726bb3fb035ca5" 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="65e02aef0b1b203c29f2faa0f5a84789b8ff1059" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromium/tools/depot_tools" remote="chromium" revision="1c822ade1f731ec35a3d2d3be8805f773df22c4c"/> |
| <project groups="minilayout,buildtools,chromeos-admin,labtools,sysmon,devserver" name="chromiumos/chromite" path="chromite" revision="e49f2aa32465d274fc145b1ba3c5df53be68a506" 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="a41e565e216465f30d556a33205d27d7b90bdcc9" 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="27d837f883175a1de37005bae4acf88b7b304838" upstream="refs/heads/master"/> |
| <project name="chromiumos/manifest" path="manifest" revision="2e35572c470ecfe9fc9c7bf70c05cdf5e529d3a8" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="47b132961fe1ff6d4d804d7e8d80e5b8074af8fc" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="ee02b92823b7790c3909fabf280cec6bd2fe8e72" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="28e997739629cad16d25a44a17b5045eec80d7ed" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="babb0ce4663925f99fb2412853e13d66340345de" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/arc-camera" path="src/platform/arc-camera" revision="13f2c1b97a44757abc15a9c3069b30fa0808bb83" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="350b7c6b354206b7a322faabfecf9204965bb675" 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="25d2d5fa9c751388da825414cfb07c7d08f1beb0" 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="caf14ab86652918a697cea4229ccff1ccd5ff34b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/crosvm" path="src/platform/crosvm" revision="034134b2db2d5b5ff43cb9d5f0197057338ec960" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="540de926c5f0427e2a7ceb90e343d6d25d62c2f9" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,devserver" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="d17f5565166e9751e85a29b6b121dc0bb5e480c9" 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="7018a3c7ca29134540fb09467cf759402902092e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="4123b5861e359318b1caf48b03f4751608a4122a" 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="71a9251f1519f4a05004fb6b7c28d362626d7c96" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="262f49ab9054bd5363569eb7e115d9e1d7e0b719" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="88faa1769b36ea4a51ea66e06416fedeadafa7af" 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="f7f138f402f90702ba35c481e6f6a900db59cde7" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="a8ce70b9f726125b7c54618e612cd889c3395825" 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="5479366c11b946cb2a48c8898c60527ef6b2e77b" 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="153c5891ab17545a7cfa9dd5e97cfca02eda5f2c" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="13b41039eda4677359fab702497bf07d8231b499" 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="8da2c778eafaa0eb961308fcb5426dde45b08c5f" 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="c6eab9e4d0b4f56176df23d30b815dc94b774a3d" 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="4bc61f9df73717a7a93bb6bb474ca3da1fc79e02" 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="748af73c67abf473d45bbacd708ce79bfc264ff5" 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="c93a15c328f511a26400c8fc77b2e5c9f67a5e70" 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="8c14662b903b2cd16358ebdc060dce77a6fc98d7" 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="04180693826b79b37efae6103f79e163f2ed2e5d" upstream="refs/heads/master"/> |
| <project groups="buildtools,labtools,devserver" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="0fdf76c4f1d62863224fe5cc29a61eb3d436ea3f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="6835f09b9097a9613817221bfe3d3bfe4de65c47" upstream="refs/heads/chromeos-5.41"/> |
| <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="292d728ba5b188e2ec422e412f522e3ae30284f8" 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="bea97e5d8288b4882020b79c16d14b054c855eb3" 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="6c185fe0c330da9ac8ce9fbcdadc272d1df54d5c" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="680ff4568315528d4af2a023e27b5df4a89bcaac" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/huddly-updater" path="src/third_party/huddly-updater" revision="927748584ce871cdebe4ec076d0632ff91f45f87" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="6c500504d904c73021cfe7d9a789da934d6ccd10" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="7feb04146e7e5a0c9d8b0e78dd45adf66fb75e22" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="dd7427fb61e02eea87553305ef11443185c0a124" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="f466136cafa6fe7f8d13e6dfd0309fcd709dafa8" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="3bf98755f9c670c5c10ca05cba22848d65117cb2" 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="ffe8878a79b02b43fb1686bcf62dbf018fb642f1" 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="064b61254f513fe6d2c7f3ccbb63c91da0fce61b" 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="7553e7c41607903a6a3ce10dbddfcffbae6b5c62" 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="d8715928b48c58edfb7fbce8c405f59d47314064" 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="3da90127652589f150dbfd998069e72cd96dd4df" 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 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="49c8a661237ee1201eed9a51625b227dee4dd4c5" 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="78a898a0b196b4b683a08dfa34128e39bad9c340" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/toolchain-utils" path="src/third_party/toolchain-utils" revision="99d32c4981138fd11e6b351b6be9311932293464" 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="1a68fe6fa860f563e8b45e3826110ceec75d61a8" 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="3501b86c9db5dfc701229f0388eb2c39b7f4aca3" 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="7b1fffe095c0374f2aba33a3a3155ba845105208" upstream="refs/heads/master"/> |
| <project name="platform/external/bsdiff" path="src/aosp/external/bsdiff" remote="aosp" revision="b9fa8599064d10afd8c231155500f0b8e934d71f" 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="351d986fad7a8236fb27c466df19a39b31ffe3be" 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" remote="weave" revision="9365e3b996ccbda44d80eadd0895c5bad8238de2" upstream="refs/heads/refactor-01-2017"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-3.10" change_id="I7b9bcb278bf5799107bd38b65bb84c3944777062" commit="f3627d15537290de0fcf05769c7ab42c27ebbf2a" commit_message="UPSTREAM: sock: tigthen lockdep checks for sock_owned_by_user sock_owned_by_user should not be used without socket lock held. It seems to be a common practice to check .owned before lock reclassification, so provide a little help to abstract this check away. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. CQ-DEPEND=CL:480159 Change-Id: I7b9bcb278bf5799107bd38b65bb84c3944777062 Cc: linux-cifs@vger.kernel.org Cc: linux-bluetooth@vger.kernel.org Cc: linux-nfs@vger.kernel.org Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit fafc4e1ea1a4c1eb13a30c9426fb799f5efacbc3) Reviewed-on: https://chromium-review.googlesource.com/479910 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="479910" owner_email="mcchou@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/10/479910/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Idc0dcd2890e15569ec74e8371ffcf9b42d7c3ddc" commit="0c1278cd9d0c6c17763b2624257f7ea0c4aa5deb" commit_message="UPSTREAM: Bluetooth: vhci: Fix race at creating hci device hci_vhci driver creates a hci device object dynamically upon each HCI_VENDOR_PKT write. Although it checks the already created object and returns an error, it's still racy and may build multiple hci_dev objects concurrently when parallel writes are performed, as the device tracks only a single hci_dev object. This patch introduces a mutex to protect against the concurrent device creations. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Idc0dcd2890e15569ec74e8371ffcf9b42d7c3ddc Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit c7c999cb18da88a881e10e07f0724ad0bfaff770) Reviewed-on: https://chromium-review.googlesource.com/480111 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480111" owner_email="mcchou@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/11/480111/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I85e32e717b852aa365eb2d765f1db7ffd2a74fe6" commit="e61a3bf0ddc16f1134fa803ac9e7ecabd07a3411" commit_message="UPSTREAM: Bluetooth: ath3k: Silence uninitialized variable warning We could print an uninitialized value in the error message. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I85e32e717b852aa365eb2d765f1db7ffd2a74fe6 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e9fc71649b5361b8ac608898342c8904167cb63d) Reviewed-on: https://chromium-review.googlesource.com/480112 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480112" owner_email="mcchou@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/12/480112/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ie471916eac33293ae00539e8c347aabce2db56d4" commit="9e49326cad2eddf48425fa391de1a4f7345c4941" commit_message="UPSTREAM: Bluetooth: Add defines for SPI and I2C Extend the set of possible HCI bus types with SPI and I2C. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie471916eac33293ae00539e8c347aabce2db56d4 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 5c0e03cd9f10d541b69b667a2b1b8980f196f432) Reviewed-on: https://chromium-review.googlesource.com/480113 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480113" owner_email="mcchou@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/13/480113/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I74636515cfeda3553c66dbafc9d330fbe937d9cc" commit="0abcfb25a314542519bf474a2d69c4ed6be9eb2d" commit_message="UPSTREAM: btmrvl: add platform specific wakeup interrupt support On some arm-based platforms, we need to configure platform specific parameters by device tree node and also define our node as a child node of parent SDIO host controller. This patch parses these parameters from device tree. It includes calibration data download to firmware, wakeup pin configured to firmware, and soc specific wake up gpio, which will be set as wakeup interrupt pin. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I74636515cfeda3553c66dbafc9d330fbe937d9cc Signed-off-by: Xinming Hu <huxm@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit bb7f4f0bcee6844632d7366d6abff4b9996ad454) Reviewed-on: https://chromium-review.googlesource.com/480114 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480114" owner_email="mcchou@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/480114/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="If1ee511278dff66ab9b36c398198b9eb0a1c4a27" commit="8a24778494a26faba0c47e46b770ebe70ef81e4d" commit_message="UPSTREAM: Bluetooth: hci_intel: Fix null gpio desc pointer dereference gpiod_get_optional can return either ERR_PTR or NULL pointer. NULL case is not tested and then dereferenced later in desc_to_gpio. Fix this by using non optional version which returns ERR_PTR in any error case (this is not an optional gpio). Use the same non optional version for the host-wake gpio. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If1ee511278dff66ab9b36c398198b9eb0a1c4a27 Fixes: 765ea3abd116 ("Bluetooth: hci_intel: Retrieve host-wake IRQ") Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 32b9ccbc3522811c0e483637b85ae25f5491296f) Reviewed-on: https://chromium-review.googlesource.com/480115 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480115" owner_email="mcchou@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/15/480115/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I6526def4552b9fcd3e28befe22379f8675d22a71" commit="2cea881e3f9eecc0e125d4bc80267d03faf85fa4" commit_message="UPSTREAM: Bluetooth: Add support for Intel Bluetooth device 8265 [8087:0a2b] This patch adds support for Intel Bluetooth device 8265 also known as Windstorm Peak (WsP). T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 6 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=8087 ProdID=0a2b Rev= 0.10 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6526def4552b9fcd3e28befe22379f8675d22a71 Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a0af53b511423cca93900066512379e21586d7dd) Reviewed-on: https://chromium-review.googlesource.com/480116 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480116" owner_email="mcchou@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/16/480116/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ia453c853a39a78a2feb59f38cb2c15cbe76e567e" commit="06b0d0fbb354c44fde345162576cf9c18985b2d3" commit_message="UPSTREAM: Bluetooth: fix power_on vs close race With all the latest fixes applied, I am still able to reproduce this (and other) warning(s): WARNING: CPU: 1 PID: 19684 at ../kernel/workqueue.c:4092 destroy_workqueue+0x70a/0x770() ... Call Trace: [<ffffffff819fee81>] ? dump_stack+0xb3/0x112 [<ffffffff8117377e>] ? warn_slowpath_common+0xde/0x140 [<ffffffff811ce68a>] ? destroy_workqueue+0x70a/0x770 [<ffffffff811739ae>] ? warn_slowpath_null+0x2e/0x40 [<ffffffff811ce68a>] ? destroy_workqueue+0x70a/0x770 [<ffffffffa0c944c9>] ? hci_unregister_dev+0x2a9/0x720 [bluetooth] [<ffffffffa0b301db>] ? vhci_release+0x7b/0xf0 [hci_vhci] [<ffffffffa0b30160>] ? vhci_flush+0x50/0x50 [hci_vhci] [<ffffffff8117cd73>] ? do_exit+0x863/0x2b90 This is due to race present in the hci_unregister_dev path. hdev->power_on work races with hci_dev_do_close. One tries to open, the other tries to close, leading to warning like the above. (Another example is a warning in kobject_get or kobject_put depending on who wins the race.) Fix this by switching those two racers to ensure hdev->power_on never triggers while hci_dev_do_close is in progress. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia453c853a39a78a2feb59f38cb2c15cbe76e567e Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit bf389cabb3b8079c23f9762e62b05f291e2d5e99) Reviewed-on: https://chromium-review.googlesource.com/480117 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480117" owner_email="mcchou@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/17/480117/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I77ac2954ca684945bb38f5856f185f9056750735" commit="74ecbce0a1e4166c93a827eac5ca3844dc21d84a" commit_message="UPSTREAM: Bluetooth: Add USB ID 13D3:3487 to ath3k Add hw id to ath3k usb device list and btusb blacklist T: Bus=01 Lev=01 Prnt=01 Port=08 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3487 Rev=00.02 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb Requires these firmwares: ar3k/AthrBT_0x11020100.dfu and ar3k/ramps_0x11020100_40.dfu Firmwares are available in linux-firmware. Device found in a laptop ASUS model N552VW. It's an Atheros AR9462 chip. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I77ac2954ca684945bb38f5856f185f9056750735 Signed-off-by: Lauro Costa <lauro@polilinux.com.br> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 72f9f8b58bc743e6b6abdc68f60db98486c3ffcf) Reviewed-on: https://chromium-review.googlesource.com/480118 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480118" owner_email="mcchou@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/18/480118/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Iec39761dd37926c36e7c13e0b1aea47ad51a6bda" commit="f34c73682917ef9e94639ba89941d8994db8b3db" commit_message="UPSTREAM: Bluetooth: Switch SMP to crypto_cipher_encrypt_one() SMP does ECB crypto on stack buffers. This is complicated and fragile, and it will not work if the stack is virtually allocated. Switch to the crypto_cipher interface, which is simpler and safer. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iec39761dd37926c36e7c13e0b1aea47ad51a6bda Signed-off-by: Andy Lutomirski <luto@kernel.org> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Tested-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a4770e1117f193c3e27f5f046cd4f8e2470f3b70) Reviewed-on: https://chromium-review.googlesource.com/480119 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480119" owner_email="mcchou@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/19/480119/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I06ece906e88c39d3bb768a5df0ba3daacaecb438" commit="d1593c438a199c13b7269946dfa91f3a291ac2a4" commit_message="UPSTREAM: Bluetooth: Add support for Intel Bluetooth device 3168 [8087:0aa7] This patch adds support for Intel Bluetooth device 3168 also known as Sandy Peak (SdP). T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=8087 ProdID=0aa7 Rev= 0.01 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I06ece906e88c39d3bb768a5df0ba3daacaecb438 Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 439e65d3998c0b9501638cc0c2190e936c0caaf2) Reviewed-on: https://chromium-review.googlesource.com/480120 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480120" owner_email="mcchou@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/20/480120/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I9c471032f1a700ab6e0341667a5fa19692c56766" commit="868b2d8127fdedf26fd8689fbf9fb9b3f424649e" commit_message="UPSTREAM: Bluetooth: Fix bt_sock_recvmsg return value If recvmsg is called with a destination buffer that is too small to receive the contents of skb in its entirety, the return value from recvmsg was inconsistent with common SOCK_SEQPACKET or SOCK_DGRAM semantics. If destination buffer provided by userspace is too small (e.g. len < copied), then MSG_TRUNC flag is set and copied is returned. Instead, it should return the length of the message, which is consistent with how other datagram based sockets act. Quoting 'man recv': "All three calls return the length of the message on successful comple tion. If a message is too long to fit in the supplied buffer, excess bytes may be discarded depending on the type of socket the message is received from." and "MSG_TRUNC (since Linux 2.2) For raw (AF_PACKET), Internet datagram (since Linux 2.4.27/2.6.8), netlink (since Linux 2.6.22), and UNIX datagram (since Linux 3.4) sockets: return the real length of the packet or datagram, even when it was longer than the passed buffer." BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I9c471032f1a700ab6e0341667a5fa19692c56766 Signed-off-by: Denis Kenzior <denkenz@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b5f34f9420b50c9b5876b9a2b68e96be6d629054) Reviewed-on: https://chromium-review.googlesource.com/480121 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480121" owner_email="mcchou@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/21/480121/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I89d0ffa78da256409603d3e60cd98d1d52f597d7" commit="8267cdd2f4e094b6de30523ad01ee55d1a255812" commit_message="UPSTREAM: Bluetooth: Fix hci_sock_recvmsg return value If recvmsg is called with a destination buffer that is too small to receive the contents of skb in its entirety, the return value from recvmsg was inconsistent with common SOCK_SEQPACKET or SOCK_DGRAM semantics. If destination buffer provided by userspace is too small (e.g. len < copied), then MSG_TRUNC flag is set and copied is returned. Instead, it should return the length of the message, which is consistent with how other datagram based sockets act. Quoting 'man recv': "All three calls return the length of the message on successful comple tion. If a message is too long to fit in the supplied buffer, excess bytes may be discarded depending on the type of socket the message is received from." and "MSG_TRUNC (since Linux 2.2) For raw (AF_PACKET), Internet datagram (since Linux 2.4.27/2.6.8), netlink (since Linux 2.6.22), and UNIX datagram (since Linux 3.4) sockets: return the real length of the packet or datagram, even when it was longer than the passed buffer." BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I89d0ffa78da256409603d3e60cd98d1d52f597d7 Signed-off-by: Denis Kenzior <denkenz@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 83871f8ccdfa8f3edab15d432aa4f3eb82953343) Reviewed-on: https://chromium-review.googlesource.com/480122 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480122" owner_email="mcchou@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/22/480122/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I7fdd716f6437aaf81b93d2a89904f755af0f680e" commit="9b5abbf1792082385e9736629573ce09fef383ca" commit_message="UPSTREAM: Bluetooth: Replace constant hw_variant from Intel Bluetooth firmware filename The format of Intel Bluetooth firmware filename for bootloader product is ibt-<hw_variant>-<device_revision_id>.sfi Currently the driver uses a constant value 11 (0x0b) for hw_variant to support LnP/SfP product. But new product like WsP product has a different value such as 12 (0x0c). To support the multiple products, this patch replaces the constant value of hw_variant to the actual hw_variant value read from the device. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I7fdd716f6437aaf81b93d2a89904f755af0f680e Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 230b04ac8f439d0797ab85fb356f069f0472306f) Reviewed-on: https://chromium-review.googlesource.com/480123 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480123" owner_email="mcchou@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/23/480123/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I5acfa38949d08c5da062d9053b8be8e3c306dc17" commit="26359660cd3589b1dc6dbfc3804f4af21a79c6dd" commit_message="UPSTREAM: Bluetooth: btmrvl: fix slab-out-of-bounds access in btmrvl_sdio Kasan reported slab-out-of-bounds access in btmrvl_sdio: [ 33.055400] ================================================================== [ 33.062585] BUG: KASAN: slab-out-of-bounds in memcpy+0x24/0x50 at addr ffffffc0d89b4a00 [ 33.070529] Read of size 256 by task btmrvl_main_ser/3576 [ 33.075885] ============================================================================= [ 33.084002] BUG kmalloc-256 (Tainted: G B ): kasan: bad access detected [ 33.091511] ----------------------------------------------------------------------------- <snip...> [ 33.413498] Call trace: [ 33.415928] [<ffffffc00020a440>] dump_backtrace+0x0/0x190 [ 33.421288] [<ffffffc00020a5ec>] show_stack+0x1c/0x28 [ 33.426305] [<ffffffc000b3288c>] dump_stack+0xa0/0xf8 [ 33.431320] [<ffffffc000396130>] print_trailer+0x158/0x16c [ 33.436765] [<ffffffc0003962cc>] object_err+0x48/0x5c [ 33.441780] [<ffffffc00039be24>] kasan_report+0x344/0x510 [ 33.447141] [<ffffffc00039afd8>] __asan_loadN+0x20/0x150 [ 33.452413] [<ffffffc00039b60c>] memcpy+0x20/0x50 [ 33.457084] [<ffffffc000595fcc>] swiotlb_tbl_map_single+0x2ec/0x310 [ 33.463305] [<ffffffc000596b54>] map_single+0x24/0x30 [ 33.468320] [<ffffffc0005970c8>] swiotlb_map_sg_attrs+0xec/0x21c [ 33.474286] [<ffffffc000219d4c>] __swiotlb_map_sg_attrs+0x48/0xec [ 33.480339] [<ffffffc0008ea610>] msdc_prepare_data.isra.11+0xf0/0x11c [ 33.486733] [<ffffffc0008ecbd0>] msdc_ops_request+0x74/0xf0 [ 33.492266] [<ffffffc0008c6b38>] __mmc_start_request+0x78/0x8c [ 33.498057] [<ffffffc0008c6d6c>] mmc_start_request+0x220/0x240 [ 33.503848] [<ffffffc0008c6e04>] mmc_wait_for_req+0x78/0x250 [ 33.509468] [<ffffffc0008d70fc>] mmc_io_rw_extended+0x2ec/0x388 [ 33.515347] [<ffffffc0008d8fc0>] sdio_io_rw_ext_helper+0x160/0x268 [ 33.521483] [<ffffffc0008d93fc>] sdio_writesb+0x40/0x50 [ 33.526677] [<ffffffbffc338b38>] btmrvl_sdio_host_to_card+0x124/0x1bc [btmrvl_sdio] [ 33.534283] [<ffffffbffc3290a0>] btmrvl_service_main_thread+0x384/0x428 [btmrvl] [ 33.541626] [<ffffffc0002518e8>] kthread+0x140/0x158 [ 33.546550] Memory state around the buggy address: [ 33.551305] ffffffc0d89b4980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 33.558474] ffffffc0d89b4a00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 33.565643] >ffffffc0d89b4a80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fc [ 33.572809] ^ [ 33.579889] ffffffc0d89b4b00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 33.587055] ffffffc0d89b4b80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 33.594221] ================================================================== The cause of this is that btmrvl_sdio_host_to_card can access memory region out of its allocated space due to: 1. the requested block size is smaller than SDIO_BLOCK_SIZE, and/or 2. the allocated memory is not BTSDIO_DMA_ALIGN-aligned. This patch fixes the issue by allocating a buffer which is big enough for SDIO_BLOCK_SIZE transfer and/or BTSDIO_DMA_ALIGN address relocation. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5acfa38949d08c5da062d9053b8be8e3c306dc17 Signed-off-by: Ricky Liang <jcliang@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d2f302409e022506640363277ea8f8034c558c6c) Reviewed-on: https://chromium-review.googlesource.com/480124 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480124" owner_email="mcchou@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/24/480124/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Iae300a20482d0531eaf384cdd57272eaec8e2224" commit="25d6b7bf50d41ebce18844e5fe00591ee857ed78" commit_message="UPSTREAM: Bluetooth: btusb: add support for device 0489:e092 With current btusb.ko kernel module, Bluetooth pretends to be active but there is no real activity. I'm using an Acer Aspire VN7-791. Output of lsusb: Bus 003 Device 007: ID 0489:e092 Foxconn / Hon Hai On my laptop, this device is actually used as a combo with wifi chipset Atheros Qualcomm Killer N1525 Wireless-AC [168c:003e], * Fix by adding a declaration in kernel sources drivers/bluetooth/btusb.c { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME }, * Compiled extra module /lib/modules/4.4.0-22-generic/extra/btusb.ko * Successfully tested against my phone (obex file transfer) BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iae300a20482d0531eaf384cdd57272eaec8e2224 Signed-off-by: Yvain THONNART <yvain.thonnart@m4x.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 47ca5898eb09bc49666958f2ea7e0ea5b4add0f5) Reviewed-on: https://chromium-review.googlesource.com/480125 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480125" owner_email="mcchou@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/25/480125/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ib0f4aa3d2cb68278b28f7ff9aa738e9e7664c021" commit="2a86f386982c05f72827d31d2b7aeb90f0dd51b5" commit_message="BACKPORT: Bluetooth: Remove connection link attributes The connection link attributes are not used and expose no valuable information. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ib0f4aa3d2cb68278b28f7ff9aa738e9e7664c021 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2a0be139868cae2465f9ed5b599203fa4f8e06ca) Reviewed-on: https://chromium-review.googlesource.com/480126 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480126" owner_email="mcchou@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/26/480126/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I1317d592080bf9a7969307a70453ff3a73b6c8d1" commit="197a13b94ab40accb03208546a4c45b7640e818d" commit_message="BACKPORT: Bluetooth: Remove controller device attributes The controller device attributes are not used and expose no valuable information. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I1317d592080bf9a7969307a70453ff3a73b6c8d1 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e14dbe72033152135eb3bae212228728089d4dd9) Reviewed-on: https://chromium-review.googlesource.com/480127 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480127" owner_email="mcchou@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/27/480127/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I6804b055ee109139d8dea265e6415384771ea860" commit="4f93bc6c2816d4d051f04cd2b5d2e8a259135e4c" commit_message="UPSTREAM: Bluetooth: Rename HCI_BREDR into HCI_PRIMARY The HCI_BREDR naming is confusing since it actually stands for Primary Bluetooth Controller. Which is a term that has been used in the latest standard. However from a legacy point of view there only really have been Basic Rate (BR) and Enhanced Data Rate (EDR). Recent versions of Bluetooth introduced Low Energy (LE) and made this terminology a little bit confused since Dual Mode Controllers include BR/EDR and LE. To simplify this the name HCI_PRIMARY stands for the Primary Controller which can be a single mode or dual mode controller. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6804b055ee109139d8dea265e6415384771ea860 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit ca8bee5dde1f02c2dbe8c8453dce27f2dfafb21c) Reviewed-on: https://chromium-review.googlesource.com/480128 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480128" owner_email="mcchou@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/28/480128/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I8e92ae816d9ef4321a4c76e0c17d19ff63113638" commit="46e3dacb83400f5e1a6908d33095997b52a3f346" commit_message="UPSTREAM: Bluetooth: hci_intel: Remove LPM enabling from setup procedure LPM can be enabled via a DDC write command at specific DDC ID. As any other DDC value, this is up to the DDC config file to include (or not) the low power mode configuration. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8e92ae816d9ef4321a4c76e0c17d19ff63113638 Signed-off-by: Loic Poulain <loic.poulain@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 31eff2670301d0367ce06645e41c3b57db4e9e78) Reviewed-on: https://chromium-review.googlesource.com/480129 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480129" owner_email="mcchou@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/29/480129/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I2ece37cc8e8d6ca9be4d7d17cbdac67fe6d0b927" commit="54adab3b633cccc5ab30d8499496082d9841b538" commit_message="UPSTREAM: Bluetooth: Add support of 13d3:3490 AR3012 device T: Bus=01 Lev=01 Prnt=01 Port=07 Cnt=05 Dev#= 5 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3490 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1600623 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2ece37cc8e8d6ca9be4d7d17cbdac67fe6d0b927 Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 12d868964f7352e8b18e755488f7265a93431de1) Reviewed-on: https://chromium-review.googlesource.com/480130 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480130" owner_email="mcchou@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/30/480130/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ica6164604cc17bb91fb79cfff584798cb9b5e5d6" commit="ecba4be727c9c6d0ad7cdaeee36f4a503a7bfa82" commit_message="UPSTREAM: Bluetooth: Add Authentication Failed reason to Disconnected Mgmt event If link is disconnected due to Authentication Failure (PIN or Key Missing status) userspace will be notified about this with proper error code. Many LE profiles define "PIN or Key Missing" status as indication of remote lost bond so this allows userspace to take action on this. @ Device Connected: 88:63:DF:88:0E:83 (1) flags 0x0000 02 01 1a 05 03 0a 18 0d 18 0b 09 48 65 61 72 74 ...........Heart 20 52 61 74 65 Rate > HCI Event: Command Status (0x0f) plen 4 LE Read Remote Used Features (0x08|0x0016) ncmd 1 Status: Success (0x00) > ACL Data RX: Handle 3585 flags 0x02 dlen 11 ATT: Read By Group Type Request (0x10) len 6 Handle range: 0x0001-0xffff Attribute group type: Primary Service (0x2800) > HCI Event: LE Meta Event (0x3e) plen 12 LE Read Remote Used Features (0x04) Status: Success (0x00) Handle: 3585 Features: 0x01 0x00 0x00 0x00 0x00 0x00 0x00 0x00 LE Encryption < HCI Command: LE Start Encryption (0x08|0x0019) plen 28 Handle: 3585 Random number: 0x0000000000000000 Encrypted diversifier: 0x0000 Long term key: 26201cd479a0921b6f949f0b1fa8dc82 > HCI Event: Command Status (0x0f) plen 4 LE Start Encryption (0x08|0x0019) ncmd 1 Status: Success (0x00) > HCI Event: Encryption Change (0x08) plen 4 Status: PIN or Key Missing (0x06) Handle: 3585 Encryption: Disabled (0x00) < HCI Command: Disconnect (0x01|0x0006) plen 3 Handle: 3585 Reason: Authentication Failure (0x05) > HCI Event: Command Status (0x0f) plen 4 Disconnect (0x01|0x0006) ncmd 1 Status: Success (0x00) > HCI Event: Disconnect Complete (0x05) plen 4 Status: Success (0x00) Handle: 3585 Reason: Connection Terminated By Local Host (0x16) @ Device Disconnected: 88:63:DF:88:0E:83 (1) reason 4 @ Device Connected: C4:43:8F:A3:4D:83 (0) flags 0x0000 08 09 4e 65 78 75 73 20 35 ..Nexus 5 > HCI Event: Command Status (0x0f) plen 4 Authentication Requested (0x01|0x0011) ncmd 1 Status: Success (0x00) > HCI Event: Link Key Request (0x17) plen 6 Address: C4:43:8F:A3:4D:83 (LG Electronics) < HCI Command: Link Key Request Reply (0x01|0x000b) plen 22 Address: C4:43:8F:A3:4D:83 (LG Electronics) Link key: 080812e4aa97a863d11826f71f65a933 > HCI Event: Command Complete (0x0e) plen 10 Link Key Request Reply (0x01|0x000b) ncmd 1 Status: Success (0x00) Address: C4:43:8F:A3:4D:83 (LG Electronics) > HCI Event: Auth Complete (0x06) plen 3 Status: PIN or Key Missing (0x06) Handle: 75 @ Authentication Failed: C4:43:8F:A3:4D:83 (0) status 0x05 < HCI Command: Disconnect (0x01|0x0006) plen 3 Handle: 75 Reason: Remote User Terminated Connection (0x13) > HCI Event: Command Status (0x0f) plen 4 Disconnect (0x01|0x0006) ncmd 1 Status: Success (0x00) > HCI Event: Disconnect Complete (0x05) plen 4 Status: Success (0x00) Handle: 75 Reason: Connection Terminated By Local Host (0x16) @ Device Disconnected: C4:43:8F:A3:4D:83 (0) reason 4 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ica6164604cc17bb91fb79cfff584798cb9b5e5d6 Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 160b925163c0aabc2c2fbb7d58a75e38b7cd6a17) Reviewed-on: https://chromium-review.googlesource.com/480131 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480131" owner_email="mcchou@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/31/480131/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I8d3c0985824eae21d40c42cc8b63d12b26cdaccf" commit="fee8938aa4b5afd2355f8ed65205c30dc26f4825" commit_message="UPSTREAM: Bluetooth: Increment management interface revision Increment the mgmt revision due to the recently added new reason code for the Disconnected event. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8d3c0985824eae21d40c42cc8b63d12b26cdaccf Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 87510973d6e137c33552b3365b5afbd5be81c5dd) Reviewed-on: https://chromium-review.googlesource.com/480132 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480132" owner_email="mcchou@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/32/480132/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I5eb2ab1c297013944cca849884d318595273de98" commit="8c033d1e2bb7599b2bee97ad9793414d9ab636a7" commit_message="UPSTREAM: drivers: misc: ti-st: Use int instead of fuzzy char for callback status On mips and parisc: drivers/bluetooth/btwilink.c: In function 'ti_st_open': drivers/bluetooth/btwilink.c:174:21: warning: overflow in implicit constant conversion [-Woverflow] hst->reg_status = -EINPROGRESS; drivers/nfc/nfcwilink.c: In function 'nfcwilink_open': drivers/nfc/nfcwilink.c:396:31: warning: overflow in implicit constant conversion [-Woverflow] drv->st_register_cb_status = -EINPROGRESS; There are actually two issues: 1. Whether "char" is signed or unsigned depends on the architecture. As the completion callback data is used to pass a (negative) error code, it should always be signed. 2. EINPROGRESS is 150 on mips, 245 on parisc. Hence -EINPROGRESS doesn't fit in a signed 8-bit number. Change the callback status from "char" to "int" to fix these. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5eb2ab1c297013944cca849884d318595273de98 Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 4360fa22ad5b48a1d1e10e31ffb383ed8c977435) Reviewed-on: https://chromium-review.googlesource.com/480133 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480133" owner_email="mcchou@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/33/480133/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I719b22331ce02172e3b7e1b269c7d37df13ce6e3" commit="95ec4a648407449f673b8b703df83b9f73c92f96" commit_message="UPSTREAM: Bluetooth: Fix l2cap_sock_setsockopt() with optname BT_RCVMTU When we retrieve imtu value from userspace we should use 16 bit pointer cast instead of 32 as it's defined that way in headers. Fixes setsockopt calls on big-endian platforms. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I719b22331ce02172e3b7e1b269c7d37df13ce6e3 Signed-off-by: Amadeusz Sawiski <amadeusz.slawinski@tieto.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 23bc6ab0a0912146fd674a0becc758c3162baabc) Reviewed-on: https://chromium-review.googlesource.com/480134 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480134" owner_email="mcchou@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/34/480134/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I4d4af054a75ebbdb4f0e3a6f35fafc27f15c08ac" commit="da32e5cc2e30a0c1bfd6afeafc45f9d0be81f46c" commit_message="UPSTREAM: Bluetooth: Move hci_recv_frame and hci_recv_diag prototypes The protoypes for hci_recv_frame and hci_recv_diag are in the wrong location in the header file. Move them close to all the other hci_dev related exported functions. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4d4af054a75ebbdb4f0e3a6f35fafc27f15c08ac Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit f962fe32f2f85769cd835ddcecbff8c1d34cf561) Reviewed-on: https://chromium-review.googlesource.com/480135 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480135" owner_email="mcchou@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/35/480135/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ic57f32c44dafa2046ebea87bec12e2ee631b81f5" commit="5d1f6a7edc741f6f8f9de498307f86ac8035f58d" commit_message="BACKPORT: mm/util: add kstrdup_const kstrdup() is often used to duplicate strings where neither source neither destination will be ever modified. In such case we can just reuse the source instead of duplicating it. The problem is that we must be sure that the source is non-modifiable and its life-time is long enough. I suspect the good candidates for such strings are strings located in kernel .rodata section, they cannot be modifed because the section is read-only and their life-time is equal to kernel life-time. This small patchset proposes alternative version of kstrdup - kstrdup_const, which returns source string if it is located in .rodata otherwise it fallbacks to kstrdup. To verify if the source is in .rodata function checks if the address is between sentinels __start_rodata, __end_rodata. I guess it should work with all architectures. The main patch is accompanied by four patches constifying kstrdup for cases where situtation described above happens frequently. I have tested the patchset on mobile platform (exynos4210-trats) and it saves 3272 string allocations. Since minimal allocation is 32 or 64 bytes depending on Kconfig options the patchset saves respectively about 100KB or 200KB of memory. Stats from tested platform show that the main offender is sysfs: By caller: 2260 __kernfs_new_node 631 clk_register+0xc8/0x1b8 318 clk_register+0x34/0x1b8 51 kmem_cache_create 12 alloc_vfsmnt By string (with count >= 5): 883 power 876 subsystem 135 parameters 132 device 61 iommu_group ... This patch (of 5): Add an alternative version of kstrdup which returns pointer to constant char array. The function checks if input string is in persistent and read-only memory section, if yes it returns the input string, otherwise it fallbacks to kstrdup. kstrdup_const is accompanied by kfree_const performing conditional memory deallocation of the string. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ic57f32c44dafa2046ebea87bec12e2ee631b81f5 Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Mike Turquette <mturquette@linaro.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Tejun Heo <tj@kernel.org> Cc: Greg KH <greg@kroah.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a4bb1e43e22d3cade8f942fc6f95920248eb2fd0) Reviewed-on: https://chromium-review.googlesource.com/480136 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480136" owner_email="mcchou@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/36/480136/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I553f8e1b7b05ffe0475f3d05b4be937fb1afd12c" commit="35d77235c9d1c81f89fffd4fa6409ba102d1e3bf" commit_message="UPSTREAM: Bluetooth: Add debugfs fields for hardware and firmware info Some Bluetooth controllers allow for reading hardware and firmware related vendor specific infos. If they are available, then they can be exposed via debugfs now. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I553f8e1b7b05ffe0475f3d05b4be937fb1afd12c Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 5177a83827cd0b8cf6ce0391b00dd4417352d2f1) Reviewed-on: https://chromium-review.googlesource.com/480137 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480137" owner_email="mcchou@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/37/480137/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I6be4c3fe48431045ff44c8670c0ff2ab4226c0f3" commit="6d6d20ed37d76843876f96f54d27018f436a71e1" commit_message="UPSTREAM: Bluetooth: bpa10x: Add support for hci_set_fw_info The Digianswer sniffer devices allow for reading a firmware specific information string. If it is available, then inform the Bluetooth core about it via hci_set_fw_info. That exposes it via debugfs like this: # cat /sys/kernel/debug/bluetooth/hci0/firmware_info SNIF_102,BB930,02/01/18,10:37:56 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6be4c3fe48431045ff44c8670c0ff2ab4226c0f3 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b2999c195bb5cec1a1c713f17c7f382bbcdb8b39) Reviewed-on: https://chromium-review.googlesource.com/480138 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480138" owner_email="mcchou@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/38/480138/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Id8d2fa0ee625c31564d80cf20d0bc0dafc85cb45" commit="f22ceedde36779fb97969ef3f631a3e19151fda3" commit_message="UPSTREAM: Bluetooth: btmrvl: reset is_suspending flag in failure path is_suspending flag remains on when host sleep fails to enable. Data path is unnecessarily blocked after this. This patch ensures to reset the flag in failure path. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id8d2fa0ee625c31564d80cf20d0bc0dafc85cb45 Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e7acf43024e95faa7460e77fe7e0fec2a3de582a) Reviewed-on: https://chromium-review.googlesource.com/480139 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480139" owner_email="mcchou@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/39/480139/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Id193defa81a5814bbf8d83f8c9aa2ffaa0916912" commit="0a10be5b2c91bf3fd6733ec1d424573c7f70930e" commit_message="UPSTREAM: Bluetooth: Fix memory leak at end of hci requests In hci_req_sync_complete the event skb is referenced in hdev->req_skb. It is used (via hci_req_run_skb) from either __hci_cmd_sync_ev which will pass the skb to the caller, or __hci_req_sync which leaks. unreferenced object 0xffff880005339a00 (size 256): comm "kworker/u3:1", pid 1011, jiffies 4294671976 (age 107.389s) backtrace: [<ffffffff818d89d9>] kmemleak_alloc+0x49/0xa0 [<ffffffff8116bba8>] kmem_cache_alloc+0x128/0x180 [<ffffffff8167c1df>] skb_clone+0x4f/0xa0 [<ffffffff817aa351>] hci_event_packet+0xc1/0x3290 [<ffffffff8179a57b>] hci_rx_work+0x18b/0x360 [<ffffffff810692ea>] process_one_work+0x14a/0x440 [<ffffffff81069623>] worker_thread+0x43/0x4d0 [<ffffffff8106ead4>] kthread+0xc4/0xe0 [<ffffffff818dd38f>] ret_from_fork+0x1f/0x40 [<ffffffffffffffff>] 0xffffffffffffffff BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id193defa81a5814bbf8d83f8c9aa2ffaa0916912 Signed-off-by: Frdric Dalleau <frederic.dalleau@collabora.co.uk> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9afee94939e3eda4c8bf239f7727cb56e158c976) Reviewed-on: https://chromium-review.googlesource.com/480140 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480140" owner_email="mcchou@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/40/480140/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Iad980b3d3e28e89d999aaae9b028b993b419e096" commit="198bd9e3af59d44ff27b2b256243fa7ef72e444e" commit_message="UPSTREAM: Bluetooth: Fix bt_sock_recvmsg when MSG_TRUNC is not set Commit b5f34f9420b50c9b5876b9a2b68e96be6d629054 attempt to introduce proper handling for MSG_TRUNC but recv and variants should still work as read if no flag is passed, but because the code may set MSG_TRUNC to msg->msg_flags that shall not be used as it may cause it to be behave as if MSG_TRUNC is always, so instead of using it this changes the code to use the flags parameter which shall contain the original flags. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iad980b3d3e28e89d999aaae9b028b993b419e096 Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 90a56f72edb088c678083c32d05936c7c8d9a948) Reviewed-on: https://chromium-review.googlesource.com/480141 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480141" owner_email="mcchou@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/41/480141/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I56c8047cbc54141bf2710183623f7dad9b6eabd6" commit="450cba75fbb724a086dc08e96fc278c31c5648d6" commit_message="UPSTREAM: Bluetooth: Fix hci_sock_recvmsg when MSG_TRUNC is not set Similar to bt_sock_recvmsg MSG_TRUNC shall be checked using the original flags not msg_flags. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I56c8047cbc54141bf2710183623f7dad9b6eabd6 Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 4f34228b67246ae3b3ab1dc33b980c77c0650ef4) Reviewed-on: https://chromium-review.googlesource.com/480142 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480142" owner_email="mcchou@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/42/480142/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I61a46d14dbd6f81ab16bed683bd71d5a7e62b60f" commit="b6da999f8f8106c5253c53721e8bc01e638a505c" commit_message="UPSTREAM: Bluetooth: Put led_trigger field behind CONFIG_BT_LEDS The led_trigger field in hci_dev should be conditional based on if CONFIG_BT_LEDS is set or not. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I61a46d14dbd6f81ab16bed683bd71d5a7e62b60f Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 53f863a66904542b03204f2b115d050b04c11ba5) Reviewed-on: https://chromium-review.googlesource.com/480143 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480143" owner_email="mcchou@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/43/480143/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ic0d5f774f6983880f219587539c036e2c851758d" commit="af1153af90ba449365a14452ff22174d15128ab6" commit_message="UPSTREAM: Bluetooth: Add combined LED trigger for controller power Instead of just having a LED trigger for power on a specific controller, this adds the LED trigger "bluetooth-power" that combines the power states of all controllers into a single trigger. This simplifies the trigger selection and also supports multiple controllers per host system via a single LED. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ic0d5f774f6983880f219587539c036e2c851758d Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e64c97b53bc6727aa4385535166aaa047281e02d) Reviewed-on: https://chromium-review.googlesource.com/480144 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480144" owner_email="mcchou@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/44/480144/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I19c769695077867bfd5c4e6e391c7de70576fcfc" commit="78996488ec961ab5e8b4fafad752b4727f801aeb" commit_message="UPSTREAM: Bluetooth: Add HCI device identifier for Qualcomm SMD This patch assigns the next free HCI device identifier to Bluetooth devices based on the Qualcomm Shared Memory channels. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I19c769695077867bfd5c4e6e391c7de70576fcfc Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 65010e68efbeda4275845240869138c0c4587422) Reviewed-on: https://chromium-review.googlesource.com/480145 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480145" owner_email="mcchou@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/45/480145/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I8690051d55cb5def89f674232b9973f5430e5d57" commit="810c9e8bd536f8157c7f2e1748657f89588d03ba" commit_message="UPSTREAM: Bluetooth: add module name for btwilink Btwilink help did not include module name, add it. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8690051d55cb5def89f674232b9973f5430e5d57 Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 22e8ee127ae6f19eb494f858086849e89320eae0) Reviewed-on: https://chromium-review.googlesource.com/480146 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480146" owner_email="mcchou@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/46/480146/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I05288078986c5d8ce5ba4201614cb628bc3121f4" commit="5bf5545f9fff5ad1d311045ece236f206183a997" commit_message="UPSTREAM: Bluetooth: Introduce Qualcomm WCNSS SMD based HCI driver The Qualcomm WCNSS chip provides two SMD channels to the BT core; one for command and one for event packets. This driver exposes the two channels as a hci device. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I05288078986c5d8ce5ba4201614cb628bc3121f4 Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1511cc750c3d9a1c402d71e3522c9cf1fad0ad9c) Reviewed-on: https://chromium-review.googlesource.com/480147 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480147" owner_email="mcchou@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/47/480147/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ibba0150f6d941edb1c0a215c39b3d6fae6d54068" commit="8cf97300fcb640cc6bcc272a76aee38eeeab3b45" commit_message="BACKPORT: sched/wait: Introduce wait_on_bit_timeout() Add a new wait_on_bit_timeout() helper, basically the same as wait_on_bit() except that it also takes a 'timeout' parameter. All the building blocks like bit_wait_timeout() and out_of_line_wait_on_bit_timeout() are already in place so the addition is rather simple. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ibba0150f6d941edb1c0a215c39b3d6fae6d54068 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: davem@davemloft.net Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/1422616476-2917-2-git-send-email-johan.hedberg@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 44fc0e5eec00db5fba748803c95920098089c4cc) Reviewed-on: https://chromium-review.googlesource.com/480148 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480148" owner_email="mcchou@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/48/480148/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Iecd126724171f803beb31a047ec845fde01afcf1" commit="34f9249e6bab3413672130d943d3ff045f0346c9" commit_message="UPSTREAM: Bluetooth: btusb: Remove unneeded btusb_wait_on_bit_timeout() There's now a proper wait_on_bit_timeout() API in linux/wait.h so we can remove our own copy from btusb.c. Our copy had the task state and timeout variables swapped so the patch also changes their order. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iecd126724171f803beb31a047ec845fde01afcf1 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 129a76931a6e90ddca586ba6e4292b5b429488bc) Reviewed-on: https://chromium-review.googlesource.com/480149 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480149" owner_email="mcchou@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/49/480149/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Idc97c0ca96993adf33857194befe751244c0ee16" commit="1c5613d1e162a62fd77e8160130766461211bdef" commit_message="UPSTREAM: Bluetooth: btusb, hci_intel: Fix wait_on_bit_timeout() return value checks wait_on_bit_timeout() returns one of the following three values: * 0 to indicate success. * -EINTR to indicate that a signal has been received; * -EAGAIN to indicate timeout; Make the wait_on_bit_timeout() callers check for these values. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Idc97c0ca96993adf33857194befe751244c0ee16 Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit f0a70a04ca10d07a383a89edea142e3cbab1f2ca) Reviewed-on: https://chromium-review.googlesource.com/480150 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480150" owner_email="mcchou@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/50/480150/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I6a1d4fae07296c1f6ec1744536385804117ca006" commit="c7d5ef6e4249d73c31eb41fc6cef53a5f512c981" commit_message="UPSTREAM: Bluetooth: add printf format attribute to hci_set_[fh]w_info() Commit 5177a83827cd ("Bluetooth: Add debugfs fields for hardware and firmware info") introduced hci_set_hw_info() and hci_set_fw_info(). These functions use kvasprintf_const() but are not marked with a __printf attribute. Adding such an attribute helps detecting issues related to printf-formatting at build time. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6a1d4fae07296c1f6ec1744536385804117ca006 Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1aabbbcefe8e62fbffaaa01ca8bdd4cd6ed1625b) Reviewed-on: https://chromium-review.googlesource.com/480151 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480151" owner_email="mcchou@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/51/480151/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I785bbe4e0f0f9ac6d1494648129273a8914a17f5" commit="287db7af750e3f325f7ca559b644d556ba8d18f4" commit_message="UPSTREAM: Bluetooth: btusb: Add support for 0cf3:e009 Device 0cf3:e009 is one of the QCA ROME family. T: Bus=01 Lev=01 Prnt=01 Port=07 Cnt=04 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 2.01 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0cf3 ProdID=e009 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I785bbe4e0f0f9ac6d1494648129273a8914a17f5 Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 935199348048902124d0b288788c3a45e78b69ab) Reviewed-on: https://chromium-review.googlesource.com/480152 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480152" owner_email="mcchou@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/52/480152/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I01ee549c400f7b4f52519ab28b3ed10bd76fbfce" commit="eea640920e1892cf3512ab4ba2506d5987ba7f72" commit_message="UPSTREAM: Bluetooth: bcm203x: don't print error when allocating urb fails kmalloc will print enough information in case of failure. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I01ee549c400f7b4f52519ab28b3ed10bd76fbfce Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 7e8524591ffffe3536bd363827ff4477a5672c65) Reviewed-on: https://chromium-review.googlesource.com/480153 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480153" owner_email="mcchou@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/53/480153/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I1046319d31fad7a7ebc54d96c11fd2eed45866db" commit="659fd571de757da3de497ffa0c9b2202a3960978" commit_message="UPSTREAM: Bluetooth: Check SOL_HCI for raw socket options The SOL_HCI level should be enforced when using socket options on the HCI raw socket interface. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I1046319d31fad7a7ebc54d96c11fd2eed45866db Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 47b0f573f2fa7634860e16ea31f2bc3057a1022a) Reviewed-on: https://chromium-review.googlesource.com/480154 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480154" owner_email="mcchou@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/54/480154/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I36c326a018484b92ba313104d73af13039140c01" commit="3a52abf8636c0a8a3dcde712c6be6e702ca676ef" commit_message="UPSTREAM: Bluetooth: Store control socket cookie and comm information To further allow unique identification and tracking of control socket, store cookie and comm information when binding the socket. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I36c326a018484b92ba313104d73af13039140c01 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 70ecce91e3a2d7e332fe56fd065c67d404b8fccf) Reviewed-on: https://chromium-review.googlesource.com/480155 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480155" owner_email="mcchou@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/55/480155/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I5a45bb49c6a70989bffbe3b8ba8695115d82637b" commit="d14b3ec4656df4f1e55b27ecda3a347c489be221" commit_message="UPSTREAM: Bluetooth: Introduce helper to pack mgmt version information The mgmt version information will be also needed for the control changell tracing feature. This provides a helper to pack them. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5a45bb49c6a70989bffbe3b8ba8695115d82637b Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 03c979c4717c7fa0c058fafe76ac4d6acdd1fb0d) Reviewed-on: https://chromium-review.googlesource.com/480156 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480156" owner_email="mcchou@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/56/480156/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Idee1c612bdbbdd5752903f1fcd5a1fd57cf056a1" commit="95ec4f5218cf47c1a2103acd293b2451be42c16d" commit_message="UPSTREAM: Bluetooth: Add support for sending MGMT open and close to monitor This sends new notifications to the monitor support whenever a management channel has been opened or closed. This allows tracing of control channels really easily. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Idee1c612bdbbdd5752903f1fcd5a1fd57cf056a1 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 249fa1699f8642c73eb43e61b321969f0549ab2c) Reviewed-on: https://chromium-review.googlesource.com/480157 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480157" owner_email="mcchou@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/57/480157/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="I9e90dea5c737f909939f776e1baa51f7ff9b9602" commit="04fca46114de02fe49c24cae0db1811b0366765a" commit_message="UPSTREAM: Bluetooth: Add support for sending MGMT commands and events to monitor This adds support for tracing all management commands and events via the monitor interface. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I9e90dea5c737f909939f776e1baa51f7ff9b9602 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 38ceaa00d02dceb22c6bdd5268f5a44d5c00e123) Reviewed-on: https://chromium-review.googlesource.com/480158 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480158" owner_email="mcchou@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/58/480158/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.10" change_id="Ibd640c254e72a2467cd08ea5d29afce3a77ec475" commit="f44242f76515bc2aaa713aafb10062abf9156ca0" commit_message="UPSTREAM: Bluetooth: mgmt: Fix sending redundant event for Advertising Instance When an Advertising Instance is removed, the Advertising Removed event shouldn't be sent to the same socket that issued the Remove Advertising command (it gets a command complete event instead). The mgmt_advertising_removed() function already has a parameter for skipping a specific socket, but there was no code to propagate the right value to this parameter. This patch fixes the issue by making sure the intermediate hci_req_clear_adv_instance() function gets the socket pointer. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Nyan_Big and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ibd640c254e72a2467cd08ea5d29afce3a77ec475 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 37d3a1fab50fa07ac706787646e61c60e7c520e0) Reviewed-on: https://chromium-review.googlesource.com/480159 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="480159" owner_email="mcchou@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/59/480159/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Iec7bbde8b1e74be8494c15287958e3d87f39dd60" commit="0c261931c6d816a4a36bdd91f87a7a757e1abea9" commit_message="Revert "FROMLIST: btmrvl: wake system up when receives a wake irq" This reverts commit 67c1bc3f12060c912eea5ce47303f49806598efe. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. CQ-DEPEND=CL:476159 Change-Id: Iec7bbde8b1e74be8494c15287958e3d87f39dd60 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474973 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474973" owner_email="mcchou@chromium.org" 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/73/474973/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I800ef74e55eb85658304d4587704acfe839f8622" commit="f802ecc95327555c40ac48d06654ac790eba975c" commit_message="Revert "CHROMIUM: bluetooth: enlarge supervision timeout to 2 secs" This reverts commit 1c12956e465eb4628b7738d1abf23ebd17f20777. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I800ef74e55eb85658304d4587704acfe839f8622 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474974 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474974" owner_email="mcchou@chromium.org" 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/74/474974/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I30f6de8c5fa653bfe0729df20b4088eac018109f" commit="1ca832108a7497beb44aa51f48a36d293eeb1296" commit_message="Revert "CHROMIUM: bluetooth: update advertising parameters for single advertisement" This reverts commit c3146bdf8e8765bbdbe727bbbda24d641609f39e. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I30f6de8c5fa653bfe0729df20b4088eac018109f Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474975 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474975" owner_email="mcchou@chromium.org" 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/75/474975/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="If02ca526264701a16b40f91aaf132ab2d4b3fc80" commit="a8866b9a3a6ff034b2b83ab67cff0a11986a1932" commit_message="Revert "CHROMIUM: bluetooth: set advertising intervals after registering advertisements" This reverts commit e8e0d94e9a95da320ca353870160a9ae58fe60b4. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If02ca526264701a16b40f91aaf132ab2d4b3fc80 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474976 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474976" owner_email="mcchou@chromium.org" 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/76/474976/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I90a3dbf5c3ae4bb93c00353a6706dff180fe45c4" commit="e2da1df70f2f2082c3ce9fa1e7843180752265e9" commit_message="Revert "CHROMIUM: bluetooth: adjust advertising duration based on max interval" This reverts commit 768362c86a0e84d52cde438effa1d7721b8f300a. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I90a3dbf5c3ae4bb93c00353a6706dff180fe45c4 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474977 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474977" owner_email="mcchou@chromium.org" 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/77/474977/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ia15c15cbe1e3fe788c91ff2c96689050d0229f90" commit="8e78b0711d568f4ba1f498c027c458c92fe67d80" commit_message="Revert "CHROMIUM: bluetooth: reset advertising intervals" This reverts commit 6343474c81bcaa76172d41b7328a7c4839371ec7. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia15c15cbe1e3fe788c91ff2c96689050d0229f90 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474978 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474978" owner_email="mcchou@chromium.org" 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/78/474978/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I47fe72ecb01e2f97512d83cb56ccc06d3b54c4bc" commit="159c7ecb9c294ac4d480f7a0e20d5f70f5be45ce" commit_message="Revert "CHROMIUM: bluetooth: set advertising intervals" This reverts commit bebb7eed7e5bfb53687ad250f3629122a4bb9095. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I47fe72ecb01e2f97512d83cb56ccc06d3b54c4bc Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474979 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474979" owner_email="mcchou@chromium.org" 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/79/474979/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I4c86138605d920835b033bea5bacb384c9d3e654" commit="f91fd628ffb59b0698226d048db25db3ee8cdfa5" commit_message="Revert "FROMLIST: Bluetooth: btmrvl_sdio: fix firmware activation failure" This reverts commit e18442bfcb9a4d5383578b85518608369cc03f42. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4c86138605d920835b033bea5bacb384c9d3e654 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474980 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474980" owner_email="mcchou@chromium.org" 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/80/474980/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I9a2f5df3045e5fac3ed5d39d646e099f3dba6bf5" commit="5a937f23b406d26aa6c8eb576a51533824c1afa4" commit_message="Revert "FROMLIST: Bluetooth: hci_core: cancel power off delayed work properly" This reverts commit aca7e483adb7919010cf62c51d97ae407b18fa2e. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I9a2f5df3045e5fac3ed5d39d646e099f3dba6bf5 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474981 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474981" owner_email="mcchou@chromium.org" 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/81/474981/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I8c7261577011b4fb56fcffc573c84b897be86545" commit="bc4a1104abf02106214b68033083f323582cb3da" commit_message="UPSTREAM: crypto: hash - Add helpers to zero stack request/descriptor As the size of an ahash_request or shash_desc is variable, it's awkward to zero them explicitly. This patch adds helpers to do that which should be used when they are created on the stack. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8c7261577011b4fb56fcffc573c84b897be86545 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e67ffe0af4d450e95e5f9bb7d081500e30777857) Reviewed-on: https://chromium-review.googlesource.com/474982 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474982" owner_email="mcchou@chromium.org" 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/82/474982/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ie40c35966e97b51a9c71e767b282ccf6023e3be2" commit="75c07b9753605ff531a6a5fc7902bfda5963b4c3" commit_message="UPSTREAM: crypto: skcipher - Add top-level skcipher interface This patch introduces the crypto skcipher interface which aims to replace both blkcipher and ablkcipher. It's very similar to the existing ablkcipher interface. The main difference is the removal of the givcrypt interface. In order to make the transition easier for blkcipher users, there is a helper SKCIPHER_REQUEST_ON_STACK which can be used to place a request on the stack for synchronous transforms. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie40c35966e97b51a9c71e767b282ccf6023e3be2 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 7a7ffe65c8c5fbf272b132d8980b2511d5e5fc98) Reviewed-on: https://chromium-review.googlesource.com/474983 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="474983" owner_email="mcchou@chromium.org" 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/83/474983/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I8937e43c39440bb5fee3927bf7e49abf9bf5fdd3" commit="f4c79ca27c6ec1c4f5f56e84b4c25e0810730e27" commit_message="UPSTREAM: crypto: skcipher - Add helper to zero stack request As the size of an skcipher_request is variable, it's awkward to zero it explicitly. This patch adds a helper to do that which should be used when it is created on the stack. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8937e43c39440bb5fee3927bf7e49abf9bf5fdd3 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1aaa753d918c48c603195a468766e6a2b32b87f9) Reviewed-on: https://chromium-review.googlesource.com/475324 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475324" owner_email="mcchou@chromium.org" 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/24/475324/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I207efb29ac01d523adefa709981cbe15fd976c95" commit="e72244ec8e4f182311e360c3dbedb091b83bb05c" commit_message="UPSTREAM: crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code Add a macro which replaces the use of a Variable Length Array In Struct (VLAIS) with a C99 compliant equivalent. This macro instead allocates the appropriate amount of memory using an char array. The new code can be compiled with both gcc and clang. struct shash_desc contains a flexible array member member ctx declared with CRYPTO_MINALIGN_ATTR, so sizeof(struct shash_desc) aligns the beginning of the array declared after struct shash_desc with long long. No trailing padding is required because it is not a struct type that can be used in an array. The CRYPTO_MINALIGN_ATTR is required so that desc is aligned with long long as would be the case for a struct containing a member with CRYPTO_MINALIGN_ATTR. If you want to get to the ctx at the end of the shash_desc as before you can do so using shash_desc_ctx(shash) BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I207efb29ac01d523adefa709981cbe15fd976c95 Signed-off-by: Behan Webster <behanw@converseincode.com> Reviewed-by: Mark Charlebois <charlebm@gmail.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Cc: Micha Mirosaw <mirqus@gmail.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a0a77af14117e388d43b2385d5ecc800e2d6eee9) Reviewed-on: https://chromium-review.googlesource.com/475325 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475325" owner_email="mcchou@chromium.org" 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/25/475325/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I7e4b1532ea63519612cccebe47732b6c40dbe5e3" commit="5ddf520af85adc9f668e257012d4417fc055fa41" commit_message="UPSTREAM: Bluetooth: Use skcipher and hash This patch replaces uses of blkcipher with skcipher and the long obsolete hash interface with shash. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I7e4b1532ea63519612cccebe47732b6c40dbe5e3 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 71af2f6bb22a4bf42663e10f1d8913d4967ed07f) Reviewed-on: https://chromium-review.googlesource.com/475326 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475326" owner_email="mcchou@chromium.org" 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/26/475326/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I297a7728db6ebe9567e3388bfc208f6d87231724" commit="71004b1e793e70255f4fa6f58ce3b896896dde4f" commit_message="UPSTREAM: Bluetooth: L2CAP: Introduce proper defines for PSM ranges Having proper defines makes the code a bit readable, it also avoids duplicating hard-coded values since these are also needed when auto-allocating PSM values (in a subsequent patch). BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I297a7728db6ebe9567e3388bfc208f6d87231724 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 114f9f1e038eb23935c20fb54f49f07caaa0546d) Reviewed-on: https://chromium-review.googlesource.com/475327 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475327" owner_email="mcchou@chromium.org" 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/27/475327/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ib6187b22bb34ebc9f1d6e66ef4ba44a0de78447f" commit="2e67d0a2e88ef757450fc015163f09fc2ea7b4e5" commit_message="UPSTREAM: Bluetooth: L2CAP: Fix auto-allocating LE PSM values The LE dynamic PSM range is different from BR/EDR (0x0080 - 0x00ff) and doesn't have requirements relating to parity, so separate checks are needed. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ib6187b22bb34ebc9f1d6e66ef4ba44a0de78447f Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 92594a51120ebc6c2f556204fc73568c8f7cb0f4) Reviewed-on: https://chromium-review.googlesource.com/475328 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475328" owner_email="mcchou@chromium.org" 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/28/475328/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I53bdd1713e3d0cc3bb3552011912aa5d35b7ce0c" commit="9af340d82b16664bb92855b1507064231abfc918" commit_message="UPSTREAM: Bluetooth: L2CAP: Fix setting chan src info before adding PSM/CID At least the l2cap_add_psm() routine depends on the source address type being properly set to know what auto-allocation ranges to use, so the assignment to l2cap_chan needs to happen before this. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I53bdd1713e3d0cc3bb3552011912aa5d35b7ce0c Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a2342c5fe5f2810b8ef6a0826bd584aa709dd2c6) Reviewed-on: https://chromium-review.googlesource.com/475329 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475329" owner_email="mcchou@chromium.org" 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/29/475329/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ibece773224c3b006affe8b362342fdd5102efe4e" commit="dbd20d5e945ebf81bec9543b60c129a44b344b21" commit_message="UPSTREAM: Bluetooth: Fix incorrect removing of IRKs The commit cad20c278085d893ebd616cd20c0747a8e9d53c7 was supposed to fix handling of devices first using public addresses and then switching to RPAs after pairing. Unfortunately it missed a couple of key places in the code. 1. When evaluating which devices should be removed from the existing white list we also need to consider whether we have an IRK for them or not, i.e. a call to hci_find_irk_by_addr() is needed. 2. In smp_notify_keys() we should not be requiring the knowledge of the RPA, but should simply keep the IRK around if the other conditions require it. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ibece773224c3b006affe8b362342fdd5102efe4e Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org # 4.4+ Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit cff10ce7b4f02718ffd25e3914e60559f5ef6ca0) Reviewed-on: https://chromium-review.googlesource.com/475330 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475330" owner_email="mcchou@chromium.org" 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/30/475330/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I076dd67c63b65f63e3109cc0c55d5b8ae4287737" commit="78a42bb5d3635fbaff6a3030c38f6f0f35f64a3c" commit_message="UPSTREAM: Bluetooth: ath3k: Fixed a blank line after declaration issue Fixed a coding style issue. Added a blank link after declaration. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I076dd67c63b65f63e3109cc0c55d5b8ae4287737 Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d2ee9c2ec659cfab715568d2d9837f7ff67402fa) Reviewed-on: https://chromium-review.googlesource.com/475331 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475331" owner_email="mcchou@chromium.org" 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/31/475331/5" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Idd60ad0d4592e3f87e6faa92dca33b2c636adec4" commit="cb7cf3b62a1ca1991131638013cdd541aa46f5c4" commit_message="UPSTREAM: leds: core: add managed version of led_trigger_register Complementing devm_led_classdev_register add a managed version of led_trigger_register. I omit a managed version of led_classdev_unregister as the equivalent devm_led_classdev_unregister isn't used in the kernel as of today. Change-Id: Idd60ad0d4592e3f87e6faa92dca33b2c636adec4 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9534cc31dda2bb129480ce2db92bf7bc1ef470ed) Reviewed-on: https://chromium-review.googlesource.com/476157 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="476157" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/476157/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="I929cb25d8350ecff55815e4a843340101659f93d" commit="c9a5067ed98d933a46da1033598fe679a8bf92ee" commit_message="UPSTREAM: Bluetooth: Use managed version of led_trigger_register in LED trigger Recently a managed version of led_trigger_register was introduced. Using devm_led_trigger_register allows to simplify the LED trigger code. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I929cb25d8350ecff55815e4a843340101659f93d Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b6e402fc84a76c0238b64de497920aeeaa495026) Reviewed-on: https://chromium-review.googlesource.com/475332 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475332" owner_email="mcchou@chromium.org" 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/32/475332/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I2e1491444b3c867909ce0d006e480892ffa34850" commit="0e39d5d8b9b96c57b207f2b2a4590723d4fdb3ee" commit_message="UPSTREAM: Bluetooth: hci_intel: Fix a wrong comparison A return value of the intel_wait_booting() function compared with a constant ETIMEDOUT instead of -ETIMEDOUT. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2e1491444b3c867909ce0d006e480892ffa34850 Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2be1149ed40812ab75bc1af67a68f5d09e8be762) Reviewed-on: https://chromium-review.googlesource.com/475333 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475333" owner_email="mcchou@chromium.org" 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/33/475333/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ieafd4d09ffe7a07369ccbef8168a597c4f769586" commit="6edd92ec435e3f232ae8439b8397c29ca20f56e4" commit_message="UPSTREAM: Bluetooth: btusb: Add new AR3012 ID 13d3:3395 T: Bus=03 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3395 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1542564 Reported-and-tested-by: Christopher Simerly <kilikopela29@gmail.com> BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ieafd4d09ffe7a07369ccbef8168a597c4f769586 Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 609574eb46335cfac1421a07c0505627cbbab1f0) Reviewed-on: https://chromium-review.googlesource.com/475334 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475334" owner_email="mcchou@chromium.org" 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/34/475334/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I75c59190d38a21fe0bd1e3348df147bc40650555" commit="9db37806206ae92047f0187ab2f4b22f033dba00" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add new ACPI ID for bcm43241 This ACPI ID is used at least by HP for their Omni 10 5600eg tablet. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I75c59190d38a21fe0bd1e3348df147bc40650555 Signed-off-by: J.J. Meijer <jjmeijer88@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b013a636b8571fa62b0fd3abeb2b36f0fc7199dd) Reviewed-on: https://chromium-review.googlesource.com/475335 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475335" owner_email="mcchou@chromium.org" 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/35/475335/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I15e3cf89242c99659b4e31cde7ba946c95da3e62" commit="9812c5315d4ee292378ff76a57837f3b9c9f0d4f" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E7C ACPI ID Recent macbooks (early 2015) with BCM43241 use this ACPI ID. Add it to the list of supported devices. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I15e3cf89242c99659b4e31cde7ba946c95da3e62 Reported-by: Leif Liddy <leif.liddy@gmail.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2791b44d6b4a2280568e0dc84be51992b7b367f1) Reviewed-on: https://chromium-review.googlesource.com/475336 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475336" owner_email="mcchou@chromium.org" 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/36/475336/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I5f1ee778a270229dc7707fdff743ce37a436e7b6" commit="86363a773c42ac4e21a03897e4cb50a1270bdc1e" commit_message="UPSTREAM: Bluetooth: btbcm: Fix handling of firmware not found If the call to request_firmware() fails in btbcm_setup_patchram(), the BCM chip will be operating with its default firmware. In this case, btbcm_setup_patchram() should not return immediately but instead should skip to btbcm_check_bdaddr() and quirk setup. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5f1ee778a270229dc7707fdff743ce37a436e7b6 Signed-off-by: Petri Gynther <pgynther@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit ad750fa142747f3f42b66ae051a0f275bd2035df) Reviewed-on: https://chromium-review.googlesource.com/475337 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475337" owner_email="mcchou@chromium.org" 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/37/475337/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I6575ff0af21f276d6ac8be02410378afd06c289e" commit="f48e65e38f04f0404ad31c15efc66e695ccc557e" commit_message="UPSTREAM: Bluetooth: Add new AR3012 ID 0489:e095 T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0489 ProdID=e095 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb This device requires ar3k/AthrBT_0x31010100.dfu and ar3k/ramps_0x31010100_40.dfu firmware files that are not in linux-firmware yet. BugLink: https://bugs.launchpad.net/bugs/1542944 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6575ff0af21f276d6ac8be02410378afd06c289e Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 28c971d82fb58ef7cba22e5308be6d2d2590473d) Reviewed-on: https://chromium-review.googlesource.com/475338 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475338" owner_email="mcchou@chromium.org" 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/38/475338/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I601fa9a7eb78656c2addb35421bc2d8fbd857e7d" commit="c7518a125b805a4df0c3f44cb89137f79014feb0" commit_message="UPSTREAM: Bluetooth: hci_core: cancel power off delayed work properly When the HCI_AUTO_OFF flag is cleared, the power_off delayed work need to be cancel or HCI will be powered off even if it's managed. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I601fa9a7eb78656c2addb35421bc2d8fbd857e7d Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d82142a8b1338e6a4339920863423379c27b0b16) Reviewed-on: https://chromium-review.googlesource.com/475339 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475339" owner_email="mcchou@chromium.org" 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/39/475339/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ie464ba2df797849d27961814d746106f70143f58" commit="964725580f76aabca521ddb757537a95c74920e9" commit_message="UPSTREAM: Bluetooth: hci_uart: Add Intel/AG6xx support This driver implements support for iBT2.1 Bluetooth controller embedded in the AG620 communication combo. The controller needs to be configured with bddata and can be patched with a binary patch file (pbn). These operations are performed in manufacturing mode. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie464ba2df797849d27961814d746106f70143f58 Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 395174bb07c1dce58fbf2baa3a01bb69f5103c59) Reviewed-on: https://chromium-review.googlesource.com/475340 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475340" owner_email="mcchou@chromium.org" 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/40/475340/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ia2da5b64e032bb40f2e9cb9876cd55e555f7dd83" commit="484667b744382a03481f2c01a6141cd40515d273" commit_message="UPSTREAM: Bluetooth: btusb: Add a new AR3012 ID 04ca:3014 T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=03 Dev#= 5 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=04ca ProdID=3014 Rev=00.02 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1546694 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia2da5b64e032bb40f2e9cb9876cd55e555f7dd83 Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 81d90442eac779938217c3444b240aa51fd3db47) Reviewed-on: https://chromium-review.googlesource.com/475341 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475341" owner_email="mcchou@chromium.org" 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/41/475341/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ibfd719034cea7734ff4eec77c4ea69c3429a9e6b" commit="8f69e99324dcc502c1dc6e76f732fd4f6e4bf6e8" commit_message="UPSTREAM: Bluetooth: hci_uart: Add diag and address support for Intel/AG6xx The AG6xx devices behave similar to Wilkens Peak and Stone Peak and with that it is needed to check for Intel default address. In addition it is possible to enable vendor events and diag support. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ibfd719034cea7734ff4eec77c4ea69c3429a9e6b Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 34bf1912bfc06bd9200893916078eb0f16480a95) Reviewed-on: https://chromium-review.googlesource.com/475342 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475342" owner_email="mcchou@chromium.org" 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/42/475342/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I215ab79d119cf711a1cedc60ff7338d9b8c3f7ac" commit="f8679357c5fb7a49c0281615782a4ed887af3dcb" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E55 ACPI ID used in Lenovo ThinkPad Tablet 8 Lenovo ThinkPad Tablet 8 with BCM43241 rev B5 chipset uses the BCM2E55 ACPI ID for Bluetooth. Add it to the list of supported devices. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I215ab79d119cf711a1cedc60ff7338d9b8c3f7ac Signed-off-by: Jrme de Bretagne <jerome.debretagne@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit c5fd9cbb9dc40e0d273d6731030e65096adceeda) Reviewed-on: https://chromium-review.googlesource.com/475343 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475343" owner_email="mcchou@chromium.org" 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/43/475343/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I45cd50c507f45c37f92062a2bcbd662aaf322d43" commit="1f0a97b56397736c9e355fdee7cbe2ff48c5fe82" commit_message="UPSTREAM: Bluetooth: btusb: Add a new AR3012 ID 13d3:3472 T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3472 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1552925 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I45cd50c507f45c37f92062a2bcbd662aaf322d43 Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 75c6aca4765dbe3d0c1507ab5052f2e373dc2331) Reviewed-on: https://chromium-review.googlesource.com/475344 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475344" owner_email="mcchou@chromium.org" 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/44/475344/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Ie97e2448084b756337491a65cbc92f007031d565" commit="9193a69f5210bf75fb6793fe3728df9e82e09f10" commit_message="UPSTREAM: Bluetooth: btmrvl_sdio: fix firmware activation failure In some case, the btmrvl_sdio firmware would fail to active within the polling time. Increase the polling interval to 100 msec to fix the issue. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie97e2448084b756337491a65cbc92f007031d565 Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org> Signed-off-by: Wei-Ning Huang <wnhuang@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9a01242dc7fc4d5fe3f722afbf35b33aa414cd2f) Reviewed-on: https://chromium-review.googlesource.com/475345 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475345" owner_email="mcchou@chromium.org" 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/45/475345/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I3a2555fe68711266fe678c9ead6ff23ebb53971e" commit="3fd4cda37d5b421e10f9a93ef5a4f31ab447aea0" commit_message="UPSTREAM: Bluetooth: Move memset closer to where it's needed Minor fix to not do the memset until the variable it clears is actually used. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I3a2555fe68711266fe678c9ead6ff23ebb53971e Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit eec7a01dc8366f7e43fc0417f4aee70eaeaca9a9) Reviewed-on: https://chromium-review.googlesource.com/475346 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475346" owner_email="mcchou@chromium.org" 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/46/475346/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I2be6fc75043bedc842c7c78877fede163ec3120a" commit="8148203a5b5577d96736e75b986585877eddb232" commit_message="UPSTREAM: Bluetooth: Fix adding discoverable to adv instance flags When lookup up the advertising instance flags for the default advertising instance (0) the discoverable flag should be filled in based on the HCI_DISCOVERABLE flag. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2be6fc75043bedc842c7c78877fede163ec3120a Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d43efbd0d545f476be0bbef30cbe18234f8a9631) Reviewed-on: https://chromium-review.googlesource.com/475347 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475347" owner_email="mcchou@chromium.org" 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/47/475347/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Id09c28330d4f4dfebced402958250da4666785e3" commit="4af8568503e9b7280cbe9f8eaadb73434d9885f0" commit_message="UPSTREAM: Bluetooth: Add support for limited privacy mode Introduce a limited privacy mode indicated by value 0x02 to the mgmt Set Privacy command. With value 0x02 the kernel will use privacy mode with a resolvable private address. In case the controller is bondable and discoverable the identity address will be used. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id09c28330d4f4dfebced402958250da4666785e3 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 82a37adeedd38880940e2772ec1ae27a09353e5a) Reviewed-on: https://chromium-review.googlesource.com/475348 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475348" owner_email="mcchou@chromium.org" 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/48/475348/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I346e2710983fe550ab70567e32a55488c3f8078c" commit="5c1f8c097c1ac44e37ceda996d0b8e276732d0fe" commit_message="UPSTREAM: Bluetooth: Increment management interface revision Increment the mgmt revision due to the recently added limited privacy mode. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I346e2710983fe550ab70567e32a55488c3f8078c Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9c176cec42e4b0deeed901fc363bf4235c5ca96a) Reviewed-on: https://chromium-review.googlesource.com/475349 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475349" owner_email="mcchou@chromium.org" 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/49/475349/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I2ae0873cb99de8903e2177c9b853ca86051be41d" commit="867b716613b6d46ce71290b5894009ce585b60f0" commit_message="UPSTREAM: Bluetooth: Fix setting correct flags in AD A recent change added MGMT_ADV_FLAG_DISCOV to the flags returned by get_adv_instance_flags(), however failed to take into account limited discoverable mode. This patch fixes the issue by setting the correct discoverability flag in the AD data. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2ae0873cb99de8903e2177c9b853ca86051be41d Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 6a19cc8c892b113fb84947207346f783de76dbd1) Reviewed-on: https://chromium-review.googlesource.com/475350 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475350" owner_email="mcchou@chromium.org" 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/50/475350/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I8a622863940af40cf3dce69569507ea7ebc0855f" commit="0978bfcf25707248355a31ee673c5e074fdd6e12" commit_message="UPSTREAM: Bluetooth: Fix potential buffer overflow with Add Advertising The Add Advertising command handler does the appropriate checks for the AD and Scan Response data, however fails to take into account the general length of the mgmt command itself, which could lead to potential buffer overflows. This patch adds the necessary check that the mgmt command length is consistent with the given ad and scan_rsp lengths. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8a622863940af40cf3dce69569507ea7ebc0855f Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 6a0e78072c2ae7b20b14e0249d8108441ea928d2) Reviewed-on: https://chromium-review.googlesource.com/475351 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475351" owner_email="mcchou@chromium.org" 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/51/475351/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I7be9b92a0a96832cd469497e64ddc18172f9435a" commit="cb79d8ad3d0494f4163336f641149ef3e6be9b92" commit_message="UPSTREAM: Bluetooth: Fix setting NO_BREDR advertising flag If we're dealing with a single-mode controller or BR/EDR is disable for a dual-mode one, the NO_BREDR flag needs to be unconditionally present in the advertising data. This patch moves it out from behind an extra condition to be always set in the create_instance_adv_data() function if BR/EDR is disabled. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I7be9b92a0a96832cd469497e64ddc18172f9435a Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit f18ba58f538e44a701ad0b86d47bb57b917d7c0a) Reviewed-on: https://chromium-review.googlesource.com/475352 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475352" owner_email="mcchou@chromium.org" 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/52/475352/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I54bcb375bd22a70f09fffa0fe3ba990c4443bbc1" commit="b13594543d72b2e49505c3cb2ea9358b776ed407" commit_message="UPSTREAM: Bluetooth: Ignore unknown advertising packet types In case of buggy controllers send advertising packet types that we don't know of we should simply ignore them instead of trying to react to them in some (potentially wrong) way. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I54bcb375bd22a70f09fffa0fe3ba990c4443bbc1 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 56b40fbf61a247e23b50e426971148b2e50262e0) Reviewed-on: https://chromium-review.googlesource.com/475353 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475353" owner_email="mcchou@chromium.org" 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/53/475353/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I709e0fcf95f8025b77e6d14320ecf6ecec5c443d" commit="a720814c615667b027bb8d99ccbe83ddfba27983" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E71 ACPI ID This ID is used at least by Asus T100-CHI. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I709e0fcf95f8025b77e6d14320ecf6ecec5c443d Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1dbfc59a931495b2e7bdc4e85886162a0b03235b) Reviewed-on: https://chromium-review.googlesource.com/475354 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475354" owner_email="mcchou@chromium.org" 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/54/475354/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I0fcbbfd8f5e15866226373dcfcff2366d384571a" commit="975406d1efd97aaa1bc55bbacf34084e1b200da7" commit_message="UPSTREAM: Bluetooth: hci_ldisc: Fix null pointer derefence in case of early data HCI_UART_PROTO_SET flag is set before hci_uart_set_proto call. If we receive data from tty layer during this procedure, proto pointer may not be assigned yet, leading to null pointer dereference in rx method hci_uart_tty_receive. This patch fixes this issue by introducing HCI_UART_PROTO_READY flag in order to avoid any proto operation before proto opening and assignment. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I0fcbbfd8f5e15866226373dcfcff2366d384571a Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 84cb3df02aea4b00405521e67c4c67c2d525c364) Reviewed-on: https://chromium-review.googlesource.com/475355 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475355" owner_email="mcchou@chromium.org" 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/55/475355/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Icf84bb23382559211458977281f3bcae935b31d9" commit="178284f16f584baea62f8d67231a776425482686" commit_message="UPSTREAM: Bluetooth: Allow setting BT_SECURITY_FIPS with setsockopt Update the security level check to allow setting BT_SECURITY_FIPS for an L2CAP socket. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Icf84bb23382559211458977281f3bcae935b31d9 Signed-off-by: Patrik Flykt <patrik.flykt@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a164cee111085f9ee77f6038f006658249073523) Reviewed-on: https://chromium-review.googlesource.com/475356 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475356" owner_email="mcchou@chromium.org" 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/56/475356/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I3493a04669d357da228a3def5000e0ba084aab5d" commit="2787af7bdcc4c451ded2f8d2a353d592ebfc25c8" commit_message="UPSTREAM: Bluetooth: vhci: fix open_timeout vs. hdev race Both vhci_get_user and vhci_release race with open_timeout work. They both contain cancel_delayed_work_sync, but do not test whether the work actually created hdev or not. Since the work can be in progress and _sync will wait for finishing it, we can have data->hdev allocated when cancel_delayed_work_sync returns. But the call sites do 'if (data->hdev)' *before* cancel_delayed_work_sync. As a result: * vhci_get_user allocates a second hdev and puts it into data->hdev. The former is leaked. * vhci_release does not release data->hdev properly as it thinks there is none. Fix both cases by moving the actual test *after* the call to cancel_delayed_work_sync. This can be hit by this program: #include <err.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <time.h> #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> int main(int argc, char **argv) { int fd; srand(time(NULL)); while (1) { const int delta = (rand() % 200 - 100) * 100; fd = open("/dev/vhci", O_RDWR); if (fd < 0) err(1, "open"); usleep(1000000 + delta); close(fd); } return 0; } And the result is: BUG: KASAN: use-after-free in skb_queue_tail+0x13e/0x150 at addr ffff88006b0c1228 Read of size 8 by task kworker/u13:1/32068 ============================================================================= BUG kmalloc-192 (Tainted: G E ): kasan: bad access detected ----------------------------------------------------------------------------- Disabling lock debugging due to kernel taint INFO: Allocated in vhci_open+0x50/0x330 [hci_vhci] age=260 cpu=3 pid=32040 ... kmem_cache_alloc_trace+0x150/0x190 vhci_open+0x50/0x330 [hci_vhci] misc_open+0x35b/0x4e0 chrdev_open+0x23b/0x510 ... INFO: Freed in vhci_release+0xa4/0xd0 [hci_vhci] age=9 cpu=2 pid=32040 ... __slab_free+0x204/0x310 vhci_release+0xa4/0xd0 [hci_vhci] ... INFO: Slab 0xffffea0001ac3000 objects=16 used=13 fp=0xffff88006b0c1e00 flags=0x5fffff80004080 INFO: Object 0xffff88006b0c1200 @offset=4608 fp=0xffff88006b0c0600 Bytes b4 ffff88006b0c11f0: 09 df 00 00 01 00 00 00 00 00 00 00 00 00 00 00 ................ Object ffff88006b0c1200: 00 06 0c 6b 00 88 ff ff 00 00 00 00 00 00 00 00 ...k............ Object ffff88006b0c1210: 10 12 0c 6b 00 88 ff ff 10 12 0c 6b 00 88 ff ff ...k.......k.... Object ffff88006b0c1220: c0 46 c2 6b 00 88 ff ff c0 46 c2 6b 00 88 ff ff .F.k.....F.k.... Object ffff88006b0c1230: 01 00 00 00 01 00 00 00 e0 ff ff ff 0f 00 00 00 ................ Object ffff88006b0c1240: 40 12 0c 6b 00 88 ff ff 40 12 0c 6b 00 88 ff ff @..k....@..k.... Object ffff88006b0c1250: 50 0d 6e a0 ff ff ff ff 00 02 00 00 00 00 ad de P.n............. Object ffff88006b0c1260: 00 00 00 00 00 00 00 00 ab 62 02 00 01 00 00 00 .........b...... Object ffff88006b0c1270: 90 b9 19 81 ff ff ff ff 38 12 0c 6b 00 88 ff ff ........8..k.... Object ffff88006b0c1280: 03 00 20 00 ff ff ff ff ff ff ff ff 00 00 00 00 .. ............. Object ffff88006b0c1290: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ Object ffff88006b0c12a0: 00 00 00 00 00 00 00 00 00 80 cd 3d 00 88 ff ff ...........=.... Object ffff88006b0c12b0: 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 00 . .............. Redzone ffff88006b0c12c0: bb bb bb bb bb bb bb bb ........ Padding ffff88006b0c13f8: 00 00 00 00 00 00 00 00 ........ CPU: 3 PID: 32068 Comm: kworker/u13:1 Tainted: G B E 4.4.6-0-default #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.8.1-0-g4adadbd-20151112_172657-sheep25 04/01/2014 Workqueue: hci0 hci_cmd_work [bluetooth] 00000000ffffffff ffffffff81926cfa ffff88006be37c68 ffff88006bc27180 ffff88006b0c1200 ffff88006b0c1234 ffffffff81577993 ffffffff82489320 ffff88006bc24240 0000000000000046 ffff88006a100000 000000026e51eb80 Call Trace: ... [<ffffffff81ec8ebe>] ? skb_queue_tail+0x13e/0x150 [<ffffffffa06e027c>] ? vhci_send_frame+0xac/0x100 [hci_vhci] [<ffffffffa0c61268>] ? hci_send_frame+0x188/0x320 [bluetooth] [<ffffffffa0c61515>] ? hci_cmd_work+0x115/0x310 [bluetooth] [<ffffffff811a1375>] ? process_one_work+0x815/0x1340 [<ffffffff811a1f85>] ? worker_thread+0xe5/0x11f0 [<ffffffff811a1ea0>] ? process_one_work+0x1340/0x1340 [<ffffffff811b3c68>] ? kthread+0x1c8/0x230 ... Memory state around the buggy address: ffff88006b0c1100: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff88006b0c1180: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc >ffff88006b0c1200: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff88006b0c1280: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc ffff88006b0c1300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I3493a04669d357da228a3def5000e0ba084aab5d Fixes: 23424c0d31 (Bluetooth: Add support creating virtual AMP controllers) Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: stable 3.13+ <stable@vger.kernel.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 373a32c848ae3a1c03618517cce85f9211a6facf) Reviewed-on: https://chromium-review.googlesource.com/475357 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475357" owner_email="mcchou@chromium.org" 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/57/475357/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I4218223dcbffe433e644c6cd2607f358a23b6f87" commit="7242e9edac1e802c7fad3d1009d07f6a29fd1e05" commit_message="UPSTREAM: Bluetooth: vhci: purge unhandled skbs The write handler allocates skbs and queues them into data->readq. Read side should read them, if there is any. If there is none, skbs should be dropped by hdev->flush. But this happens only if the device is HCI_UP, i.e. hdev->power_on work was triggered already. When it was not, skbs stay allocated in the queue when /dev/vhci is closed. So purge the queue in ->release. Program to reproduce: #include <err.h> #include <fcntl.h> #include <stdio.h> #include <unistd.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/uio.h> int main() { char buf[] = { 0xff, 0 }; struct iovec iov = { .iov_base = buf, .iov_len = sizeof(buf), }; int fd; while (1) { fd = open("/dev/vhci", O_RDWR); if (fd < 0) err(1, "open"); usleep(50); if (writev(fd, &iov, 1) < 0) err(1, "writev"); usleep(50); close(fd); } return 0; } Result: kmemleak: 4609 new suspected memory leaks unreferenced object 0xffff88059f4d5440 (size 232): comm "vhci", pid 1084, jiffies 4294912542 (age 37569.296s) hex dump (first 32 bytes): 20 f0 23 87 05 88 ff ff 20 f0 23 87 05 88 ff ff .#..... .#..... 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: ... [<ffffffff81ece010>] __alloc_skb+0x0/0x5a0 [<ffffffffa021886c>] vhci_create_device+0x5c/0x580 [hci_vhci] [<ffffffffa0219436>] vhci_write+0x306/0x4c8 [hci_vhci] BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4218223dcbffe433e644c6cd2607f358a23b6f87 Fixes: 23424c0d31 (Bluetooth: Add support creating virtual AMP controllers) Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable 3.13+ <stable@vger.kernel.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 13407376b255325fa817798800117a839f3aa055) Reviewed-on: https://chromium-review.googlesource.com/475358 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475358" owner_email="mcchou@chromium.org" 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/58/475358/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="Icef5242fbd79d91f3c3a665efaff40fde0b10359" commit="f2484af32444dd21af7c7897e7c5ca8a762f8a52" commit_message="UPSTREAM: Bluetooth: hci_bcsp: fix code style This commit fixed: trailing "*/" trailing spaces mixed indent space between ~ and ( BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Icef5242fbd79d91f3c3a665efaff40fde0b10359 Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 8805eea2494a2837983bc4aaaf6842c89666ec25) Reviewed-on: https://chromium-review.googlesource.com/475359 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="475359" owner_email="mcchou@chromium.org" 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/59/475359/6" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.14" change_id="I156359a1109a380b4e2c97aaa03aa52263e12fb9" commit="f86729dfedeef2fd19a8bc3e0a9edf353c13af82" commit_message="UPSTREAM: tcp: md5: fix lockdep annotation When a passive TCP is created, we eventually call tcp_md5_do_add() with sk pointing to the child. It is not owner by the user yet (we will add this socket into listener accept queue a bit later anyway) But we do own the spinlock, so amend the lockdep annotation to avoid following splat : [ 8451.090932] net/ipv4/tcp_ipv4.c:923 suspicious rcu_dereference_protected() usage! [ 8451.090932] [ 8451.090932] other info that might help us debug this: [ 8451.090932] [ 8451.090934] [ 8451.090934] rcu_scheduler_active = 1, debug_locks = 1 [ 8451.090936] 3 locks held by socket_sockopt_/214795: [ 8451.090936] #0: (rcu_read_lock){.+.+..}, at: [<ffffffff855c6ac1>] __netif_receive_skb_core+0x151/0xe90 [ 8451.090947] #1: (rcu_read_lock){.+.+..}, at: [<ffffffff85618143>] ip_local_deliver_finish+0x43/0x2b0 [ 8451.090952] #2: (slock-AF_INET){+.-...}, at: [<ffffffff855acda5>] sk_clone_lock+0x1c5/0x500 [ 8451.090958] [ 8451.090958] stack backtrace: [ 8451.090960] CPU: 7 PID: 214795 Comm: socket_sockopt_ [ 8451.091215] Call Trace: [ 8451.091216] <IRQ> [<ffffffff856fb29c>] dump_stack+0x55/0x76 [ 8451.091229] [<ffffffff85123b5b>] lockdep_rcu_suspicious+0xeb/0x110 [ 8451.091235] [<ffffffff8564544f>] tcp_md5_do_add+0x1bf/0x1e0 [ 8451.091239] [<ffffffff85645751>] tcp_v4_syn_recv_sock+0x1f1/0x4c0 [ 8451.091242] [<ffffffff85642b27>] ? tcp_v4_md5_hash_skb+0x167/0x190 [ 8451.091246] [<ffffffff85647c78>] tcp_check_req+0x3c8/0x500 [ 8451.091249] [<ffffffff856451ae>] ? tcp_v4_inbound_md5_hash+0x11e/0x190 [ 8451.091253] [<ffffffff85647170>] tcp_v4_rcv+0x3c0/0x9f0 [ 8451.091256] [<ffffffff85618143>] ? ip_local_deliver_finish+0x43/0x2b0 [ 8451.091260] [<ffffffff856181b6>] ip_local_deliver_finish+0xb6/0x2b0 [ 8451.091263] [<ffffffff85618143>] ? ip_local_deliver_finish+0x43/0x2b0 [ 8451.091267] [<ffffffff85618d38>] ip_local_deliver+0x48/0x80 [ 8451.091270] [<ffffffff85618510>] ip_rcv_finish+0x160/0x700 [ 8451.091273] [<ffffffff8561900e>] ip_rcv+0x29e/0x3d0 [ 8451.091277] [<ffffffff855c74b7>] __netif_receive_skb_core+0xb47/0xe90 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Fixes: a8afca0329988 ("tcp: md5: protects md5sig_info with RCU") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1b8e6a01e19f001e9f93b39c32387961c91ed3cc) Change-Id: I156359a1109a380b4e2c97aaa03aa52263e12fb9 Reviewed-on: https://chromium-review.googlesource.com/476158 Commit-Ready: Miao-chen Chou <mcchou@chromium.org> Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="476158" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/476158/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.14" change_id="Iea10bdbeb64474e887946f043df03be215141e7d" commit="e9e78f23f0cd32c6474559de4f807279735b2162" commit_message="BACKPORT: ipv6: add complete rcu protection around np->opt This patch addresses multiple problems : UDP/RAW sendmsg() need to get a stable struct ipv6_txoptions while socket is not locked : Other threads can change np->opt concurrently. Dmitry posted a syzkaller (http://github.com/google/syzkaller) program desmonstrating use-after-free. Starting with TCP/DCCP lockless listeners, tcp_v6_syn_recv_sock() and dccp_v6_request_recv_sock() also need to use RCU protection to dereference np->opt once (before calling ipv6_dup_options()) This patch adds full RCU protection to np->opt BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Minnie and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iea10bdbeb64474e887946f043df03be215141e7d Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 45f6fad84cc305103b28d73482b344d7f5b76f39) Reviewed-on: https://chromium-review.googlesource.com/476159 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="476159" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/476159/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-3.18" change_id="I1982523a70d1b9fb16109580431ddbe64b9a350c" commit="d4e5a7081e188b9682b57ea4c6799c781e7e9ede" commit_message="Revert "CHROMIUM: bluetooth: update advertising parameters for single advertisement" This reverts commit ff701ac57791801e9f60eee8f54811c548d97281. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. CQ-DEPEND=CL:474434 Change-Id: I1982523a70d1b9fb16109580431ddbe64b9a350c Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474068 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474068" owner_email="mcchou@chromium.org" 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/68/474068/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I2b599a319dfd68c3b1fa2a1e42f102113fdbbb15" commit="c124526b54e1b196313039674797c6831d1d5355" commit_message="Revert "CHROMIUM: bluetooth: set advertising intervals after registering advertisements" This reverts commit acc176d8d5b8eeeb6cd8ef677e84e8e75b7a4547. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2b599a319dfd68c3b1fa2a1e42f102113fdbbb15 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474069 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474069" owner_email="mcchou@chromium.org" 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/69/474069/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="If718dc215112c1707fd221aeebc5ab20481dbd2e" commit="ad9b83fccd453a6a63d53813a5f1b8e4f17babd9" commit_message="Revert "CHROMIUM: bluetooth: adjust advertising duration based on max interval" This reverts commit cfc4e390b7ff69011c03c62284688e8e1dbac97d. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If718dc215112c1707fd221aeebc5ab20481dbd2e Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474070 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474070" owner_email="mcchou@chromium.org" 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/70/474070/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I4385b6f06d38f35b4bae351c0712944792efde74" commit="3da17ea27375ba589935132ccc5344ed13854d62" commit_message="Revert "CHROMIUM: bluetooth: reset advertising intervals" This reverts commit 92022b2f83105aa2dcfcc7867880805818b4b98a. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4385b6f06d38f35b4bae351c0712944792efde74 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474071 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474071" owner_email="mcchou@chromium.org" 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/71/474071/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I39dc826464e0499e75612305a17c832d722a437e" commit="eb8c244b6465070896344b125c438072f369a4ab" commit_message="Revert "CHROMIUM: bluetooth: set advertising intervals" This reverts commit 9fe315b3205844a32a07a90f337eb5beb743c952. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I39dc826464e0499e75612305a17c832d722a437e Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474072 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474072" owner_email="mcchou@chromium.org" 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/72/474072/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ic1b425d6d9e0fbe1fc33d3c228e21b3809533860" commit="594efeaaf2f9bfff564d3e3b8fcb74793d4ca323" commit_message="Revert "FROMLIST: Bluetooth: btmrvl: fix slab-out-of-bounds access in btmrvl_sdio" This reverts commit c5c58ab9c8760ce286e98894d4f21aea243c16ad. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ic1b425d6d9e0fbe1fc33d3c228e21b3809533860 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474073 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474073" owner_email="mcchou@chromium.org" 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/73/474073/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ic5004c3f27bb8c345154da8b96870898ce956f6f" commit="e6b3fc09bd635b6a464f45bae19cf5c5cee64645" commit_message="Revert "FROMLIST: Bluetooth: btmrvl: reset is_suspending flag in failure path" This reverts commit ff1649887ef9e73433d4d6c853583357130b0115. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ic5004c3f27bb8c345154da8b96870898ce956f6f Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474074 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474074" owner_email="mcchou@chromium.org" 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/74/474074/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Icd36f4d1959d4a66a2b4e4e0a2bf9d315fd0311f" commit="4957645207d81196e87814117db226cf24412c99" commit_message="Revert "FROMLIST: Bluetooth: btmrvl_sdio: fix firmware activation failure" This reverts commit 22719ab7dc8053ef3dca58734ced85b3eba3d4aa. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Icd36f4d1959d4a66a2b4e4e0a2bf9d315fd0311f Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474075 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474075" owner_email="mcchou@chromium.org" 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/75/474075/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="If515c8917c47b1e00747463ac3a18166facddbba" commit="526af1b1ffe816d9f6d702e3987c35e41c0f36f2" commit_message="Revert "FROMLIST: Bluetooth: hci_core: cancel power off delayed work properly" This reverts commit b2bd17bf0199dc7ba466a7519523edff0f79b5c7. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If515c8917c47b1e00747463ac3a18166facddbba Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474076 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474076" owner_email="mcchou@chromium.org" 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/76/474076/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ifa4689cad1461c7e2a2c70e3452424d329a9316f" commit="3c3afd0c078b98399453cc90321235244a5c66f4" commit_message="UPSTREAM: net: rfkill: Add Broadcom BCM2E40 bluetooth ACPI ID This is yet another Broadcom bluetooth chip with ACPI ID BCM2E40. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ifa4689cad1461c7e2a2c70e3452424d329a9316f Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 79044f60caa7c377333dc8f13cf1e48c144e2521) Reviewed-on: https://chromium-review.googlesource.com/474077 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474077" owner_email="mcchou@chromium.org" 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/77/474077/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Id973978e35162bfa8cde5ba08772b92e86290dbb" commit="180613629c236adb220b9dceb14be0b4ed2a4990" commit_message="UPSTREAM: net: rfkill: gpio: Remove BCM2E39 support Power management support for BCM2E39 is now performed in Bluetooth BCM UART driver. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id973978e35162bfa8cde5ba08772b92e86290dbb Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9e6080936c3e507da60492a8a606bdd1164baa81) Reviewed-on: https://chromium-review.googlesource.com/474078 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474078" owner_email="mcchou@chromium.org" 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/78/474078/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Id1f29c79dc246f865a9d1a924c24abc0e4e48db4" commit="507b413e9fbec44a46e0e72c36bbe0abca3178df" commit_message="UPSTREAM: Bluetooth: hci_bcm: move all Broadcom ACPI IDs to BCM HCI driver The IDs should all be for Broadcom BCM43241 module, and hci_bcm is now the proper driver for them. This removes one of two different ways of handling PM with the module. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id1f29c79dc246f865a9d1a924c24abc0e4e48db4 Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d3d20725407955d0bb107939f23535d2e7dadbee) Reviewed-on: https://chromium-review.googlesource.com/474079 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474079" owner_email="mcchou@chromium.org" 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/79/474079/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Id1d161dbc0d8a9a63ab3dbbbfe1f28f5cef00f01" commit="271393b9a40bef1a5fce986512b7d107ef067f59" commit_message="UPSTREAM: Bluetooth: hci_bcm: new ACPI IDs These are used at least by Acer with BCM43241. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id1d161dbc0d8a9a63ab3dbbbfe1f28f5cef00f01 Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit adbdeae5cece1d888a1542edfe9e1c6f8884fef8) Reviewed-on: https://chromium-review.googlesource.com/474080 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474080" owner_email="mcchou@chromium.org" 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/80/474080/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I45cc610f12d87c7a3271e9a04d888a810bf7620f" commit="a701ec470b207f1889ded140d1c4160ec15eac03" commit_message="UPSTREAM: Bluetooth: 6lowpan: Fix kernel NULL pointer dereferences The fixes provided in this patch assigns a valid net_device structure to skb before dispatching it for further processing. Scenario #1: ============ Bluetooth 6lowpan receives an uncompressed IPv6 header, and dispatches it to netif. The following error occurs: Null pointer dereference error #1 crash log: [ 845.854013] BUG: unable to handle kernel NULL pointer dereference at 0000000000000048 [ 845.855785] IP: [<ffffffff816e3d36>] enqueue_to_backlog+0x56/0x240 ... [ 845.909459] Call Trace: [ 845.911678] [<ffffffff816e3f64>] netif_rx_internal+0x44/0xf0 The first modification fixes the NULL pointer dereference error by assigning dev to the local_skb in order to set a valid net_device before processing the skb by netif_rx_ni(). Scenario #2: ============ Bluetooth 6lowpan receives an UDP compressed message which needs further decompression by nhc_udp. The following error occurs: Null pointer dereference error #2 crash log: [ 63.295149] BUG: unable to handle kernel NULL pointer dereference at 0000000000000840 [ 63.295931] IP: [<ffffffffc0559540>] udp_uncompress+0x320/0x626 [nhc_udp] The second modification fixes the NULL pointer dereference error by assigning dev to the local_skb in the case of a udp compressed packet. The 6lowpan udp_uncompress function expects that the net_device is set in the skb when checking lltype. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I45cc610f12d87c7a3271e9a04d888a810bf7620f Signed-off-by: Glenn Ruben Bakke <glenn.ruben.bakke@nordicsemi.no> Signed-off-by: Lukasz Duda <lukasz.duda@nordicsemi.no> Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Cc: stable@vger.kernel.org # 4.4+ Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 4c58f3282e3de43d34f8955f8eca676294380bf9) Reviewed-on: https://chromium-review.googlesource.com/474081 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474081" owner_email="mcchou@chromium.org" 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/81/474081/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Iaebcf5bc60086f4698415639ba47fb8068bc4576" commit="6ac42377c305f1bc8c27f6e230421aebdf3ccda3" commit_message="UPSTREAM: Bluetooth: 6lowpan: Fix handling of uncompressed IPv6 packets This patch fixes incorrect handling of the 6lowpan packets that contain uncompressed IPv6 header. RFC4944 specifies a special dispatch for 6lowpan to carry uncompressed IPv6 header. This dispatch (1 byte long) has to be removed during reception and skb data pointer has to be moved. To correctly point in the beginning of the IPv6 header the dispatch byte has to be pulled off before packet can be processed by netif_rx_in(). Test scenario: IPv6 packets are not correctly interpreted by the network layer when IPv6 header is not compressed (e.g. ICMPv6 Echo Reply is not propagated correctly to the ICMPv6 layer because the extra byte will make the header look corrupted). Similar approach is done for IEEE 802.15.4. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iaebcf5bc60086f4698415639ba47fb8068bc4576 Signed-off-by: Lukasz Duda <lukasz.duda@nordicsemi.no> Signed-off-by: Glenn Ruben Bakke <glenn.ruben.bakke@nordicsemi.no> Acked-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Cc: stable@vger.kernel.org # 4.4+ Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 87f5fedb3bebbbb566f847dd0c567fcea49a36a6) Reviewed-on: https://chromium-review.googlesource.com/474082 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474082" owner_email="mcchou@chromium.org" 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/82/474082/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Id32411757f8172706d7d97b98c7b5ac1ae406910" commit="e938c11886136cbb3259ea49eb3c37fc4973bf79" commit_message="UPSTREAM: crypto: hash - Add helpers to zero stack request/descriptor As the size of an ahash_request or shash_desc is variable, it's awkward to zero them explicitly. This patch adds helpers to do that which should be used when they are created on the stack. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id32411757f8172706d7d97b98c7b5ac1ae406910 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e67ffe0af4d450e95e5f9bb7d081500e30777857) Reviewed-on: https://chromium-review.googlesource.com/474083 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474083" owner_email="mcchou@chromium.org" 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/83/474083/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I1bd30d9bdb3f14df990bcd90f892ea717cfc80c1" commit="b85dc5ae12f86b870e1a54474a1438aa7210d88d" commit_message="UPSTREAM: crypto: skcipher - Add top-level skcipher interface This patch introduces the crypto skcipher interface which aims to replace both blkcipher and ablkcipher. It's very similar to the existing ablkcipher interface. The main difference is the removal of the givcrypt interface. In order to make the transition easier for blkcipher users, there is a helper SKCIPHER_REQUEST_ON_STACK which can be used to place a request on the stack for synchronous transforms. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I1bd30d9bdb3f14df990bcd90f892ea717cfc80c1 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 7a7ffe65c8c5fbf272b132d8980b2511d5e5fc98) Reviewed-on: https://chromium-review.googlesource.com/474084 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474084" owner_email="mcchou@chromium.org" 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/84/474084/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I07388b74604a14552a6c3f9bd562d3239c5a82f1" commit="3a6dc0f00649b5439292d4673d8436d51fb6dbde" commit_message="UPSTREAM: crypto: skcipher - Add crypto_skcipher_has_setkey This patch adds a way for skcipher users to determine whether a key is required by a transform. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I07388b74604a14552a6c3f9bd562d3239c5a82f1 Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a1383cd86a062fc798899ab20f0ec2116cce39cb) Reviewed-on: https://chromium-review.googlesource.com/474085 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474085" owner_email="mcchou@chromium.org" 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/85/474085/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ia1233078f01566163a384bac1a2b424bffc6e844" commit="bf65716a1667b4ffc09b682a249d8361531c7344" commit_message="UPSTREAM: crypto: skcipher - Add default key size helper While converting ecryptfs over to skcipher I found that it needs to pick a default key size if one isn't given. Rather than having it poke into the guts of the algorithm to get max_keysize, let's provide a helper that is meant to give a sane default (just in case we ever get an algorithm that has no maximum key size). BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia1233078f01566163a384bac1a2b424bffc6e844 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 973fb3fb50e3959d90179d09ed3ce454dd7bc6e4) Reviewed-on: https://chromium-review.googlesource.com/474404 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474404" owner_email="mcchou@chromium.org" 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/04/474404/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ie90630fc9989904ecc491ea342f5bb43f7dfeee8" commit="d34bb14567824d61a76e8fb63e1501e28788a929" commit_message="UPSTREAM: crypto: skcipher - Add helper to zero stack request As the size of an skcipher_request is variable, it's awkward to zero it explicitly. This patch adds a helper to do that which should be used when it is created on the stack. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie90630fc9989904ecc491ea342f5bb43f7dfeee8 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1aaa753d918c48c603195a468766e6a2b32b87f9) Reviewed-on: https://chromium-review.googlesource.com/474405 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474405" owner_email="mcchou@chromium.org" 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/05/474405/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I037ccc37fd8765163f5f6e86eda2f0bdd4952056" commit="9f4df44c5cdefc56b6f27be99bca4a6b5801771b" commit_message="UPSTREAM: Bluetooth: Use skcipher and hash This patch replaces uses of blkcipher with skcipher and the long obsolete hash interface with shash. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I037ccc37fd8765163f5f6e86eda2f0bdd4952056 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 71af2f6bb22a4bf42663e10f1d8913d4967ed07f) Reviewed-on: https://chromium-review.googlesource.com/474406 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474406" owner_email="mcchou@chromium.org" 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/06/474406/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I5d38c4d35c64d0d33b88a589558fd1cf297e7a45" commit="881febbf5ea524721d5d9d6488490dd2be89efd6" commit_message="UPSTREAM: Bluetooth: L2CAP: Introduce proper defines for PSM ranges Having proper defines makes the code a bit readable, it also avoids duplicating hard-coded values since these are also needed when auto-allocating PSM values (in a subsequent patch). BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5d38c4d35c64d0d33b88a589558fd1cf297e7a45 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 114f9f1e038eb23935c20fb54f49f07caaa0546d) Reviewed-on: https://chromium-review.googlesource.com/474407 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474407" owner_email="mcchou@chromium.org" 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/07/474407/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I4dab53239dcdc4586a1ff8e06f6fd6555c0c57d4" commit="953bb49a3b020e4e681eb5a0c1b9a79fa7c7f960" commit_message="UPSTREAM: Bluetooth: L2CAP: Fix auto-allocating LE PSM values The LE dynamic PSM range is different from BR/EDR (0x0080 - 0x00ff) and doesn't have requirements relating to parity, so separate checks are needed. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4dab53239dcdc4586a1ff8e06f6fd6555c0c57d4 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 92594a51120ebc6c2f556204fc73568c8f7cb0f4) Reviewed-on: https://chromium-review.googlesource.com/474408 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474408" owner_email="mcchou@chromium.org" 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/08/474408/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I709e72210266d729b2f43d39801f8384b0c49a2d" commit="a3b62df3e708151f18bd9e6c80f8b5bcc0bc7006" commit_message="UPSTREAM: Bluetooth: L2CAP: Fix setting chan src info before adding PSM/CID At least the l2cap_add_psm() routine depends on the source address type being properly set to know what auto-allocation ranges to use, so the assignment to l2cap_chan needs to happen before this. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I709e72210266d729b2f43d39801f8384b0c49a2d Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a2342c5fe5f2810b8ef6a0826bd584aa709dd2c6) Reviewed-on: https://chromium-review.googlesource.com/474409 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474409" owner_email="mcchou@chromium.org" 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/474409/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ia20c18f355b74c0d65c9546291ece2874046abcd" commit="93f13ee151e126537611b1b29f674e7b6999b522" commit_message="UPSTREAM: Bluetooth: Fix incorrect removing of IRKs The commit cad20c278085d893ebd616cd20c0747a8e9d53c7 was supposed to fix handling of devices first using public addresses and then switching to RPAs after pairing. Unfortunately it missed a couple of key places in the code. 1. When evaluating which devices should be removed from the existing white list we also need to consider whether we have an IRK for them or not, i.e. a call to hci_find_irk_by_addr() is needed. 2. In smp_notify_keys() we should not be requiring the knowledge of the RPA, but should simply keep the IRK around if the other conditions require it. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia20c18f355b74c0d65c9546291ece2874046abcd Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org # 4.4+ Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit cff10ce7b4f02718ffd25e3914e60559f5ef6ca0) Reviewed-on: https://chromium-review.googlesource.com/474410 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474410" owner_email="mcchou@chromium.org" 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/10/474410/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I6a936a126effa47fb4665905ff827b852257c29e" commit="294fb571b27e0dca7360d168ec654c8f64041480" commit_message="UPSTREAM: Bluetooth: ath3k: Fixed a blank line after declaration issue Fixed a coding style issue. Added a blank link after declaration. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6a936a126effa47fb4665905ff827b852257c29e Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d2ee9c2ec659cfab715568d2d9837f7ff67402fa) Reviewed-on: https://chromium-review.googlesource.com/474411 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474411" owner_email="mcchou@chromium.org" 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/11/474411/5" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I808bee74b91615ab37489a7df17fd8314a373e27" commit="1f6857e141e0f1973137addafe24f93146e79bfc" commit_message="UPSTREAM: leds: core: add managed version of led_trigger_register Complementing devm_led_classdev_register add a managed version of led_trigger_register. I omit a managed version of led_classdev_unregister as the equivalent devm_led_classdev_unregister isn't used in the kernel as of today. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I808bee74b91615ab37489a7df17fd8314a373e27 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9534cc31dda2bb129480ce2db92bf7bc1ef470ed) Reviewed-on: https://chromium-review.googlesource.com/476175 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="2" gerrit_number="476175" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/75/476175/4" remote="cros" total_fail_count="3"/><pending_commit branch="chromeos-3.18" change_id="I3cd7635d51520fde44c916292d9c0a36d0a2fe3b" commit="1ae7b405a8514b2034f7bbfb2e2fee638f663621" commit_message="UPSTREAM: Bluetooth: Use managed version of led_trigger_register in LED trigger Recently a managed version of led_trigger_register was introduced. Using devm_led_trigger_register allows to simplify the LED trigger code. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I3cd7635d51520fde44c916292d9c0a36d0a2fe3b Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b6e402fc84a76c0238b64de497920aeeaa495026) Reviewed-on: https://chromium-review.googlesource.com/474412 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474412" owner_email="mcchou@chromium.org" 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/12/474412/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I3f179556016f867d02f4065c4461069420507b5d" commit="3b7b03b8384096065c60ba47f651adc123db6964" commit_message="UPSTREAM: Bluetooth: hci_intel: Fix a wrong comparison A return value of the intel_wait_booting() function compared with a constant ETIMEDOUT instead of -ETIMEDOUT. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I3f179556016f867d02f4065c4461069420507b5d Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2be1149ed40812ab75bc1af67a68f5d09e8be762) Reviewed-on: https://chromium-review.googlesource.com/474413 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474413" owner_email="mcchou@chromium.org" 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/13/474413/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I3966056f5da4e960040d2ef44ccda54de011e34f" commit="26c622053cdd3b5ab50152f9b31bebb9b9a84dbf" commit_message="UPSTREAM: Bluetooth: btusb: Add new AR3012 ID 13d3:3395 T: Bus=03 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3395 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1542564 Reported-and-tested-by: Christopher Simerly <kilikopela29@gmail.com> BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I3966056f5da4e960040d2ef44ccda54de011e34f Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 609574eb46335cfac1421a07c0505627cbbab1f0) Reviewed-on: https://chromium-review.googlesource.com/474414 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474414" owner_email="mcchou@chromium.org" 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/14/474414/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Iff0aea4f6beadbb0aa1df49916d24018357a2af9" commit="559a637de9ef28fe992e96fb6c49b7c6fcf2151e" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add new ACPI ID for bcm43241 This ACPI ID is used at least by HP for their Omni 10 5600eg tablet. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iff0aea4f6beadbb0aa1df49916d24018357a2af9 Signed-off-by: J.J. Meijer <jjmeijer88@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b013a636b8571fa62b0fd3abeb2b36f0fc7199dd) Reviewed-on: https://chromium-review.googlesource.com/474415 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474415" owner_email="mcchou@chromium.org" 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/15/474415/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Iae4df9afec852b287047e6938a12faeafce7d31f" commit="d7de1038483a0cca8f6cdf43c0b56d95881456dd" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E7C ACPI ID Recent macbooks (early 2015) with BCM43241 use this ACPI ID. Add it to the list of supported devices. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iae4df9afec852b287047e6938a12faeafce7d31f Reported-by: Leif Liddy <leif.liddy@gmail.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2791b44d6b4a2280568e0dc84be51992b7b367f1) Reviewed-on: https://chromium-review.googlesource.com/474416 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474416" owner_email="mcchou@chromium.org" 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/16/474416/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Idfae1974f890aae9e6a6c10a764c8c59b575f21b" commit="a0a3ef000bb211c363f6e81324eb3a102d20ce7a" commit_message="UPSTREAM: Bluetooth: btbcm: Fix handling of firmware not found If the call to request_firmware() fails in btbcm_setup_patchram(), the BCM chip will be operating with its default firmware. In this case, btbcm_setup_patchram() should not return immediately but instead should skip to btbcm_check_bdaddr() and quirk setup. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Idfae1974f890aae9e6a6c10a764c8c59b575f21b Signed-off-by: Petri Gynther <pgynther@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit ad750fa142747f3f42b66ae051a0f275bd2035df) Reviewed-on: https://chromium-review.googlesource.com/474417 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474417" owner_email="mcchou@chromium.org" 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/17/474417/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I861f2a7caf79b9eb56d48ffb52452868825d458b" commit="a95722e87c6fff91f7a52be4bd5abe4701ee800f" commit_message="UPSTREAM: Bluetooth: Add new AR3012 ID 0489:e095 T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0489 ProdID=e095 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb This device requires ar3k/AthrBT_0x31010100.dfu and ar3k/ramps_0x31010100_40.dfu firmware files that are not in linux-firmware yet. BugLink: https://bugs.launchpad.net/bugs/1542944 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I861f2a7caf79b9eb56d48ffb52452868825d458b Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 28c971d82fb58ef7cba22e5308be6d2d2590473d) Reviewed-on: https://chromium-review.googlesource.com/474418 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474418" owner_email="mcchou@chromium.org" 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/18/474418/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I5eff22b0770f2fcdb558ba78917d8c57b12dfdd7" commit="7acbc1f66b7e02110d325675c40fa59d77cb6fe7" commit_message="UPSTREAM: Bluetooth: hci_core: cancel power off delayed work properly When the HCI_AUTO_OFF flag is cleared, the power_off delayed work need to be cancel or HCI will be powered off even if it's managed. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5eff22b0770f2fcdb558ba78917d8c57b12dfdd7 Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d82142a8b1338e6a4339920863423379c27b0b16) Reviewed-on: https://chromium-review.googlesource.com/474419 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474419" owner_email="mcchou@chromium.org" 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/19/474419/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I00e57a38026019be01716e0f0a9eb63df8f1afc0" commit="36c94ee49b8d9ddc4051e716da758ab6986e0803" commit_message="UPSTREAM: Bluetooth: hci_uart: Add Intel/AG6xx support This driver implements support for iBT2.1 Bluetooth controller embedded in the AG620 communication combo. The controller needs to be configured with bddata and can be patched with a binary patch file (pbn). These operations are performed in manufacturing mode. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I00e57a38026019be01716e0f0a9eb63df8f1afc0 Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 395174bb07c1dce58fbf2baa3a01bb69f5103c59) Reviewed-on: https://chromium-review.googlesource.com/474420 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474420" owner_email="mcchou@chromium.org" 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/20/474420/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ia1fbaace908ec0b1f882775ca5d167de40bcefc5" commit="9b9ccbc6b4636cf1d57d2874d87eea29388f6f54" commit_message="UPSTREAM: Bluetooth: btusb: Add a new AR3012 ID 04ca:3014 T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=03 Dev#= 5 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=04ca ProdID=3014 Rev=00.02 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1546694 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia1fbaace908ec0b1f882775ca5d167de40bcefc5 Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 81d90442eac779938217c3444b240aa51fd3db47) Reviewed-on: https://chromium-review.googlesource.com/474421 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474421" owner_email="mcchou@chromium.org" 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/21/474421/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ia60b6cf6435444369062d38c492599b780a94689" commit="b7e8cb139b9373588c11dea8bfafbbe64a02627f" commit_message="UPSTREAM: Bluetooth: hci_uart: Add diag and address support for Intel/AG6xx The AG6xx devices behave similar to Wilkens Peak and Stone Peak and with that it is needed to check for Intel default address. In addition it is possible to enable vendor events and diag support. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia60b6cf6435444369062d38c492599b780a94689 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 34bf1912bfc06bd9200893916078eb0f16480a95) Reviewed-on: https://chromium-review.googlesource.com/474422 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474422" owner_email="mcchou@chromium.org" 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/22/474422/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I2832284a2a5e6d539bf53983dde8261ae51d5bf4" commit="40b970dc43783b8a0681425491f8fdffc6af17ac" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E55 ACPI ID used in Lenovo ThinkPad Tablet 8 Lenovo ThinkPad Tablet 8 with BCM43241 rev B5 chipset uses the BCM2E55 ACPI ID for Bluetooth. Add it to the list of supported devices. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2832284a2a5e6d539bf53983dde8261ae51d5bf4 Signed-off-by: Jrme de Bretagne <jerome.debretagne@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit c5fd9cbb9dc40e0d273d6731030e65096adceeda) Reviewed-on: https://chromium-review.googlesource.com/474423 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474423" owner_email="mcchou@chromium.org" 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/23/474423/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Icc0a256968ecab8f0ee9603e688548509996f320" commit="f565f367c2e4ba982a77501b17feb441a0725d01" commit_message="UPSTREAM: Bluetooth: btusb: Add a new AR3012 ID 13d3:3472 T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3472 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb BugLink: https://bugs.launchpad.net/bugs/1552925 BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Icc0a256968ecab8f0ee9603e688548509996f320 Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 75c6aca4765dbe3d0c1507ab5052f2e373dc2331) Reviewed-on: https://chromium-review.googlesource.com/474424 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474424" owner_email="mcchou@chromium.org" 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/24/474424/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I5702a7f514b94ffaa79bfa7511225d17ca14c8df" commit="d2b07afc45757a513d82c4fa558bd49620248017" commit_message="UPSTREAM: Bluetooth: btmrvl_sdio: fix firmware activation failure In some case, the btmrvl_sdio firmware would fail to active within the polling time. Increase the polling interval to 100 msec to fix the issue. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5702a7f514b94ffaa79bfa7511225d17ca14c8df Signed-off-by: Wei-Ning Huang <wnhuang@chromium.org> Signed-off-by: Wei-Ning Huang <wnhuang@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9a01242dc7fc4d5fe3f722afbf35b33aa414cd2f) Reviewed-on: https://chromium-review.googlesource.com/474425 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474425" owner_email="mcchou@chromium.org" 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/25/474425/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="If404c60a65e735e65b906c2deedf024c60cfdf40" commit="86de217bfa8de02e72db4dc8e3af98060c4eb55a" commit_message="UPSTREAM: Bluetooth: Move memset closer to where it's needed Minor fix to not do the memset until the variable it clears is actually used. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If404c60a65e735e65b906c2deedf024c60cfdf40 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit eec7a01dc8366f7e43fc0417f4aee70eaeaca9a9) Reviewed-on: https://chromium-review.googlesource.com/474426 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474426" owner_email="mcchou@chromium.org" 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/26/474426/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I9bab37b1edae1bff9db21b320b77e686ccb30207" commit="f7352bc2374685707b04d1eb655e7bd51038d930" commit_message="UPSTREAM: Bluetooth: Fix adding discoverable to adv instance flags When lookup up the advertising instance flags for the default advertising instance (0) the discoverable flag should be filled in based on the HCI_DISCOVERABLE flag. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I9bab37b1edae1bff9db21b320b77e686ccb30207 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d43efbd0d545f476be0bbef30cbe18234f8a9631) Reviewed-on: https://chromium-review.googlesource.com/474427 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474427" owner_email="mcchou@chromium.org" 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/27/474427/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Iea988ed9f95c16dcb8dc05f929655d7e8fc0ae29" commit="9551c1bdf078b54d79f4a9a34d97c05990283ed4" commit_message="UPSTREAM: Bluetooth: Add support for limited privacy mode Introduce a limited privacy mode indicated by value 0x02 to the mgmt Set Privacy command. With value 0x02 the kernel will use privacy mode with a resolvable private address. In case the controller is bondable and discoverable the identity address will be used. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iea988ed9f95c16dcb8dc05f929655d7e8fc0ae29 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 82a37adeedd38880940e2772ec1ae27a09353e5a) Reviewed-on: https://chromium-review.googlesource.com/474428 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474428" owner_email="mcchou@chromium.org" 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/28/474428/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I9e0dbf3819a2e96435c7013e7a47718ba0642f94" commit="caa490648f5a58f27d6c8dcc714eddaf72f01ae8" commit_message="UPSTREAM: Bluetooth: Increment management interface revision Increment the mgmt revision due to the recently added limited privacy mode. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I9e0dbf3819a2e96435c7013e7a47718ba0642f94 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9c176cec42e4b0deeed901fc363bf4235c5ca96a) Reviewed-on: https://chromium-review.googlesource.com/474429 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474429" owner_email="mcchou@chromium.org" 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/29/474429/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="If9108fa0aa0ff372a203ea428b0598bace060e8c" commit="fe5cbd779a5732e64523c078d9559b06a851434c" commit_message="UPSTREAM: Bluetooth: Fix setting correct flags in AD A recent change added MGMT_ADV_FLAG_DISCOV to the flags returned by get_adv_instance_flags(), however failed to take into account limited discoverable mode. This patch fixes the issue by setting the correct discoverability flag in the AD data. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If9108fa0aa0ff372a203ea428b0598bace060e8c Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 6a19cc8c892b113fb84947207346f783de76dbd1) Reviewed-on: https://chromium-review.googlesource.com/474430 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474430" owner_email="mcchou@chromium.org" 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/30/474430/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I1fafbf39c979bd494a987bebe3eec37940eb0f1e" commit="fabad680d30c0de7cff3161e9ee95129203a8444" commit_message="UPSTREAM: Bluetooth: Fix potential buffer overflow with Add Advertising The Add Advertising command handler does the appropriate checks for the AD and Scan Response data, however fails to take into account the general length of the mgmt command itself, which could lead to potential buffer overflows. This patch adds the necessary check that the mgmt command length is consistent with the given ad and scan_rsp lengths. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I1fafbf39c979bd494a987bebe3eec37940eb0f1e Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 6a0e78072c2ae7b20b14e0249d8108441ea928d2) Reviewed-on: https://chromium-review.googlesource.com/474431 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474431" owner_email="mcchou@chromium.org" 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/31/474431/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ieb20f5e9639291c43b0046954c22ee64559bdf99" commit="3b8ba0708663f15d94b45890bb9546158a2d0150" commit_message="UPSTREAM: Bluetooth: Fix setting NO_BREDR advertising flag If we're dealing with a single-mode controller or BR/EDR is disable for a dual-mode one, the NO_BREDR flag needs to be unconditionally present in the advertising data. This patch moves it out from behind an extra condition to be always set in the create_instance_adv_data() function if BR/EDR is disabled. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ieb20f5e9639291c43b0046954c22ee64559bdf99 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit f18ba58f538e44a701ad0b86d47bb57b917d7c0a) Reviewed-on: https://chromium-review.googlesource.com/474432 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474432" owner_email="mcchou@chromium.org" 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/32/474432/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="I7aa972062ced03349b4885939d046061adb3786e" commit="18ab04d3a0b6f8886417dacd41f79bf0a47254c9" commit_message="UPSTREAM: Bluetooth: Ignore unknown advertising packet types In case of buggy controllers send advertising packet types that we don't know of we should simply ignore them instead of trying to react to them in some (potentially wrong) way. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I7aa972062ced03349b4885939d046061adb3786e Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 56b40fbf61a247e23b50e426971148b2e50262e0) Reviewed-on: https://chromium-review.googlesource.com/474433 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474433" owner_email="mcchou@chromium.org" 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/33/474433/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-3.18" change_id="Ib81e3f3dab83090f963d40703a28ada9445c90cd" commit="864202d812e94151635b10025f51dfa8013cfdc1" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E71 ACPI ID This ID is used at least by Asus T100-CHI. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Oak and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ib81e3f3dab83090f963d40703a28ada9445c90cd Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1dbfc59a931495b2e7bdc4e85886162a0b03235b) Reviewed-on: https://chromium-review.googlesource.com/474434 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="3" gerrit_number="474434" owner_email="mcchou@chromium.org" 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/34/474434/6" remote="cros" total_fail_count="4"/><pending_commit branch="chromeos-4.4" change_id="Ide8e9c5a7bd9f2d00fad2967588686b70090ac08" commit="2bee9f4f6b9e1d6f17bf5676c5d8c4051b232946" commit_message="Revert "FROMLIST: btusb: wake system up when receives a wake irq" This reverts commit 8a4ee6fb18a19c074b5749d007ae88036bfe428a. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. CQ-DEPEND=CL:474291 Change-Id: Ide8e9c5a7bd9f2d00fad2967588686b70090ac08 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474246 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474246" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/46/474246/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I78c2ab4e06d4854736edc66c5acb9ce4091bdd37" commit="00bdaf072f2d3d39bb50d32f6da4d0d5db4062d9" commit_message="Revert "FROMLIST: Bluetooth: hidp: fix possible might sleep error in hidp_session_thread" This reverts commit b4fe2d7eaa5b8598c427c9436fc98acb72a4009c. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I78c2ab4e06d4854736edc66c5acb9ce4091bdd37 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474247 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474247" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/47/474247/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I907a8762f51ce4ed978fe4f8c9047c043e5cad63" commit="8fe8ed3127e288ec0c8fd295755fd36a7a457c5f" commit_message="Revert "FROMLIST: Bluetooth: btusb: Check for "ENABLED" instead of "DISABLED" in" This reverts commit 3e2d55e05ff40ba12b97ad68761f35589138a19d. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I907a8762f51ce4ed978fe4f8c9047c043e5cad63 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474248 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474248" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/48/474248/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Id03730463cc1eb39bc418726fea92ea7a78ada0f" commit="08b4215f1f5cbee28a438a09a3546a83f48c8e68" commit_message="Revert "FROMLIST: Bluetooth: btusb: Configure Marvell to use one of the pins for oob wakeup" This reverts commit 23a67d88afb92d55ec2d92b5ef404c5b0a07e8f1. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id03730463cc1eb39bc418726fea92ea7a78ada0f Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474249 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474249" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/49/474249/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I70c1259b5e2df68873b5a14fd462a38e41855c92" commit="cb1502bc7f37210846718dc2da59a5afd3655ae7" commit_message="Revert "FROMLIST: Bluetooth: btusb: Add out-of-band wakeup support" This reverts commit e340990473979c3c52f89a6bc89f2105a15e8c4e. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I70c1259b5e2df68873b5a14fd462a38e41855c92 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474250 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474250" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/50/474250/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I8edf03f09af408a1764fca0414fdcd0eed3926e4" commit="eb189b779f055c7c5e9d057455d5aeb4579e5c8c" commit_message="Revert "CHROMIUM: bluetooth: update advertising parameters for single advertisement" This reverts commit 7e28173e9785072936d2a95fa89e902c2b3833ef. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8edf03f09af408a1764fca0414fdcd0eed3926e4 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474251 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474251" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/51/474251/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I90c15abd1cd045e4fca38e462e9721e50751463f" commit="93e2f9bbe3e211c47634e080063e3544bf62fe19" commit_message="Revert "FROMLIST: Bluetooth: btusb: Use an error label for error paths" This reverts commit 2e5c960679c33a4abceef5dc433d9871729be047. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I90c15abd1cd045e4fca38e462e9721e50751463f Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474252 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474252" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/52/474252/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I41ca1ad6898fd20fe23908e25303e6f5615ecbf0" commit="04a397e44c46aae9bfacea94dfadc886af8b380c" commit_message="Revert "CHROMIUM: bluetooth: set advertising intervals after registering advertisements" This reverts commit 90f7f7d33e3e6b24c5759f1b08fc12590a77438f. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I41ca1ad6898fd20fe23908e25303e6f5615ecbf0 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474253 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474253" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/53/474253/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ie5b3ba11e0c45ede05f47559c3c482bc05162dde" commit="2f31eca47b2e107961d95aca8e69d5acebd99336" commit_message="Revert "CHROMIUM: bluetooth: adjust advertising duration based on max interval" This reverts commit 05a013c73de6f4f753813d906ece3b290534d569. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie5b3ba11e0c45ede05f47559c3c482bc05162dde Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474254 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474254" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/474254/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I102779af9a58b1a1ca72ee96e7dc430a7fe4a771" commit="d8bc77a78337233166ea15593db93abdce2b2bb8" commit_message="Revert "CHROMIUM: bluetooth: reset advertising intervals" This reverts commit 30792b81e96ab37890c3979b551b1aa82e48aa14. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I102779af9a58b1a1ca72ee96e7dc430a7fe4a771 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474255 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474255" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/55/474255/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I07dbe677874af5cdc845a778b2d2ccb9ea546620" commit="3e41ec6677489b303339f635496f49f8e798660b" commit_message="Revert "CHROMIUM: bluetooth: set advertising intervals" This reverts commit a109a3dd3840554975b5e65676021e40ba282a65. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I07dbe677874af5cdc845a778b2d2ccb9ea546620 Signed-off-by: Miao-chen Chou <mcchou@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/474256 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474256" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/56/474256/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I8a97787fed7dd2467ecf5d20db1c7c9cea11890b" commit="3ade4323af1d3b7d2a1bc2b1fd411b7a0553f15f" commit_message="UPSTREAM: Bluetooth: hci_bcm: move all Broadcom ACPI IDs to BCM HCI driver The IDs should all be for Broadcom BCM43241 module, and hci_bcm is now the proper driver for them. This removes one of two different ways of handling PM with the module. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8a97787fed7dd2467ecf5d20db1c7c9cea11890b Cc: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d3d20725407955d0bb107939f23535d2e7dadbee) Reviewed-on: https://chromium-review.googlesource.com/474257 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474257" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/57/474257/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ia0f58a16aa0ff08438923a69a5ae28bedc37ef39" commit="1814d697a9d566a03e36fb7cffd0be423b75447f" commit_message="UPSTREAM: Bluetooth: hci_bcm: new ACPI IDs These are used at least by Acer with BCM43241. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia0f58a16aa0ff08438923a69a5ae28bedc37ef39 Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit adbdeae5cece1d888a1542edfe9e1c6f8884fef8) Reviewed-on: https://chromium-review.googlesource.com/474258 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474258" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/58/474258/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I4fc5259de849da77b909ced16cedd97ba4c0d544" commit="a8df73753124810e952c28a8e4b4dc1fc1a73aff" commit_message="UPSTREAM: crypto: hash - Add helpers to zero stack request/descriptor As the size of an ahash_request or shash_desc is variable, it's awkward to zero them explicitly. This patch adds helpers to do that which should be used when they are created on the stack. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4fc5259de849da77b909ced16cedd97ba4c0d544 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e67ffe0af4d450e95e5f9bb7d081500e30777857) Reviewed-on: https://chromium-review.googlesource.com/474259 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474259" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/59/474259/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ie04a7420981cf22d26a6bfdf8f3fea35e5725a26" commit="bc1ccc8a9c8b808511c928418efae44bb31b2477" commit_message="UPSTREAM: crypto: skcipher - Add helper to zero stack request As the size of an skcipher_request is variable, it's awkward to zero it explicitly. This patch adds a helper to do that which should be used when it is created on the stack. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie04a7420981cf22d26a6bfdf8f3fea35e5725a26 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1aaa753d918c48c603195a468766e6a2b32b87f9) Reviewed-on: https://chromium-review.googlesource.com/474260 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474260" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/60/474260/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I67a74cece4c574c4f8c1bdef8c043486e8720fbb" commit="54edc1c2ae90fa510c7d95db1beb9c2f1eeab90a" commit_message="UPSTREAM: Bluetooth: Use skcipher and hash This patch replaces uses of blkcipher with skcipher and the long obsolete hash interface with shash. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I67a74cece4c574c4f8c1bdef8c043486e8720fbb Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 71af2f6bb22a4bf42663e10f1d8913d4967ed07f) Reviewed-on: https://chromium-review.googlesource.com/474261 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474261" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/61/474261/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ica4edcc27aae4cf123bfa4ab85264ec88eb1f566" commit="d0ab455c38221e0fa5c5fb5ab76ea19159100f17" commit_message="UPSTREAM: Bluetooth: ath3k: Fixed a blank line after declaration issue Fixed a coding style issue. Added a blank link after declaration. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ica4edcc27aae4cf123bfa4ab85264ec88eb1f566 Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d2ee9c2ec659cfab715568d2d9837f7ff67402fa) Reviewed-on: https://chromium-review.googlesource.com/474262 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474262" owner_email="mcchou@chromium.org" pass_count="0" patch_number="4" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/62/474262/4" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I6d64f22f03dbfe808a138e6a8eeccbd83061c011" commit="d0b23a3b385cb5b45d8447262e3509ea43be61d5" commit_message="UPSTREAM: leds: core: add managed version of led_trigger_register Complementing devm_led_classdev_register add a managed version of led_trigger_register. I omit a managed version of led_classdev_unregister as the equivalent devm_led_classdev_unregister isn't used in the kernel as of today. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I6d64f22f03dbfe808a138e6a8eeccbd83061c011 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9534cc31dda2bb129480ce2db92bf7bc1ef470ed) Reviewed-on: https://chromium-review.googlesource.com/476036 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="476036" owner_email="mcchou@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/36/476036/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="If991d20135cde4afbf6c976f70354232472a9a09" commit="1b6c43d81677c8b936ca8549bdd94dc45926507f" commit_message="UPSTREAM: Bluetooth: Use managed version of led_trigger_register in LED trigger Recently a managed version of led_trigger_register was introduced. Using devm_led_trigger_register allows to simplify the LED trigger code. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If991d20135cde4afbf6c976f70354232472a9a09 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b6e402fc84a76c0238b64de497920aeeaa495026) Reviewed-on: https://chromium-review.googlesource.com/474263 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="474263" owner_email="mcchou@chromium.org" 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/63/474263/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I656d291e1937ea1945027d1582e7cb9e4d328f4e" commit="b8d152761b204683b3d576fd3c45fda7e65b9f14" commit_message="UPSTREAM: Bluetooth: hci_intel: Fix a wrong comparison A return value of the intel_wait_booting() function compared with a constant ETIMEDOUT instead of -ETIMEDOUT. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I656d291e1937ea1945027d1582e7cb9e4d328f4e Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2be1149ed40812ab75bc1af67a68f5d09e8be762) Reviewed-on: https://chromium-review.googlesource.com/474264 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474264" owner_email="mcchou@chromium.org" 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/64/474264/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I353630a46beacbe53ed3d2a2ead81bd4a2a420ab" commit="d6978d6d06ea1a98abed4c052d9f56287fe628d6" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add new ACPI ID for bcm43241 This ACPI ID is used at least by HP for their Omni 10 5600eg tablet. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I353630a46beacbe53ed3d2a2ead81bd4a2a420ab Signed-off-by: J.J. Meijer <jjmeijer88@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b013a636b8571fa62b0fd3abeb2b36f0fc7199dd) Reviewed-on: https://chromium-review.googlesource.com/474265 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474265" owner_email="mcchou@chromium.org" 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/65/474265/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I7c3018fd86818a79ab6dae99a8f68752471f6905" commit="9cc18f5e31d35d2a0ddac197738d5fd1edd4c0ea" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E7C ACPI ID Recent macbooks (early 2015) with BCM43241 use this ACPI ID. Add it to the list of supported devices. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I7c3018fd86818a79ab6dae99a8f68752471f6905 Reported-by: Leif Liddy <leif.liddy@gmail.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2791b44d6b4a2280568e0dc84be51992b7b367f1) Reviewed-on: https://chromium-review.googlesource.com/474266 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474266" owner_email="mcchou@chromium.org" 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/66/474266/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ia62e096b17a6af3e6b67d380dad0c36d7f756092" commit="68deb7261820c3e3e030f751dde999d34db53a44" commit_message="UPSTREAM: Bluetooth: btbcm: Fix handling of firmware not found If the call to request_firmware() fails in btbcm_setup_patchram(), the BCM chip will be operating with its default firmware. In this case, btbcm_setup_patchram() should not return immediately but instead should skip to btbcm_check_bdaddr() and quirk setup. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ia62e096b17a6af3e6b67d380dad0c36d7f756092 Signed-off-by: Petri Gynther <pgynther@google.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit ad750fa142747f3f42b66ae051a0f275bd2035df) Reviewed-on: https://chromium-review.googlesource.com/474267 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474267" owner_email="mcchou@chromium.org" 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/67/474267/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Id9b90ecd3349204a92db2803c2349fef653dc3d4" commit="522d91e770ce032e5bca8d5f8e59095ef890ba89" commit_message="UPSTREAM: Bluetooth: hci_uart: Add diag and address support for Intel/AG6xx The AG6xx devices behave similar to Wilkens Peak and Stone Peak and with that it is needed to check for Intel default address. In addition it is possible to enable vendor events and diag support. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id9b90ecd3349204a92db2803c2349fef653dc3d4 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 34bf1912bfc06bd9200893916078eb0f16480a95) Reviewed-on: https://chromium-review.googlesource.com/474268 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474268" owner_email="mcchou@chromium.org" 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/68/474268/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="If5c0d26f27845fddaa40176934b5392e5e09d9a4" commit="21026830b2f9fbcc02bec28b610d48022f85f15d" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E55 ACPI ID used in Lenovo ThinkPad Tablet 8 Lenovo ThinkPad Tablet 8 with BCM43241 rev B5 chipset uses the BCM2E55 ACPI ID for Bluetooth. Add it to the list of supported devices. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: If5c0d26f27845fddaa40176934b5392e5e09d9a4 Signed-off-by: Jrme de Bretagne <jerome.debretagne@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit c5fd9cbb9dc40e0d273d6731030e65096adceeda) Reviewed-on: https://chromium-review.googlesource.com/474269 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474269" owner_email="mcchou@chromium.org" 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/69/474269/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I3851a48a814f73b77bfb9624b5491ca0c89b1871" commit="6e750ecd8301e9018bceacd0ffb53d0f3344f943" commit_message="UPSTREAM: Bluetooth: Move memset closer to where it's needed Minor fix to not do the memset until the variable it clears is actually used. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I3851a48a814f73b77bfb9624b5491ca0c89b1871 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit eec7a01dc8366f7e43fc0417f4aee70eaeaca9a9) Reviewed-on: https://chromium-review.googlesource.com/474270 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474270" owner_email="mcchou@chromium.org" 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/70/474270/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Iedf72d7253b921d90aa64f0d9a5d6e4cc797490c" commit="75826954c3c9e85e43d1bc3947fe30768bb0879b" commit_message="UPSTREAM: Bluetooth: Fix adding discoverable to adv instance flags When lookup up the advertising instance flags for the default advertising instance (0) the discoverable flag should be filled in based on the HCI_DISCOVERABLE flag. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iedf72d7253b921d90aa64f0d9a5d6e4cc797490c Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit d43efbd0d545f476be0bbef30cbe18234f8a9631) Reviewed-on: https://chromium-review.googlesource.com/474271 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474271" owner_email="mcchou@chromium.org" 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/71/474271/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I1b130586336f0bff1c47f603081e6d23a52b8f0b" commit="eeedc884cfee022031122a3d209a827047d896ae" commit_message="UPSTREAM: Bluetooth: Add support for limited privacy mode Introduce a limited privacy mode indicated by value 0x02 to the mgmt Set Privacy command. With value 0x02 the kernel will use privacy mode with a resolvable private address. In case the controller is bondable and discoverable the identity address will be used. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I1b130586336f0bff1c47f603081e6d23a52b8f0b Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 82a37adeedd38880940e2772ec1ae27a09353e5a) Reviewed-on: https://chromium-review.googlesource.com/474272 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474272" owner_email="mcchou@chromium.org" 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/72/474272/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I93fb565fb9bd3a6089bab1519aa7bc70d7ed5765" commit="6663a4a78202c4b26f1be2135c8df64238bcf8be" commit_message="UPSTREAM: Bluetooth: Increment management interface revision Increment the mgmt revision due to the recently added limited privacy mode. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I93fb565fb9bd3a6089bab1519aa7bc70d7ed5765 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 9c176cec42e4b0deeed901fc363bf4235c5ca96a) Reviewed-on: https://chromium-review.googlesource.com/474273 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474273" owner_email="mcchou@chromium.org" 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/73/474273/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I031ae1ef1b324fa0da65aaf8d9171e40da17c363" commit="69310bee964cdcb3dce02c0b85563b19d5d0a12e" commit_message="UPSTREAM: Bluetooth: Fix setting correct flags in AD A recent change added MGMT_ADV_FLAG_DISCOV to the flags returned by get_adv_instance_flags(), however failed to take into account limited discoverable mode. This patch fixes the issue by setting the correct discoverability flag in the AD data. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I031ae1ef1b324fa0da65aaf8d9171e40da17c363 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 6a19cc8c892b113fb84947207346f783de76dbd1) Reviewed-on: https://chromium-review.googlesource.com/474274 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474274" owner_email="mcchou@chromium.org" 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/74/474274/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I51d1669b086ffaae56b2c98b429414fabb796bfb" commit="b5555c3e9c0d8a1b1683151012e87c810dfa9e1c" commit_message="UPSTREAM: Bluetooth: Fix setting NO_BREDR advertising flag If we're dealing with a single-mode controller or BR/EDR is disable for a dual-mode one, the NO_BREDR flag needs to be unconditionally present in the advertising data. This patch moves it out from behind an extra condition to be always set in the create_instance_adv_data() function if BR/EDR is disabled. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I51d1669b086ffaae56b2c98b429414fabb796bfb Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit f18ba58f538e44a701ad0b86d47bb57b917d7c0a) Reviewed-on: https://chromium-review.googlesource.com/474275 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474275" owner_email="mcchou@chromium.org" 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/75/474275/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I95dfae1af7def73820935301a794fd2fc6fd08b3" commit="deff22d6d662497c6620623416468bddf9bd4221" commit_message="UPSTREAM: Bluetooth: Ignore unknown advertising packet types In case of buggy controllers send advertising packet types that we don't know of we should simply ignore them instead of trying to react to them in some (potentially wrong) way. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I95dfae1af7def73820935301a794fd2fc6fd08b3 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 56b40fbf61a247e23b50e426971148b2e50262e0) Reviewed-on: https://chromium-review.googlesource.com/474276 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474276" owner_email="mcchou@chromium.org" 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/76/474276/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I73793a0bca204f6410bdb120818823c7859248ce" commit="4444392f796aa72baf239da0886b02b88de9a599" commit_message="UPSTREAM: Bluetooth: hci_bcm: Add BCM2E71 ACPI ID This ID is used at least by Asus T100-CHI. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I73793a0bca204f6410bdb120818823c7859248ce Signed-off-by: Loic Poulain <loic.poulain@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1dbfc59a931495b2e7bdc4e85886162a0b03235b) Reviewed-on: https://chromium-review.googlesource.com/474277 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474277" owner_email="mcchou@chromium.org" 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/77/474277/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Id52ff2245a872323973d1b793a08aef4054be593" commit="d31154c0627d3f00fe6c61951001fbbce794f804" commit_message="UPSTREAM: Bluetooth: Allow setting BT_SECURITY_FIPS with setsockopt Update the security level check to allow setting BT_SECURITY_FIPS for an L2CAP socket. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Id52ff2245a872323973d1b793a08aef4054be593 Signed-off-by: Patrik Flykt <patrik.flykt@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a164cee111085f9ee77f6038f006658249073523) Reviewed-on: https://chromium-review.googlesource.com/474278 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474278" owner_email="mcchou@chromium.org" 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/78/474278/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I06877daa7062d33cef91bbe6fc0da69f45435ef9" commit="405cbc7223f712aefa650e8815156491cfaf3ef3" commit_message="UPSTREAM: Bluetooth: hci_bcsp: fix code style This commit fixed: trailing "*/" trailing spaces mixed indent space between ~ and ( BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I06877daa7062d33cef91bbe6fc0da69f45435ef9 Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 8805eea2494a2837983bc4aaaf6842c89666ec25) Reviewed-on: https://chromium-review.googlesource.com/474279 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474279" owner_email="mcchou@chromium.org" 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/79/474279/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I0c2d4238de831059d8f9f0673dce838938adb03a" commit="7854142bd93fc6b608911cf95dc5026914bf3591" commit_message="UPSTREAM: net: introduce lockdep_is_held and update various places to use it The socket is either locked if we hold the slock spin_lock for lock_sock_fast and unlock_sock_fast or we own the lock (sk_lock.owned != 0). Check for this and at the same time improve that the current thread/cpu is really holding the lock. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I0c2d4238de831059d8f9f0673dce838938adb03a Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 1e1d04e678cf72442f57ce82803c7a407769135f) Reviewed-on: https://chromium-review.googlesource.com/476037 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="476037" owner_email="mcchou@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/37/476037/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I5ad94e3f122b3f87a8eae731f9b3be1a6b04625e" commit="3e9d60a5f5b0f92503541be56d32443ada7cf7b5" commit_message="UPSTREAM: sock: make lockdep_sock_is_held static inline I forgot to add inline to lockdep_sock_is_held, so it generated all kinds of build warnings if not build with lockdep support. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5ad94e3f122b3f87a8eae731f9b3be1a6b04625e Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 03be98226c14d787939381b9f42d81764ea8eedc) Reviewed-on: https://chromium-review.googlesource.com/476038 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="476038" owner_email="mcchou@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/38/476038/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ie3f31ba1b705b74ae3fb0f8b43e671285532748e" commit="b77d5c182144f907341c6949924e89430708e1e5" commit_message="UPSTREAM: net: Fix build failure due to lockdep_sock_is_held(). Needs to be protected with CONFIG_LOCKDEP. Based upon a patch by Hannes Frederic Sowa. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ie3f31ba1b705b74ae3fb0f8b43e671285532748e Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b33b0a1bf69faff89693df49519fa7b459f5d807) Reviewed-on: https://chromium-review.googlesource.com/476039 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="476039" owner_email="mcchou@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/39/476039/3" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I7b8ef5ffab3877e50f0c12ffdb5ddd97918a3286" commit="f1943ecce8ef237bc14a2feae75a7dbf787c94ba" commit_message="UPSTREAM: sock: tigthen lockdep checks for sock_owned_by_user sock_owned_by_user should not be used without socket lock held. It seems to be a common practice to check .owned before lock reclassification, so provide a little help to abstract this check away. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I7b8ef5ffab3877e50f0c12ffdb5ddd97918a3286 Cc: linux-cifs@vger.kernel.org Cc: linux-bluetooth@vger.kernel.org Cc: linux-nfs@vger.kernel.org Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit fafc4e1ea1a4c1eb13a30c9426fb799f5efacbc3) Reviewed-on: https://chromium-review.googlesource.com/474280 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Dmitry Grinberg <dmitrygr@google.com> " fail_count="1" gerrit_number="474280" owner_email="mcchou@chromium.org" 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/80/474280/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I5a385800f8f2dc56a6cbae3393f571b490cf1b8c" commit="83d03d99b99d387ac3225dfe3ac0fdfaaf587970" commit_message="UPSTREAM: Bluetooth: ath3k: Silence uninitialized variable warning We could print an uninitialized value in the error message. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I5a385800f8f2dc56a6cbae3393f571b490cf1b8c Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit e9fc71649b5361b8ac608898342c8904167cb63d) Reviewed-on: https://chromium-review.googlesource.com/474281 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474281" owner_email="mcchou@chromium.org" 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/81/474281/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I4ed72b4d35eac68080a235af17e032bdf355fec3" commit="176a5aa0a51dc91d4e6182e9e9ee4c3bc9c75ca1" commit_message="UPSTREAM: Bluetooth: Add defines for SPI and I2C Extend the set of possible HCI bus types with SPI and I2C. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I4ed72b4d35eac68080a235af17e032bdf355fec3 Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 5c0e03cd9f10d541b69b667a2b1b8980f196f432) Reviewed-on: https://chromium-review.googlesource.com/474282 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474282" owner_email="mcchou@chromium.org" 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/82/474282/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Iecf7eaafd8c5d60aa28872fbf04b7024088c3fb6" commit="2edd2d03fe066994acfe9951ba199da0f1b84fb8" commit_message="UPSTREAM: Bluetooth: fix power_on vs close race With all the latest fixes applied, I am still able to reproduce this (and other) warning(s): WARNING: CPU: 1 PID: 19684 at ../kernel/workqueue.c:4092 destroy_workqueue+0x70a/0x770() ... Call Trace: [<ffffffff819fee81>] ? dump_stack+0xb3/0x112 [<ffffffff8117377e>] ? warn_slowpath_common+0xde/0x140 [<ffffffff811ce68a>] ? destroy_workqueue+0x70a/0x770 [<ffffffff811739ae>] ? warn_slowpath_null+0x2e/0x40 [<ffffffff811ce68a>] ? destroy_workqueue+0x70a/0x770 [<ffffffffa0c944c9>] ? hci_unregister_dev+0x2a9/0x720 [bluetooth] [<ffffffffa0b301db>] ? vhci_release+0x7b/0xf0 [hci_vhci] [<ffffffffa0b30160>] ? vhci_flush+0x50/0x50 [hci_vhci] [<ffffffff8117cd73>] ? do_exit+0x863/0x2b90 This is due to race present in the hci_unregister_dev path. hdev->power_on work races with hci_dev_do_close. One tries to open, the other tries to close, leading to warning like the above. (Another example is a warning in kobject_get or kobject_put depending on who wins the race.) Fix this by switching those two racers to ensure hdev->power_on never triggers while hci_dev_do_close is in progress. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Iecf7eaafd8c5d60aa28872fbf04b7024088c3fb6 Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit bf389cabb3b8079c23f9762e62b05f291e2d5e99) Reviewed-on: https://chromium-review.googlesource.com/474283 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474283" owner_email="mcchou@chromium.org" 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/83/474283/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I82dd7856449ca98d73d98fdf944f7deca6b28b9b" commit="a62a202c0b54fd8185cc586ab4559642b80d9cf2" commit_message="UPSTREAM: Bluetooth: Add USB ID 13D3:3487 to ath3k Add hw id to ath3k usb device list and btusb blacklist T: Bus=01 Lev=01 Prnt=01 Port=08 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3487 Rev=00.02 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb Requires these firmwares: ar3k/AthrBT_0x11020100.dfu and ar3k/ramps_0x11020100_40.dfu Firmwares are available in linux-firmware. Device found in a laptop ASUS model N552VW. It's an Atheros AR9462 chip. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I82dd7856449ca98d73d98fdf944f7deca6b28b9b Signed-off-by: Lauro Costa <lauro@polilinux.com.br> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 72f9f8b58bc743e6b6abdc68f60db98486c3ffcf) Reviewed-on: https://chromium-review.googlesource.com/474284 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474284" owner_email="mcchou@chromium.org" 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/84/474284/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ibd343dc504482d96c33c3c718d6f344728bb6968" commit="25155a43fe9b433354a18fed3b94fcdc0a2af5f1" commit_message="UPSTREAM: Bluetooth: Switch SMP to crypto_cipher_encrypt_one() SMP does ECB crypto on stack buffers. This is complicated and fragile, and it will not work if the stack is virtually allocated. Switch to the crypto_cipher interface, which is simpler and safer. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ibd343dc504482d96c33c3c718d6f344728bb6968 Signed-off-by: Andy Lutomirski <luto@kernel.org> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Tested-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit a4770e1117f193c3e27f5f046cd4f8e2470f3b70) Reviewed-on: https://chromium-review.googlesource.com/474285 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474285" owner_email="mcchou@chromium.org" 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/85/474285/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I21db1b4cdb030348996049416aa2818cd14b2e54" commit="ea808036aad8472a065b598458506138ddddea0b" commit_message="UPSTREAM: Bluetooth: Add support for Intel Bluetooth device 3168 [8087:0aa7] This patch adds support for Intel Bluetooth device 3168 also known as Sandy Peak (SdP). T: Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 2.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=8087 ProdID=0aa7 Rev= 0.01 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I21db1b4cdb030348996049416aa2818cd14b2e54 Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 439e65d3998c0b9501638cc0c2190e936c0caaf2) Reviewed-on: https://chromium-review.googlesource.com/474286 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474286" owner_email="mcchou@chromium.org" 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/86/474286/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I1339881cb7eb87111881c4fff8cd808e873dcb92" commit="dfaf0584a5a7585f271beb7706e58efa5f81aa1e" commit_message="UPSTREAM: Bluetooth: Fix bt_sock_recvmsg return value If recvmsg is called with a destination buffer that is too small to receive the contents of skb in its entirety, the return value from recvmsg was inconsistent with common SOCK_SEQPACKET or SOCK_DGRAM semantics. If destination buffer provided by userspace is too small (e.g. len < copied), then MSG_TRUNC flag is set and copied is returned. Instead, it should return the length of the message, which is consistent with how other datagram based sockets act. Quoting 'man recv': "All three calls return the length of the message on successful comple tion. If a message is too long to fit in the supplied buffer, excess bytes may be discarded depending on the type of socket the message is received from." and "MSG_TRUNC (since Linux 2.2) For raw (AF_PACKET), Internet datagram (since Linux 2.4.27/2.6.8), netlink (since Linux 2.6.22), and UNIX datagram (since Linux 3.4) sockets: return the real length of the packet or datagram, even when it was longer than the passed buffer." BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I1339881cb7eb87111881c4fff8cd808e873dcb92 Signed-off-by: Denis Kenzior <denkenz@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit b5f34f9420b50c9b5876b9a2b68e96be6d629054) Reviewed-on: https://chromium-review.googlesource.com/474287 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474287" owner_email="mcchou@chromium.org" 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/87/474287/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I938c8f9c6cea34420eb86ae21f1d1e4111467c87" commit="6abf57b41f3b653c59a0e3036c62e279f11d80cb" commit_message="UPSTREAM: Bluetooth: Fix hci_sock_recvmsg return value If recvmsg is called with a destination buffer that is too small to receive the contents of skb in its entirety, the return value from recvmsg was inconsistent with common SOCK_SEQPACKET or SOCK_DGRAM semantics. If destination buffer provided by userspace is too small (e.g. len < copied), then MSG_TRUNC flag is set and copied is returned. Instead, it should return the length of the message, which is consistent with how other datagram based sockets act. Quoting 'man recv': "All three calls return the length of the message on successful comple tion. If a message is too long to fit in the supplied buffer, excess bytes may be discarded depending on the type of socket the message is received from." and "MSG_TRUNC (since Linux 2.2) For raw (AF_PACKET), Internet datagram (since Linux 2.4.27/2.6.8), netlink (since Linux 2.6.22), and UNIX datagram (since Linux 3.4) sockets: return the real length of the packet or datagram, even when it was longer than the passed buffer." BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I938c8f9c6cea34420eb86ae21f1d1e4111467c87 Signed-off-by: Denis Kenzior <denkenz@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 83871f8ccdfa8f3edab15d432aa4f3eb82953343) Reviewed-on: https://chromium-review.googlesource.com/474288 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474288" owner_email="mcchou@chromium.org" 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/88/474288/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I2e6191c18fc28abe9564f4d0df3a64ec683a3275" commit="a496294f90e844424f43242b82c8ba9a8accf221" commit_message="UPSTREAM: Bluetooth: Replace constant hw_variant from Intel Bluetooth firmware filename The format of Intel Bluetooth firmware filename for bootloader product is ibt-<hw_variant>-<device_revision_id>.sfi Currently the driver uses a constant value 11 (0x0b) for hw_variant to support LnP/SfP product. But new product like WsP product has a different value such as 12 (0x0c). To support the multiple products, this patch replaces the constant value of hw_variant to the actual hw_variant value read from the device. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I2e6191c18fc28abe9564f4d0df3a64ec683a3275 Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 230b04ac8f439d0797ab85fb356f069f0472306f) Reviewed-on: https://chromium-review.googlesource.com/474289 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474289" owner_email="mcchou@chromium.org" 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/89/474289/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ibca2267c2eb12fd970d3fdd6cd7324e2166f41e6" commit="f4004d541c8702215f665f2f127f609b384bb4f1" commit_message="UPSTREAM: Bluetooth: btusb: add support for device 0489:e092 With current btusb.ko kernel module, Bluetooth pretends to be active but there is no real activity. I'm using an Acer Aspire VN7-791. Output of lsusb: Bus 003 Device 007: ID 0489:e092 Foxconn / Hon Hai On my laptop, this device is actually used as a combo with wifi chipset Atheros Qualcomm Killer N1525 Wireless-AC [168c:003e], * Fix by adding a declaration in kernel sources drivers/bluetooth/btusb.c { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME }, * Compiled extra module /lib/modules/4.4.0-22-generic/extra/btusb.ko * Successfully tested against my phone (obex file transfer) BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: Ibca2267c2eb12fd970d3fdd6cd7324e2166f41e6 Signed-off-by: Yvain THONNART <yvain.thonnart@m4x.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 47ca5898eb09bc49666958f2ea7e0ea5b4add0f5) Reviewed-on: https://chromium-review.googlesource.com/474290 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474290" owner_email="mcchou@chromium.org" 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/90/474290/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I8ee21639e68070e9ed7b9c962d7ce80f325b0987" commit="97cf3f44604f049cb90fff2ac5fefee5e631b446" commit_message="UPSTREAM: Bluetooth: Remove connection link attributes The connection link attributes are not used and expose no valuable information. BUG=chromium:704196 TEST=Deploy v5.44 BlueZ system daemon with v4.9 BlueZ kernel on Kevin and perform automated tests (suite:bluetooth) and manual tests against mouses, keyboards and headphones. Change-Id: I8ee21639e68070e9ed7b9c962d7ce80f325b0987 Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Miao-chen Chou <mcchou@chromium.org> (cherry picked from commit 2a0be139868cae2465f9ed5b599203fa4f8e06ca) Reviewed-on: https://chromium-review.googlesource.com/474291 Tested-by: Shyh-In Hwang <josephsih@chromium.org> Reviewed-by: Shyh-In Hwang <josephsih@chromium.org> " fail_count="1" gerrit_number="474291" owner_email="mcchou@chromium.org" 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/91/474291/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I7f6b5adc602a5ba43dfaed152df1ba2a7301223c" commit="e1a880dbd6bbc8cf8aeea956cd33bb956444473d" commit_message="UPSTREAM: locking/mutex: Allow next waiter lockless wakeup Make use of wake-queues and enable the wakeup to occur after releasing the wait_lock. This is similar to what we do with rtmutex top waiter, slightly shortening the critical region and allow other waiters to acquire the wait_lock sooner. In low contention cases it can also help the recently woken waiter to find the wait_lock available (fastpath) when it continues execution. Reviewed-by: Waiman Long <Waiman.Long@hpe.com> Signed-off-by: Davidlohr Bueso <dbueso@suse.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Ding Tianhong <dingtianhong@huawei.com> Cc: Jason Low <jason.low2@hp.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Paul E. McKenney <paulmck@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tim Chen <tim.c.chen@linux.intel.com> Cc: Waiman Long <waiman.long@hpe.com> Cc: Will Deacon <Will.Deacon@arm.com> Link: http://lkml.kernel.org/r/20160125022343.GA3322@linux-uzut.site Signed-off-by: Ingo Molnar <mingo@kernel.org> (cherry picked from commit 1329ce6fbbe4536592dfcfc8d64d61bfeb598fe6) BUG=b:35862219 TEST=build and boot Change-Id: I7f6b5adc602a5ba43dfaed152df1ba2a7301223c Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-on: https://chromium-review.googlesource.com/485399 Reviewed-by: Derek Basehore <dbasehore@chromium.org> " fail_count="0" gerrit_number="485399" owner_email="jeffy.chen@rock-chips.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/99/485399/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I61579a0f64cdd27c0692684c2cf53db257e21694" commit="f2fac656ab1e27befb7f0935c3e2dd7659867084" commit_message="UPSTREAM: locking/mutex: Set and clear owner using WRITE_ONCE() The mutex owner can get read and written to locklessly. Use WRITE_ONCE when setting and clearing the owner field in order to avoid optimizations such as store tearing. This avoids situations where the owner field gets written to with multiple stores and another thread could concurrently read and use a partially written owner value. Signed-off-by: Jason Low <jason.low2@hpe.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Davidlohr Bueso <dave@stgolabs.net> Acked-by: Waiman Long <Waiman.Long@hpe.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Scott J Norton <scott.norton@hpe.com> Cc: Terry Rudd <terry.rudd@hpe.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1463782776.2479.9.camel@j-VirtualBox Signed-off-by: Ingo Molnar <mingo@kernel.org> (cherry picked from commit 6e2814745c67ab422b86262b05e6f23a56f28aa3) BUG=b:35862219 TEST=build and boot Change-Id: I61579a0f64cdd27c0692684c2cf53db257e21694 Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-on: https://chromium-review.googlesource.com/485400 Reviewed-by: Derek Basehore <dbasehore@chromium.org> " fail_count="0" gerrit_number="485400" owner_email="jeffy.chen@rock-chips.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/00/485400/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Iecf6bea8bd0d78f2a8a04e6d95fa3b8f2fee92fd" commit="4aa8d4a49eb6c95a7b5a03785668ee2b60b1e143" commit_message="UPSTREAM: locking: avoid passing around 'thread_info' in mutex debugging code None of the code actually wants a thread_info, it all wants a task_struct, and it's just converting back and forth between the two ("ti->task" to get the task_struct from the thread_info, and "task_thread_info(task)" to go the other way). No semantic change. Acked-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> (cherry picked from commit 6720a305df74ca30bcc10fc316881641b6ff0c80) BUG=b:35862219 TEST=build and boot Change-Id: Iecf6bea8bd0d78f2a8a04e6d95fa3b8f2fee92fd Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-on: https://chromium-review.googlesource.com/485401 Reviewed-by: Derek Basehore <dbasehore@chromium.org> " fail_count="0" gerrit_number="485401" owner_email="jeffy.chen@rock-chips.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/485401/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="I483e340f83ebcbb61a9828b32ea9d7ab57f79f33" commit="c44dea4a3db9dea96d86cd94e56f01d49ea88e90" commit_message="CHROMIUM: config: x86_64: Add cros_ec_accel_legacy driver Add support for accelerometer for Glimmer. BUG=chromium:709642 TEST=Check sensor values with script: DIR=/sys/bus/iio/devices/ for i in 0 1 ; do cat $DIR/iio:device$i/location for j in x y z; do echo -n $j: ; cat $DIR/iio:device$i/in_accel_${j}_raw done done Change-Id: I483e340f83ebcbb61a9828b32ea9d7ab57f79f33 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/483964 Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="483964" owner_email="gwendal@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/64/483964/3" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-4.4" change_id="Ic5fceddce9499585ed513614c660b6f4810ec4a8" commit="91de740f158db6cfcb0a961adfb029b829da9884" commit_message="CHROMIUM: config: renormalize splitconfigs Run chromeos/scripts/kernelconfig oldconfig and accept the defaults. BUG=None TEST=Compile Change-Id: Ic5fceddce9499585ed513614c660b6f4810ec4a8 Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/483980 Reviewed-by: Dmitry Torokhov <dtor@chromium.org> " fail_count="0" gerrit_number="483980" owner_email="gwendal@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/80/483980/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Icc6a2ac84c2906e8d92e038842525817880fd48b" commit="6328828d6e4fd188eceffcf9d95658e42dd5bcb6" commit_message="security_RootfsStatefulSymlinks: move /etc/resolv.conf to /run Since /var/run is a symlink to /run, and we want to avoid going through the stateful /var whenever possible, use the direct path. BUG=chromium:699880 TEST=precq passes CQ-DEPEND=CL:481200 Change-Id: Icc6a2ac84c2906e8d92e038842525817880fd48b Reviewed-on: https://chromium-review.googlesource.com/481201 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="5" gerrit_number="481201" owner_email="vapier@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/01/481201/1" remote="cros" total_fail_count="5"/><pending_commit branch="master" change_id="I4bf2d463be9a715f4e05dbd3a69de7b5732ff887" commit="ef0b6d1715f8e735ad0d80a0e3de2eedfc2b8cc5" commit_message="shill: move /etc/resolv.conf to /run Since /var/run is a symlink to /run, and we want to avoid going through the stateful /var whenever possible, use the direct path. BUG=chromium:699880 TEST=precq passes CQ-DEPEND=CL:481201 Change-Id: I4bf2d463be9a715f4e05dbd3a69de7b5732ff887 Reviewed-on: https://chromium-review.googlesource.com/481200 Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Ben Chan <benchan@chromium.org> " fail_count="7" gerrit_number="481200" owner_email="vapier@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/00/481200/2" remote="cros" total_fail_count="7"/><pending_commit branch="master" change_id="Ice12072a2406dfe52b294168a37c5ce347a9ff5d" commit="60efb3659facee24746a116a667a3f7f6ba80206" commit_message="imageloader: read container key from PEM file This will be stored on the rootfs as a PEM file. We need to read it and then convert it to DER format so the crypto verifier can use it. BUG=chromium:697645 TEST=load a component signed with the container key Change-Id: Ice12072a2406dfe52b294168a37c5ce347a9ff5d Reviewed-on: https://chromium-review.googlesource.com/457803 Commit-Ready: Eric Caruso <ejcaruso@chromium.org> Tested-by: Eric Caruso <ejcaruso@chromium.org> Reviewed-by: Greg Kerr <kerrnel@chromium.org> " fail_count="0" gerrit_number="457803" owner_email="ejcaruso@chromium.org" pass_count="0" patch_number="7" project="chromiumos/platform/imageloader" project_url="https://chromium-review.googlesource.com/chromiumos/platform/imageloader" ref="refs/changes/03/457803/7" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I79640a1da3e972485a09145bd8843e0498c06355" commit="818c46387179f1a393bbf4c78eba2458f951932a" commit_message="copy .clang-format from chromium repo BUG=None TEST=Set in vim: """ if $CROS_WORKON_SRCROOT != "" map <leader>cf :pyfile /usr/share/clang/clang-format.py<CR> else map <leader>cf :pyfile <path to chromium checkout>/src/buildtools/clang_format/script/clang-format.py<CR> endif """ and make sure auto-formatting works in vim. Change-Id: I79640a1da3e972485a09145bd8843e0498c06355 Reviewed-on: https://chromium-review.googlesource.com/465886 Commit-Ready: Ricky Liang <jcliang@chromium.org> Tested-by: Ricky Liang <jcliang@chromium.org> Reviewed-by: Wu-cheng Li <wuchengli@chromium.org> " fail_count="5" gerrit_number="465886" owner_email="jcliang@chromium.org" pass_count="0" patch_number="2" project="chromiumos/platform/arc-camera" project_url="https://chromium-review.googlesource.com/chromiumos/platform/arc-camera" ref="refs/changes/86/465886/2" remote="cros" total_fail_count="17"/><pending_commit branch="master" change_id="Ib9d1ef0b80d79543db7cea1c9e5561ad02021482" commit="36aad99c8f12f3dd7b7e0f3b08f3a834961046e7" commit_message="midis: Add client tracking boiler plate Just creates a client object, but doesn't do anything with it (yet). BUG=chromium:701005 TEST=cros_run_unit_tests --board veyron_minnie --packages "midis" Change-Id: Ib9d1ef0b80d79543db7cea1c9e5561ad02021482 Reviewed-on: https://chromium-review.googlesource.com/483045 Commit-Ready: Prashant Malani <pmalani@google.com> Tested-by: Prashant Malani <pmalani@google.com> Reviewed-by: Chirantan Ekbote <chirantan@chromium.org> " fail_count="0" gerrit_number="483045" owner_email="pmalani@google.com" pass_count="0" patch_number="11" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/45/483045/11" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ib1c13957f975047d37c4ccbc6d07242b412f4186" commit="e751e6aef0349bd89c44d372b3a29f545d3bd4b6" commit_message="Fix summarize_build_stats start date calculation. When run with an end date plus "past-day", "past-week", or "past-month", the summarize_build_stats script would always include one extra day in the results report. This fixes the script to search the expected number of days. BUG=None TEST=run the script, compare included builds against expectations Change-Id: Ib1c13957f975047d37c4ccbc6d07242b412f4186 Reviewed-on: https://chromium-review.googlesource.com/484650 Commit-Ready: Richard Barnette <jrbarnette@chromium.org> Tested-by: Richard Barnette <jrbarnette@chromium.org> Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org> Reviewed-by: Paul Hobbs <phobbs@google.com> Reviewed-by: Xixuan Wu <xixuan@chromium.org> Reviewed-by: Ningning Xia <nxia@chromium.org> " fail_count="1" gerrit_number="484650" owner_email="jrbarnette@chromium.org" pass_count="0" patch_number="1" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/50/484650/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I56047cf3bd4eaa48346c51d08f7441378e251f6b" commit="87c2c002dc7f9835da4155878c168c17dcbfcf00" commit_message="Add "tail_until_writer_finished" script Copied a script from chromiumos/src/platform/dev which is useful for tailing log files which will be rotated. This is necessary for the apache_error_stats script. BUG=chromium:712388 TEST=Tests pass, and are properly skipped if "inotifywait" is missing. Change-Id: I56047cf3bd4eaa48346c51d08f7441378e251f6b Reviewed-on: https://chromium-review.googlesource.com/486122 Commit-Ready: Paul Hobbs <phobbs@google.com> Tested-by: Paul Hobbs <phobbs@google.com> Reviewed-by: Shuqian Zhao <shuqianz@chromium.org> " fail_count="1" gerrit_number="486122" owner_email="phobbs@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/22/486122/2" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Iaa99b92d1f6b2d68a0f1f468dada7d4f0f588fe5" commit="b0e2ec4a2ca1a073e26dfc60c1ccd3806a842beb" commit_message="CHROMIUM: arm64: dts: mt8176-rowan: Do not configure mfg_async-supply Mediatek MT8173 Generic Power Domains are handled by Mediatek "scpsys" driver. This driver allows specifying a single regulator per domain, via device tree, that will be enabled when powering on the domain and disabled on domain disable. On MT8173 the GPU is powered by three dependent power domains, "mfg", "mfg_2d" and "mfg_async". The "outer" "mfg_async" domain was assigned the GPU GPU regulator which, for rowan, is the VBUCKB supply of the da9211 PMIC. On the chromeos-3.18 kernel, this worked well. However, chromeos-4.4 implements genpd system pm states differently. In particular, 4.4 now allows devices to temporarily enable/disable runtime pm for devices during suspend/resume transition handlers. To support this, genpds now disables genpds very late during system suspend during pm_genpd_suspend_noirq, and re-enables them on resume during pm_genpd_resume_noirq. This means that it must be able to enable a genpd atomically (without irqs). Unfortunately, this means that we cannot rely on the scpsys driver to re-enable a i2c connected da9211 regulator when enabling the gpu genpd during resume, since MT8173 i2c communication requires interrupts. This would result in a failure like this in the console (since "is_enabled() requires actually talking to the regulator to see if it has its enabled register bit set): [ 576.500754] calling 13000000.mfgsys-gpu+ @ 3071, parent: soc, cb: pm_genpd_resume_noirq [ 578.508666] VBUCKB: is_enabled() failed: -110 [ 578.513026] call 13000000.mfgsys-gpu+ returned 0 after 1957240 usecs Since this automatic regulator enable fails during resume, the genpd loses track of whether it has enabled the domain or not resulting in the following spew a bit later when genpd tries to runtime pm disable the domain: [ 581.185646] unbalanced disables for VBUCKB [ 581.189923] ------------[ cut here ]------------ [ 581.194503] WARNING: at /mnt/host/source/src/third_party/kernel/v4.4/drivers/regulator/core.c:2225 [ 581.203389] Modules linked in: rfcomm uinput uvcvideo videobuf2_vmalloc mwifiex_sdio mwifiex btmrvl_sdio btmrvl i2c_dev ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat bluetooth xt_mark bridge stp fuse llc zram cfg80211 smsc95xx ip6table_filter cdc_ether usbnet r8152 mii joydev [ 581.229814] [ 581.231295] CPU: 4 PID: 2552 Comm: kworker/4:2 Not tainted 4.4.52 #117 [ 581.237768] Hardware name: Mediatek Rowan board (DT) [ 581.242700] Workqueue: pm genpd_power_off_work_fn ... [ 582.313211] ---[ end trace bc5322c75e61de2c ]--- [ 582.317789] Call trace: [ 582.320219] [<ffffffc00052169c>] _regulator_disable+0x3c/0x124 [ 582.326007] [<ffffffc0005217c8>] regulator_disable+0x44/0x74 [ 582.331624] [<ffffffc00051bad0>] scpsys_power_off+0x17c/0x1ac [ 582.337326] [<ffffffc00051bbc4>] scpsys_mfg_power_off+0x38/0x48 [ 582.343200] [<ffffffc00060efc4>] genpd_power_off+0x6c/0xc0 [ 582.348642] [<ffffffc00060fef0>] genpd_poweroff+0x100/0x158 [ 582.354171] [<ffffffc00060ff7c>] genpd_power_off_work_fn+0x34/0x48 [ 582.360305] [<ffffffc0002390fc>] process_one_work+0x26c/0x420 [ 582.366007] [<ffffffc00023a010>] worker_thread+0x2fc/0x424 [ 582.371449] [<ffffffc00023f360>] kthread+0x10c/0x114 [ 582.376376] [<ffffffc000203dd0>] ret_from_fork+0x10/0x40 It turns out, that the img-rogue GPU driver is ALREADY enabling/disabling this same regulator as part of its own enable/disable sequence (see mtk_mfg_enable / mtk_mfg_disable). Thus, the scpsys initiated regulator operations were actually redundant and can be safely eliminated by removing the mfg_async-supply field from rowan's scpsys dt node. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> BUG=b:37651946 TEST=On rowan: powerd_dbus_suspend --wakeup_timeout=10 => resume takes < 2 seconds, and no WARNING in _regulator_disable Change-Id: Iaa99b92d1f6b2d68a0f1f468dada7d4f0f588fe5 Reviewed-on: https://chromium-review.googlesource.com/486621 Commit-Ready: Daniel Kurtz <djkurtz@chromium.org> Tested-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Nicolas Boichat <drinkcat@chromium.org> " fail_count="1" gerrit_number="486621" owner_email="djkurtz@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/486621/1" remote="cros" total_fail_count="1"/><pending_commit branch="master" change_id="I5fc42348fdf4864843d0b8ccc7e427046005c97c" commit="c12dcf1290837168c778d87c707f5f9102b1f784" commit_message="Refactor shopfloor_server.py. Rewrite the logic for signal handling, so that the RPC server run in another thread, and the main thread is only used to handle interrupt signal. This solves many flakyness and deadlock issue for shopfloor_unittest. BUG=chromium:665306 TEST=make test Change-Id: I5fc42348fdf4864843d0b8ccc7e427046005c97c Reviewed-on: https://chromium-review.googlesource.com/469533 Commit-Ready: Pi-Hsun Shih <pihsun@chromium.org> Tested-by: Pi-Hsun Shih <pihsun@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org> " fail_count="0" gerrit_number="469533" owner_email="pihsun@chromium.org" pass_count="0" patch_number="11" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/33/469533/11" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ic5c55f7be9be195182e4c4f4ad64b7426afd42db" commit="60058c43f04012dec198debdc7ea2b8828090def" commit_message="npcx: peci: Fixed bug caused by wrong source clock of peci. On npcx5, the peci speed should be 750K bps but we got 1.5M bps since selecting wrong source clock of peci. From the peci specification, the speed range is from 2K bps to 2M bps. That's why we still passed the peci test on npcx5's evb. This CL corrects the source clock of it from apb2 to fmclk and make sure the speed is 750K bps by the scope. BRANCH=none BUG=none TEST=Passed peci test on npcx5's evb and make sure the speed of peci is 750K bps. Change-Id: Ic5c55f7be9be195182e4c4f4ad64b7426afd42db Signed-off-by: Mulin Chao <mlchao@nuvoton.com> Reviewed-on: https://chromium-review.googlesource.com/486680 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> " fail_count="0" gerrit_number="486680" owner_email="mlchao@nuvoton.com" pass_count="0" patch_number="1" project="chromiumos/platform/ec" project_url="https://chromium-review.googlesource.com/chromiumos/platform/ec" ref="refs/changes/80/486680/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ibf3d40255bead8f23f33fa93d671074ce4ea8b1d" commit="03468a3d4f6729a0a6feb4c2d18481934fb98c77" commit_message="biod: biod_client_tool bug fix Previous biod_client_tool experiences segfault when fake_biometric_tool sends a scan_done signal. This is fixed by disabling copy and assign for BiometricsManagerProxy. BUG=chromium:629657 TEST=biod_client_tool and fake_biometric_tool Change-Id: Ibf3d40255bead8f23f33fa93d671074ce4ea8b1d Reviewed-on: https://chromium-review.googlesource.com/469157 Commit-Ready: Mengqi Guo <mqg@chromium.org> Tested-by: Mengqi Guo <mqg@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> " fail_count="0" gerrit_number="469157" owner_email="mqg@chromium.org" pass_count="0" patch_number="11" project="chromiumos/platform2" project_url="https://chromium-review.googlesource.com/chromiumos/platform2" ref="refs/changes/57/469157/11" remote="cros" total_fail_count="4"/><pending_commit branch="master" change_id="Ifb39d6282388810a3ea97068728d4543c960c1a3" commit="4c7e30a0c1aa939149b066d7e6f9207e32f22464" commit_message="cros-firmware: Drop use of old firmware script Now that we have the Python replacement we can drop the shell script. BUG=chromium:708772 TEST=emerge-reef chromeos-firmware-reef Change-Id: Ifb39d6282388810a3ea97068728d4543c960c1a3 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/486134 Reviewed-by: Hung-Te Lin <hungte@chromium.org> " fail_count="0" gerrit_number="486134" owner_email="sjg@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/34/486134/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I1c937c9cafb7c6638727c39b8d5aa7d37a5c1c71" commit="b5ba6f693aaa7ebee80b5dc543a3f00be3d6e4ef" commit_message="chromeos_config_unittest: Require test image for hwqual. The ArchiveHWQual step requires a test image. Add a unit test that disallows enabling 'hwqual' unless a test image is being built. This change also fixes the firmware builder configs to pass the new unit test. BUG=chromium:710079 TEST=Ran test. Change-Id: I1c937c9cafb7c6638727c39b8d5aa7d37a5c1c71 Reviewed-on: https://chromium-review.googlesource.com/481228 Commit-Ready: Richard Barnette <jrbarnette@chromium.org> Tested-by: Richard Barnette <jrbarnette@chromium.org> Reviewed-by: Don Garrett <dgarrett@chromium.org> " fail_count="0" gerrit_number="481228" owner_email="dgarrett@chromium.org" pass_count="0" patch_number="2" project="chromiumos/chromite" project_url="https://chromium-review.googlesource.com/chromiumos/chromite" ref="refs/changes/28/481228/2" remote="cros" total_fail_count="0"/><lkgm version="9495.0.0-rc2"/></manifest> |
