summaryrefslogtreecommitdiff
path: root/arch (follow)
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | | ARM: dts: msm: Enable support for guest virtual platformAtul Raut2017-05-16
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add device tree to support guest virtual machine on msm kernel. CRs-Fixed: 2000645 Change-Id: I4ca06c28c349dd533057b24fe6794a7c11a84cc6 Signed-off-by: Atul Raut <araut@codeaurora.org>
* | | | | | | | | | | | | Merge "ARM: dts: msm: always enable mdss_mdp node for msm8998 based MOB3 ↵Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | platform"
| * | | | | | | | | | | | ARM: dts: msm: always enable mdss_mdp node for msm8998 based MOB3 platformNarender Ankam2017-05-16
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Duplicate probing of mdss_mdp device node is now handled within SDE driver. Change-Id: I3e4bb5c73c8d43e6fe07ff791ea3815636e50a55 Signed-off-by: Narender Ankam <nankam@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: Update high-speed PHY parameters for QRD SDM660"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ARM: dts: msm: Update high-speed PHY parameters for QRD SDM660Ziqi Chen2017-05-15
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRD SDM660 failed on high-speed eye diagram test. Updated these parameters based on tuning result to pass compliance test. Change-Id: Ice00698872be4c39c2184dbd5bc2d99af7641b02 Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: Update high-speed PHY parameters for QRD SDM630"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ARM: dts: msm: Update high-speed PHY parameters for QRD SDM630Ziqi Chen2017-05-15
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRD SDM630 failed on high-speed eye diagram test. Update these parameters based on tuning result to pass compliance test. Change-Id: I34bb4d7808448ba687bdd9495e1573cb9eac6098 Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
* | | | | | | | | | | | Merge "defconfig: arm64: Enable UFSHCD_CMD_LOGGING flag"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | defconfig: arm64: Enable UFSHCD_CMD_LOGGING flagCan Guo2017-05-15
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling SCSI_UFSHCD_CMD_LOGGING flag in defconfig file. With this feature eanbled, ufs commands send through ufshcd shall be logged. Change-Id: Ibc4d1f39221fbcdc926e030d1df08a9fea31d24c Signed-off-by: Can Guo <cang@codeaurora.org>
* | | | | | | | | | | | Merge "ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATAStephen Boyd2017-05-12
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KERNEL_TEXT_RDONLY is similar to DEBUG_RODATA, but it relies on 4k pages to be made, whereas DEBUG_RODATA can work with or without 4k pages. Let's move the depends on statement from FORCE_PAGES to KERNEL_TEXT_RDONLY to accurately reflect the real dependency here. This fixes a warning where we have FORCE_PAGES enabled but DEBUG_RODATA is also enabled at the same time because the latter is "default y" now and the depends on for FORCE_PAGES can't be satisfied. In fact, it's OK for FORCE_PAGES to be enabled at the same time as DEBUG_RODATA, it's really there to prevent KERNEL_TEXT_RDONLY being enabled at the same time as DEBUG_RODATA. Move the depends on to make things clearer. Change-Id: Ie73b768ed4540cdb4d752a9b5f1a049bf644bc7e Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: move tdm common prop to parent node"Linux Build Service Account2017-05-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ARM: dts: msm: move tdm common prop to parent nodeDerek Chen2017-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move tdm common properties from child node to parent for msm8996 automotive adp/cdp/dragonboard platforms. CRs-fixed: 2034655 Change-Id: I861f221d0cdd47d9748b0ab6f9dee986a9776e87 Signed-off-by: Derek Chen <chenche@codeaurora.org>
* | | | | | | | | | | | | Merge "ASoC: msm: qdsp6v2: Add TDM master slave select setting"Linux Build Service Account2017-05-16
|\| | | | | | | | | | | | | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ASoC: msm: qdsp6v2: Add TDM master slave select settingKarthikeyan Mani2017-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add TDM clock id setting in TDM parent node to select between IBIT and EBIT for TDM operation. Move dtsi entries from child to parent that are common to the group. CRs-fixed: 1116515 Change-Id: I663eb926818c2aae1eaea8c78bdc0a973ecd0ae3 Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FG"Linux Build Service Account2017-05-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ARM: dts: msm: Update charging ESR timer value to 96 for PM660 FGAnirudh Ghayal2017-05-15
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same FG ESR timer value (96) for charging and discharging. This is to avoid the frequent periodic spur seen in the RF performance with charger connected. CRs-Fixed: 2046553 Change-Id: I9d1ad61f75f553bf527906715699817236f44b01 Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
* | | | | | | | | | | | Merge "defconfig: msm: remove dcc config for perf on sdm660"Linux Build Service Account2017-05-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | defconfig: msm: remove dcc config for perf on sdm660Saranya Chidura2017-05-12
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the DCC_CONFIG option in perf defconfig for SDM660 target. Change-Id: Id1b019a5eb1c6a71d4b5e6e854e642411714a900 Signed-off-by: Saranya Chidura <schidura@codeaurora.org>
* | | | | | | | | | | | Merge "defconfig: msmcortex: Cleanup"Linux Build Service Account2017-05-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | defconfig: msmcortex: CleanupOlav Haugan2017-05-12
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync defconfig with make menuconfig output. Change-Id: Ieefef23fe14676007580c524268ef2a228d38059 Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
* | | | | | | | | | | | Merge "dma-mapping: Always remap on dma buffer free"Linux Build Service Account2017-05-15
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | dma-mapping: Always remap on dma buffer freeShiraz Hashim2017-05-11
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DMA clients may opt to clear cpu virtual address mapping on alloc. On free when dma buffer is given back to cpu, ensure that it is always remapped in cpu address space. Change-Id: I67f9616d9bee8cf07cbe81468ebf174d2599f4c5 Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: Update the virtual corner for SDM630"Linux Build Service Account2017-05-15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ARM: dts: msm: Update the virtual corner for SDM630Taniya Das2017-05-11
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The virtual corner mapping for 2.15GHz for speed-bin-1 was incorrectly mapped. Update the mapping to reflect the correct corner. Change-Id: I73b11f7a3a4346fc0118a51032148fad75db40eb Signed-off-by: Taniya Das <tdas@codeaurora.org>
* | | | | | | | | | | Merge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'"Linux Build Service Account2017-05-11
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'Blagovest Kolenichev2017-05-09
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/9796ea8 Linux 4.4.67 dm ioctl: prevent stack leak in dm ioctl call nfsd: stricter decoding of write-like NFSv2/v3 ops nfsd4: minor NFSv2/v3 write decoding cleanup ext4/fscrypto: avoid RCU lookup in d_revalidate ext4 crypto: use dget_parent() in ext4_d_revalidate() ext4 crypto: revalidate dentry after adding or removing the key ext4: require encryption feature for EXT4_IOC_SET_ENCRYPTION_POLICY IB/ehca: fix maybe-uninitialized warnings IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE netlink: Allow direct reclaim for fallback allocation 8250_pci: Fix potential use-after-free in error path scsi: cxlflash: Improve EEH recovery time scsi: cxlflash: Fix to avoid EEH and host reset collisions scsi: cxlflash: Scan host only after the port is ready for I/O net: tg3: avoid uninitialized variable warning mtd: avoid stack overflow in MTD CFI code drbd: avoid redefinition of BITS_PER_PAGE ALSA: ppc/awacs: shut up maybe-uninitialized warning ASoC: intel: Fix PM and non-atomic crash in bytcr drivers Handle mismatched open calls timerfd: Protect the might cancel mechanism proper ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK ANDROID: android-base.cfg: remove defunct options ANDROID: arm64: suspend: Restore the UAO state ANDROID: usb: gadget: f_audio_source: disable the CPU C-states upon playback ANDROID: usb: gadget: f_mtp: Set 0xFFFFFFFF in mtp header ContainerLength field Conflicts: drivers/usb/gadget/function/f_mtp.c fs/ext4/crypto.c Change-Id: I408054176798ba49f0b62fb46a3b0d59060d108e Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
| | * | | | | | | | | | ANDROID: arm64: suspend: Restore the UAO stateAmit Pundir2017-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream commit d08544127d9f ("arm64: suspend: Reconfigure PSTATE after resume from idle") when cherry-picked on LTS linux-4.4.y removed UAO reset code because UAO is not supported in linux-4.4.y. But common/android-4.4 has UAO support, added in Change-Id: I1a6a74a1f33b92d54368bd99387b55cf62930903 ("UPSTREAM: arm64: kernel: Add support for User Access Override"). This patch pick up the UAO specific changes of upstream commit dropped in LTS cherry-pick. Fixes: LTS commit 71710cd35a55 ("arm64: suspend: Reconfigure PSTATE after resume from idle") Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
* | | | | | | | | | | | Merge "ARM: dts: msm: Add SMB1381 device node for QRD SDM660"Linux Build Service Account2017-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ARM: dts: msm: Add SMB1381 device node for QRD SDM660Yingwei Zhao2017-05-11
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMB1381 acts as a slave charger in QRD SDM660 board. Add device node to support this function. Delete SMB1351 device node to avoid conflict with SMB1381. CRs-Fixed: 2042455 Change-Id: I97a5b2acb757cbbf08010ad03df6e24039beccac Signed-off-by: Yingwei Zhao <cyizhao@codeaurora.org>
* | | | | | | | | | | Merge "ARM: dts: msm: Add support for camss throttle clock on SDM660"Linux Build Service Account2017-05-11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ARM: dts: msm: Add support for camss throttle clock on SDM660Shilpa Mamidi2017-05-04
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camss throttle clock is always on which is consuming power. To avoid this add support to dynamically enable and disable clock. Change-Id: I2eddb414f5c1a22ab42154d28a05e41e64cb5bc9 Signed-off-by: Shilpa Mamidi <shilpam@codeaurora.org>
* | | | | | | | | | | Merge "ARM: dts: msm: Add iris support on msm8998 and sdm660"Linux Build Service Account2017-05-11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ARM: dts: msm: Add iris support on msm8998 and sdm660Tanvi Aggarwal2017-05-02
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add IRIS camera support on msm8998 and sdm660 mtp platforms. This is required for secure camera feature. CRs-Fixed: 2024793 Change-Id: I5a95e58caa814c23b8e82a21485c056b6066fa95 Signed-off-by: Tanvi Aggarwal <tanvia@codeaurora.org>
* | | | | | | | | | | Merge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONEMohit Khanna2017-05-09
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is primarily being used for WLAN to support WLAN hardware which cannot handle "> 32 bit" physical addresses for DMA. Disable this flag for the perf variant of msm8998. This flag forces DMA addresses to be in 32 bit region. Using this flag with ihelium WLAN solution (which can handle 64 bit physical DMA addresses) is causing a reduction in peak KPIs for TCP RX. Since kernel 4.4 is being used only by ihelium and not being used for older versions of WLAN hardware (e.g. ROME), we can safely disable this flag. CRs-Fixed: 2044326 Change-Id: If2e7d4bab15f6211e91b1095a8ac6c2bf7e9000e Signed-off-by: Mohit Khanna <mkhannaqca@codeaurora.org>
* | | | | | | | | | | Merge "defconfig: msm: Enable CNSS_ASYNC for auto platform"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | defconfig: msm: Enable CNSS_ASYNC for auto platformWei Li2017-05-09
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option allow CNSS platform driver to use asynchronous probe for auto platform. Change-Id: I54c997be995e3fb660779a18fd848dcbc325c49a Signed-off-by: Wei Li <weili@codeaurora.org>
* | | | | | | | | | | Merge "ARM64: config: msm: Adding perf defconfig for mediabox"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ARM64: config: msm: Adding perf defconfig for mediaboxShadab Naseem2017-05-09
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding perf defconfig for APQ8098 mediabox. APQ8098 Display driver is moving away from Framebuffer (CONFIG_FB) configuration to DRM (CONFIG_DRM) configuration and mediabox is using ATH10k wlan driver. Change-Id: I6f0b52a4beca9b3367d9fc52127aa57426685355 Signed-off-by: Shadab Naseem <snaseem@codeaurora.org>
* | | | | | | | | | | Merge "defconfig: msm: Enable OnSemi regulator driver for msm8996-auto"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | defconfig: msm: Enable OnSemi regulator driver for msm8996-autoKiran Gunda2017-05-09
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable OnSemi external buck regulator driver to provide the supply for graphics rail on msm8996-auto board. Change-Id: I0e7a37aca19fba94c17fb34c81753115b9fe6d7c Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
* | | | | | | | | | | Merge "ARM: dts: msm: Add GPU speed bin 2 support for MSM8996Pro"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ARM: dts: msm: Add GPU speed bin 2 support for MSM8996ProHareesh Gundu2017-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GPU clock plan for speed bin 2 of MSM8996Pro target. This is initial change for supporting GPU speed bin 2. CRs-Fixed: 1082439 Change-Id: Ifb21ae3baa3df001d944aa2c9db36dffa2a29504 Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
* | | | | | | | | | | | Merge "Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'"Linux Build Service Account2017-05-10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'android-4.4@24ac44d' into branch 'msm-4.4'Blagovest Kolenichev2017-05-04
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs/heads/tmp-24ac44d Linux 4.4.66 ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram ARCv2: save r30 on kernel entry as gcc uses it for code-gen nfsd: check for oversized NFSv2/v3 arguments Input: i8042 - add Clevo P650RS to the i8042 reset list p9_client_readdir() fix MIPS: Avoid BUG warning in arch_check_elf MIPS: KGDB: Use kernel context for sleeping threads ALSA: seq: Don't break snd_use_lock_sync() loop by timeout ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type ipv6: check raw payload size correctly in ioctl ipv6: check skb->protocol before lookup for nexthop macvlan: Fix device ref leak when purging bc_queue ip6mr: fix notification device destruction netpoll: Check for skb->queue_mapping net: ipv6: RTF_PCPU should not be settable from userspace dp83640: don't recieve time stamps twice tcp: clear saved_syn in tcp_disconnect() sctp: listen on the sock only when it's state is listening or closed net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given l2tp: fix PPP pseudo-wire auto-loading l2tp: take reference on sessions being dumped net/packet: fix overflow in check for tp_reserve net/packet: fix overflow in check for tp_frame_nr l2tp: purge socket queues in the .destruct() callback net: phy: handle state correctly in phy_stop_machine net: neigh: guard against NULL solicit() method sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() sparc64: kern_addr_valid regression xen/x86: don't lose event interrupts usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize regulator: core: Clear the supply pointer if enabling fails RDS: Fix the atomicity for congestion map update net_sched: close another race condition in tcf_mirred_release() net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata MIPS: Fix crash registers on non-crashing CPUs md:raid1: fix a dead loop when read from a WriteMostly disk ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea() drm/amdgpu: fix array out of bounds crypto: testmgr - fix out of bound read in __test_aead() clk: sunxi: Add apb0 gates for H3 ARM: OMAP2+: timer: add probe for clocksources xc2028: unlock on error in xc2028_set_config() f2fs: do more integrity verification for superblock net: pppolac/pppopns: Add back the msg_flags Conflicts: drivers/regulator/core.c Change-Id: I8e7b279efa442a0338ee735d27ff3ebe866a8dee Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
| | * | | | | | | | Merge 4.4.66 into android-4.4Greg Kroah-Hartman2017-05-03
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 4.4.66: f2fs: do more integrity verification for superblock xc2028: unlock on error in xc2028_set_config() ARM: OMAP2+: timer: add probe for clocksources clk: sunxi: Add apb0 gates for H3 crypto: testmgr - fix out of bound read in __test_aead() drm/amdgpu: fix array out of bounds ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea() md:raid1: fix a dead loop when read from a WriteMostly disk MIPS: Fix crash registers on non-crashing CPUs net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata net_sched: close another race condition in tcf_mirred_release() RDS: Fix the atomicity for congestion map update regulator: core: Clear the supply pointer if enabling fails usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize xen/x86: don't lose event interrupts sparc64: kern_addr_valid regression sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() net: neigh: guard against NULL solicit() method net: phy: handle state correctly in phy_stop_machine l2tp: purge socket queues in the .destruct() callback net/packet: fix overflow in check for tp_frame_nr net/packet: fix overflow in check for tp_reserve l2tp: take reference on sessions being dumped l2tp: fix PPP pseudo-wire auto-loading net: ipv4: fix multipath RTM_GETROUTE behavior when iif is given sctp: listen on the sock only when it's state is listening or closed tcp: clear saved_syn in tcp_disconnect() dp83640: don't recieve time stamps twice net: ipv6: RTF_PCPU should not be settable from userspace netpoll: Check for skb->queue_mapping ip6mr: fix notification device destruction macvlan: Fix device ref leak when purging bc_queue ipv6: check skb->protocol before lookup for nexthop ipv6: check raw payload size correctly in ioctl ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type ALSA: seq: Don't break snd_use_lock_sync() loop by timeout MIPS: KGDB: Use kernel context for sleeping threads MIPS: Avoid BUG warning in arch_check_elf p9_client_readdir() fix Input: i8042 - add Clevo P650RS to the i8042 reset list nfsd: check for oversized NFSv2/v3 arguments ARCv2: save r30 on kernel entry as gcc uses it for code-gen ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram Linux 4.4.66 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * | | | | | | ftrace/x86: Fix triple fault with graph tracing and suspend-to-ramJosh Poimboeuf2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 34a477e5297cbaa6ecc6e17c042a866e1cbe80d6 upstream. On x86-32, with CONFIG_FIRMWARE and multiple CPUs, if you enable function graph tracing and then suspend to RAM, it will triple fault and reboot when it resumes. The first fault happens when booting a secondary CPU: startup_32_smp() load_ucode_ap() prepare_ftrace_return() ftrace_graph_is_dead() (accesses 'kill_ftrace_graph') The early head_32.S code calls into load_ucode_ap(), which has an an ftrace hook, so it calls prepare_ftrace_return(), which calls ftrace_graph_is_dead(), which tries to access the global 'kill_ftrace_graph' variable with a virtual address, causing a fault because the CPU is still in real mode. The fix is to add a check in prepare_ftrace_return() to make sure it's running in protected mode before continuing. The check makes sure the stack pointer is a virtual kernel address. It's a bit of a hack, but it's not very intrusive and it works well enough. For reference, here are a few other (more difficult) ways this could have potentially been fixed: - Move startup_32_smp()'s call to load_ucode_ap() down to *after* paging is enabled. (No idea what that would break.) - Track down load_ucode_ap()'s entire callee tree and mark all the functions 'notrace'. (Probably not realistic.) - Pause graph tracing in ftrace_suspend_notifier_call() or bringup_cpu() or __cpu_up(), and ensure that the pause facility can be queried from real mode. Reported-by: Paul Menzel <pmenzel@molgen.mpg.de> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net> Cc: linux-acpi@vger.kernel.org Cc: Borislav Petkov <bp@alien8.de> Cc: Len Brown <lenb@kernel.org> Link: http://lkml.kernel.org/r/5c1272269a580660703ed2eccf44308e790c7a98.1492123841.git.jpoimboe@redhat.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | | * | | | | | | ARCv2: save r30 on kernel entry as gcc uses it for code-genVineet Gupta2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ecd43afdbe72017aefe48080631eb625e177ef4d upstream. This is not exposed to userspace debugers yet, which can be done independently as a seperate patch ! Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | | * | | | | | | MIPS: Avoid BUG warning in arch_check_elfJames Cowgill2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c46f59e90226fa5bfcc83650edebe84ae47d454b upstream. arch_check_elf contains a usage of current_cpu_data that will call smp_processor_id() with preemption enabled and therefore triggers a "BUG: using smp_processor_id() in preemptible" warning when an fpxx executable is loaded. As a follow-up to commit b244614a60ab ("MIPS: Avoid a BUG warning during prctl(PR_SET_FP_MODE, ...)"), apply the same fix to arch_check_elf by using raw_current_cpu_data instead. The rationale quoted from the previous commit: "It is assumed throughout the kernel that if any CPU has an FPU, then all CPUs would have an FPU as well, so it is safe to perform the check with preemption enabled - change the code to use raw_ variant of the check to avoid the warning." Fixes: 46490b572544 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode checks") Signed-off-by: James Cowgill <James.Cowgill@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15951/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>