Commit graph

577865 commits

Author SHA1 Message Date
Linux Build Service Account
5d4d0ab7a7 Merge "clk: Add support to allow client to print all enabled clocks" 2016-11-18 01:54:42 -08:00
Linux Build Service Account
29674d7418 Merge "scsi: ufs: enable auto hibern8 only after device initialization" 2016-11-18 01:54:41 -08:00
Linux Build Service Account
0f04e7c48a Merge "scsi: ufs: fix sleep in atomic context" 2016-11-18 01:54:40 -08:00
Linux Build Service Account
94410a85f4 Merge "phy: qcom-ufs: update ufs phy 1-lane settings" 2016-11-18 01:54:36 -08:00
Linux Build Service Account
bf1c2c6407 Merge "diag: Set the diag write buffers to busy state on channel close" 2016-11-18 01:54:35 -08:00
Linux Build Service Account
d52c401860 Merge "leds: qpnp-wled: Add support to configure AUTO_GM settings" 2016-11-17 10:08:45 -08:00
Linux Build Service Account
a2f4ac784a Merge "tcp: take care of truncations done by sk_filter()" 2016-11-17 10:08:44 -08:00
Linux Build Service Account
5b00a91adb Merge "scsi: ufs: handle LINERESET during hibern8" 2016-11-17 10:08:43 -08:00
Linux Build Service Account
a1008bfb76 Merge "scsi: ufs-qcom: update clock scaling sequence" 2016-11-17 10:08:42 -08:00
Linux Build Service Account
64f717aeaa Merge "ARM: dts: msm: ensure contiguous MSI for PCIe on msmcobalt" 2016-11-17 10:08:41 -08:00
Linux Build Service Account
b953b336af Merge "driver: thermal: msm_thermal: Enable Reliability algorithm" 2016-11-17 10:08:40 -08:00
Linux Build Service Account
3c8d77bac1 Merge "leds: qpnp-flash: Fix the mask in the flash prepare API" 2016-11-17 10:08:40 -08:00
Linux Build Service Account
37d58e6c59 Merge "leds: qpnp-flash-v2: change from dev_*() to pr_*() for logging" 2016-11-17 10:08:38 -08:00
Linux Build Service Account
a1716776fd Merge "leds: qpnp-flash-v2: Add support for configuring OTST thresholds" 2016-11-17 10:08:38 -08:00
Linux Build Service Account
f645e3ce31 Merge "leds: qpnp-flash-v2: Add support for thermal derate features" 2016-11-17 10:08:37 -08:00
Linux Build Service Account
a58828453e Merge "msm: kgsl: preserve ISENSE registers across GPU power collapse" 2016-11-17 10:08:36 -08:00
Linux Build Service Account
f01a84f38a Merge "scsi: ufs: error out all issued requests after shutdown" 2016-11-17 10:08:33 -08:00
Linux Build Service Account
4b1c2e228c Merge "leds: qpnp-wled: Add support to configure VREF_CONTROL for pmicobalt" 2016-11-17 02:22:35 -08:00
Linux Build Service Account
15c0f0e20c Merge "msm: cpp: Use the src clock node to read the cpp src clock rate" 2016-11-17 02:22:34 -08:00
Linux Build Service Account
f60b2ad20f Merge "ARM: dts: msm: Add cpp src clock rates configuration for msmcobalt" 2016-11-17 02:22:33 -08:00
Linux Build Service Account
0579bfa116 Merge "icnss: Update WLFW header file to the latest and add fw_build_id" 2016-11-16 18:17:04 -08:00
Linux Build Service Account
4e2587d3f5 Merge "icnss: Collect ramdump from MSA memory space" 2016-11-16 18:17:03 -08:00
Linux Build Service Account
761768049f Merge "msm: sde: Fix SDE rotator context list locking" 2016-11-16 18:17:02 -08:00
Linux Build Service Account
61f26e3aa5 Merge "soc: qcom: secure_buffer: Fix an uninitialized variable" 2016-11-15 23:39:31 -08:00
Linux Build Service Account
123738ad00 Merge "defconfig: msm: update mmap randomness for all targets" 2016-11-15 23:39:30 -08:00
Linux Build Service Account
ef0a4e083c Merge "iommu/arm-smmu: Fix uninitialized use of variable error" 2016-11-15 23:39:30 -08:00
Linux Build Service Account
4d8f3d0afa Merge "ARM: dts: msm: Enable the haptics in QRD SKUK and vr1" 2016-11-15 23:39:29 -08:00
Linux Build Service Account
af9ecbbe5e Merge "ARM: dts: msm: enable RPM regulator device node for MSMFALCON" 2016-11-15 23:39:28 -08:00
Taniya Das
b9b1975fe3 clk: Add support to allow client to print all enabled clocks
The clock api clock_debug_print_enabled would allow any client like low
power driver to print all the enabled clocks which include the
prepare_count/enable_count/rate/rate max vote.

Change-Id: I936496e553bc958c10e743fd8a225ffc7fbc0f79
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-11-16 09:16:52 +05:30
Taniya Das
dba9af81b8 clk: Add support for list_rates ops for clocks
Add support for clocks debugfs to be able to display
 - rates_max which indicates the frequency to voltage mapping of a clock.
 - list_rates, the list of clock frequencies supported by root clocks.
 - Also display the rate_max associated with enabled clocks list.

Change-Id: I0a202af6f46c7cf164036d65487db5c40aab4063
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-11-16 09:16:51 +05:30
Taniya Das
770f204fbd clk: add/modify debugfs support for clocks
Update clock debugfs to support the below functionalities.
 - Allow enable/disable a clock.
 - Allow set_rate on a clock.
 - Display the list of enabled_clocks along with prepare_count,
   enable_count and rate.
 - Display the register contents of all the clocks which support
  this clock operation.

Change-Id: Ib67b3a3409c9e7d8adb710bb524f54f543abf712
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2016-11-16 09:16:51 +05:30
Eric Dumazet
68b87a2b4a tcp: take care of truncations done by sk_filter()
With syzkaller help, Marco Grassi found a bug in TCP stack,
crashing in tcp_collapse()

Root cause is that sk_filter() can truncate the incoming skb,
but TCP stack was not really expecting this to happen.
It probably was expecting a simple DROP or ACCEPT behavior.

We first need to make sure no part of TCP header could be removed.
Then we need to adjust TCP_SKB_CB(skb)->end_seq

Many thanks to syzkaller team and Marco for giving us a reproducer.

CRs-Fixed: 1089895
Change-Id: I84185558fa6e80b13d7d0078bda9d75143680941
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Marco Grassi <marco.gra@gmail.com>
Reported-by: Vladis Dronov <vdronov@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: ac6e780070e30e4c35bd395acfe9191e6268bdd3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
[subashab@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2016-11-15 14:54:51 -07:00
Willem de Bruijn
f36f22a49d rose: limit sk_filter trim to payload
Sockets can have a filter program attached that drops or trims
incoming packets based on the filter program return value.

Rose requires data packets to have at least ROSE_MIN_LEN bytes. It
verifies this on arrival in rose_route_frame and unconditionally pulls
the bytes in rose_recvmsg. The filter can trim packets to below this
value in-between, causing pull to fail, leaving the partial header at
the time of skb_copy_datagram_msg.

Place a lower bound on the size to which sk_filter may trim packets
by introducing sk_filter_trim_cap and call this for rose packets.

CRs-Fixed: 1089895
Change-Id: Idc52737bc96097a9220dfe47bb76e94ff1026a05
Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: f4979fcea7fd36d8e2f556abef86f80e0d5af1ba
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[subashab@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2016-11-15 14:54:51 -07:00
Sreelakshmi Gownipalli
bddd67fc5c diag: Set the diag write buffers to busy state on channel close
Set the diag forward write buffers to busy state when glink
diag channel receives remote disconnected event.

Change-Id: I3c9422f3a790c0c1633ab64d4213a088faaeb9e5
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
2016-11-15 13:46:08 -08:00
Tony Truong
f7f2185840 ARM: dts: msm: ensure contiguous MSI for PCIe on msmcobalt
PCIe MSI have to be contiguous by spec. Relocated
PCIe node so that it receives contiguous MSIs from
GIC driver.

Change-Id: Ia73ab1ba51df7b501d246bb45141018409496d01
Signed-off-by: Tony Truong <truong@codeaurora.org>
2016-11-15 10:01:55 -08:00
Tony Truong
ef48989c47 ARM: dts: msm: enable QGIC MSI for PCIe on msmcobalt
Add all SPIs for MSI, the base address, and the base SPI
to PCIe node to support and enable QGIC MSI on msmcobalt.

Change-Id: I1e74f1b03c3e15880efdac7ff07aca2f628de99d
Signed-off-by: Tony Truong <truong@codeaurora.org>
2016-11-15 09:41:32 -08:00
Linux Build Service Account
1e17007652 Merge "msm: ipa3: retry on IPA_HW_CONS_DISABLE_CMD_GSI_STOP_FAILURE" 2016-11-15 04:07:58 -08:00
Linux Build Service Account
76fb91705e Merge "pinctrl: qcom: msmfalcon: Split function groups based on mirrors" 2016-11-15 04:07:57 -08:00
Linux Build Service Account
e8d37e0204 Merge "pinctrl: qcom: Add all the gpios to pingroups for msmfalcon" 2016-11-15 04:07:56 -08:00
Linux Build Service Account
5c2a834f84 Merge "msm: pcie: support configurable wr halt size for PCIe" 2016-11-15 04:07:55 -08:00
Linux Build Service Account
2db8e29779 Merge "iio: adc: qcom-tadc: cast raw ADC readings before conversion" 2016-11-15 04:07:54 -08:00
Linux Build Service Account
adb38b4519 Merge "ARM: dts: msm: update TADC ibatt scale for MSMCOBALT" 2016-11-15 04:07:54 -08:00
Linux Build Service Account
bda0cf17e9 Merge "usb: gadget: f_mtp: Increase default TX buffer size" 2016-11-15 04:07:53 -08:00
Linux Build Service Account
126f773020 Merge "qcom-cpufreq: skip frequencies that round to same rate" 2016-11-15 04:07:52 -08:00
Linux Build Service Account
276980d3e2 Merge "ARM: dts: msm: Remove min svs level for A540 in msmcobaltv2" 2016-11-15 04:07:51 -08:00
Linux Build Service Account
8ca1dae0da Merge "Revert "clk: msm: clock-gpu-cobalt: Update the graphics core clock frequency"" 2016-11-15 04:07:50 -08:00
Linux Build Service Account
16a21bcd77 Merge "ARM: dts: msm: update APC0/APC1/GFX aging allowed revisions for msm8998v2" 2016-11-15 04:07:50 -08:00
Linux Build Service Account
2ce4f26719 Merge "core_ctl: Export boost function" 2016-11-15 04:07:49 -08:00
Linux Build Service Account
86060df701 Merge "msm: pcie: support QGIC MSI for multiple clients" 2016-11-15 04:07:48 -08:00
Linux Build Service Account
21a0144d38 Merge "msm: mdss: Avoid accessing pipe out of the boundaries" 2016-11-15 04:07:47 -08:00