Commit graph

576492 commits

Author SHA1 Message Date
Badhri Jagan Sridharan
03b451f737 ANDROID: dm-android-verity: Rebase on top of 4.1
Following CLs in upstream causes minor changes to dm-android-verity target.
1. keys: change asymmetric keys to use common hash definitions
2. block: Abstract out bvec iterator
Rebase dm-android-verity on top of these changes.

Bug: 27175947

Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: Icfdc3e7b3ead5de335a059cade1aca70414db415
Git-commit: f42f971b7b
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-10-28 14:46:57 -07:00
Badhri Jagan Sridharan
6fad3408f5 ANDROID: dm: Add android verity target
This device-mapper target is virtually a VERITY target. This
target is setup by reading the metadata contents piggybacked
to the actual data blocks in the block device. The signature
of the metadata contents are verified against the key included
in the system keyring. Upon success, the underlying verity
target is setup.

BUG: 27175947

Change-Id: I7e99644a0960ac8279f02c0158ed20999510ea97
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Git-commit: 36d01a590d
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-10-28 14:46:56 -07:00
Vikram Mulukutla
d3dd1af9c3 dm-verity: Add a temporary dummy opaque struct declaration
Upcoming dm-verity changes include a series that introduces
an extern in dm-verity.h that is both useless (isn't defined)
and causes a warning that breaks compilation. Introduce a
dummy opaque struct to allow compilation and revert it later
when the offending declaration is fixed.

Change-Id: I82a911cf963367b1f311c5035bf894a380a76e54
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
2016-10-28 14:46:47 -07:00
Linux Build Service Account
ce610f2fc9 Merge "ASoC: msm: Add routes for all TDM modes" 2016-10-27 15:49:28 -07:00
Linux Build Service Account
a8a45f5fcb Merge "ASoC: msmcobalt: Add support for all TDM modes" 2016-10-27 15:49:26 -07:00
Linux Build Service Account
4578a0a555 Merge "ARM: dts: msm: fix sd card detection for msmcobalt QRD SKUK board" 2016-10-27 15:49:25 -07:00
Linux Build Service Account
dbcf7687b3 Merge "ASoC: msm: Enable Media Format converter for all resampling usecases" 2016-10-27 15:49:24 -07:00
Linux Build Service Account
dceddf2339 Merge "msm: mdss: Fix memleak in framebuffer register and remove" 2016-10-27 15:49:22 -07:00
Linux Build Service Account
d4d8e11cce Merge "msm: mdss: Correct settings when on/off happens in dest-scaler" 2016-10-27 15:49:21 -07:00
Linux Build Service Account
57054d8cd6 Merge "msm: mdss: Avoid adaptive variable refresh during dynaminc FPS" 2016-10-27 15:49:20 -07:00
Linux Build Service Account
8493ec68b0 Merge "msm: mdss: dp: remove programming of maud/naud for audio" 2016-10-27 15:49:19 -07:00
Linux Build Service Account
c2e7ee2c2a Merge "ARM: dts: msm: enable esd for jdi qhd cmd mode panel in msmcobalt" 2016-10-27 15:49:18 -07:00
Linux Build Service Account
a04b622efd Merge "qcom-charger: set optimal buck switching frequency" 2016-10-27 15:49:17 -07:00
Linux Build Service Account
66f8ffa044 Merge "ARM: dts: msm: add SLPI fw name property for msmcobalt" 2016-10-27 15:49:16 -07:00
Linux Build Service Account
8779c92e1a Merge "sensors: ssc: add support to read SLPI fw name" 2016-10-27 15:49:15 -07:00
Linux Build Service Account
e155d614ea Merge "msm: ipa: Fix the memory leak in error cases" 2016-10-27 15:49:14 -07:00
Linux Build Service Account
42d02f4156 Merge "qseecom: check buffer size when loading firmware images" 2016-10-27 15:49:13 -07:00
Linux Build Service Account
e223d02cbb Merge "leds: qpnp-flash-v2: fix safety timer configuration" 2016-10-27 15:49:12 -07:00
Linux Build Service Account
a7981f61bc Merge "msm: ipa: fix ioctl input param validation" 2016-10-27 15:49:11 -07:00
Linux Build Service Account
6600841f13 Merge "defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmfalcon" 2016-10-27 15:49:10 -07:00
Linux Build Service Account
7f8343eaa4 Merge "defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmcortex" 2016-10-27 15:49:09 -07:00
Linux Build Service Account
97d4de6ccb Merge "ASoC: msmcobalt: Fix MCLK routing on msmcobalt for WCD9340" 2016-10-27 15:49:08 -07:00
Linux Build Service Account
201f4347e2 Merge "ARM: dts: msm: Add dmic clock rate on ECPP path for msmcobalt" 2016-10-27 15:49:07 -07:00
Linux Build Service Account
10fb467dd6 Merge "soc: qcom: add support for fingerprint sensor driver" 2016-10-27 15:49:06 -07:00
Linux Build Service Account
c60241fc75 Merge "ASoC: wcd-dsp-mgr: fix restart logic when codec comes back online" 2016-10-27 15:49:05 -07:00
Linux Build Service Account
59ba1d179c Merge "ASoC: wcd934x-dsp-cntl: fix memory enable/disable sequence" 2016-10-27 15:49:04 -07:00
Linux Build Service Account
5df4ae6428 Merge "USB: dwc3-msm: Disable pipe clock requirement for HS/FS only mode" 2016-10-27 15:49:04 -07:00
Linux Build Service Account
094d9bc859 Merge "clk: qcom: Change clock index for mmssnoc_axi clock for MSMfalcon" 2016-10-27 15:49:03 -07:00
Linux Build Service Account
df255661d4 Merge "msm: sde: Fix SDE rotator clock disable sequence" 2016-10-27 15:49:02 -07:00
Linux Build Service Account
a893d7854b Merge "input: misc: hbtp_input: Add support for multiple AFE" 2016-10-27 15:49:01 -07:00
Linux Build Service Account
206ef38970 Merge "msm: mdss: edid: fix dtd parsing" 2016-10-27 15:49:00 -07:00
Linux Build Service Account
35021f91c8 Merge "clk: msm: clock: Remove controlling some graphics clocks in Linux" 2016-10-27 15:49:00 -07:00
Linux Build Service Account
2a676929f1 Merge "sched: Fix compilation issue with reset_hmp_stats" 2016-10-27 15:48:59 -07:00
Linux Build Service Account
77a8b4c9a8 Merge "ASoC: wcd934x: Trigger codec DSP subsystem restart" 2016-10-27 15:48:57 -07:00
Linux Build Service Account
3ff6b4cb95 Merge "usb: dwc3: gadget: Remove dev_WARN_ONCE in dwc3_gadget_ep_disable" 2016-10-27 15:48:56 -07:00
Linux Build Service Account
4c06faec54 Merge "ARM: dts: msm: Add support for Modem PIL on msmfalcon" 2016-10-27 15:48:54 -07:00
Linux Build Service Account
28c2768ca1 Merge "ARM: dts: msm: Add support for Modem PIL on msmtriton" 2016-10-27 15:48:54 -07:00
Linux Build Service Account
4efc0ba57b Merge "leds: qpnp-wled: Fix configuration of AVDD TRIM and OVP registers" 2016-10-27 15:48:51 -07:00
Linux Build Service Account
6250b19938 Merge "cfg80211: Add support to configure a beacon data rate" 2016-10-27 15:48:50 -07:00
Linux Build Service Account
95a99fbf30 Merge "icnss: Do not parse VBATT DT entry if VBATT feature is disabled" 2016-10-27 15:48:50 -07:00
Linux Build Service Account
3896b5e4d8 Merge "ARM: dts: msm: add PCIe PHY sequence for msmcobalt v2" 2016-10-27 15:48:49 -07:00
Linux Build Service Account
970b543f51 Merge "input: touchscreen: fix compilation errors for Goodix driver" 2016-10-27 15:48:48 -07:00
Linux Build Service Account
118b930531 Merge "ASoC: qdsp6v2: fix potential bug of infinite loop" 2016-10-27 15:48:47 -07:00
Sunil Paidimarri
de9d29a416 msm: ipa: Fix the memory leak in error cases
Free the skb if packet is not sent to ipa hw
successfully other than TX_BUSY error cases to avoid
memory leak.

Change-Id: I012484aa92e8f25ed0ad4f6709a54f40409ab8d2
CRs-Fixed: 1077525
Signed-off-by: Sunil Paidimarri <hisunil@codeaurora.org>
2016-10-26 17:34:59 -07:00
Zhen Kong
ecd28536e3 qseecom: check buffer size when loading firmware images
Make change in __qseecom_load_fw() and qseecom_load_commonlib_image()
to check buffer size before copying img to buffer.

CRs-fixed: 1080290
Change-Id: I0f48666ac948a9571e249598ae7cc19df9036b1d
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
2016-10-26 15:58:38 -07:00
Harry Yang
b6d0253492 qcom-charger: set optimal buck switching frequency
Reduce the power dissipation impact by choosing the optimal
switching frequency per input voltage.

The optimal switching frequences are chosen as follow,
	5V only = 600kHz
	6-8V QC3 = 800kHz
	9V QC2 or vanilla PD = 1.0MHz
	12V QC2 or PD adapter = 1.2MHz

CRs-Fixed: 1048242
Change-Id: I2ef9f3e122b39682a743334668fcd0aeb085e147
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2016-10-26 14:22:51 -07:00
Linux Build Service Account
bcd8ec9210 Merge "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4" 2016-10-26 13:13:24 -07:00
Linux Build Service Account
b12304a536 Merge "clk: osm: msm: allow WDOG status register to be enabled via debugfs" 2016-10-26 13:13:23 -07:00
Linux Build Service Account
6d89479bd3 Merge "msm: mdss: fix crash when wrong params are passed on the esd config" 2016-10-26 13:13:21 -07:00
Linux Build Service Account
604c0ceedb Merge "icnss: Do top level reset when timeout to pull register state" 2016-10-26 13:13:20 -07:00