| <?xml version="1.0" encoding="utf-8"?><manifest revision="267a0935f202464987ffa427cb204381b6d1ef2c"> |
| <notice>Your sources have been sync'd successfully.</notice> |
| <remote alias="cros" fetch="https://chromium.googlesource.com/" name="chromium"/> |
| <remote fetch="https://chromium.googlesource.com" name="cros" review="https://chromium-review.googlesource.com"/> |
| <default remote="cros" revision="refs/heads/master" sync-j="8"/> |
| <project name="aosp/platform/external/dbus-binding-generator" path="src/aosp/external/dbus-binding-generator" revision="bce0483dd09f592d6f9f989f0e34fc930d206810" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libbrillo" path="src/aosp/external/libbrillo" revision="16c285d16813172eaacd12d3396df90a3894cbc5" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/libchrome" path="src/aosp/external/libchrome" revision="4ba5a9a6b07148b0b812ed34f8cdfe3a738a4dd4" upstream="refs/heads/master"/> |
| <project name="aosp/platform/external/minijail" path="src/aosp/external/minijail" revision="7a569073b95af7532892dc726c2f33cd40edfb57" 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="b606f03ee5a4d7a5f5f78cc980a447f08d94f9df" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/connectivity/shill" path="src/aosp/system/connectivity/shill" revision="ccc0d430d68a8aba8c7cf29052d4cc091360171b" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/firewalld" path="src/aosp/system/firewalld" revision="90c4a0d3a66a84270aa8a8b4d46a97e6172074e9" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/tpm" path="src/aosp/system/tpm" revision="fb18ddc14b013ec8a46dea102df699d680b8fa05" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/update_engine" path="src/aosp/system/update_engine" revision="696faf4dffebca4d15959251cf3fb88b0727d801" upstream="refs/heads/master"/> |
| <project name="aosp/platform/system/webservd" path="src/aosp/system/webservd" revision="b470b41a117a213f5b8cf2d7badcc208da001b72" upstream="refs/heads/master"/> |
| <project name="chromium/deps/libmtp" path="chromium/src/third_party/libmtp" revision="0680a2d0c4cec58f8163fe115de80cff8852fd8b" upstream="refs/heads/master"/> |
| <project name="chromium/src/third_party/hwcplus" revision="e66a31e54e12906e86dc59f95b458889f025c505" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromium/tools/depot_tools" revision="9d20675998f69ae543c3ebed4bcc14f748f3797e"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/chromite" path="chromite" revision="5b4d2470839b24c2d53687c4080c0fb2f3113012" upstream="refs/heads/master"> |
| <copyfile dest="AUTHORS" src="AUTHORS"/> |
| <copyfile dest="LICENSE" src="LICENSE"/> |
| </project> |
| <project name="chromiumos/manifest" path="manifest" revision="49ef9671d35ef92f1e2f0eea163ef17a4e167f12" upstream="refs/heads/master"/> |
| <project groups="minilayout" name="chromiumos/overlays/board-overlays" path="src/overlays" revision="75fbf09e52c83b53b3b4a5b844bb021a9e753be7" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/chromiumos-overlay" path="src/third_party/chromiumos-overlay" revision="2803bd3e98d609c547fa7ddfaa278b8822e3f1e2" sync-c="true" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/eclass-overlay" path="src/third_party/eclass-overlay" revision="161edc9f4dddd54a867ae6ce521a32971ba48f30" upstream="refs/heads/master"/> |
| <project groups="minilayout,labtools" name="chromiumos/overlays/portage-stable" path="src/third_party/portage-stable" revision="1957d62c74d0bec1dc5ae27cc6af229c2024a953" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/assets" path="src/platform/assets" revision="5fc15dee29d1d967ccc46071a732d802d3b34655" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/audiotest" path="src/platform/audiotest" revision="5af2f5ec27b9a119038406571ca23f3e435335a8" 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="563ac6b7db7e742045b02ed29cc5ecc81ff58531" 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="58f2af01e5fd082e1579787a38f4e12dcab1b319" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/chromiumos-assets" path="src/platform/chromiumos-assets" revision="05ce8d3c59a2d8e765b3beb2e1a69e7fcf59e5ba" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/crostestutils" path="src/platform/crostestutils" revision="aeae673cc06d857bf34b35a5a81f07ad8ec877d2" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/platform/crosutils" path="src/scripts" revision="f46176e35875cdb0f35f1cc586484e3ac81e41e6" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/depthcharge" path="src/platform/depthcharge" revision="c241485bc7e3f2554d58a58018f51d967cc18a45" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="chromiumos/platform/dev-util" path="src/platform/dev" revision="dcf798af9f626b22f6fe06b42de1758619a09475" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/dm-verity" path="src/platform/verity" revision="c4df284b32558f631862f79c75fc03af4f5ca68a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/drm-tests" path="src/platform/drm-tests" revision="fa0547a876bf0e1ac3740ea2a9cf8c7999acb87f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/ec" path="src/platform/ec" revision="8c65294108db43a3717c5afa3017058c826f27b5" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory" path="src/platform/factory" revision="f8656219198593385e2e0060abf685b24f482547" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/factory_installer" path="src/platform/factory_installer" revision="312f06df6f921915f15f976f936eea335c51b236" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/firmware" path="src/platform/firmware" revision="70f79da7a3bd18c942fa65a6b21fea589bbb5516" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/frecon" path="src/platform/frecon" revision="607e4dcf6dbc983272bee14f8e8c1300d6a1eecd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/gestures" path="src/platform/gestures" revision="9d27a36fdd3727d7fdebe96fd24013bc601a58df" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/glbench/images" path="src/platform2/glbench/images" revision="5fd5ce655833f65d46b1950bec4eedeb4e96959b" 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="67d5567177301d0c24303f26ad119ab7bd7fab40" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/imageloader" path="src/platform/imageloader" revision="d5eb65afd5f9da10a3fa86f65d357a817221717e" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/initramfs" path="src/platform/initramfs" revision="1a710721263b8b93ab49af6a6f749a778483f3df" 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="5ee665e7c68856d3b6ce8bb0f610d43503e603af" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/libevdev" path="src/platform/libevdev" revision="61f882f395b9f39478d7164209e7134cccdcb72b" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/memento_softwareupdate" path="src/platform/memento_softwareupdate" revision="3c7204287bbc8f4341f546857216389bdff58e51" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/microbenchmark" path="src/platform/microbenchmark" revision="d5ea30febe406c5b486325dfae926564f3a46efd" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/minigbm" path="src/platform/minigbm" revision="f9e7c4c8e91fb354abf714c7a5c89b4990814ff3" 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="d9df0a566bf16c8146a0b4b0c0e9025b7960d489" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/mtpd" path="src/platform/mtpd" revision="44148fe605b952132644f0d0e5ccea7cfcc6d6c8" 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="9efd0e1723cd45709bd0d34e8e7bbfd15967f0d5" 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="11d79edeefbdb56771022de0f266251ff227fa4a" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_firmware_test" path="src/platform/touch_firmware_test" revision="b0885609127d3790a11cf3240837ad8323c89e13" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_noise_filter" path="src/platform/touch_noise_filter" revision="6b0aba12a385f4d3a7a47641a3a919018032f6f8" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/touch_updater" path="src/platform/touch_updater" revision="59f9479d0d46e408cb9a6c1be1046b1a76d02d13" 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/trunks" path="src/platform/trunks" revision="92dbe8c9e7fcf8acf67805fd5e25e85aa371f673" 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" path="src/platform/vboot" revision="2d30a2f5b1c81eb61de4bf82180a910d45f22e81" upstream="refs/heads/master"/> |
| <project groups="buildtools" name="chromiumos/platform/vboot_reference" path="src/platform/vboot_reference" revision="7fbebd98be355d18455aabac40b127ecff4cd7ab" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/vpd" path="src/platform/vpd" revision="3e4cf4867fff44491b4f4c294eee9c77b92d4440" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/webplot" path="src/platform/webplot" revision="bbd5ea22ef9f8e109e363b26958d9a2fc8921f0f" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/wireless_automation" path="src/platform/wireless_automation" revision="d7177dbd464f2952e10309bf1eef56bb31a7f8ad" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform/workarounds" path="src/platform/workarounds" revision="76475bb60c7fa2c2522c27e2c63c9dbbe5de73d7" 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="141199fa101370af0aed16a44f7122fea43f7c30" upstream="refs/heads/master"/> |
| <project name="chromiumos/platform2" path="src/platform2" revision="6b5559a40c459742d1dcb0e410bace774f0178c2" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools,labtools" name="chromiumos/repohooks" path="src/repohooks" revision="fdbac8e95ef6153ab23370ea1586a86f462dbe5f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/adhd" path="src/third_party/adhd" revision="28348f8ce8bca72ebb8bc4f363338bb7b87a2258" 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="a7e530331d7cf4b58618f0715e61b5a872176f07"> |
| <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 groups="buildtools,labtools" name="chromiumos/third_party/autotest" path="src/third_party/autotest/files" revision="e7a59b16565c10d95da589bb1b9224e2f98c997b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/bluez" path="src/third_party/bluez" revision="66a047f35c6940fb32bddc349cb75e209640cb38" upstream="refs/heads/chromeos-5.39"/> |
| <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="06238cd25d6bf58e3128732332656ef4aee00f06" 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="5319e836704fcf2df75c7425addebb89bb973714" 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="3182aa85c087446e4358370549adc45db21ec124" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-cplusplus" path="src/third_party/dbus-c++" revision="f140c0aa430e1db1c0f31d23d3eb2397d47f209e" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/dbus-spy" path="src/third_party/dbus-spy" revision="0e04421c73b24536de7fcc1886da469d8b7a2a41" 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="aaaf66654dba797f152066df4d1dc4144b492c66" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/flashrom" path="src/third_party/flashrom" revision="b389abba71d6e26a94b205ba045b93894a6b3397" 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="69702c400e274984a24d08fcaefe3952d5dcb36e" 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="9071ed919092ba2d5fcae84a4b3b3c3de4b4049f" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hostap" path="src/third_party/wpa_supplicant" revision="3439f52e7ec7a5d6d422e6298ba02831042f6575" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/hwcplus-drm" path="src/third_party/hwcplus-drm" revision="7376a8da1c961115a61d7a3cb23bb13e4153583d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ibus-chewing" path="src/third_party/ibus-chewing/files" revision="7a9514a0844eb5eb90ab96f62484a6af9e4a0d6d" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ibus-xkb-layouts" path="src/third_party/ibus-xkb-layouts/files" revision="6af015110aa92dc2eed88a9f704634c3eff53b14" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.8" revision="3b0fb2814b1b99c7aafd9f45b8db916700b544b1" upstream="refs/heads/chromeos-3.8"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.10" revision="952003fed099ee14c194f0492b3a97f07256fbe4" upstream="refs/heads/chromeos-3.10"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.14" revision="525b3ce15bf3faa584ee57cdcecc6d59d51fc003" upstream="refs/heads/chromeos-3.14"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v3.18" revision="cf323b3985af7c6f2fa7758c6a3927598d122040" upstream="refs/heads/chromeos-3.18"/> |
| <project name="chromiumos/third_party/kernel" path="src/third_party/kernel/v4.4" revision="462ebd82820287e9290b2e9d7ffaca51ebe07bc0" upstream="refs/heads/chromeos-4.4"/> |
| <project name="chromiumos/third_party/khronos" path="src/third_party/khronos" revision="dceee6ef99b968fd11d9c6058448202db835bc0f" 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="2c25afb719347a151657f8637ad62a5df42e247e" upstream="refs/heads/chromeos-2.4.66"/> |
| <project name="chromiumos/third_party/libmbim" path="src/third_party/libmbim" revision="c4e2949edeed01ca3b810729a7af0d265c49629b" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/libqmi" path="src/third_party/libqmi" revision="a436c551cf226af66cdb3dd74ee3971d0b1dae04" 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="61eb2eceaed6f66a36aa9fc3ed2bd55b8aa3eafe" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/linux-firmware" path="src/third_party/linux-firmware" revision="097976b1cb170cd100200cf58618870e849de3da" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/ltp" path="src/third_party/ltp" revision="7fea30a4ad5b7b4e99865afcee8b6bfd19ec8b03" upstream="refs/heads/chromeos-20150119"/> |
| <project name="chromiumos/third_party/marvell" path="src/third_party/marvell" revision="db05d126a42a1540a503a2e5b49c3746c03df77d" 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="b2b27d09c1d7f694a37a80f7b04e4f79df557b1f" upstream="refs/heads/arc-11.3.0-pre1"/> |
| <project name="chromiumos/third_party/mesa" path="src/third_party/mesa" revision="6ef50efc1079e544d7fe912aba219e8907cb0cbd" 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/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="d759387adb6b4079241f7d1f2a145738acad929b" upstream="refs/heads/master"/> |
| <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/rootdev" path="src/third_party/rootdev" revision="5d7d7ff513315abd103d0c95e92ae646c1a7688c" 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/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="0c4b13bf15b8e5773b79e6317121fba5e97a154f" 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="716a46a8f2e9516bd9ac64674a5811374f446792" upstream="refs/heads/master"/> |
| <project name="chromiumos/third_party/trousers" path="src/third_party/trousers" revision="416d30f74a9c1dc08b95b907d8b7e81edf6c9db0" 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="chromiumos/third_party/xf86-video-armsoc" path="src/third_party/xf86-video-armsoc" revision="30370e9dbf7ba0e457ee7de297d2ad6c269a00be" upstream="refs/heads/master"/> |
| <project groups="minilayout,buildtools" name="external/swarming.client" path="chromite/third_party/swarming.client" revision="715861067a7cc8d20d2d629b6d76d796c004feb4"/> |
| <project name="linux-syscall-support" path="src/third_party/breakpad/src/third_party/lss" revision="9292030109847793f7a6689adac1ddafb412fe14"/> |
| <repo-hooks enabled-list="pre-upload" in-project="chromiumos/repohooks"/> |
| <pending_commit branch="chromeos-4.4" change_id="I133d55c11c3ad8cb7c2b5cfb2295f52aa0c599a7" commit="071926228a4e4d7c13bb98c3fca2cfecc933b074" commit_message="UPSTREAM: tpm: drop 'base' from struct tpm_vendor_specific Dropped the field 'base' from struct tpm_vendor_specific and migrated it to the private structures of tpm_atmel and tpm_nsc. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> (cherry picked from commit edc77a0230f17d7938d99cd18fd5f6326f489399 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I133d55c11c3ad8cb7c2b5cfb2295f52aa0c599a7 Reviewed-on: https://chromium-review.googlesource.com/354861 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354861" owner_email="apronin@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/61/354861/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I41b8f0a15d6ff2e3ae2b611988bdd4d49e5bf972" commit="e2a4b2304960f89067da1368656236ac4d874dec" commit_message="UPSTREAM: tpm: drop the field 'time_expired' from struct tpm_chip Removed the field because it is not used for anything. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> (cherry picked from commit b48562ccf65c579c1af05948d54a004f33d117e4 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I41b8f0a15d6ff2e3ae2b611988bdd4d49e5bf972 Reviewed-on: https://chromium-review.googlesource.com/354862 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354862" owner_email="apronin@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/62/354862/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I9bc7b8bde7fa5637fae0d3ce06781a1d96549bd5" commit="1519bebe5f87e369ef4a9d21b6e8d3311056765c" commit_message="UPSTREAM: tpm: drop list from struct tpm_vendor_specific Dropped list from struct tpm_vendor_specific as it is not used in any place. It is initialized in tpm_i2c_infineon but not used at all in the code. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit a6b0860dae4e92a465eabdaa20e6f5bce9fe1be1 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I9bc7b8bde7fa5637fae0d3ce06781a1d96549bd5 Reviewed-on: https://chromium-review.googlesource.com/354863 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354863" owner_email="apronin@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/354863/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I1318b52765f19c5ab823c56f3386b25b1302394e" commit="81992f8f65c10e54dab832d7a6d0da8de955ba52" commit_message="UPSTREAM: tpm: drop 'iobase' from struct tpm_vendor_specific Dropped the field 'iobase' from struct tpm_vendor_specific and migrated it to the private structures of tpm_atmel and tpm_tis. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 4490e3838279203514765b28b83ead25e5450369 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I1318b52765f19c5ab823c56f3386b25b1302394e Reviewed-on: https://chromium-review.googlesource.com/354864 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354864" owner_email="apronin@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/354864/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I3995979e744769ec91976605e32ae85ba1f0b176" commit="d2132ba4b49419a817ab2b30213ddf6f7b25952d" commit_message="UPSTREAM: tpm: drop 'irq' from struct tpm_vendor_specific Dropped the field 'irq' from struct tpm_vendor_specific and make it available to the various private structures in the drivers using irqs. A dedicated flag TPM_CHIP_FLAG_IRQ is added for the upper layers. In st33zp24, struct st33zp24_dev declaration is moved to st33zp24.h in order to make accessible irq from other phy's(i2c, spi). In tpm_i2c_nuvoton, chip->vendor.priv is not directly allocated. We can access irq field from priv_data in a cleaner way. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit d18c5741388203daaac5db3c2b025cef49dd2172 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I3995979e744769ec91976605e32ae85ba1f0b176 Reviewed-on: https://chromium-review.googlesource.com/354865 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354865" owner_email="apronin@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/354865/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I277c86507623013861f6441272519f105019d9c0" commit="d41803777b0ab0304038379465f3a8eee3021d10" commit_message="UPSTREAM: tpm: drop 'read_queue' from struct tpm_vendor_specific Dropped the field 'read_queue' from struct tpm_vendor_specific and make it available to the various private structures in the drivers. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 756b2bb2e858ad69842a045679492f3200cb06f5 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I277c86507623013861f6441272519f105019d9c0 Reviewed-on: https://chromium-review.googlesource.com/354866 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354866" owner_email="apronin@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/354866/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Ic0310e51aae3aa589e88ea541f0470a56854d6b0" commit="28a6a9d1cb868b4fac82cfd1da90746da9dcc501" commit_message="UPSTREAM: tpm: drop 'locality' from struct tpm_vendor_specific Dropped the field 'locality' from struct tpm_vendor_specific migrated it to the private structures of st33zp24, tpm_i2c_infineon and tpm_tis. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit de44b209f0094d9e217e300aa2dcb1a7d314ad0d git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: Ic0310e51aae3aa589e88ea541f0470a56854d6b0 Reviewed-on: https://chromium-review.googlesource.com/354867 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354867" owner_email="apronin@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/354867/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Id4755b289f9457a6d146ef799904f5ff303f214c" commit="bf5eedca79457a51b38043f8696ac7c344b141a2" commit_message="UPSTREAM: tpm: Move tpm_vendor_specific data related with PTP specification to tpm_chip Move tpm_vendor_specific data related to TCG PTP specification to tpm_chip. Move all fields directly linked with well known TCG concepts and used in TPM drivers (tpm_i2c_atmel, tpm_i2c_infineon, tpm_i2c_nuvoton, tpm_tis and xen-tpmfront) as well as in TPM core files (tpm-sysfs, tpm-interface and tpm2-cmd) in tpm_chip. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit c7586a4b0d3959ddc9ac923a38488111d4c527cc git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Conflicts: [apronin: merge with CL 316576: minor output string change] drivers/char/tpm/tpm-interface.c Change-Id: Id4755b289f9457a6d146ef799904f5ff303f214c Reviewed-on: https://chromium-review.googlesource.com/354868 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354868" owner_email="apronin@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/354868/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I66466a3a7d37d23ddb115300df1b87d864d9e865" commit="07768305b4df5ab337d1ad1988d67bbfe70d6bce" commit_message="UPSTREAM: tpm: Remove useless priv field in struct tpm_vendor_specific Remove useless priv field in struct tpm_vendor_specific and take benefit of chip->dev.driver_data. As priv is the latest field available in struct tpm_vendor_specific, remove any reference to that structure. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 28157164b05623b7574c2c659da715f86939952c git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I66466a3a7d37d23ddb115300df1b87d864d9e865 Reviewed-on: https://chromium-review.googlesource.com/354869 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354869" owner_email="apronin@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/354869/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I9aed5346ef837073fe8e7bdff7e31252bfe9fdbe" commit="7b002143dcfb60e6c3165701e2a8bc28996befb2" commit_message="UPSTREAM: tpm: Remove all uses of drvdata from the TPM Core The final thing preventing this was the way the sysfs files were attached to the pdev. Follow the approach developed for ppi and move the sysfs files to the chip->dev with symlinks from the pdev for compatibility. Everything in the core now sanely uses container_of to get the chip. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit e89f8b1ade9cc1a8ea2bd581b06f34ca939e36ee git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Conflicts: [apronin: merge with CL 316574: adjacent tpm_shutdown_notify] drivers/char/tpm/tpm-chip.c Change-Id: I9aed5346ef837073fe8e7bdff7e31252bfe9fdbe Reviewed-on: https://chromium-review.googlesource.com/354870 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354870" owner_email="apronin@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/354870/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I4176023a35274e9fe05c2c71c9c7730557207265" commit="b890684bbd04a24a18c6f626728b53a6daf1954f" commit_message="UPSTREAM: tpm: Introduce TPM_CHIP_FLAG_VIRTUAL Introduce TPM_CHIP_FLAG_VIRTUAL to be used when the chip device has no parent device. Prevent sysfs entries requiring a parent device from being created. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 26a0889905415b15fd69711f1bbcd159db466199 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I4176023a35274e9fe05c2c71c9c7730557207265 Reviewed-on: https://chromium-review.googlesource.com/354871 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354871" owner_email="apronin@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/354871/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="If515e8b029c6094cba58d8d0aae36bdbb714e1d4" commit="d5668b38032bc5e8f5ce41af539803f974e515e5" commit_message="UPSTREAM: tpm: Proxy driver for supporting multiple emulated TPMs This patch implements a proxy driver for supporting multiple emulated TPMs in a system. The driver implements a device /dev/vtpmx that is used to created a client device pair /dev/tpmX (e.g., /dev/tpm10) and a server side that is accessed using a file descriptor returned by an ioctl. The device /dev/tpmX is the usual TPM device created by the core TPM driver. Applications or kernel subsystems can send TPM commands to it and the corresponding server-side file descriptor receives these commands and delivers them to an emulated TPM. The driver retrievs the TPM 1.2 durations and timeouts. Since this requires the startup of the TPM, we send a startup for TPM 1.2 as well as TPM 2. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> CC: linux-kernel@vger.kernel.org CC: linux-doc@vger.kernel.org CC: linux-api@vger.kernel.org Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 794c38e013581d81944580618b8e2f7517eb4e95 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: If515e8b029c6094cba58d8d0aae36bdbb714e1d4 Reviewed-on: https://chromium-review.googlesource.com/354872 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354872" owner_email="apronin@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/354872/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I55c278937d585316ac628dbb13364d597f12a962" commit="bbef9bfa2a659b3d1d50c5f1f22e5805be72aaf6" commit_message="UPSTREAM: tpm: Fix IRQ unwind ordering in TIS The devm for the IRQ was placed on the chip, not the pdev. This can cause the irq to be still callable after the pdev has been cleaned up (eg priv kfree'd). Found by CONFIG_DEBUG_SHIRQ=y BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Reported-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Fixes: 233a065e0cd0 ("tpm: Get rid of chip->pdev") Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit c5f074b23a79ee5fb6cb9bb44e5bfb18fcac4cb6 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I55c278937d585316ac628dbb13364d597f12a962 Reviewed-on: https://chromium-review.googlesource.com/354873 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354873" owner_email="apronin@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/354873/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I145e59bff3131e4804c8b6ae0886937bdd7d9d70" commit="b6d38669226ae60442e9ec4cf75c4e2fd851a4b4" commit_message="UPSTREAM: tpm: select ANON_INODES for proxy driver The newly added vtpmx driver fails to build if CONFIG_ANON_INODES is disabled: drivers/char/built-in.o: In function `vtpmx_fops_ioctl': (.text+0x97f8): undefined reference to `anon_inode_getfile' This adds a Kconfig 'select' statement to ensure it's always there when we need it. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 794c38e01358 ("tpm: Proxy driver for supporting multiple emulated TPMs") Acked-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Acked-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 54745cb483392f9b94eb07e6cba05b07ea78dfcc git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I145e59bff3131e4804c8b6ae0886937bdd7d9d70 Reviewed-on: https://chromium-review.googlesource.com/354874 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354874" owner_email="apronin@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/354874/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I1dd72fe9709025710a4d5cfdee3ab8b22515b353" commit="67904398ee3dd0edecd7dfe5851b8c3bd3566d88" commit_message="UPSTREAM: tpm: fix for typo in tpm/tpm_ibmvtpm.c BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 1191ef66391354586e545550d3f02fef52428831 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I1dd72fe9709025710a4d5cfdee3ab8b22515b353 Reviewed-on: https://chromium-review.googlesource.com/354875 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354875" owner_email="apronin@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/354875/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Idbc3d87e3e18c70c06995a91ad79606e30f7a22d" commit="7f19d302cd538d18acfaeff4545423430fad6c30" commit_message="UPSTREAM: tpm: Fix suspend regression Fix the suspend regression due to the wrong way of retrieving the chip structure. The suspend functions are attached to the hardware device, not the chip and thus must rely on drvdata. BUG=chrome-os-partner:54590 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Fixes: e89f8b1ade9cc1a ("tpm: Remove all uses of drvdata from the TPM Core") Reported-by: Jeremiah Mahler <jmmahler@gmail.com> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Tested-by: Jeremiah Mahler <jmmahler@gmail.com> Acked-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkine@linux.intel.com> (cherry picked from commit e8f2f45a4402deb715220b750d892f7a70b0f868 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: Idbc3d87e3e18c70c06995a91ad79606e30f7a22d Reviewed-on: https://chromium-review.googlesource.com/354876 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354876" owner_email="apronin@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/354876/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="I790d87b26ddbce36f00f8f923d75b47377e20643" commit="b68dda816ce24b20ce382d756922fbd5f2c7d39a" commit_message="UPSTREAM: tpm: Add include guards in tpm.h Add missing include guards in tpm.h BUG=chrome-os-partner:54601 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Peter Huewe <peter.huewe@infineon.com> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 57eb1d220202b31b892fd07d3f7d71ee54f0a948 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I790d87b26ddbce36f00f8f923d75b47377e20643 Reviewed-on: https://chromium-review.googlesource.com/354877 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="0" gerrit_number="354877" owner_email="apronin@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/354877/5" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Id829cb6ca23394165ea576ae186b6c08437bfad7" commit="1d8732f95503a756e1ba365fa676f86b988b89c1" commit_message="UPSTREAM: tpm: tpm_tis: Share common data between phys Split priv_data structure in common and phy specific structures. This will allow in future patches to reuse the same tis logic on top of new phy such as spi and i2c. Ultimately, other drivers may reuse this tis logic. (e.g: st33zp24...) iobase field is specific to TPM addressed on 0xFED4xxxx on LPC/SPI bus. This commit is based on the initial work by Peter Huewe. BUG=chrome-os-partner:54601 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit 5622a58a5cee39326435adaf0ec9d6865f377381 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: Id829cb6ca23394165ea576ae186b6c08437bfad7 Reviewed-on: https://chromium-review.googlesource.com/354878 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="354878" owner_email="apronin@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/354878/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I4fc7e8c36edecc6ae8408ad049a8018b6c426768" commit="ed6994020e394b716b37a3d1eb43a19fe5eb1e5f" commit_message="UPSTREAM: tpm_tis: Introduce intermediate layer for TPM access This splits tpm_tis in a high-level protocol part and a low-level interface for the actual TPM communication. The low-level interface can then be implemented by additional drivers to provide access to TPMs using other mechanisms, for example native I2C or SPI transfers, while still reusing the same TIS protocol implementation. Though the ioread/iowrite calls cannot fail, other implementations of this interface might want to return error codes if their communication fails. This follows the usual pattern of negative values representing errors and zero representing success. Positive values are not used (yet). Errors are passed back to the caller if possible. If the interface of a function does not allow that, it tries to do the most sensible thing it can, but this might also mean ignoring the error in this instance. This commit is based on the initial work by Peter Huewe. BUG=chrome-os-partner:54601 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit c42142164dacd587a2f2c1335a0c7ac6a207af38 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Conflicts: [apronin: merge with CL 316574: output string change] drivers/char/tpm/tpm_tis.c Change-Id: I4fc7e8c36edecc6ae8408ad049a8018b6c426768 Reviewed-on: https://chromium-review.googlesource.com/354879 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="354879" owner_email="apronin@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/354879/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Ic3b6efedf83d7c37c8a699e4ebe0ec53dc69ca75" commit="441155f5b994c5d157cbafd9ad14104440127bac" commit_message="UPSTREAM: tpm/tpm_tis: Split tpm_tis driver into a core and TCG TIS compliant phy To avoid code duplication between the old tpm_tis and the new and future native tcg tis driver(ie: spi, i2c...), the tpm_tis driver was reworked, so that all common logic is extracted and can be reused from all drivers. The core methods can also be used from other TIS like drivers. itpm workaround is now managed with a specific tis flag TPM_TIS_ITPM_POSSIBLE. This commit is based on the initial work by Peter Huewe. BUG=chrome-os-partner:54601 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Peter Huewe <peter.huewe@infineon.com> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit cb234d31963cc0244ac471efbe25b26d894ae51a git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Conflicts: [apronin: merge with CLs 316573, 316574: vendor_timeout_overrides for STMicro, gentle shutdown in dev_info string] drivers/char/tpm/tpm_tis.c Change-Id: Ic3b6efedf83d7c37c8a699e4ebe0ec53dc69ca75 Reviewed-on: https://chromium-review.googlesource.com/354880 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="354880" owner_email="apronin@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/354880/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I28b18898dbbdb8467fcb5a1b11b13929820f274f" commit="edc8d4826129a4bf695343b2398fd851c2ea4b9f" commit_message="UPSTREAM: tpm/tpm_tis_spi: Add support for spi phy Spi protocol standardized by the TCG is now supported by most of TPM vendors. It supports SPI Bit Protocol as describe in the TCG PTP specification (chapter 6.4.6 SPI Bit Protocol). Irq mode is not supported. This commit is based on the initial work by Peter Huewe. BUG=chrome-os-partner:54601 TEST=Build and boot on kevin, verify that /dev/tpm0 is present. Signed-off-by: Peter Huewe <peter.huewe@infineon.com> Signed-off-by: Alexander Steffen <Alexander.Steffen@infineon.com> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (cherry picked from commit a1093bad748f43ab5755f363c41a2b2bc5465604 git://git.infradead.org/users/jjs/linux-tpmdd.git master) Signed-off-by: Andrey Pronin <apronin@chromium.org> Change-Id: I28b18898dbbdb8467fcb5a1b11b13929820f274f Reviewed-on: https://chromium-review.googlesource.com/354881 Commit-Ready: Andrey Pronin <apronin@chromium.org> Tested-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> " fail_count="1" gerrit_number="354881" owner_email="apronin@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/354881/5" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I7ffe44af8b93c99603917fe8b153b9fd63df0170" commit="0a3f88339b2918b43ef5e66ce1741f7ae977315d" commit_message="FROMLIST: drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain The API is not suitable for subsystems consisting of multiple devices and requires severe hacks to use it. To mitigate this, this patch implements allocation and address space management locally by using helpers provided by DRM framework, like other DRM drivers do, e.g. Tegra. This patch should not introduce any functional changes until the driver is made to attach subdevices into an IOMMU domain with the generic IOMMU API, which will happen in following patch. Based heavily on GEM implementation of Tegra DRM driver. Signed-off-by: Tomasz Figa <tfiga@chromium.org> Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com> (am from https://patchwork.kernel.org/patch/9196387/) BUG=chrome-os-partner:53565 TEST=boot to ui on Gru Change-Id: I7ffe44af8b93c99603917fe8b153b9fd63df0170 Reviewed-on: https://chromium-review.googlesource.com/353591 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> " fail_count="0" gerrit_number="353591" owner_email="tfiga@chromium.org" pass_count="0" patch_number="11" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/91/353591/11" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-4.4" change_id="Ide4ce9f74fd431f0b7cd480e38b683f833733b40" commit="8d675c848b4d40235857d4bd11387610f6a1273f" commit_message="FROMLIST: drm/rockchip: Use common IOMMU API to attach devices Rockchip DRM used the arm special API, arm_iommu_*(), to attach iommu for ARM32 SoCs. This patch convert to common iommu API so it would support ARM64 like RK3399. Since previous patch added support for direct IOMMU address space management, there is no need to use DMA API anymore and this patch wires things to use the new method. Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com> Signed-off-by: Tomasz Figa <tfiga@chromium.org> (am from https://patchwork.kernel.org/patch/9196389/) BUG=chrome-os-partner:53565 TEST=boot to ui on Gru Change-Id: Ide4ce9f74fd431f0b7cd480e38b683f833733b40 Reviewed-on: https://chromium-review.googlesource.com/349521 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Tomasz Figa <tfiga@chromium.org> " fail_count="1" gerrit_number="349521" owner_email="zhengsq@rock-chips.com" pass_count="0" patch_number="27" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/21/349521/27" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="Id073883b572b257faa44bd5982ad2ed96529adaf" commit="42a2f336387690efc072e40d2b2e827575b5bc97" commit_message="FROMLIST: iommu/rockchip: Enable Rockchip IOMMU on ARM64 This patch makes it possible to compile the rockchip-iommu driver on ARM64, so that it can be used with 64-bit SoCs equipped with this type of IOMMU. Signed-off-by: Simon Xue <xxm@rock-chips.com> Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com> Signed-off-by: Tomasz Figa <tfiga@chromium.org> (am from https://patchwork.kernel.org/patch/9196391/) BUG=chrome-os-partner:53565 TEST=boot to ui on Gru Change-Id: Id073883b572b257faa44bd5982ad2ed96529adaf Reviewed-on: https://chromium-review.googlesource.com/346329 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> Reviewed-by: Tomasz Figa <tfiga@chromium.org> " fail_count="1" gerrit_number="346329" owner_email="ykk@rock-chips.com" pass_count="0" patch_number="38" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/29/346329/38" remote="cros" total_fail_count="2"/><pending_commit branch="chromeos-4.4" change_id="I4717433ccba1259b7a98778128bee81af8dea011" commit="59c20a21306517f6570e370278534112cbe32974" commit_message="CHROMIUM: config: enable ROCKCHIP_IOMMU support for rockchip This is the equivalent of: echo 'CONFIG_ROCKCHIP_IOMMU=y' >> chromeos/config/arm64/common.config ./chromeos/scripts/kernelconfig oldconfig BUG=chrome-os-partner:53565 TEST=Test eDP on rk3399 kevin Change-Id: I4717433ccba1259b7a98778128bee81af8dea011 Signed-off-by: Yakir Yang <ykk@rock-chips.com> Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/346854 Commit-Ready: Tomasz Figa <tfiga@chromium.org> Tested-by: Tomasz Figa <tfiga@chromium.org> " fail_count="0" gerrit_number="346854" owner_email="ykk@rock-chips.com" pass_count="0" patch_number="37" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/54/346854/37" remote="cros" total_fail_count="1"/><pending_commit branch="chromeos-3.8" change_id="I4a93e86dfa3a50f76042f2f4682043d95a895bc6" commit="8fa20697193f78373ab65c68d66a2c1cf6872968" commit_message="UPSTREAM: cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect When we disconnect from the AP, drivers call cfg80211_disconnect(). This doesn't know whether the disconnection was initiated locally or by the AP though, which can cause problems with the supplicant, for example with WPS. This issue obviously doesn't show up with any mac80211 based driver since mac80211 doesn't call this function. Fix this by requiring drivers to indicate whether the disconnect is locally generated or not. I've tried to update the drivers, but may not have gotten the values correct, and some drivers may currently not be able to report correct values. In case of doubt I left it at false, which is the current behaviour. For libertas, make adjustments as indicated by Dan Williams. Signed-off-by: Johannes Berg <johannes.berg@intel.com> (cherry picked from commit 80279fb7ba5b71981a60988b0307afa43f78f6b1) BUG=chrome-os-partner:48225 TEST=autotest network_WiFi_DisconnectReason Change-Id: I4a93e86dfa3a50f76042f2f4682043d95a895bc6 Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Reviewed-on: https://chromium-review.googlesource.com/355821 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="355821" owner_email="akarwar@marvell.com" pass_count="0" patch_number="2" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/21/355821/2" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.8" change_id="Icce7a567fd8ac64cb90722ebb7a0aa94eda9e7a9" commit="2a5fc8ade49876d318f76fbd7d6f611ff28b5870" commit_message="UPSTREAM: mwifiex: inform disconnection initiator correctly. This patch ensures that 'locally_generated' parameter is correctly passed to the cfg80211_disconnected() API BUG=NONE TEST=autotest network_WiFi_DisconnectReason Change-Id: Icce7a567fd8ac64cb90722ebb7a0aa94eda9e7a9 Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> (cherry-picked from commit c62d50a4062e586855a68c3acfbc2a2c299270cd) Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Reviewed-on: https://chromium-review.googlesource.com/354327 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="354327" owner_email="akarwar@marvell.com" 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/27/354327/4" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I4654c98196c7bedc05e149268b5e4e642e15aee2" commit="61643a5b93dbd8f75d1867b008b7af1ff543fa81" commit_message="CHROMIUM: config: renormalize splitconfigs Run `chromeos/scripts/kernelconfig oldconfig` and accept defaults. BUG=none TEST=Boot kernel on Oak. Change-Id: I4654c98196c7bedc05e149268b5e4e642e15aee2 Reviewed-on: https://chromium-review.googlesource.com/355422 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> " fail_count="0" gerrit_number="355422" owner_email="drinkcat@chromium.org" pass_count="0" patch_number="1" project="chromiumos/third_party/kernel" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/kernel" ref="refs/changes/22/355422/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="I7f6d5c474e01a77fd09830a7be0041aba0e10c3b" commit="5ceb656a2cd5af7d54b8c5b580d905b94c2e665e" commit_message="UPSTREAM: drm: Don't overwrite UNVERFIED mode status to OK The way the mode probing works is this: 1. All modes currently on the mode list are marked as UNVERIFIED 2. New modes are on the probed_modes list (they start with status OK) 3. Modes are moved from the probed_modes list to the actual mode list. If a mode already on the mode list is deemed to match one of the probed modes, the duplicate is dropped and the mode status updated to OK. After this the probed_modes list will be empty. 4. All modes on the mode list are verified to not violate any constraints. Any that do are marked as such. 5. Any mode left with a non-OK status is pruned from the list, with an appropriate debug message. What all this means is that any mode on the original list that didn't have a duplicate on the probed_modes list, should be left with status UNVERFIED (or previously could have been left with some other status, but never OK). I broke that in commit 05acaec334fc ("drm: Reorganize probed mode validation") by always assigning something to the mode->status during the validation step. So any mode from the old list that still passed the validation would be left on the list with status OK in the end. Fix this by not doing the basic mode validation unless the mode already has status OK (meaning it came from the probed_modes list, or at least a duplicate of it was on that list). This way we will correctly prune away any mode from the old mode list that didn't appear on the probed_modes list. Cc: stable@vger.kernel.org Cc: Adam Jackson <ajax@redhat.com> Fixes: 05acaec334fc ("drm: Reorganize probed mode validation") Signed-off-by: Ville Syrjl <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1449177255-9515-2-git-send-email-ville.syrjala@linux.intel.com Testcase: igt/kms_force_connector_basic/prune-stale-modes Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93332 [danvet: Also applying to drm-misc to avoid too much conflict hell - there's a big pile of patches from Ville on top of this one.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> (cherry picked from commit be8719a610003297c28b140f1ebd4445aef1d613) Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> BUG=chrome-os-partner:52354 TEST=Boot elm-rev1, connect both USB-C/Hoho and HDMI, unplug/replug HDMI. Change-Id: I7f6d5c474e01a77fd09830a7be0041aba0e10c3b Reviewed-on: https://chromium-review.googlesource.com/355782 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> " fail_count="0" gerrit_number="355782" owner_email="drinkcat@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/82/355782/1" remote="cros" total_fail_count="0"/><pending_commit branch="chromeos-3.18" change_id="Icce7a567fd8ac64cb90722ebb7a0aa94eda9e7a9" commit="63a2913c85375046d1d7c3536fd586d30fe12cb8" commit_message="UPSTREAM: mwifiex: inform disconnection initiator correctly. This patch ensures that 'locally_generated' parameter is correctly passed to the cfg80211_disconnected() API BUG=NONE TEST=autotest network_WiFi_DisconnectReason Change-Id: Icce7a567fd8ac64cb90722ebb7a0aa94eda9e7a9 Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> (cherry-picked from commit c62d50a4062e586855a68c3acfbc2a2c299270cd) Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Reviewed-on: https://chromium-review.googlesource.com/355920 Reviewed-by: Wei-Ning Huang <wnhuang@chromium.org> " fail_count="0" gerrit_number="355920" owner_email="akarwar@marvell.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/20/355920/1" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="Ica5c021e6f619802db3717dbfada613ddc777d7f" commit="30108072219db780e066aaa7545178138f7812ef" commit_message="sound_infrastructure: Skip checking record device on some boards Refactor the test so it supports board that does not have playback or record sound device by design. BUG=chromium:622187 TEST=test_that --fast <veyron_mickey IP> "Sound System Validation" Change-Id: Ica5c021e6f619802db3717dbfada613ddc777d7f Reviewed-on: https://chromium-review.googlesource.com/355760 Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org> Tested-by: Cheng-Yi Chiang <cychiang@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org> " fail_count="0" gerrit_number="355760" owner_email="cychiang@chromium.org" pass_count="0" patch_number="2" project="chromiumos/third_party/autotest" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/autotest" ref="refs/changes/60/355760/2" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I953fe24f312942a691c2444132e4269c40ac3f70" commit="f37d91ac6630c00781096cfdf74a6dd4dd73e5ca" commit_message="CRAS: iodev - Add no_stream and output_should_wake ops Add no_stream ops with a default implementation in cras_iodev. The default implementation is to fill some zeros. Override no_stream ops to optimize no stream playback for alsa_io. When there is no stream, and there is no valid sample in ALSA buffer anymore, we can fill whole ALSA buffer with zeros, and let device hw_ptr keep running while appl_ptr remains the same. This state in alsa_io is defined as "free run". When there is a valid sample ready from a new stream, we can move appl_ptr to some distance ahead of hw_ptr such that the valid sample written to the position of appl_ptr will be played at low latency. If OptimizeNoStream flag is set in UCM, we enable no_stream related ops in alsa_io. If device has min_buffer_level, it will be taken into account when resuming from free run. Before filling whole ALSA buffer with zeros, valid samples must be played. This is done by filling zeros targeting two times of callback level for some cycles, until all samples in the device are zeros. The number of zeros filled is tracked in filled_zeros_for_draining. When hw_level is less than this value, it means all samples in device are zeros. Then we can fill whole ALSA buffer with zeros. Add output_should_wake ops to alsa_io so audio thread does not need to wake up for alsa_io device when its buffer is filled with zeros. Device other than alsa_io device can have its own optimization for no stream playback if it override no_stream ops. BUG=chromium:519942 TEST=make check TEST=set OptimizeNoStream "1" in HiFi.conf on samus and run below tests. TEST=Check audio playback works for the first time. TEST=Check audio playback works within 10 seconds after the first stream ends. TEST=cras_test_client --playback_f /usr/local/autotest/cros/audio/fix_440_16.raw --show_latency and see the latency of the second stream is reduced from 16 ms to 11 ms for speaker on samus, from 10 ms to 5 ms for headphone. Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org> Change-Id: I953fe24f312942a691c2444132e4269c40ac3f70 Reviewed-on: https://chromium-review.googlesource.com/346084 Reviewed-by: Hsinyu Chao <hychao@chromium.org> " fail_count="0" gerrit_number="346084" owner_email="cychiang@chromium.org" pass_count="0" patch_number="20" project="chromiumos/third_party/adhd" project_url="https://chromium-review.googlesource.com/chromiumos/third_party/adhd" ref="refs/changes/84/346084/20" remote="cros" total_fail_count="0"/><pending_commit branch="master" change_id="I5c7489d26cd7c71e749c7e464c51706444b064f0" commit="b0724ab97aa90c975bb5a8e28af6310873bf15ef" commit_message="vpd: Fix exception when calling GetAll() in file based VPD. There are two problems in current implementation of 'file based vpd'. 1. TypeError: string indices must be integers, not tuple Caused by having extra ',' in file name slicing. 2. IOError: [Errno 2] No such file or directory: '' Caused by split('\n') that will create an empty element in list and should be replaced by splitlines(). BUG=none TEST=make test Change-Id: I5c7489d26cd7c71e749c7e464c51706444b064f0 Reviewed-on: https://chromium-review.googlesource.com/355852 Commit-Ready: Hung-Te Lin <hungte@chromium.org> Tested-by: Hung-Te Lin <hungte@chromium.org> Reviewed-by: Ting Shen <phoenixshen@chromium.org> " fail_count="0" gerrit_number="355852" owner_email="hungte@chromium.org" pass_count="0" patch_number="1" project="chromiumos/platform/factory" project_url="https://chromium-review.googlesource.com/chromiumos/platform/factory" ref="refs/changes/52/355852/1" remote="cros" total_fail_count="0"/><lkgm version="8495.0.0-rc1"/></manifest> |
