summaryrefslogtreecommitdiff
path: root/arch (follow)
Commit message (Collapse)AuthorAge
...
* | | | | | ARM: dts: msm: Remove adv7533 power commands for 600p DSI panelDaocai2017-12-01
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "qcom,mdss-dsi-on-command" and "mdss-dsi-off command" commands for boot up performance optimization. The two commands are for native DSI panels without a bridge chip. However,AUTO platform has adv7533 bridge chip,which is controlled by I2C instead of the above two commands. In addition,the two command will cause extra wait for about 210ms in dsi_panel_tx_cmd_set() for dsi_display_enbale(). This make drmAtomicCommit() in libdrm a little slower, so total boot time will be longer. Change-Id: I1c95456b1734acb05cf2f38bb4c95441343bffab Signed-off-by: Daocai <daocai@codeaurora.org>
* | | | | Merge "ARM: dts: msm: Pass usb controller id for 8996"Linux Build Service Account2017-11-30
|\ \ \ \ \
| * | | | | ARM: dts: msm: Pass usb controller id for 8996Ajay Agarwal2017-11-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to uniquely identify the multiple controllers on MSM8996. Change-Id: I99296cee886119e59af67e2d1a3983a28015b720 Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
* | | | | | Merge "ARM: dts: msm: modify HDMI configuration for msm8996 auto ADP/CDP"Linux Build Service Account2017-11-29
|\ \ \ \ \ \
| * | | | | | ARM: dts: msm: modify HDMI configuration for msm8996 auto ADP/CDPRahul Sharma2017-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automotive use case requirement is to have HDMI display as non-pluggable. This change also set a custom mode as 1920x1080p@60Hz. Change-Id: Ic2baec180d51dc6a91eaf72c44df1da066f04d2e Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
* | | | | | | Merge "defconfig: msm: Enable CONFIG_ESOC_DRV for msm8996 auto"Linux Build Service Account2017-11-29
|\ \ \ \ \ \ \
| * | | | | | | defconfig: msm: Enable CONFIG_ESOC_DRV for msm8996 autoGustavo Solaira2017-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the CONFIG_ESOC_DRV for msm8996 auto to support SSR for external MDM modems connected via PCIe. Change-Id: I03026351ef521e7b85af2bb47f85ff91842fe405 Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
| * | | | | | | ARM: dts: msm: Add support for esoc on msm8996 CV2XGustavo Solaira2017-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some properties to better support esoc on msm8996 CV2X boards. These properties correct some definition of the MDM esoc connection on the board and support scenarios of external SoC crashes and graceful reboot. Change-Id: I994a2b0a3d3320b2a31fa0fc238a182497659f67 Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
* | | | | | | | Merge "defconfig: msm: Enable USB audio QMI service driver for 8996"Linux Build Service Account2017-11-29
|\ \ \ \ \ \ \ \
| * | | | | | | | defconfig: msm: Enable USB audio QMI service driver for 8996Sriharsha Allenki2017-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows APPS USB XHCI driver to offload the USB audio ISOC data transfer to remote processor. USB audio QMI driver starts a QMI service to communicate with remote processor to exchange audio stream related information. Change-Id: If7bcd41eb5e169551f18d8ed64d38fe17fa1df91 Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
* | | | | | | | | Merge "defconfig: msm: Enable SPI slave framework on 8996 Auto"Linux Build Service Account2017-11-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | defconfig: msm: Enable SPI slave framework on 8996 AutoDilip Kota2017-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable SPI slave protocol handlers. Change-Id: I9458d6445db5f78a08cff9796d4f2e7afbc2909c Signed-off-by: Dilip Kota <dkota@codeaurora.org>
* | | | | | | | | | Merge "defconfig: msm: enable memory hotplug support"Linux Build Service Account2017-11-28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | defconfig: msm: enable memory hotplug supportArun KS2017-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable memory hotplug for msm8996 on automotive targets. Change-Id: I3cc52027e7d41384b9bfa24e858e3cf14c8940e3 Signed-off-by: Arun KS <arunks@codeaurora.org>
| * | | | | | | | | | arm64: Add fallback option during memory hot addArun KS2017-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Section mapping is good for TLB. But sometimes, when system is low on physically continuous memory, this can cause memory allocation failures. Add a fallback option to allocate vmemmap pages from discontinuous pages. Change-Id: Ide921c36c1e8980a8af047e2c991310405804858 Signed-off-by: Arun KS <arunks@codeaurora.org> Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
* | | | | | | | | | | Merge "arm64: Honor limits set by bootloader"Linux Build Service Account2017-11-28
|\| | | | | | | | | |
| * | | | | | | | | | arm64: Honor limits set by bootloaderArun KS2017-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a varible to save bootloader enforced memory limits and restricts adding beyond this boundary during a memory hotplug. Change-Id: I28c100644b7287ec4625c4c018b5fffc865e2e72 Signed-off-by: Arun KS <arunks@codeaurora.org>
* | | | | | | | | | | Merge "arm64: Hot-remove implementation for arm64"Linux Build Service Account2017-11-28
|\| | | | | | | | | |
| * | | | | | | | | | arm64: Hot-remove implementation for arm64Andrea Reale2017-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - arch_remove_memory interface - kernel page tables cleanup - vmemmap_free implementation for arm64 Change-Id: I8945b6b91ed7012abc1478de266302427ebeb639 Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com> Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com> Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25 Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org> Signed-off-by: Arun KS <arunks@codeaurora.org>
| * | | | | | | | | | arm64: Memory hotplug support for arm64 platformMaciej Bielski2017-11-22
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a second and improved version of the patch previously released in [3]. It builds on the work by Scott Branden [2] and, henceforth, it needs to be applied on top of Scott's patches [2]. Comments are very welcome. Changes from the original patchset and known issues: - Compared to Scott's original patchset, this work adds the mapping of the new hotplugged pages into the kernel page tables. This is done by copying the old swapper_pg_dir over a new page, adding the new mappings, and then switching to the newly built pg_dir (see `hotplug_paging` in arch/arm64/mmu.c). There might be better ways to to this: suggestions are more than welcome. - The stub function for `arch_remove_memory` has been removed for now; we are working in parallel on memory hot remove, and we plan to contribute it as a separate patch. - Corresponding Kconfig flags have been added; - Note that this patch does not work when NUMA is enabled; in fact, the function `memory_add_physaddr_to_nid` does not have an implementation when the NUMA flag is on: this function is supposed to return the nid the hotplugged memory should be associated with. However it is not really clear to us yet what the semantics of this function in the context of a NUMA system should be. A quick and dirty fix would be to always attach to the first available NUMA node. - In arch/arm64/mm/init.c `arch_add_memory`, we are doing a hack with the nomap memory block flags to satisfy preconditions and postconditions of `__add_pages` and postconditions of `arch_add_memory`. Compared to memory hotplug implementation for other architectures, the "issue" seems to be in the implemenation of `pfn_valid`. Suggestions on how to cleanly avoid this hack are welcome. This patchset can be tested by starting the kernel with the `mem=X` flag, where X is less than the total available physical memory and has to be multiple of MIN_MEMORY_BLOCK_SIZE. We also tested it on a customised version of QEMU capable to emulate physical hotplug on arm64 platform. To enable the feature the CONFIG_MEMORY_HOTPLUG compilation flag needs to be set to true. Then, after memory is physically hotplugged, the standard two steps to make it available (as also documented in Documentation/memory-hotplug.txt) are: (1) Notify memory hot-add echo '0xYY000000' > /sys/devices/system/memory/probe where 0xYY000000 is the first physical address of the new memory section. (2) Online new memory block(s) echo online > /sys/devices/system/memory/memoryXXX/state -- or -- echo online_movable > /sys/devices/system/memory/memoryXXX/state where XXX corresponds to the ids of newly added blocks. Onlining can optionally be automatic at hot-add notification by enabling the global flag: echo online > /sys/devices/system/memory/auto_online_blocks or by setting the corresponding config flag in the kernel build. Again, any comment is highly appreciated. [1] https://lkml.org/lkml/2016/11/17/49 [2] https://lkml.org/lkml/2016/12/1/811 [3] https://lkml.org/lkml/2016/12/14/188 Change-Id: I545807e3121c159aaa2f917ea914ee98f38fb296 Signed-off-by: Maciej Bielski <m.bielski@virtualopensystems.com> Signed-off-by: Andrea Reale <ar@linux.vnet.ibm.com> Patch-mainline: linux-kernel @ 11 Apr 2017, 18:25 Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org> [arunks@codeaurora.org: fix to pass checker test] Signed-off-by: Arun KS <arunks@codeaurora.org>
* | | | | | | | | | Merge "defconfig: msm: Compile ADV7481 as a module"Linux Build Service Account2017-11-27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | defconfig: msm: Compile ADV7481 as a moduleRahul Sharma2017-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile ADV7481 as a module, as part of kernel modularization requirement. Change-Id: Ie3e9669d05646503de6ddd3468cbd6da4ee4eae4 Suggested-by: Resmi Rajendran <resmir@qti.qualcomm.com> Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
* | | | | | | | | | | Merge "ARM: dts: msm: Remove useless DSI panel commands for adv7533"Linux Build Service Account2017-11-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ARM: dts: msm: Remove useless DSI panel commands for adv7533Daocai2017-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "qcom,mdss-dsi-on-command" and "mdss-dsi-off command" commands for boot up performance optimization. The two commands are for native DSI panels without a bridge chip. However,AUTO platform has adv7533 bridge chip,which is controlled by I2C instead of the above two commands. In addition,the two command will cause extra wait for about 210ms in dsi_panel_tx_cmd_set() for dsi_display_enbale(). This make drmAtomicCommit() in libdrm a little slower, so total boot time will be longer. Change-Id: I848d189d4055b5626eadd809fc5da7c9c4ecbcce Signed-off-by: Daocai <daocai@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: add psci for msm8996 auto virtual platform"Linux Build Service Account2017-11-27
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ARM: dts: msm: add psci for msm8996 auto virtual platformYimin Peng2017-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hypervisor supports psci-1.0 not 0.1 and new function IDs have been defined in psci driver. Change-Id: Id257dd264f9ffc812879997c0b227e53f84c86a2 Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
| * | | | | | | | | | | defconfig: msm: add PM config for virtual platformYimin Peng2017-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable PM config to support gvm suspend and resume. Change-Id: I5f71add6d2c5ac0fb1fc7ea98d13dc256f6e4d5a Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: msm: dts: Enable support for audio tunneling mode for msm8996"Linux Build Service Account2017-11-26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ARM: msm: dts: Enable support for audio tunneling mode for msm8996Vijayavardhan Vennapusa2017-11-16
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is required to pass usb-audio-qmi-dev device node from dtsi to provide StreamID and interrupt number info so that this info will be used for enabling for USB audio tunneling mode over USB. Hence add the node to enable audio tunneling mode for msm8996. Change-Id: Iba4d18ff0495460f5d488604f31c4d5209252940 Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
* | | | | | | | | | | Merge "ARM: dts: msm: update the new HDMI splash address on msm8996"Linux Build Service Account2017-11-23
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | ARM: dts: msm: update the new HDMI splash address on msm8996Rahul Sharma2017-11-22
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDMI continuous splash memory addrerss has been changed in bootloader. This change updates the splash memory address to support the smooth LK to kernel handoff. Change-Id: If9c8f20b8215a4ea835b0e070feb2b51364772e6 Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
* | | | | / / / / / arm64: memory-hotplug: Add MEMORY_HOTPLUG, MEMORY_HOTREMOVE, MEMORY_PROBEScott Branden2017-11-21
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add memory-hotplug support for ARM64 platform. This requires addition of ARCH_ENABLE_MEMORY_HOTPLUG and ARCH_ENABLE_MEMORY_HOTREMOVE config options. MEMORY_PROBE config option is added to support /sys/devices/system/memory/probe functionality. In addition architecture specific arch_add_memory and arch_remove memory management functions are added. Change-Id: I1fc4e8c93cfe1b9722b2fc8d811390e6cdfa7995 Signed-off-by: Scott Branden <scott.branden@broadcom.com> Patch-mainline: linux-kernel @ 11 Apr 2017, 18:24 Signed-off-by: Srivatsa Vaddagiri <vatsa@codeaurora.org>
* | | | | | | | | Merge "ARM: dts: msm: Fix tavil codec reset issue on sdm660"Linux Build Service Account2017-11-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ARM: dts: msm: Fix tavil codec reset issue on sdm660Vatsal Bucha2017-10-31
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdm660-mtp has only tavil as codec.If tasha codec is also enabled then it results in enumeration of device twice which results in kernel crash sometimes. This can be avoided if we disable tasha codec from dts. Similarly sdm660-qrd has only tasha as codec. CRs-Fixed: 2124709 Change-Id: I66812186d2e769681f00f1ba9a87a3588b04eaf9 Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
* | | | | | | | | ARM: dts: msm: Add support for MSM8996 Mizar platformBharathraj Nagaraju2017-11-15
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add device tree files needed to support MSM8996 based mizar platform. Change-Id: Ife6c6659b981b37c6b9d9cbb0a0c106488f1e07f Signed-off-by: Bharathraj Nagaraju <snbraj@codeaurora.org>
* | | | | | | | ARM: dts: msm: add SLPI fw name property for msm8996Ananda Kishore2017-11-10
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add SLPI fw name property to support dynamic loading of SLPI fw images based on the version info. Change-Id: I31baf971106a7a076cf83bd72c4509d860b3e7cb Signed-off-by: Ananda Kishore <kananda@codeaurora.org>
* | | | | | | Merge "ARM: dts: msm: Add support for irs1645 eeprom on msm8998"Linux Build Service Account2017-11-09
|\ \ \ \ \ \ \
| * | | | | | | ARM: dts: msm: Add support for irs1645 eeprom on msm8998Vivek Iyer2017-11-08
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add device tree entry needed to support eeprom on the irs1645 sensor. Change-Id: I88ad09c7da813e3b74d465392e8e40839d9c88a9 Signed-off-by: Vivek Iyer <viyer@codeaurora.org>
* | | | | | | Merge "Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4"Linux Build Service Account2017-11-09
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge android-4.4@ceee5bd (v4.4.95) into msm-4.4Blagovest Kolenichev2017-11-06
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/tmp-ceee5bd BACKPORT: arm64: relocatable: suppress R_AARCH64_ABS64 relocations in vmlinux sched/core: fix have_sched_energy_data build warning sched/core: Warn if ENERGY_AWARE is enabled but data is missing sched: walt: Correct WALT window size initialization FROMLIST: sched/fair: Use wake_q length as a hint for wake_wide sched: WALT: account cumulative window demand sched/fair: remove useless variable in find_best_target sched/tune: access schedtune_initialized under CGROUP_SCHEDTUNE sched/fair: consider task utilization in group_max_util() sched/fair: consider task utilization in group_norm_util() sched/fair: enforce EAS mode sched/fair: ignore backup CPU when not valid sched/fair: trace energy_diff for non boosted tasks UPSTREAM: sched/fair: Sync task util before slow-path wakeup UPSTREAM: sched/fair: Fix usage of find_idlest_group() when the local group is idlest UPSTREAM: sched/fair: Fix usage of find_idlest_group() when no groups are allowed BACKPORT: sched/fair: Fix find_idlest_group when local group is not allowed UPSTREAM: sched/fair: Remove unnecessary comparison with -1 BACKPORT: sched/fair: Move select_task_rq_fair slow-path into its own function UPSTREAM: sched/fair: Force balancing on nohz balance if local group has capacity UPSTREAM: sched/core: Add missing update_rq_clock() call in set_user_nice() UPSTREAM: sched/core: Add missing update_rq_clock() call for task_hot() UPSTREAM: sched/core: Add missing update_rq_clock() in detach_task_cfs_rq() UPSTREAM: sched/core: Add missing update_rq_clock() in post_init_entity_util_avg() UPSTREAM: sched/core: Fix find_idlest_group() for fork BACKPORT: sched/fair: Fix PELT integrity for new tasks BACKPORT: sched/cgroup: Fix cpu_cgroup_fork() handling UPSTREAM: sched/fair: Fix and optimize the fork() path BACKPORT: sched/fair: Make it possible to account fair load avg consistently cpufreq/sched: Consider max cpu capacity when choosing frequencies Linux 4.4.95 FS-Cache: fix dereference of NULL user_key_payload fscrypto: require write access to mount to set encryption policy KEYS: Fix race between updating and finding a negative key fscrypt: fix dereference of NULL user_key_payload f2fs crypto: add missing locking for keyring_key access f2fs crypto: replace some BUG_ON()'s with error checks sched/autogroup: Fix autogroup_move_group() to never skip sched_move_task() parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels parisc: Avoid trashing sr2 and sr3 in LWS code pkcs7: Prevent NULL pointer dereference, since sinfo is not always set. KEYS: don't let add_key() update an uninstantiated key lib/digsig: fix dereference of NULL user_key_payload KEYS: encrypted: fix dereference of NULL user_key_payload rtlwifi: rtl8821ae: Fix connection lost problem clockevents/drivers/cs5535: Improve resilience to spurious interrupts bus: mbus: fix window size calculation for 4GB windows brcmsmac: make some local variables 'static const' to reduce stack size i2c: ismt: Separate I2C block read from SMBus block read ALSA: hda: Remove superfluous '-' added by printk conversion ALSA: seq: Enable 'use' locking in all configurations drm/nouveau/mmu: flush tlbs before deleting page tables drm/nouveau/bsp/g92: disable by default can: esd_usb2: Fix can_dlc value for received RTR, frames usb: musb: Check for host-mode using is_host_active() on reset interrupt usb: musb: sunxi: Explicitly release USB PHY on exit can: gs_usb: fix busy loop if no more TX context is available ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital usb: hub: Allow reset retry for USB2 devices on connect bounce usb: quirks: add quirk for WORLDE MINI MIDI keyboard usb: cdc_acm: Add quirk for Elatec TWN3 USB: serial: metro-usb: add MS7820 device id USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor() USB: devio: Revert "USB: devio: Don't corrupt user memory" ANDROID: binder: show high watermark of alloc->pages. ANDROID: binder: Add thread->process_todo flag. UPSTREAM: arm64: compat: Remove leftover variable declaration ANDROID: sched/fair: Select correct capacity state for energy_diff Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub" cpufreq: schedutil: clamp util to CPU maximum capacity FROMLIST: android: binder: Fix null ptr dereference in debug msg FROMLIST: android: binder: Change binder_shrinker to static cpufreq/sched: Use cpu max freq rather than policy max Conflicts: include/linux/sched.h kernel/sched/core.c kernel/sched/fair.c Change-Id: I2751f851df741f00e797deaf2119872b3dced655 Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
| | * | | | | Merge 4.4.95 into android-4.4Greg Kroah-Hartman2017-10-30
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 4.4.95 USB: devio: Revert "USB: devio: Don't corrupt user memory" USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor() USB: serial: metro-usb: add MS7820 device id usb: cdc_acm: Add quirk for Elatec TWN3 usb: quirks: add quirk for WORLDE MINI MIDI keyboard usb: hub: Allow reset retry for USB2 devices on connect bounce ALSA: usb-audio: Add native DSD support for Pro-Ject Pre Box S2 Digital can: gs_usb: fix busy loop if no more TX context is available usb: musb: sunxi: Explicitly release USB PHY on exit usb: musb: Check for host-mode using is_host_active() on reset interrupt can: esd_usb2: Fix can_dlc value for received RTR, frames drm/nouveau/bsp/g92: disable by default drm/nouveau/mmu: flush tlbs before deleting page tables ALSA: seq: Enable 'use' locking in all configurations ALSA: hda: Remove superfluous '-' added by printk conversion i2c: ismt: Separate I2C block read from SMBus block read brcmsmac: make some local variables 'static const' to reduce stack size bus: mbus: fix window size calculation for 4GB windows clockevents/drivers/cs5535: Improve resilience to spurious interrupts rtlwifi: rtl8821ae: Fix connection lost problem KEYS: encrypted: fix dereference of NULL user_key_payload lib/digsig: fix dereference of NULL user_key_payload KEYS: don't let add_key() update an uninstantiated key pkcs7: Prevent NULL pointer dereference, since sinfo is not always set. parisc: Avoid trashing sr2 and sr3 in LWS code parisc: Fix double-word compare and exchange in LWS code on 32-bit kernels sched/autogroup: Fix autogroup_move_group() to never skip sched_move_task() f2fs crypto: replace some BUG_ON()'s with error checks f2fs crypto: add missing locking for keyring_key access fscrypt: fix dereference of NULL user_key_payload KEYS: Fix race between updating and finding a negative key fscrypto: require write access to mount to set encryption policy FS-Cache: fix dereference of NULL user_key_payload Linux 4.4.95 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * | | | parisc: Fix double-word compare and exchange in LWS code on 32-bit kernelsJohn David Anglin2017-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 374b3bf8e8b519f61eb9775888074c6e46b3bf0c upstream. As discussed on the debian-hppa list, double-wordcompare and exchange operations fail on 32-bit kernels. Looking at the code, I realized that the ",ma" completer does the wrong thing in the "ldw,ma 4(%r26), %r29" instruction. This increments %r26 and causes the following store to write to the wrong location. Note by Helge Deller: The patch applies cleanly to stable kernel series if this upstream commit is merged in advance: f4125cfdb300 ("parisc: Avoid trashing sr2 and sr3 in LWS code"). Signed-off-by: John David Anglin <dave.anglin@bell.net> Tested-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Fixes: 89206491201c ("parisc: Implement new LWS CAS supporting 64 bit operations.") Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | | * | | | parisc: Avoid trashing sr2 and sr3 in LWS codeJohn David Anglin2017-10-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f4125cfdb3008363137f744c101e5d76ead760ba upstream. There is no need to trash sr2 and sr3 in the Light-weight syscall (LWS). sr2 already points to kernel space (it's zero in userspace, otherwise syscalls wouldn't work), and since the LWS code is executed in userspace, we can simply ignore to preload sr3. Signed-off-by: John David Anglin <dave.anglin@bell.net> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * | | | | BACKPORT: arm64: relocatable: suppress R_AARCH64_ABS64 relocations in vmlinuxSami Tolvanen2017-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker routines that we rely on to produce a relocatable PIE binary treat it as a shared ELF object in some ways, i.e., it emits symbol based R_AARCH64_ABS64 relocations into the final binary since doing so would be appropriate when linking a shared library that is subject to symbol preemption. (This means that an executable can override certain symbols that are exported by a shared library it is linked with, and that the shared library *must* update all its internal references as well, and point them to the version provided by the executable.) Symbol preemption does not occur for OS hosted PIE executables, let alone for vmlinux, and so we would prefer to get rid of these symbol based relocations. This would allow us to simplify the relocation routines, and to strip the .dynsym, .dynstr and .hash sections from the binary. (Note that these are tiny, and are placed in the .init segment, but they clutter up the vmlinux binary.) Note that these R_AARCH64_ABS64 relocations are only emitted for absolute references to symbols defined in the linker script, all other relocatable quantities are covered by anonymous R_AARCH64_RELATIVE relocations that simply list the offsets to all 64-bit values in the binary that need to be fixed up based on the offset between the link time and run time addresses. Fortunately, GNU ld has a -Bsymbolic option, which is intended for shared libraries to allow them to ignore symbol preemption, and unconditionally bind all internal symbol references to its own definitions. So set it for our PIE binary as well, and get rid of the asoociated sections and the relocation code that processes them. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> [will: fixed conflict with __dynsym_offset linker script entry] Signed-off-by: Will Deacon <will.deacon@arm.com> Note: This backport only adds -Bsymbolic to LDFLAGS_vmlinux, but doesn't remove R_AARCH64_ABS64 relocation handling, because those changes depend on later refactoring of the code that we don't need in android-4.4. Bug: 66932127 Change-Id: I56f664e02bc8d2fa3e5f496fb041bc3a8e1a4094 (cherry picked from commit 08cc55b2afd97a654f71b3bebf8bb0ec89fdc498) Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
| | * | | | | UPSTREAM: arm64: compat: Remove leftover variable declarationKevin Brodsky2017-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 82d24d114f249d919b918ff8eefde4117db8f088) Commit a1d5ebaf8ccd ("arm64: big-endian: don't treat code as data when copying sigret code") moved the 32-bit sigreturn trampoline code from the aarch32_sigret_code array to kuser32.S. The commit removed the array definition from signal32.c, but not its declaration in signal32.h. Remove the leftover declaration. Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com> Signed-off-by: Mark Salyzyn <salyzyn@android.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Bug: 20045882 Bug: 63737556 Change-Id: Ic8a5f0e367f0ecd5c5ddd9e3885d0285f91cf89e
* | | | | | | Merge "ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996"Linux Build Service Account2017-11-08
|\ \ \ \ \ \ \
| * | | | | | | ARM: dts: msm: enable adv7533 bridge chip power rails on msm8996Rahul Sharma2017-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | msm8996 auto CDP platform missing vddio power supply to power up adv7533 bridge chip for DSI interfaces, which converts DSI to HDMI signal. This change adds power rails to adv7533. Change-Id: Ieaea589803bbac1d42478fff16e8a4a833cf7426 Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
* | | | | | | | Merge "ARM: dts: msm: Add sdhc_2 on msm8996 virtual platform"Linux Build Service Account2017-11-08
|\ \ \ \ \ \ \ \
| * | | | | | | | ARM: dts: msm: Add sdhc_2 on msm8996 virtual platformZhiqiang Tu2017-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sdhc_2 on msm8996 virtual platform for SDIO WLAN. Change-Id: Ic021ca67507af88a2c98eac4d5b4c10c3300f1a9 Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
* | | | | | | | | Merge "defconfig: arm64: msm: Enable MMC on msm8996 virtual plaform"Linux Build Service Account2017-11-08
|\ \ \ \ \ \ \ \ \