summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* arm64: Implement branch predictor hardening for FalkorShanker Donthineni2018-02-08
| | | | | | | | | | | | | | | | | Falkor is susceptible to branch predictor aliasing and can theoretically be attacked by malicious code. This patch implements a mitigation for these attacks, preventing any malicious entries from affecting other victim contexts. Change-Id: I535d423c2cefaf93627267b867bf0846e502d4c1 Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org> [will: fix label name when !CONFIG_KVM and remove references to MIDR_FALKOR] Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: ec82b567a74fbdffdf418d4bb381d55f6a9096af Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [sramana@codeaurora.org: Use only the link stack sanitization routines, and leave Falkor related BP hardening code] Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arch: arm64: Add midr values for kryo2xx big coresSrinivas Ramana2018-02-07
| | | | | | | | Add midr value for kryo2xx big cores to apply errata workarounds for branch prediction hardening. Change-Id: I7ca9cfa3e6b48d5af78a5297cb76ebe6f52e519e Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: Implement branch predictor hardening for affected Cortex-A CPUsWill Deacon2018-02-07
| | | | | | | | | | | | | | | | Cortex-A57, A72, A73 and A75 are susceptible to branch predictor aliasing and can theoretically be attacked by malicious code. This patch implements a PSCI-based mitigation for these CPUs when available. The call into firmware will invalidate the branch predictor state, preventing any malicious entries from affecting other victim contexts. Change-Id: I554536e8e5cb3839e102299da8f5b944415b1880 Co-developed-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: aa6acde65e03186b5add8151e1ffe36c3c62639b Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: Define Cortex-A73 MIDRMarc Zyngier2018-02-07
| | | | | | | | | | | | | | As we're about to introduce a new workaround that is specific to Cortex-A73, let's define the coresponding MIDR. Change-Id: Iabb0e83a0eadddbde458fdafd1224e442b6f3e63 Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Git-commit: 199fd2bff4040985fbd7853cc39b7245fcf54bb9 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [sramana@codeaurora.org: Resolve trivial merge conflicts] Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75Will Deacon2018-02-07
| | | | | | | | | | | | Hook up MIDR values for the Cortex-A72 and Cortex-A75 CPUs, since they will soon need MIDR matches for hardening the branch predictor. Change-Id: I59af5ea4af17198aa70d2ba4b25f729a562727ee Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: a65d219fe5dc7887fd5ca04c2ac3e9a34feb8dfc Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [sramana@codeaurora.org: Resolve trivial merge conflicts] Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: cpu_errata: Allow an erratum to be match for all revisions of a coreMarc Zyngier2018-02-07
| | | | | | | | | | | | | | | | | | | | Some minor erratum may not be fixed in further revisions of a core, leading to a situation where the workaround needs to be updated each time an updated core is released. Introduce a MIDR_ALL_VERSIONS match helper that will work for all versions of that MIDR, once and for all. Change-Id: Icbb685f79205ba45f9c990d83cf961616b0d96b7 Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Git-commit: 06f1494f837da8997d670a1ba87add7963b08922 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [sramana@codeaurora.org: Fix merge conflicts] Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: Add skeleton to harden the branch predictor against aliasing attacksWill Deacon2018-02-07
| | | | | | | | | | | | | | | | | | | Aliasing attacks against CPU branch predictors can allow the attacks to redirect speculative control flow on some CPUs and potentially divulge information from one context to another. This patch adds initial skeleton code behind a new Kconfig option to enable implementation-specific mitigations against these attacks for CPUs that are affected. Change-Id: I07fba1943dd63df8951bf68fac947666100e5559 Co-developed-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: 0f15adbb2861ce6f75ccfc5a92b19eae0ef327d0 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [sramana@codeaurora.org: Fix merge conflicts and make it compilable on msm-4.4] Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* drivers/firmware: Expose psci_get_version through psci_ops structureWill Deacon2018-02-06
| | | | | | | | | | | | | | | Entry into recent versions of ARM Trusted Firmware will invalidate the CPU branch predictor state in order to protect against aliasing attacks. This patch exposes the PSCI "VERSION" function via psci_ops, so that it can be invoked outside of the PSCI driver where necessary. Change-Id: Id6edce067d098ed7aca19ad9321c858c89097966 Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: d68e3ba5303f7e1099f51fdcd155f5263da8569b Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: cpufeature: Pass capability structure to ->enable callbackWill Deacon2018-02-06
| | | | | | | | | | | | | | | | In order to invoke the CPU capability ->matches callback from the ->enable callback for applying local-CPU workarounds, we need a handle on the capability structure. This patch passes a pointer to the capability structure to the ->enable callback. Change-Id: Ie9a18c7a5d721dcb3d3d6c6001c74366525cf87e Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Git-commit: 0a0d111d40fd1dc588cc590fab6b55d86ddc71d3 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* arm64: errata: Calling enable functions for CPU errata tooAndre Przywara2018-02-06
| | | | | | | | | | | | | | | | Currently we call the (optional) enable function for CPU _features_ only. As CPU _errata_ descriptions share the same data structure and having an enable function is useful for errata as well (for instance to set bits in SCTLR), lets call it when enumerating erratas too. Change-Id: Ie5d4d14dc1c0006423196e9fc1b102655f0c13b2 Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Git-commit: 8e2318521bf5837dae093413f81292b59d49d030 Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [sramana@codeaurora.org: Resolve trivial merge conflicts] Signed-off-by: Srinivas Ramana <sramana@codeaurora.org>
* Merge "diag: Fix possible use-after-free issue for mdlog session info"Linux Build Service Account2018-02-05
|\
| * diag: Fix possible use-after-free issue for mdlog session infoHardik Arya2018-02-02
| | | | | | | | | | | | | | | | | | | | | | Currently there is a possibility of accessing freed mdlog session info and it's attributes after closing the session. The patch adds protection while accessing mdlog session info for preventing use-after-free issue. CRs-Fixed: 2133028 Change-Id: Iba603bc2d75f84a604df2627e8fcb2a18acf4637 Signed-off-by: Hardik Arya <harya@codeaurora.org>
* | Merge "ARM: dts: qcom: add an empty hab into the baseline vplatform"Linux Build Service Account2018-02-05
|\ \
| * | ARM: dts: qcom: add an empty hab into the baseline vplatformYong Ding2018-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | The empty hab entry has no actual MMID group entries. With it, hab driver can initialize successfully, but it can not be used by any clients since no acutal physical channels are created. Change-Id: Ia5c85cf9c32ae2cb33bd1f36de7ac3e9337dfa2f Signed-off-by: Yong Ding <yongding@codeaurora.org>
* | | Merge "reg: qcom: call regulatory callback for self managed hints"Linux Build Service Account2018-02-05
|\ \ \
| * | | reg: qcom: call regulatory callback for self managed hintsAmar Singhal2018-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, kernel ignores the regulatory hint if wiphy flag REGULATORY_WIPHY_SELF_MANAGED is set. This would lead to drop of hints sent directly to kernel from user-space. To fix, call the driver callback with the request. CRs-Fixed: 2183721 Change-Id: Ic6d17ce8c3e9b889f618f3494672020bb1c98c42 Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
* | | | Merge "msm: sensor: actuator: fix out of bound read for region params"Linux Build Service Account2018-02-05
|\ \ \ \
| * | | | msm: sensor: actuator: fix out of bound read for region paramsHaibin Liu2018-02-04
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: the region index is not validated against the region size. this cause out-of-bound read on the KASAN kernel. Fix: Add restriction that region index smaller than region size. CRs-Fixed: 2153841 Change-Id: I141bba45662769f0661c947fb642c2671578f32e Signed-off-by: Haibin Liu <haibinl@codeaurora.org>
* | | | Merge "ASoC: msm: qdsp6v2: Fix Set Lpass Clk Timeout Issue"Linux Build Service Account2018-02-04
|\ \ \ \ | |/ / / |/| | |
| * | | ASoC: msm: qdsp6v2: Fix Set Lpass Clk Timeout IssueCong Tang2018-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lpass set clk time timeout due to afe_callback waked up wrong wait_queue, use index in token instead of IDX_CLOBAL_CFG. Change-Id: I25ce1fbba5692d0a30e946a54096b5b7a58f51e7 Signed-off-by: Cong Tang <congt@codeaurora.org>
* | | | Merge "xhci: plat: Fix xhci_plat shutdown hung"Linux Build Service Account2018-02-02
|\ \ \ \
| * | | | xhci: plat: Fix xhci_plat shutdown hungLei wang2018-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xhci-plat Shutdown callback should check HCD_FLAG_HW_ACCESSIBLE before accessing any register. This should avoid hung with access controllers which support runtime suspend Change-Id: I53eedf5b8f77dfdfa31d21b303da7058c5a86ba9 Signed-off-by: Lei wang <leiwan@codeaurora.org>
* | | | | Merge "mm: change max readahead size to 512KB"Linux Build Service Account2018-02-02
|\ \ \ \ \
| * | | | | mm: change max readahead size to 512KBLee Susman2018-02-02
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the VM_MAX_READAHEAD value from the default 128KB to 512KB. This will allow the readahead window to grow to a maximum size of 512KB, which greatly benefits to sequential read throughput. Change-Id: Ia0780ea4e2a4ae0b6111485b72fb25376dcb1f96 Signed-off-by: Lee Susman <lsusman@codeaurora.org>
* | | | | Merge "ath10k: fix the race condition in wow suspend-resume cycle"Linux Build Service Account2018-02-02
|\ \ \ \ \
| * | | | | ath10k: fix the race condition in wow suspend-resume cycleSarada Prasanna Garnayak2018-02-01
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During wow suspend enable the wow event wakeup source if the STA is in connected state and during wow resume report the wow wakeup reason to mac80211 and nl80211 layer. This fix adds support to synchronize the wow suspend-resume cycle and prevent the device to wakeup from wow suspend state by an invalid wow event when the STA is in the disconnected state. CRs-Fixed: 2175472 Change-Id: I093f3c5a80b4f67578dfb114b9cc9ea778f19168 Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
* | | | | Merge "ath10k: dma unmap mgmt tx buffer if wmi cmd send fails"Linux Build Service Account2018-02-02
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ath10k: dma unmap mgmt tx buffer if wmi cmd send failsRakesh Pillai2018-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WCN3990 sends mgmt frames by reference via WMI. If the wmi command send fails, the frame is not being dma unmapped. Fix the missing dma unmapping of mgmt tx frame when wmi command sending fails. Add a separate wmi-tlv op for mgmt tx, via ref, which accepts dma mapped address which is sent to the firmware. CRs-Fixed: 2181836 Change-Id: I3f036023ac0ecbd845d842b649be882fd17619e5 Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
* | | | | Merge "msm: ipa3: lift the HOLB only when WDI enable"Linux Build Service Account2018-02-01
|\ \ \ \ \
| * | | | | msm: ipa3: lift the HOLB only when WDI enableSkylar Chang2018-02-01
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should only remove HOLD on WDI pipes after getting WDI_ENABLE, not on WDI_CONNECT or those Tx pkts will stock in WLAN tx pipes. Change-Id: I23a87afbc5b7a6fe8abbab16fbfe2caab7535f8e Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
* | | | | Merge "icnss: Avoid wlan driver remove during modem graceful shutdown"Linux Build Service Account2018-02-01
|\ \ \ \ \
| * | | | | icnss: Avoid wlan driver remove during modem graceful shutdownHardik Kantilal Patel2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of modem graceful shutdown case during wlan driver remove it delete the wlan interface and later probe time create the new interface. some time new interface may get different interface index. Android wificond framework module is not aware about this interface index change due to this after recovery it try to do scan with old interface index which result into scan failure. To address above issue avoid wlan driver remove during modem graceful shutdown. CRs-Fixed: 2157835 Change-Id: I8b828bef8b5f43cc39ba8ee578dcafc6afaa98d6 Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
* | | | | | Merge "msm: kgsl: Update global memory base to 0XFC000000 for 64bit kernel"Linux Build Service Account2018-02-01
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | msm: kgsl: Update global memory base to 0XFC000000 for 64bit kernelDeepak Kumar2018-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KGSL memstore GPU address should be 32bit value for user mode graphics driver to successfully mmap device memstore. Move global memory base to 0XFC000000 from 0X100000000 for 64bit kernel to allow user mode graphics driver to successfully mmap memstore. Change-Id: Iadfbde5e2b13c1be943a272e424f6c5f05cc1b97 Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
| * | | | | msm: kgsl: Move global memory region to 0x100000000Deepak Kumar2018-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a 64bit kernel, a 32bit user application is not restricted to 3GB limit of virtual memory. It is allowed to access complete 4GB range. Move global memory region to 0x100000000 outside of 32bit range on 64bit kernel to increase the virtual memory range for a 32bit application running on a 64bit kernel. This will also move secure memory region to 0xF0000000. Change-Id: I017ac0c052b4d9466f9f1a66af4a83f0636450cb Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
* | | | | | Merge "ais: adjust frame id values to match user space of all platforms"Linux Build Service Account2018-02-01
|\ \ \ \ \ \
| * | | | | | ais: adjust frame id values to match user space of all platformsAndy Sun2018-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. resume frame done id solution: 2, 4, 6 ... 2. set field SOF id value to starts from 1: 1, 2, 3 ... Change-Id: Ic7aea3cf99cd6d9b6ca62edb4dd17bce065717bd Signed-off-by: Andy Sun <bins@codeaurora.org>
* | | | | | | Merge "ARM: dts: msm: add client id for sde-hyp for msm8996"Linux Build Service Account2018-02-01
|\ \ \ \ \ \ \
| * | | | | | | ARM: dts: msm: add client id for sde-hyp for msm8996Camus Wong2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add client id node for virtual kernel drm driver for msm8996. Change-Id: I579149c72e9fa1741784ee37afb662d04ee20f0a Signed-off-by: Camus Wong <camusw@codeaurora.org>
* | | | | | | | Merge "drm/msm-hyp: parse client id from dtsi"Linux Build Service Account2018-02-01
|\| | | | | | |
| * | | | | | | drm/msm-hyp: parse client id from dtsiCamus Wong2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read client id from dtsi, then parse and return it when queried by user space. This change allows setting different client id without changing driver code. Change-Id: I3858ee80748f2a485a115c652608cc484d6f3720 Signed-off-by: Camus Wong <camusw@codeaurora.org>
* | | | | | | | Merge "ARM: dts: msm: correct the syntax format of firmware node"Linux Build Service Account2018-02-01
|\ \ \ \ \ \ \ \
| * | | | | | | | ARM: dts: msm: correct the syntax format of firmware nodeChao Bi2018-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device node of "firmware" which is used for LA platform should be placed within scope of root node. Change-Id: I9387ee3871415b5f1d9da50979909d2321be0a85 Signed-off-by: Chao Bi <chaobi@codeaurora.org>
* | | | | | | | | Merge "Merge android-4.4.113 (ef588ef) into msm-4.4"Linux Build Service Account2018-02-01
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge android-4.4.113 (ef588ef) into msm-4.4Srinivasarao P2018-01-24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/tmp-ef588ef Linux 4.4.113 MIPS: AR7: ensure the port type's FCR value is used x86/retpoline: Optimize inline assembler for vmexit_fill_RSB x86/pti: Document fix wrong index kprobes/x86: Disable optimizing on the function jumps to indirect thunk kprobes/x86: Blacklist indirect thunk functions for kprobes retpoline: Introduce start/end markers of indirect thunk x86/mce: Make machine check speculation protected kbuild: modversions for EXPORT_SYMBOL() for asm x86/cpu, x86/pti: Do not enable PTI on AMD processors arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6 dm btree: fix serious bug in btree_split_beneath() libata: apply MAX_SEC_1024 to all LITEON EP1 series devices can: peak: fix potential bug in packet fragmentation ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7 phy: work around 'phys' references to usb-nop-xceiv devices tracing: Fix converting enum's from the map in trace_event_eval_update() Input: twl4030-vibra - fix sibling-node lookup Input: twl6040-vibra - fix child-node lookup Input: twl6040-vibra - fix DT node memory management Input: 88pm860x-ts - fix child-node lookup x86/apic/vector: Fix off by one in error path pipe: avoid round_pipe_size() nr_pages overflow on 32-bit module: Add retpoline tag to VERMAGIC x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros sched/deadline: Zero out positive runtime after throttling constrained tasks scsi: hpsa: fix volume offline state af_key: fix buffer overread in parse_exthdrs() af_key: fix buffer overread in verify_address_len() ALSA: hda - Apply the existing quirk to iMac 14,1 ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant ALSA: pcm: Remove yet superfluous WARN_ON() futex: Prevent overflow by strengthen input validation scsi: sg: disable SET_FORCE_LOW_DMA x86/retpoline: Remove compile time warning x86/retpoline: Fill return stack buffer on vmexit x86/retpoline/irq32: Convert assembler indirect jumps x86/retpoline/checksum32: Convert assembler indirect jumps x86/retpoline/xen: Convert Xen hypercall indirect jumps x86/retpoline/hyperv: Convert assembler indirect jumps x86/retpoline/ftrace: Convert ftrace assembler indirect jumps x86/retpoline/entry: Convert entry assembler indirect jumps x86/retpoline/crypto: Convert crypto assembler indirect jumps x86/spectre: Add boot time option to select Spectre v2 mitigation x86/retpoline: Add initial retpoline support kconfig.h: use __is_defined() to check if MODULE is defined EXPORT_SYMBOL() for asm x86/asm: Make asm/alternative.h safe from assembly x86/kbuild: enable modversions for symbols exported from asm x86/asm: Use register variable to get stack pointer value x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC x86/cpu/AMD: Make LFENCE a serializing instruction gcov: disable for COMPILE_TEST ANDROID: sdcardfs: Move default_normal to superblock blkdev: Refactoring block io latency histogram codes FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN FROMLIST: arm64: Move post_ttbr_update_workaround to C code FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path Conflicts: arch/arm64/include/asm/efi.h arch/arm64/include/asm/mmu_context.h drivers/scsi/sg.c drivers/scsi/ufs/ufshcd.h Change-Id: Ibfa06af8ef308077aad6995874d4b7b0a73e95f3 Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
| | * \ \ \ \ \ \ \ \ Merge 4.4.113 into android-4.4Greg Kroah-Hartman2018-01-23
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 4.4.113 gcov: disable for COMPILE_TEST x86/cpu/AMD: Make LFENCE a serializing instruction x86/cpu/AMD: Use LFENCE_RDTSC in preference to MFENCE_RDTSC x86/mm/32: Move setup_clear_cpu_cap(X86_FEATURE_PCID) earlier x86/asm: Use register variable to get stack pointer value x86/kbuild: enable modversions for symbols exported from asm x86/asm: Make asm/alternative.h safe from assembly EXPORT_SYMBOL() for asm kconfig.h: use __is_defined() to check if MODULE is defined x86/retpoline: Add initial retpoline support x86/spectre: Add boot time option to select Spectre v2 mitigation x86/retpoline/crypto: Convert crypto assembler indirect jumps x86/retpoline/entry: Convert entry assembler indirect jumps x86/retpoline/ftrace: Convert ftrace assembler indirect jumps x86/retpoline/hyperv: Convert assembler indirect jumps x86/retpoline/xen: Convert Xen hypercall indirect jumps x86/retpoline/checksum32: Convert assembler indirect jumps x86/retpoline/irq32: Convert assembler indirect jumps x86/retpoline: Fill return stack buffer on vmexit x86/retpoline: Remove compile time warning scsi: sg: disable SET_FORCE_LOW_DMA futex: Prevent overflow by strengthen input validation ALSA: pcm: Remove yet superfluous WARN_ON() ALSA: hda - Apply headphone noise quirk for another Dell XPS 13 variant ALSA: hda - Apply the existing quirk to iMac 14,1 af_key: fix buffer overread in verify_address_len() af_key: fix buffer overread in parse_exthdrs() scsi: hpsa: fix volume offline state sched/deadline: Zero out positive runtime after throttling constrained tasks x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB macros module: Add retpoline tag to VERMAGIC pipe: avoid round_pipe_size() nr_pages overflow on 32-bit x86/apic/vector: Fix off by one in error path Input: 88pm860x-ts - fix child-node lookup Input: twl6040-vibra - fix DT node memory management Input: twl6040-vibra - fix child-node lookup Input: twl4030-vibra - fix sibling-node lookup tracing: Fix converting enum's from the map in trace_event_eval_update() phy: work around 'phys' references to usb-nop-xceiv devices ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7 can: peak: fix potential bug in packet fragmentation libata: apply MAX_SEC_1024 to all LITEON EP1 series devices dm btree: fix serious bug in btree_split_beneath() dm thin metadata: THIN_MAX_CONCURRENT_LOCKS should be 6 arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls x86/cpu, x86/pti: Do not enable PTI on AMD processors kbuild: modversions for EXPORT_SYMBOL() for asm x86/mce: Make machine check speculation protected retpoline: Introduce start/end markers of indirect thunk kprobes/x86: Blacklist indirect thunk functions for kprobes kprobes/x86: Disable optimizing on the function jumps to indirect thunk x86/pti: Document fix wrong index x86/retpoline: Optimize inline assembler for vmexit_fill_RSB MIPS: AR7: ensure the port type's FCR value is used Linux 4.4.113 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * | | | | | | | | Linux 4.4.113Greg Kroah-Hartman2018-01-23
| | | | | | | | | | | |
| | | * | | | | | | | | MIPS: AR7: ensure the port type's FCR value is usedJonas Gorski2018-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0a5191efe06b5103909206e4fbcff81d30283f8e upstream. Since commit aef9a7bd9b67 ("serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers"), the port's default FCR value isn't used in serial8250_do_set_termios anymore, but copied over once in serial8250_config_port and then modified as needed. Unfortunately, serial8250_config_port will never be called if the port is shared between kernel and userspace, and the port's flag doesn't have UPF_BOOT_AUTOCONF, which would trigger a serial8250_config_port as well. This causes garbled output from userspace: [ 5.220000] random: procd urandom read with 49 bits of entropy available ers [kee Fix this by forcing it to be configured on boot, resulting in the expected output: [ 5.250000] random: procd urandom read with 50 bits of entropy available Press the [f] key and hit [enter] to enter failsafe mode Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level Fixes: aef9a7bd9b67 ("serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Nicolas Schichan <nschichan@freebox.fr> Cc: linux-mips@linux-mips.org Cc: linux-serial@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/17544/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | | * | | | | | | | | x86/retpoline: Optimize inline assembler for vmexit_fill_RSBAndi Kleen2018-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3f7d875566d8e79c5e0b2c9a413e91b2c29e0854 upstream. The generated assembler for the C fill RSB inline asm operations has several issues: - The C code sets up the loop register, which is then immediately overwritten in __FILL_RETURN_BUFFER with the same value again. - The C code also passes in the iteration count in another register, which is not used at all. Remove these two unnecessary operations. Just rely on the single constant passed to the macro for the iterations. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: David Woodhouse <dwmw@amazon.co.uk> Cc: dave.hansen@intel.com Cc: gregkh@linuxfoundation.org Cc: torvalds@linux-foundation.org Cc: arjan@linux.intel.com Link: https://lkml.kernel.org/r/20180117225328.15414-1-andi@firstfloor.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | | * | | | | | | | | x86/pti: Document fix wrong indexzhenwei.pi2018-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 98f0fceec7f84d80bc053e49e596088573086421 upstream. In section <2. Runtime Cost>, fix wrong index. Signed-off-by: zhenwei.pi <zhenwei.pi@youruncloud.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: dave.hansen@linux.intel.com Link: https://lkml.kernel.org/r/1516237492-27739-1-git-send-email-zhenwei.pi@youruncloud.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-24 15:41:33 +0000