OSDN Git Service
Linux Build Service Account [Fri, 2 Feb 2018 02:49:17 +0000 (18:49 -0800)]
Merge "msm: ipa3: lift the HOLB only when WDI enable"
Linux Build Service Account [Fri, 2 Feb 2018 02:49:16 +0000 (18:49 -0800)]
Merge "icnss: Avoid wlan driver remove during modem graceful shutdown"
Linux Build Service Account [Fri, 2 Feb 2018 02:49:14 +0000 (18:49 -0800)]
Merge "msm: kgsl: Update global memory base to 0XFC000000 for 64bit kernel"
Skylar Chang [Fri, 26 Jan 2018 01:10:41 +0000 (17:10 -0800)]
msm: ipa3: lift the HOLB only when WDI enable
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>
Linux Build Service Account [Thu, 1 Feb 2018 09:42:16 +0000 (01:42 -0800)]
Merge "ais: adjust frame id values to match user space of all platforms"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:14 +0000 (01:42 -0800)]
Merge "ARM: dts: msm: add client id for sde-hyp for msm8996"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:14 +0000 (01:42 -0800)]
Merge "drm/msm-hyp: parse client id from dtsi"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:12 +0000 (01:42 -0800)]
Merge "ARM: dts: msm: correct the syntax format of firmware node"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:11 +0000 (01:42 -0800)]
Merge "Merge android-4.4.113 (
ef588ef) into msm-4.4"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:09 +0000 (01:42 -0800)]
Merge "ath10k: Indicate MSDU_ID_NEW_PARTITION support in host cap flags"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:08 +0000 (01:42 -0800)]
Merge "ath10k: Add host capability indication flag in wmi ready cmd"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:06 +0000 (01:42 -0800)]
Merge "spi: spi_qsd: Correct SPI slave hw init sequence"
Linux Build Service Account [Thu, 1 Feb 2018 09:42:05 +0000 (01:42 -0800)]
Merge "ARM: dts: msm: disable tv tuner on apq8096pro and msm8996pro ADP Lite"
Hardik Kantilal Patel [Fri, 12 Jan 2018 12:32:10 +0000 (18:02 +0530)]
icnss: Avoid wlan driver remove during modem graceful shutdown
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>
Camus Wong [Mon, 29 Jan 2018 03:57:01 +0000 (22:57 -0500)]
ARM: dts: msm: add client id for sde-hyp for msm8996
Add client id node for virtual kernel drm driver for msm8996.
Change-Id: I579149c72e9fa1741784ee37afb662d04ee20f0a
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Camus Wong [Mon, 29 Jan 2018 03:45:01 +0000 (22:45 -0500)]
drm/msm-hyp: parse client id from dtsi
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>
Linux Build Service Account [Wed, 31 Jan 2018 16:52:31 +0000 (08:52 -0800)]
Merge "spi_qsd: Add sysfs entry for QUP state"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:30 +0000 (08:52 -0800)]
Merge "ath10k: Enable SRRI/DRRI support on ddr"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:29 +0000 (08:52 -0800)]
Merge "mmc: sdhci: Avoid leaking kernel addresses"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:28 +0000 (08:52 -0800)]
Merge "mmc: sdhci-msm: Remove printing tlmm physical address"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:27 +0000 (08:52 -0800)]
Merge "mmc: cmdq-hci: Change unnecessary pr_err logs to pr_debug"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:26 +0000 (08:52 -0800)]
Merge "mmc: sdhci-msm: Avoid leaking kernel address from mmc platform driver"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:24 +0000 (08:52 -0800)]
Merge "ARM: dts: msm: Change PM8994 GPIO11 configuration for Mizar"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:23 +0000 (08:52 -0800)]
Merge "ARM: dts: msm: switch to virtual clock for usb3 on msm8996 vplatform"
Linux Build Service Account [Wed, 31 Jan 2018 16:52:22 +0000 (08:52 -0800)]
Merge "ARM: dts: msm: add a device tree for LV in multi-GVMs"
Alok Chauhan [Thu, 25 Jan 2018 20:49:18 +0000 (02:19 +0530)]
spi: spi_qsd: Correct SPI slave hw init sequence
While configuring QUP in SPI slave mode, an internal
HW signal needs to propagate from AHB clock domain
to SPI core clock domain. To make sure a safe and
correct propagation of this signal the software should
perform the SPI HW init sequence in proper order.
Change-Id: Ied621bb5d1ba793ce48c5a6a0f6be3b86b3a6773
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
Chao Bi [Mon, 29 Jan 2018 08:47:25 +0000 (16:47 +0800)]
ARM: dts: msm: correct the syntax format of firmware node
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>
Linux Build Service Account [Tue, 30 Jan 2018 15:22:38 +0000 (07:22 -0800)]
Merge "usb: dwc3: Suspend USB SS PHY in host mode with device connect case"
Rahul Sharma [Tue, 30 Jan 2018 08:20:01 +0000 (13:50 +0530)]
ARM: dts: msm: disable tv tuner on apq8096pro and msm8996pro ADP Lite
Tv tuner is not used on apq8096pro auto adp lite
and msm8996pro auto adp lite platform.
So disable tv tuner to fix bootup failure in ADP lite Board.
Change-Id: Icc2082cc1fa21373bd0d97c3d4671946403355ea
Suggested-by: Suprith Shankaregowda <c_suprit@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Dilip Kota [Fri, 22 Dec 2017 11:10:49 +0000 (16:40 +0530)]
spi_qsd: Add sysfs entry for QUP state
QUP state entry exposes the state of the SPI QUP
hardware. It tells whether SPI QUP is in run state,
pause state or reset state.
Change-Id: Idc012a30f78846ff5b4c6da20adcf68a7cd2b4d3
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
Dilip Kota [Thu, 14 Dec 2017 15:21:19 +0000 (20:51 +0530)]
spi_qsd: Reset SPI core for transaction failure
Reset SPI core for transaction failure.
Remove the code configuring IO_CONTROL register
for SPI slave.
Change-Id: I3819269a9f2b7815ccfaf96713943eb04b36e137
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
Govind Singh [Mon, 17 Apr 2017 12:24:46 +0000 (17:54 +0530)]
ath10k: Enable SRRI/DRRI support on ddr
The SRRI/DRRI can be read from DDR instead of doing an
actual hardware read. Host allocates non cached memory
on ddr and sends the physical address of this memory to
the CE hardware. The hardware updates the RRI on this
particular location. Target registers are not accessible
during CSS shutdown while target is in idle mode. Direct
access to SRRI/DRRI can lead to NOC error in target idle
state. Read SRRI/DRRI from DDR location instead of
direct target read.
Change-Id: Iae3772fb6408469c5f9db8a9210d3ab6ea35eccf
Signed-off-by: Govind Singh <govinds@codeaurora.org>
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Deepak Kumar [Mon, 29 Jan 2018 11:40:18 +0000 (17:10 +0530)]
msm: kgsl: Update global memory base to 0XFC000000 for 64bit kernel
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>
Vijay Viswanath [Fri, 5 Jan 2018 05:10:28 +0000 (10:40 +0530)]
mmc: sdhci: Avoid leaking kernel addresses
Use %pK instead of %p in debug logs so that kernel addresses don't get
leaked when debug logs are dynamically enabled.
Change-Id: I3c0df8a8db6643ab547d8599dd03b54030f76ece
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Vijay Viswanath [Fri, 5 Jan 2018 05:52:03 +0000 (11:22 +0530)]
mmc: sdhci-msm: Remove printing tlmm physical address
Remove the debug log which leaks physical address,
eventhough tlmm is no longer used.
Change-Id: Ie6968c46ea063e9192e2ccef053107ee7d8f5775
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Vijay Viswanath [Mon, 11 Dec 2017 05:20:29 +0000 (10:50 +0530)]
mmc: cmdq-hci: Change unnecessary pr_err logs to pr_debug
Now that CMDQ device and driver are stable, Change unnecessary
pr_err logs to pr_debug.
Also use %pK instead of %p while printing addresses to avoid leaking
of kernel addresses.
Change-Id: I95683ffe0410daef86dd9a376f5769d8f40ae990
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Vijay Viswanath [Mon, 11 Dec 2017 05:22:49 +0000 (10:52 +0530)]
mmc: sdhci-msm: Avoid leaking kernel address from mmc platform driver
Remove printing the address of sdhci_msm driver variables to avoid
leaking the kernel addresses. This is no longer required as the
sdhci_msm driver has become stable.
Change-Id: I88d9d66d9d00adad8ec79df689ae80f4aae97b7e
Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
Linux Build Service Account [Mon, 29 Jan 2018 22:02:09 +0000 (14:02 -0800)]
Merge "ARM: dts: msm: Make allocation for diag as guaranteed on msm8998"
Linux Build Service Account [Mon, 29 Jan 2018 22:02:08 +0000 (14:02 -0800)]
Merge "soc: qcom: qdss_bridge: add support for SSR"
Bharathraj Nagaraju [Sat, 27 Jan 2018 00:22:45 +0000 (16:22 -0800)]
ARM: dts: msm: Change PM8994 GPIO11 configuration for Mizar
For Mizar drive strength of PMIC_GPIO_11 should be medium.
Changed PMIC_GPIO_11 drive strength to medium.
Change-Id: I4d7d5e4065c6d29be4d8567a8e40472fc1f62f9e
Signed-off-by: Bharathraj Nagaraju <snbraj@codeaurora.org>
Surabhi Vishnoi [Mon, 29 Jan 2018 12:54:40 +0000 (18:24 +0530)]
ath10k: Indicate MSDU_ID_NEW_PARTITION support in host cap flags
The HL1.0 firmware uses msdu desc_id above 3000 as a reference
to indicate tx completion on a different endpoint. Due to this, if the
host driver uses more than 3000 msdu desc_id, the tx completion
for the msdu with desc_id above 3000 is sent to a different endpoint.
Setting the MSDU_ID_NEW_PARTITION host driver capability support
in the wmi ready flags indicates to the HL1.0 firmware to change
this threshold reference to a higher value.
Change-Id: If7bbddb6827bbe2be995c153328611930319d74e
Signed-off-by: Surabhi Vishnoi <svishnoi@codeaurora.org>
Surabhi Vishnoi [Mon, 29 Jan 2018 05:59:41 +0000 (11:29 +0530)]
ath10k: Add host capability indication flag in wmi ready cmd
Add the host capability indication flags in the wmi ready command,
for firmware to know the features supported by host driver.
Change-Id: I0c07fb371e474995cb00f51bfe0eea4f46ab4223
Signed-off-by: Surabhi Vishnoi <svishnoi@codeaurora.org>
Yimin Peng [Wed, 27 Dec 2017 09:23:27 +0000 (17:23 +0800)]
ARM: dts: msm: switch to virtual clock for usb3 on msm8996 vplatform
Virtual clock driver is ready and gvm needs to manage clocks of usb3
which is a typical pass through device.
Change-Id: Ie8edfce2602f090d0f6b59d0af2e4b39282dfd6d
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Andy Sun [Mon, 29 Jan 2018 10:34:58 +0000 (18:34 +0800)]
ais: adjust frame id values to match user space of all platforms
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>
Yong Ding [Mon, 29 Jan 2018 08:14:54 +0000 (16:14 +0800)]
ARM: dts: msm: add a device tree for LV in multi-GVMs
The new device tree file is used to support the LV GVM
which will run in multiple Guest VMs environment, like
together with a LA GVM.
Change-Id: I086488012169531027699c0970221bb58056ec24
Signed-off-by: Yong Ding <yongding@codeaurora.org>
Linux Build Service Account [Mon, 29 Jan 2018 07:35:14 +0000 (23:35 -0800)]
Merge "ASoC: msm: Loopback Driver Reg Stream in Prepare Stage"
Manoj Prabhu B [Mon, 11 Dec 2017 09:19:35 +0000 (14:49 +0530)]
ARM: dts: msm: Make allocation for diag as guaranteed on msm8998
Currently, memshare allocates 5MB memory to diag client on
receiving requests from modem. With the patch diag client
will be considered guaranteed on msm8998 to avoid memory
allocation failure on modem SSRs. Marking diag guaranteed
client allocated memory will never be freed.
Change-Id: I93fa8ae34d2268f6a18c7311b6833ed7e33ab30b
Signed-off-by: Manoj Prabhu B <bmanoj@codeaurora.org>
Linux Build Service Account [Sat, 27 Jan 2018 00:10:33 +0000 (16:10 -0800)]
Merge "ARM: dts: msm: Add cnss for WLAN in ivi vplatform"
Linux Build Service Account [Sat, 27 Jan 2018 00:10:32 +0000 (16:10 -0800)]
Merge "ARM: dts: msm: Switch to virtual clock and reset for usb2 on vplatform"
Linux Build Service Account [Sat, 27 Jan 2018 00:10:30 +0000 (16:10 -0800)]
Merge "ARM: dts: msm: Change haptic vmax and play-rate setting for QRD660"
Linux Build Service Account [Fri, 26 Jan 2018 13:40:06 +0000 (05:40 -0800)]
Merge "ARM: dts: msm: usb3 switches to virtual reset on msm8996 vplatfrom"
Linux Build Service Account [Fri, 26 Jan 2018 13:40:05 +0000 (05:40 -0800)]
Merge "ARM: dts: msm: Add a baseline device tree for msm8996 vplatform"
Linux Build Service Account [Fri, 26 Jan 2018 13:40:03 +0000 (05:40 -0800)]
Merge "qcom: qpnp-haptics: extend stop timer for a longer request"
Ferry Zhou [Fri, 19 Jan 2018 02:57:15 +0000 (10:57 +0800)]
ARM: dts: msm: Add cnss for WLAN in ivi vplatform
Add qcom,cnss for WLAN over PCIe in msm8996 ivi vplatform.
Change-Id: Ic1480ca4c75145e1cc97f92602772a76d69837a5
Signed-off-by: Ferry Zhou <tianguiz@codeaurora.org>
Linux Build Service Account [Thu, 25 Jan 2018 19:37:38 +0000 (11:37 -0800)]
Merge "ais: move axi_irq process before sof_irq"
Linux Build Service Account [Thu, 25 Jan 2018 19:37:37 +0000 (11:37 -0800)]
Merge "soc: qcom: pil: Increase MBA encryption timeout to 5secs"
Linux Build Service Account [Thu, 25 Jan 2018 19:37:36 +0000 (11:37 -0800)]
Merge "icnss: Avoid qmi exchange when fw is down"
Linux Build Service Account [Thu, 25 Jan 2018 19:37:34 +0000 (11:37 -0800)]
Merge "ASoC: msm: qdsp6v2: correct return value check"
Linux Build Service Account [Thu, 25 Jan 2018 19:37:33 +0000 (11:37 -0800)]
Merge "ASoc: wcd_cpe_core: Add mutex lock for CPE session"
Linux Build Service Account [Thu, 25 Jan 2018 19:37:31 +0000 (11:37 -0800)]
Merge "ASoC: wcd_cpe_core: add size check for WDSP ELF files"
Mayank Rana [Tue, 15 Aug 2017 17:41:28 +0000 (10:41 -0700)]
usb: dwc3: Suspend USB SS PHY in host mode with device connect case
Currently driver is not suspending USB Super Speed PHY (here USB QMP
PHY) with below usecases.
a. USB super speed HUB is connected and going into bus suspend
b. USB super speed HUB is connected and having USB super speed device
connected on HUB's downstream port
This results into no USB super speed device connect or removal being
detected as autonomous mode is not being enabled with USB QMP PHY.
Fix these issues by suspending USB SS PHY in host mode with device
connect (i.e. HUB or HUB with USB SS device connected) case.
Change-Id: I469b02f0845228f55d9253e7683ea3c133fd9542
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Andy Sun [Thu, 25 Jan 2018 07:32:00 +0000 (15:32 +0800)]
ais: move axi_irq process before sof_irq
Under high cpu loading condition, next field sof will come with previous
frame done together, need to process for previous one firstly.
Change-Id: I9438e5adc034a20a39b0bc072e97df05f8863e9d
Signed-off-by: Andy Sun <bins@codeaurora.org>
Zhiqiang Tu [Mon, 15 Jan 2018 04:50:15 +0000 (12:50 +0800)]
ARM: dts: msm: Add a baseline device tree for msm8996 vplatform
The baseline device tree is for firmware update on msm8996 virtual
platform. It does not need any peripheral.
Change-Id: I080038a03b7dc484f6149f8c832374ee6def031b
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Jitendra Sharma [Thu, 18 Jan 2018 12:43:20 +0000 (18:13 +0530)]
soc: qcom: pil: Increase MBA encryption timeout to 5secs
Increase PIL timeout to give MBA more time for encryption
for modem segments as now wlan segments are also being
dumped in addition to modem and we see that encryption
for WLAN is taking extra time.
Change-Id: Ic1b43c63bcd4f0d46fbd73695a95de5917fddd9e
Signed-off-by: Jitendra Sharma <shajit@codeaurora.org>
Anurag Chouhan [Fri, 19 Jan 2018 10:29:25 +0000 (15:59 +0530)]
icnss: Avoid qmi exchange when fw is down
Currently wlan Host driver call exported API's which
invoke qmi exchanges irrespective of the firmware status
which leads to QMI timeouts.
To address this issue avoid sending qmi request to
firmware when firmware is down.
CRs-Fixed:
2175302
Change-Id: Ie5e340cebf7ee7f6143472e7dca0dfd9600d1b7d
Signed-off-by: Anurag Chouhan <achouhan@codeaurora.org>
Linux Build Service Account [Thu, 25 Jan 2018 04:36:49 +0000 (20:36 -0800)]
Merge "msm: ipa: add new IPA filtering bitmap"
Linux Build Service Account [Thu, 25 Jan 2018 04:36:48 +0000 (20:36 -0800)]
Merge "soc: qcom: pil: Add PDR minidump support"
Linux Build Service Account [Thu, 25 Jan 2018 04:36:45 +0000 (20:36 -0800)]
Merge "Merge android-4.4.112 (
5f6325b) into msm-4.4"
Linux Build Service Account [Thu, 25 Jan 2018 04:36:43 +0000 (20:36 -0800)]
Merge "msm: camera: Fix csiphy issue on sdm660"
Linux Build Service Account [Thu, 25 Jan 2018 04:36:42 +0000 (20:36 -0800)]
Merge "defconfig: msm: Modify tv tuner config in MSM8996"
Fenglin Wu [Tue, 23 Jan 2018 01:35:50 +0000 (09:35 +0800)]
ARM: dts: msm: Change haptic vmax and play-rate setting for QRD660
QRD660 device is using a LRA with 235Hz frequency and 1.8V max input
voltage, change the haptic setting to match with the vibrator spec.
CRs-Fixed:
2176673
Change-Id: I219522060d45ce51c0a01e20cb343046968218c5
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
Linux Build Service Account [Wed, 24 Jan 2018 17:12:48 +0000 (09:12 -0800)]
Merge "msm: ipa: return the wifi stats when reset is set"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:47 +0000 (09:12 -0800)]
Merge "ipv6: release rt6->rt6i_idev properly during ifdown"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:45 +0000 (09:12 -0800)]
Merge "mmc: core: Reset on error during deferred resume"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:44 +0000 (09:12 -0800)]
Merge "ais: support field info report to user space"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:42 +0000 (09:12 -0800)]
Merge "clk: msm: Add usb2s support for msm8996 virtual clock"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:41 +0000 (09:12 -0800)]
Merge "ARM: dts: msm: Add msm android vm device node on msm8996 vplatform"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:40 +0000 (09:12 -0800)]
Merge "ARM: dts: msm: remove no-map for lk_pool on msm8996 auto boards"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:38 +0000 (09:12 -0800)]
Merge "ARM: dts: msm: add usb2s and usb3 devices on msm8996 vplatform"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:37 +0000 (09:12 -0800)]
Merge "net: cnss2: Enable CONFIG_CNSS_UTILS for msm8996AU"
Linux Build Service Account [Wed, 24 Jan 2018 17:12:36 +0000 (09:12 -0800)]
Merge "dev_freq: devfreq_spdm: add null terminator to prevent OOB access"
Srinivasarao P [Wed, 24 Jan 2018 12:55:18 +0000 (18:25 +0530)]
Merge android-4.4.113 (
ef588ef) into msm-4.4
* 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>
Vijay kumar Tumati [Wed, 24 Jan 2018 06:58:11 +0000 (12:28 +0530)]
msm: camera: Fix csiphy issue on sdm660
Align with HPG for impedance value. This
effects cphy mode of operation.
Change-Id: I742ac285aacc36843698fc3ee746dc88a099f78d
Signed-off-by: Vijay kumar Tumati <vtumati@codeaurora.org>
Rahul Sharma [Mon, 22 Jan 2018 10:44:52 +0000 (16:14 +0530)]
defconfig: msm: Modify tv tuner config in MSM8996
Make TV tuner driver as a built-in module in MSM8996 auto defconfig
and MSM8996 perf defconfig.
Change-Id: I910d6f5d72c304591bd87245f03fa4cb140b03cd
Suggested-by: Suprith Shankaregowda <c_suprit@qti.qualcomm.com>
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Jitendra Sharma [Mon, 8 Jan 2018 07:42:33 +0000 (13:12 +0530)]
soc: qcom: pil: Add PDR minidump support
This change add support to collect PD dump along
with minidump on subsystem ssr event.
Change-Id: Icb3c20ee2f37ecc8bdbc91d9ba1ee7f383fa075a
Signed-off-by: Jitendra Sharma <shajit@codeaurora.org>
Srinivasarao P [Wed, 24 Jan 2018 07:02:01 +0000 (12:32 +0530)]
Merge android-4.4.112 (
5f6325b) into msm-4.4
* refs/heads/tmp-
5f6325b
Linux 4.4.112
selftests/x86: Add test_vsyscall
x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm
x86/alternatives: Fix optimize_nops() checking
sysfs/cpu: Fix typos in vulnerability documentation
x86/cpu: Implement CPU vulnerabilites sysfs functions
sysfs/cpu: Add vulnerability folder
x86/cpu: Merge bugs.c and bugs_64.c
x86/cpufeatures: Add X86_BUG_SPECTRE_V[12]
x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
x86/cpufeatures: Add X86_BUG_CPU_INSECURE
x86/cpufeatures: Make CPU bugs sticky
x86/cpu: Factor out application of forced CPU caps
x86/Documentation: Add PTI description
e1000e: Fix e1000_check_for_copper_link_ich8lan return value.
uas: ignore UAS for Norelsys NS1068(X) chips
Bluetooth: Prevent stack info leak from the EFS element.
staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl
usbip: remove kernel addresses from usb device and urb debug msgs
USB: fix usbmon BUG trigger
usb: misc: usb3503: make sure reset is low for at least 100us
USB: serial: cp210x: add new device ID ELV ALC 8xxx
USB: serial: cp210x: add IDs for LifeScan OneTouch Verio IQ
target: Avoid early CMD_T_PRE_EXECUTE failures during ABORT_TASK
iscsi-target: Make TASK_REASSIGN use proper se_cmd->cmd_kref
bpf, array: fix overflow in max_entries and undefined behavior in index_mask
bpf: prevent out-of-bounds speculation
bpf: adjust insn_aux_data when patching insns
bpf: refactor fixup_bpf_calls()
bpf: move fixup_bpf_calls() function
bpf: don't (ab)use instructions to store state
bpf: add bpf_patch_insn_single helper
kaiser: Set _PAGE_NX only if supported
drm/vmwgfx: Potential off by one in vmw_view_add()
KVM: x86: Add memory barrier on vmcs field lookup
x86/microcode/intel: Extend BDW late-loading with a revision check
rbd: set max_segments to USHRT_MAX
crypto: algapi - fix NULL dereference in crypto_remove_spawns()
ipv6: fix possible mem leaks in ipv6_make_skb()
net: stmmac: enable EEE in MII, GMII or RGMII only
sh_eth: fix SH7757 GEther initialization
sh_eth: fix TSU resource handling
RDS: null pointer dereference in rds_atomic_free_op
RDS: Heap OOB write in rds_message_alloc_sgs()
net: core: fix module type in sock_diag_bind
ip6_tunnel: disable dst caching if tunnel is dual-stack
8021q: fix a memory leak for VLAN 0 device
x86/pti/efi: broken conversion from efi to kernel page table
Revert "userfaultfd: selftest: vm: allow to build in vm/ directory"
xhci: Fix ring leak in failure path of xhci_alloc_virt_device()
sysrq: Fix warning in sysrq generated crash.
hwrng: core - sleep interruptible in read
x86/mm/pat, /dev/mem: Remove superfluous error message
cx82310_eth: use skb_cow_head() to deal with cloned skbs
smsc75xx: use skb_cow_head() to deal with cloned skbs
sr9700: use skb_cow_head() to deal with cloned skbs
lan78xx: use skb_cow_head() to deal with cloned skbs
r8152: adjust ALDPS function
r8152: use test_and_clear_bit
r8152: fix the wake event
usb: musb: ux500: Fix NULL pointer dereference at system PM
usbvision fix overflow of interfaces array
locking/mutex: Allow next waiter lockless wakeup
futex: Replace barrier() in unqueue_me() with READ_ONCE()
locks: don't check for race with close when setting OFD lock
zswap: don't param_set_charp while holding spinlock
mm/zswap: use workqueue to destroy pool
mm/page-writeback: fix dirty_ratelimit calculation
mm/compaction: pass only pageblock aligned range to pageblock_pfn_to_page
mm/compaction: fix invalid free_pfn and compact_cached_free_pfn
x86/acpi: Reduce code duplication in mp_override_legacy_irq()
ALSA: aloop: Fix racy hw constraints adjustment
ALSA: aloop: Fix inconsistent format due to incomplete rule
ALSA: aloop: Release cable upon open error path
ALSA: pcm: Allow aborting mutex lock at OSS read/write loops
ALSA: pcm: Abort properly at pending signal in OSS read/write loops
ALSA: pcm: Add missing error checks in OSS emulation plugin builder
ALSA: pcm: Remove incorrect snd_BUG_ON() usages
iommu/arm-smmu-v3: Don't free page table ops twice
x86/acpi: Handle SCI interrupts above legacy space gracefully
x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n
kvm: vmx: Scrub hardware GPRs at VM-exit
net/mac80211/debugfs.c: prevent build failure with CONFIG_UBSAN=y
MIPS: Disallow outsized PTRACE_SETREGSET NT_PRFPREG regset accesses
MIPS: Also verify sizeof `elf_fpreg_t' with PTRACE_SETREGSET
MIPS: Fix an FCSR access API regression with NT_PRFPREG and MSA
MIPS: Consistently handle buffer counter with PTRACE_SETREGSET
MIPS: Guard against any partial write attempt with PTRACE_SETREGSET
MIPS: Factor out NT_PRFPREG regset access helpers
MIPS: Validate PR_SET_FP_MODE prctl(2) requests against the ABI of the task
IB/srpt: Disable RDMA access by the initiator
can: gs_usb: fix return value of the "set_bittiming" callback
KVM: Fix stack-out-of-bounds read in write_mmio
dm bufio: fix shrinker scans when (nr_to_scan < retain_target)
fscrypt: updates on 4.15-rc4
ANDROID: uid_sys_stats: fix the comment
BACKPORT: optee: fix invalid of_node_put() in optee_driver_init()
BACKPORT: tee: optee: sync with new naming of interrupts
BACKPORT: tee: indicate privileged dev in gen_caps
BACKPORT: tee: optee: interruptible RPC sleep
BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
BACKPORT: tee: add forward declaration for struct device
BACKPORT: tee: optee: fix uninitialized symbol 'parg'
BACKPORT: tee.txt: standardize document format
BACKPORT: tee: add ARM_SMCCC dependency
BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
Conflicts:
security/selinux/nlmsgtab.c
Change-Id: I5770a565f39c321f2305f8228e41f822e3cd0625
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Srinivasarao P [Wed, 24 Jan 2018 06:49:03 +0000 (12:19 +0530)]
Merge android-4.4.111 (
f851888) into msm-4.4
* refs/heads/tmp-
f851888
Linux 4.4.111
Fix build error in vma.c
Map the vsyscall page with _PAGE_USER
proc: much faster /proc/vmstat
module: Issue warnings when tainting kernel
module: keep percpu symbols in module's symtab
genksyms: Handle string literals with spaces in reference files
x86/tlb: Drop the _GPL from the cpu_tlbstate export
parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
x86/microcode/AMD: Add support for fam17h microcode loading
Input: elantech - add new icbody type 15
ARC: uaccess: dont use "l" gcc inline asm constraint modifier
kernel/signal.c: remove the no longer needed SIGNAL_UNKILLABLE check in complete_signal()
kernel/signal.c: protect the SIGNAL_UNKILLABLE tasks from !sig_kernel_only() signals
kernel/signal.c: protect the traced SIGNAL_UNKILLABLE tasks from SIGKILL
kernel: make groups_sort calling a responsibility group_info allocators
fscache: Fix the default for fscache_maybe_release_page()
sunxi-rsb: Include OF based modalias in device uevent
crypto: pcrypt - fix freeing pcrypt instances
crypto: chacha20poly1305 - validate the digest size
crypto: n2 - cure use after free
kernel/acct.c: fix the acct->needcheck check in check_free_space()
x86/kasan: Write protect kasan zero shadow
clocksource: arch_timer: make virtual counter access configurable
arm64: issue isb when trapping CNTVCT_EL0 access
BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
BACKPORT: arm64: Add CNTVCT_EL0 trap handler
ANDROID: sdcardfs: Fix missing break on default_normal
ANDROID: usb: f_fs: Prevent gadget unbind if it is already unbound
arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
arm64: use RET instruction for exiting the trampoline
FROMLIST: arm64: kaslr: Put kernel vectors address in separate data page
FROMLIST: arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
FROMLIST: arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
FROMLIST: arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
FROMLIST: arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
FROMLIST: arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
FROMLIST: arm64: entry: Hook up entry trampoline to exception vectors
FROMLIST: arm64: entry: Explicitly pass exception level to kernel_ventry macro
FROMLIST: arm64: mm: Map entry trampoline into trampoline and kernel page tables
FROMLIST: arm64: entry: Add exception trampoline page for exceptions from EL0
FROMLIST: arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
FROMLIST: arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
FROMLIST: arm64: mm: Allocate ASIDs in pairs
FROMLIST: arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
FROMLIST: arm64: mm: Move ASID from TTBR0 to TTBR1
FROMLIST: arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
FROMLIST: arm64: mm: Use non-global mappings for kernel space
UPSTREAM: arm64: factor out entry stack manipulation
UPSTREAM: arm64: tlbflush.h: add __tlbi() macro
Conflicts:
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/asm-offsets.c
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/vmlinux.lds.S
drivers/clocksource/Kconfig
drivers/clocksource/arm_arch_timer.c
drivers/usb/gadget/function/f_fs.c
Change-Id: I41e84762e30c9a7b1e283850c3f780f3dbe86f44
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Fenglin Wu [Fri, 12 Jan 2018 03:30:55 +0000 (11:30 +0800)]
qcom: qpnp-haptics: extend stop timer for a longer request
Haptics works as a timed output device and it doesn't expect another
enable request while current one is still in progress. If a new
enabling request comes in and its duration is longer than current
pattern's expiry then extend the stop timer.
CRs-Fixed:
2171601
Change-Id: I1f1f4e9a58140114a41d2af54b06cd798332eae4
Signed-off-by: Fenglin Wu <fenglinw@codeaurora.org>
Cong Tang [Tue, 28 Nov 2017 03:44:40 +0000 (11:44 +0800)]
ASoC: msm: Loopback Driver Reg Stream in Prepare Stage
Move the msm_pcm_routing_reg_phy_stream() to prepare stage.
Then it allows to set channel mixer configuration pre usecase start.
Change-Id: I1811c4d9bcbdd2bb1ee425044407a2c61e794a9a
Signed-off-by: Cong Tang <congt@codeaurora.org>
Zhiqiang Tu [Wed, 10 Jan 2018 02:37:57 +0000 (10:37 +0800)]
ARM: dts: msm: usb3 switches to virtual reset on msm8996 vplatfrom
Enable virtual reset controller for usb3 on msm8996 virtual
platform.
Change-Id: Ie25210a3304ade476c8b6a1c180591a1162bedb2
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Greg Kroah-Hartman [Tue, 23 Jan 2018 19:01:24 +0000 (20:01 +0100)]
Merge 4.4.113 into android-4.4
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>
Greg Kroah-Hartman [Tue, 23 Jan 2018 18:50:18 +0000 (19:50 +0100)]
Linux 4.4.113
Jonas Gorski [Sun, 29 Oct 2017 15:27:21 +0000 (16:27 +0100)]
MIPS: AR7: ensure the port type's FCR value is used
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>
Andi Kleen [Wed, 17 Jan 2018 22:53:28 +0000 (14:53 -0800)]
x86/retpoline: Optimize inline assembler for vmexit_fill_RSB
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>
zhenwei.pi [Thu, 18 Jan 2018 01:04:52 +0000 (09:04 +0800)]
x86/pti: Document fix wrong index
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>
Masami Hiramatsu [Thu, 18 Jan 2018 16:15:20 +0000 (01:15 +0900)]
kprobes/x86: Disable optimizing on the function jumps to indirect thunk
commit
c86a32c09f8ced67971a2310e3b0dda4d1749007 upstream.
Since indirect jump instructions will be replaced by jump
to __x86_indirect_thunk_*, those jmp instruction must be
treated as an indirect jump. Since optprobe prohibits to
optimize probes in the function which uses an indirect jump,
it also needs to find out the function which jump to
__x86_indirect_thunk_* and disable optimization.
Add a check that the jump target address is between the
__indirect_thunk_start/end when optimizing kprobe.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Link: https://lkml.kernel.org/r/151629212062.10241.6991266100233002273.stgit@devbox
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masami Hiramatsu [Thu, 18 Jan 2018 16:14:51 +0000 (01:14 +0900)]
kprobes/x86: Blacklist indirect thunk functions for kprobes
commit
c1804a236894ecc942da7dc6c5abe209e56cba93 upstream.
Mark __x86_indirect_thunk_* functions as blacklist for kprobes
because those functions can be called from anywhere in the kernel
including blacklist functions of kprobes.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Link: https://lkml.kernel.org/r/151629209111.10241.5444852823378068683.stgit@devbox
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Masami Hiramatsu [Thu, 18 Jan 2018 16:14:21 +0000 (01:14 +0900)]
retpoline: Introduce start/end markers of indirect thunk
commit
736e80a4213e9bbce40a7c050337047128b472ac upstream.
Introduce start/end markers of __x86_indirect_thunk_* functions.
To make it easy, consolidate .text.__x86.indirect_thunk.* sections
to one .text.__x86.indirect_thunk section and put it in the
end of kernel text section and adds __indirect_thunk_start/end
so that other subsystem (e.g. kprobes) can identify it.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org>
Link: https://lkml.kernel.org/r/151629206178.10241.6828804696410044771.stgit@devbox
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Thomas Gleixner [Thu, 18 Jan 2018 15:28:26 +0000 (16:28 +0100)]
x86/mce: Make machine check speculation protected
commit
6f41c34d69eb005e7848716bbcafc979b35037d5 upstream.
The machine check idtentry uses an indirect branch directly from the low
level code. This evades the speculation protection.
Replace it by a direct call into C code and issue the indirect call there
so the compiler can apply the proper speculation protection.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by:Borislav Petkov <bp@alien8.de>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
Niced-by: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801181626290.1847@nanos
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Nicholas Piggin [Tue, 1 Nov 2016 01:46:19 +0000 (12:46 +1100)]
kbuild: modversions for EXPORT_SYMBOL() for asm
commit
4efca4ed05cbdfd13ec3e8cb623fb77d6e4ab187 upstream.
Allow architectures to create asm/asm-prototypes.h file that
provides C prototypes for exported asm functions, which enables
proper CRC versions to be generated for them.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
[jkosina@suse.cz: folded
cc6acc11cad1 fixup in as well ]
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>