OSDN Git Service

sagit-ice-cold/kernel_xiaomi_msm8998.git
7 years agomsm: kgsl: Enable limits management on A540v2
Oleg Perelet [Tue, 25 Oct 2016 17:49:36 +0000 (10:49 -0700)]
msm: kgsl: Enable limits management on A540v2

Add limits management to A540v2 GPU feature set.

CRs-Fixed: 1075694
Change-Id: Ib2680fb97fed1d297c9a96c95edb08dea620495b
Signed-off-by: Oleg Perelet <operelet@codeaurora.org>
7 years agoMerge "msm: vidc: Correct debugfs directory name"
Linux Build Service Account [Wed, 2 Nov 2016 12:22:33 +0000 (05:22 -0700)]
Merge "msm: vidc: Correct debugfs directory name"

7 years agoMerge "ARM: dts: msm: Add qcom,dump-size entry for dumping CPU L1/L2 caches"
Linux Build Service Account [Wed, 2 Nov 2016 12:22:31 +0000 (05:22 -0700)]
Merge "ARM: dts: msm: Add qcom,dump-size entry for dumping CPU L1/L2 caches"

7 years agoMerge "Documentation: arm: add cache DT bindings"
Linux Build Service Account [Wed, 2 Nov 2016 12:22:31 +0000 (05:22 -0700)]
Merge "Documentation: arm: add cache DT bindings"

7 years agopower: reset: Do not disable SDI during reset
Satya Durga Srinivasu Prabhala [Tue, 1 Nov 2016 18:53:40 +0000 (11:53 -0700)]
power: reset: Do not disable SDI during reset

During reset if SDI is disabled, PIMEM gets zeroed out.

Change-Id: I55bff36d8504f5fd3041f0dad42a077f25976966
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
7 years agoARM: dts: msm: Add qcom,dump-size entry for dumping CPU L1/L2 caches
Prasad Sodagudi [Tue, 28 Jul 2015 04:31:04 +0000 (10:01 +0530)]
ARM: dts: msm: Add qcom,dump-size entry for dumping CPU L1/L2 caches

Update arm cache documentation about qcom,dump-size to dump
the CPU L1/L2 caches in order to analyze data corruption.

Change-Id: Ia9350b9c7810db7eb900957b4ce5dac046ab5e0d
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
7 years agoDocumentation: arm: add cache DT bindings
Lorenzo Pieralisi [Tue, 29 Apr 2014 01:35:24 +0000 (18:35 -0700)]
Documentation: arm: add cache DT bindings

On ARM systems the cache topology cannot be probed at runtime, in
particular, it is impossible to probe which CPUs share a given cache
level. Power management software requires this knowledge to implement
optimized power down sequences, hence this patch adds a document that
defines the DT cache bindings for ARM systems. The bindings are compliant
with ePAPR (PowerPC bindings), even though most of the cache nodes
properties requirements are overriden, because caches geometry for
architected caches is probeable on ARM systems. This patch also adds
properties that are specific to ARM architected caches to the existing ones
defined in the ePAPR v1.1, as bindings extensions.

Change-Id: I37ca3aae0471fcd60499615df77093d5b5451bf8
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
7 years agoMerge "soc: qcom: signal buffer response after glink_rx_done()"
Linux Build Service Account [Tue, 1 Nov 2016 11:46:24 +0000 (04:46 -0700)]
Merge "soc: qcom: signal buffer response after glink_rx_done()"

7 years agoMerge "drivers: cpuidle: lpm-levels: Enable Sleep prediction"
Linux Build Service Account [Tue, 1 Nov 2016 11:46:15 +0000 (04:46 -0700)]
Merge "drivers: cpuidle: lpm-levels: Enable Sleep prediction"

7 years agoMerge "spmi-pmic-arb: fix a possible null pointer dereference"
Linux Build Service Account [Tue, 1 Nov 2016 03:15:01 +0000 (20:15 -0700)]
Merge "spmi-pmic-arb: fix a possible null pointer dereference"

7 years agoMerge "msm: vidc: Add Colorspace in sequence change event"
Linux Build Service Account [Tue, 1 Nov 2016 03:14:59 +0000 (20:14 -0700)]
Merge "msm: vidc: Add Colorspace in sequence change event"

7 years agoMerge "msm: mdss: Add Rec2020 YUV conversion to CSC tables"
Linux Build Service Account [Tue, 1 Nov 2016 03:14:59 +0000 (20:14 -0700)]
Merge "msm: mdss: Add Rec2020 YUV conversion to CSC tables"

7 years agoMerge "pmic-voter: Add the votable name in debugfs"
Linux Build Service Account [Tue, 1 Nov 2016 03:14:54 +0000 (20:14 -0700)]
Merge "pmic-voter: Add the votable name in debugfs"

7 years agospmi-pmic-arb: fix a possible null pointer dereference
Abhijeet Dharmapurikar [Tue, 13 Sep 2016 18:10:48 +0000 (11:10 -0700)]
spmi-pmic-arb: fix a possible null pointer dereference

If "core" memory resource is not specified, the driver could end up
dereferencing a null pointer.

Fix this by returning -EINVAL when core resource is missing.

Change-Id: Id08f7b2e109b6b2963b19dfe07f07cbfb424202b
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agoMerge "Don't show empty tag stats for unprivileged uids"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:32 +0000 (13:04 -0700)]
Merge "Don't show empty tag stats for unprivileged uids"

7 years agoMerge "msm: ipa3: wait for uC load before USB disconnect"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:31 +0000 (13:04 -0700)]
Merge "msm: ipa3: wait for uC load before USB disconnect"

7 years agoMerge "wil6210: prevent XTAL off in device bootloader"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:30 +0000 (13:04 -0700)]
Merge "wil6210: prevent XTAL off in device bootloader"

7 years agoMerge "msm: ipa3: fix send_cmd_timeout logic"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:29 +0000 (13:04 -0700)]
Merge "msm: ipa3: fix send_cmd_timeout logic"

7 years agoMerge "ASoC: wcd9335: Enable standalone ldo_h"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:28 +0000 (13:04 -0700)]
Merge "ASoC: wcd9335: Enable standalone ldo_h"

7 years agoMerge "ASoC: wcd934x: Restore CPR defaults after SSR"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:27 +0000 (13:04 -0700)]
Merge "ASoC: wcd934x: Restore CPR defaults after SSR"

7 years agoMerge "ASoC: wcd934x: Add impedance detection controls"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:27 +0000 (13:04 -0700)]
Merge "ASoC: wcd934x: Add impedance detection controls"

7 years agoMerge "smb138x-charger: Fix FCC and FV parameters"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:26 +0000 (13:04 -0700)]
Merge "smb138x-charger: Fix FCC and FV parameters"

7 years agomsm: mdss: Add Rec2020 YUV conversion to CSC tables
Benet Clark [Fri, 18 Dec 2015 15:51:08 +0000 (07:51 -0800)]
msm: mdss: Add Rec2020 YUV conversion to CSC tables

Rec2020 CSC type will be set by hwcomposer when incoming YUV data
is of the same type.

CRs-Fixed: 1081779
Change-Id: I321bd79d04e135030764dcdf83a58fee3c4e72c8
Signed-off-by: Benet Clark <benetc@codeaurora.org>
7 years agoMerge "init: do_mounts: Add a dummy definition for dm_table_put"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:16 +0000 (13:04 -0700)]
Merge "init: do_mounts: Add a dummy definition for dm_table_put"

7 years agoMerge "qseecom: check error return value of ion_map_kernel"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:15 +0000 (13:04 -0700)]
Merge "qseecom: check error return value of ion_map_kernel"

7 years agoMerge "clk: msm: clock-osm: Request Nominal Fmax frequency after OSM enable"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:14 +0000 (13:04 -0700)]
Merge "clk: msm: clock-osm: Request Nominal Fmax frequency after OSM enable"

7 years agoMerge "cfg80211: pass struct to interface combination check/iter"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:14 +0000 (13:04 -0700)]
Merge "cfg80211: pass struct to interface combination check/iter"

7 years agoMerge "ASoC: wcd934x: fix default value for FLL threshold"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:13 +0000 (13:04 -0700)]
Merge "ASoC: wcd934x: fix default value for FLL threshold"

7 years agoMerge "binder: prevent kptr leak by using %pK format specifier"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:12 +0000 (13:04 -0700)]
Merge "binder: prevent kptr leak by using %pK format specifier"

7 years agoMerge "ARM: dts: msm: correct pmicobalt_bob regulator name for msmcobalt"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:11 +0000 (13:04 -0700)]
Merge "ARM: dts: msm: correct pmicobalt_bob regulator name for msmcobalt"

7 years agoMerge "usb: dwc3: Turn on memory core and periphery upon resume"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:11 +0000 (13:04 -0700)]
Merge "usb: dwc3: Turn on memory core and periphery upon resume"

7 years agoMerge "Bluetooth:Add ioctl to power control connectivity chip"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:10 +0000 (13:04 -0700)]
Merge "Bluetooth:Add ioctl to power control connectivity chip"

7 years agoMerge "ARM: qcom: add board entries for msmtriton"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:09 +0000 (13:04 -0700)]
Merge "ARM: qcom: add board entries for msmtriton"

7 years agoMerge "msm: crypto: Fix integer over flow check in qce driver"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:08 +0000 (13:04 -0700)]
Merge "msm: crypto: Fix integer over flow check in qce driver"

7 years agoMerge "leds: qpnp-wled: add support for configuring ILIM in pmicobalt"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:04 +0000 (13:04 -0700)]
Merge "leds: qpnp-wled: add support for configuring ILIM in pmicobalt"

7 years agoMerge "leds: qpnp-wled: Update AMOLED_VOUT programming"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:03 +0000 (13:04 -0700)]
Merge "leds: qpnp-wled: Update AMOLED_VOUT programming"

7 years agoMerge "clk: msm: Add COMMON_CLK branch memory flags"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:02 +0000 (13:04 -0700)]
Merge "clk: msm: Add COMMON_CLK branch memory flags"

7 years agoMerge "ARM: dts: msm: fix WLED sink configuration for msmcobalt QRD platform"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:01 +0000 (13:04 -0700)]
Merge "ARM: dts: msm: fix WLED sink configuration for msmcobalt QRD platform"

7 years agoMerge "msm: kgsl: Clear the interrupt immediately"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:01 +0000 (13:04 -0700)]
Merge "msm: kgsl: Clear the interrupt immediately"

7 years agoMerge "ARM: dts: msm: add support for etm and cpu-cti on msmfalcon"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:00 +0000 (13:04 -0700)]
Merge "ARM: dts: msm: add support for etm and cpu-cti on msmfalcon"

7 years agoDon't show empty tag stats for unprivileged uids
Mohamad Ayyash [Wed, 11 May 2016 20:18:35 +0000 (13:18 -0700)]
Don't show empty tag stats for unprivileged uids

BUG: 27577101
BUG: 27532522
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Git-repo: https://android.googlesource.com/kernel/common.git
Git-commit: d85e322ff3bc8d7aa872ad12df6427dd236e540a
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
Change-Id: Ia706e7184ab31c5e4e3bb2668a1ab7660ca3c6ce

7 years agomsm: ipa3: wait for uC load before USB disconnect
Skylar Chang [Mon, 31 Oct 2016 16:57:54 +0000 (09:57 -0700)]
msm: ipa3: wait for uC load before USB disconnect

In case RG10 workaround is in use, USB disconnect sequence
needs to be delayed until uC image is loaded in order to
allow to suspend and unsuspend pipes successfully.

Change-Id: I0ba41c9564c12b0b2c419222b54fa0e05be93b75
CRs-Fixed: 1083675
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
7 years agoMerge "icnss: Shutdown Adrastea before remapping MSA0"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:16 +0000 (06:59 -0700)]
Merge "icnss: Shutdown Adrastea before remapping MSA0"

7 years agoMerge "sched/hmp: Disable interrupts when resetting all task stats"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:15 +0000 (06:59 -0700)]
Merge "sched/hmp: Disable interrupts when resetting all task stats"

7 years agoMerge "msm: ADSPRPC: Do not pass offset for secure buffers"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:14 +0000 (06:59 -0700)]
Merge "msm: ADSPRPC: Do not pass offset for secure buffers"

7 years agoMerge "dt-bindings: power: reset: add document for reboot-mode driver"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:14 +0000 (06:59 -0700)]
Merge "dt-bindings: power: reset: add document for reboot-mode driver"

7 years agoMerge "power: reset: add reboot mode driver"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:13 +0000 (06:59 -0700)]
Merge "power: reset: add reboot mode driver"

7 years agoMerge "usb: xhci-plat: Enable wakeup for the root hubs"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:12 +0000 (06:59 -0700)]
Merge "usb: xhci-plat: Enable wakeup for the root hubs"

7 years agoMerge "usb: pd: Observe PSHardResetTimer for source hard reset"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:11 +0000 (06:59 -0700)]
Merge "usb: pd: Observe PSHardResetTimer for source hard reset"

7 years agoMerge "msm: ipa3: Support IPA-USB suspend sequence without remote wake-up"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:10 +0000 (06:59 -0700)]
Merge "msm: ipa3: Support IPA-USB suspend sequence without remote wake-up"

7 years agoMerge "arm64: Implement optimised IP checksum helpers"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:09 +0000 (06:59 -0700)]
Merge "arm64: Implement optimised IP checksum helpers"

7 years agoMerge "ARM: dts: msm: Add initial support for msmcobalt v2 QRD VR1 board"
Linux Build Service Account [Mon, 31 Oct 2016 02:50:59 +0000 (19:50 -0700)]
Merge "ARM: dts: msm: Add initial support for msmcobalt v2 QRD VR1 board"

7 years agowil6210: prevent XTAL off in device bootloader
Maya Erez [Sun, 30 Oct 2016 19:38:14 +0000 (21:38 +0200)]
wil6210: prevent XTAL off in device bootloader

Device bootloader enters deep sleep and turns off
its clock after 1 second of inactivity.
Waking up from this stage takes several milliseconds
and can cause PCIe timeout.
To prevent that, we need to add HALP vote in the reset
flow which will prevent the BL from turning off its
XTAL.

Change-Id: Id9273e546d3565935a7b1150c27993f02c5734e3
Signed-off-by: Maya Erez <merez@codeaurora.org>
7 years agoMerge "icnss: Enable PMM_TCXO_CLK before switch to cxo"
Linux Build Service Account [Sun, 30 Oct 2016 07:07:04 +0000 (00:07 -0700)]
Merge "icnss: Enable PMM_TCXO_CLK before switch to cxo"

7 years agoASoC: wcd9335: Enable standalone ldo_h
Phani Kumar Uppalapati [Sat, 9 Apr 2016 01:46:51 +0000 (18:46 -0700)]
ASoC: wcd9335: Enable standalone ldo_h

Add support for standalone enablement of ldo_h
in wcd9335 hardware. This is required to enable
certain audio TX use-cases.

CRs-fixed: 1083755
Change-Id: Iea068907241b42846d95d8e62e59409cdd29ca42
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
7 years agoASoC: wcd934x: Add impedance detection controls
Phani Kumar Uppalapati [Fri, 28 Oct 2016 18:38:59 +0000 (11:38 -0700)]
ASoC: wcd934x: Add impedance detection controls

Add impedance detection mixer controls used to get
the impedance values of headphone left and right
channels.

CRs-Fixed: 1083198
Change-Id: Ibbca465192c58deba3618d70e36089119c7f3994
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
7 years agoinit: do_mounts: Add a dummy definition for dm_table_put
Vikram Mulukutla [Sat, 29 Oct 2016 00:05:46 +0000 (17:05 -0700)]
init: do_mounts: Add a dummy definition for dm_table_put

To temporarily allow compilation of an upcoming dm change,
add a dummy dm_table_put definition.

Change-Id: Iceca2eb6daa55f0acb936eafe1d59f65f7cfcd55
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoASoC: wcd934x: Restore CPR defaults after SSR
Phani Kumar Uppalapati [Wed, 26 Oct 2016 18:52:19 +0000 (11:52 -0700)]
ASoC: wcd934x: Restore CPR defaults after SSR

Restore CPR bank registers to correct state
after subsystem restart for codec core to go
into CPR during rock bottom sleep mode.

CRs-Fixed: 1083795
Change-Id: Ifa59335033f8b9bda6fb0ca4b071387fdaa8f6f9
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
7 years agoANDROID: dm verity fec: initialize recursion level
Sami Tolvanen [Fri, 17 Jun 2016 18:31:17 +0000 (11:31 -0700)]
ANDROID: dm verity fec: initialize recursion level

Explicitly initialize recursion level to zero at the beginning of each
I/O operation.

Bug: 28943429
Change-Id: I00c612be2b8c22dd5afb65a739551df91cb324fc
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
(cherry picked from commit 32ffb3a22d7fd269b2961323478ece92c06a8334)
Git-commit: d053106b93363b77ef8ca60352069cbdc8fa0f87
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm verity fec: fix RS block calculation
Sami Tolvanen [Fri, 17 Jun 2016 18:22:03 +0000 (11:22 -0700)]
ANDROID: dm verity fec: fix RS block calculation

A call to do_div was changed in Linux 4.5 to div64_u64 in
verity_fec_decode, which broke RS block calculation due to
incompatible semantics. This change fixes the computation.

Bug: 21893453
Change-Id: Idb88b901e0209c2cccc9c0796689f780592d58f9
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
(cherry picked from commit 879aac93eebcc2862d71afa9eca3a0c0f51b3b01)
Git-commit: 8f9576b38193b8eb32d94d17f02baab436c3580a
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm verity fec: add missing release from fec_ktype
Sami Tolvanen [Fri, 3 Jun 2016 21:22:46 +0000 (14:22 -0700)]
ANDROID: dm verity fec: add missing release from fec_ktype

Add a release function to allow destroying the dm-verity device.

Bug: 27928374
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Change-Id: Ic0f7c17e4889c5580d70b52d9a709a37165a5747
(cherry picked from commit 0039ccf47c8f99888f7b71b2a36a68a027fbe357)
Git-commit: c4d8e3e8d2aa09f5826f517339baa7632f7873ea
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm verity fec: limit error correction recursion
Sami Tolvanen [Fri, 3 Jun 2016 21:06:14 +0000 (14:06 -0700)]
ANDROID: dm verity fec: limit error correction recursion

If verity tree itself is sufficiently corrupted in addition to data
blocks, it's possible for error correction to end up in a deep recursive
error correction loop that eventually causes a kernel panic as follows:

[   14.728962] [<ffffffc0008c1a14>] verity_fec_decode+0xa8/0x138
[   14.734691] [<ffffffc0008c3ee0>] verity_verify_level+0x11c/0x180
[   14.740681] [<ffffffc0008c482c>] verity_hash_for_block+0x88/0xe0
[   14.746671] [<ffffffc0008c1508>] fec_decode_rsb+0x318/0x75c
[   14.752226] [<ffffffc0008c1a14>] verity_fec_decode+0xa8/0x138
[   14.757956] [<ffffffc0008c3ee0>] verity_verify_level+0x11c/0x180
[   14.763944] [<ffffffc0008c482c>] verity_hash_for_block+0x88/0xe0

This change limits the recursion to a reasonable level during a single
I/O operation.

Bug: 28943429
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Change-Id: I0a7ebff331d259c59a5e03c81918cc1613c3a766
(cherry picked from commit f4b9e40597e73942d2286a73463c55f26f61bfa7)
Git-commit: 249d2baf9b494381f2ff4f21feeaaa47eaa78e7c
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: android-verity: Remove fec_header location constraint
Badhri Jagan Sridharan [Tue, 27 Sep 2016 20:48:29 +0000 (13:48 -0700)]
ANDROID: dm: android-verity: Remove fec_header location constraint

This CL removes the mandate of the fec_header being located right
after the ECC data.

(Cherry-picked from https://android-review.googlesource.com/#/c/280401)

Bug: 28865197
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: Ie04c8cf2dd755f54d02dbdc4e734a13d6f6507b5
Git-commit: 1daecfe215ea3379fdc842f264607d37dd8fe091
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoRevert "dm-verity: Add a temporary dummy opaque struct declaration"
Vikram Mulukutla [Fri, 28 Oct 2016 21:48:02 +0000 (14:48 -0700)]
Revert "dm-verity: Add a temporary dummy opaque struct declaration"

The declaration that caused a compilation failure is not fixed.
Remove the dummy opaque struct declaration.

Change-Id: Id27cf5231aebcdd14f4fb25dd44052f829e0427e
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm-verity: adopt changes made to dm callbacks
Badhri Jagan Sridharan [Tue, 9 Aug 2016 19:47:37 +0000 (12:47 -0700)]
ANDROID: dm-verity: adopt changes made to dm callbacks

v4.4 introduced changes to the callbacks used for
dm-linear and dm-verity-target targets. Move to those headers
in dm-android-verity.

Verified on hikey while having
BOARD_USES_RECOVERY_AS_BOOT := true
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

BUG: 27339727
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: Ic64950c3b55f0a6eaa570bcedc2ace83bbf3005e
Git-commit: aa3cda16a57e73e9fc269e1de1eb3c35f3f0ed20
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: android-verity: Verify header before fetching table
Badhri Jagan Sridharan [Thu, 7 Jul 2016 00:16:19 +0000 (17:16 -0700)]
ANDROID: dm: android-verity: Verify header before fetching table

Move header validation logic before reading the verity_table as
an invalid header implies the table is invalid as well.

(Cherry-picked from:
https://partner-android-review.git.corp.google.com/#/c/625203)

BUG: 29940612
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: Ib34d25c0854202f3e70df0a6d0ef1d96f0250c8e
Git-commit: ad2f6cf0be78107a2bf435b8a21f801658935719
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: allow adb disable-verity only in userdebug
Badhri Jagan Sridharan [Mon, 27 Jun 2016 23:25:55 +0000 (16:25 -0700)]
ANDROID: dm: allow adb disable-verity only in userdebug

adb disable-verity was allowed when the phone is in the
unlocked state. Since the driver is now aware of the build
variant, honor "adb disable-verity" only in userdebug
builds.

(Cherry-picked from
https://partner-android-review.git.corp.google.com/#/c/622117)

BUG: 29276559
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: I7ce9f38d8c7a62361392c5a8ccebb288f8a3a2ea
Git-commit: f74284f6c25dca79c052c3a1e1bd3fc58de4d4a0
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: mount as linear target if eng build
Badhri Jagan Sridharan [Sat, 18 Jun 2016 01:54:35 +0000 (18:54 -0700)]
ANDROID: dm: mount as linear target if eng build

eng builds dont have verity enabled i.e it does even
have verity metadata appended to the parition. Therefore
add rootdev as linear device and map the entire partition
if build variant is "eng".

(Cherry-picked based on
https://partner-android-review.git.corp.google.com/#/c/618690/)

BUG: 29276559
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: I8f5c2289b842b820ca04f5773525e5449bb3f355
Git-commit: 58bae772a7018ebfa735c91af22e26474a1dfcc7
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: use default verity public key
Badhri Jagan Sridharan [Fri, 20 May 2016 23:45:45 +0000 (16:45 -0700)]
ANDROID: dm: use default verity public key

If the dm-android-verity target does not provide a default
key try using the default public key from the system keyring.
The defualt verity keyid is passed as a kernel command line
argument veritykeyid=.

The order of the dm-android-verity params have been reversed
to facilitate the change.

Old format example:
dm="system none ro,0 1 android-verity Android:#7e4333f9bba00adfe0ede979e28ed1920492b40f /dev/mmcblk0p43"

New formats supported:
dm="system none ro,0 1 android-verity /dev/mmcblk0p43 Android:#7e4333f9bba00adfe0ede979e28ed1920492b40f"

(or)

dm="system none ro,0 1 android-verity /dev/mmcblk0p43"
when veritykeyid= is set in the kernel command line.

BUG: 28384658
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: I506c89b053d835ab579e703eef2bc1f8487250de
(cherry picked from commit c5c74d0327729f35b576564976885596c6d0e7fb)
Git-commit: 051d4706c621a73d3622f0b0d91a444ab37a8f1a
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: fix signature verification flag
Badhri Jagan Sridharan [Fri, 20 May 2016 23:44:19 +0000 (16:44 -0700)]
ANDROID: dm: fix signature verification flag

The bug was that the signature verification was only
happening when verity was disabled. It should always
happen when verity is enabled.

Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: I2d9354e240d36ea06fc68c2d18d8e87b823a4c2f
(cherry picked from commit 5364b5ca0b1a12a58283b51408e43fc36d4e4fe7)
Git-commit: 9c43aca47bbdf652fc0d05d8e94ee43aaeea2458
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: use name_to_dev_t
Jeremy Compostella [Fri, 15 Apr 2016 11:32:54 +0000 (13:32 +0200)]
ANDROID: dm: use name_to_dev_t

This patch makes android_verity_ctr() parse its block device string
parameter with name_to_dev_t().  It allows the use of less hardware
related block device reference like PARTUUID for instance.

Change-Id: Idb84453e70cc11abd5ef3a0adfbb16f8b5feaf07
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Git-commit: a517817c1708dd9d762d37d7dd475d4728a4b34e
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: rename dm-linear methods for dm-android-verity
Badhri Jagan Sridharan [Tue, 5 Apr 2016 18:18:16 +0000 (11:18 -0700)]
ANDROID: dm: rename dm-linear methods for dm-android-verity

This keeps linear_target as static variable and just exposes
the linear target methods for android-verity

Cherry-picked: https://android-review.googlesource.com/#/c/212858

Change-Id: I4a377e417b00afd9ecccdb3e605fea31a7df112e
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
(cherry picked from commit a6d1b091f40b25d97849487e29ec097bc5f568dd)
Git-commit: 86fd82659f745b5fea48090fe320cb817e199805
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: Minor cleanup
Badhri Jagan Sridharan [Mon, 28 Mar 2016 21:41:21 +0000 (14:41 -0700)]
ANDROID: dm: Minor cleanup

Compacts the linear device arguments removing the
unnecessary variables.

Bug: 27175947
Change-Id: I157170eebe3c0f89a68ae05870a1060f188d0da0
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Git-commit: 438e162621ac7e80ec9c81bea3f0eaec0b801ff9
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: Mounting root as linear device when verity disabled
Badhri Jagan Sridharan [Mon, 21 Mar 2016 17:55:23 +0000 (10:55 -0700)]
ANDROID: dm: Mounting root as linear device when verity disabled

This CL makes android-verity target to be added as linear
dm device if when bootloader is unlocked and verity is disabled.

Bug: 27175947
Change-Id: Ic41ca4b8908fb2777263799cf3a3e25934d70f18
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Git-commit: 67ce481897e0656404fe0af42d563101a5629bbe
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm-android-verity: Rebase on top of 4.1
Badhri Jagan Sridharan [Tue, 9 Feb 2016 00:28:43 +0000 (16:28 -0800)]
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: f42f971b7b59257a8610608b7f45a046c7c57b5d
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agoANDROID: dm: Add android verity target
Badhri Jagan Sridharan [Tue, 15 Dec 2015 04:09:39 +0000 (20:09 -0800)]
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: 36d01a590d035804dc100e105facf4049cf6fe43
Git-repo: https://android.googlesource.com/kernel/common
Signed-off-by: Vikram Mulukutla <markivx@codeaurora.org>
7 years agodm-verity: Add a temporary dummy opaque struct declaration
Vikram Mulukutla [Fri, 28 Oct 2016 21:06:12 +0000 (14:06 -0700)]
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>
7 years agoicnss: Shutdown Adrastea before remapping MSA0
Sameer Thalappil [Fri, 28 Oct 2016 20:55:28 +0000 (13:55 -0700)]
icnss: Shutdown Adrastea before remapping MSA0

MSA0 is remapped to HLOS during SSR/PDR for ramdump purposes.
Remap this memory region only after Adrastea is being shutdown, otherwise
Adrastea could still try to access this region resulting in SMMU fault.

CRs-Fixed: 1082630
Change-Id: I490b5679de4cb4837f5ed5d4e40d339e12c8ecc9
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
7 years agomsm: ipa3: fix send_cmd_timeout logic
Skylar Chang [Fri, 28 Oct 2016 21:22:59 +0000 (14:22 -0700)]
msm: ipa3: fix send_cmd_timeout logic

When sending commands to IPA with timeout, the completion
object needs to be allocated on heap to make sure memory
is still available when EOT is received for this command.

Change-Id: I0228967ca3b33a56489a80833c0565ba2dfe8c2a
CRs-Fixed: 1082708
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
7 years agosmb138x-charger: Fix FCC and FV parameters
Abhijeet Dharmapurikar [Wed, 26 Oct 2016 01:40:37 +0000 (18:40 -0700)]
smb138x-charger: Fix FCC and FV parameters

The float voltage min value is 2450mV and the max value is 4950mV.
Also the FCC can go up to 6Amps.
Make these corrections.

Change-Id: I2d3f3a299939a061a43b4f552aedc7cac897d8b7
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
7 years agosoc: qcom: signal buffer response after glink_rx_done()
Vidyakumar Athota [Fri, 28 Oct 2016 18:56:45 +0000 (11:56 -0700)]
soc: qcom: signal buffer response after glink_rx_done()

Currently glink rx buffer response signal is updated before
calling glink_rx_done(). Since response sent for the command,
there is a chance that next command will be sent before
glink_rx_done() API called which is not expected from wdsp.
Avoid this scenario by calling glink_rx_done() before signaling
buffer response.

Change-Id: Ifdd0089a6a970792ebd84665178bd4de86eae2fb
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
7 years agosched/hmp: Disable interrupts when resetting all task stats
Syed Rameez Mustafa [Fri, 28 Oct 2016 19:12:41 +0000 (12:12 -0700)]
sched/hmp: Disable interrupts when resetting all task stats

Taking the pi_lock without disabling interrupts in reset_all_task_stats()
is problematic. In that an interrupt can end up waking a task which in
turn needs the pi_lock again causing a deadlock. Disable interrupts along
with taking the lock to avoid this problem.

Change-Id: If27cb2bb3fcaafa5c8435f3c2e0e4be9b8f1e987
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
7 years agoqseecom: check error return value of ion_map_kernel
Zhen Kong [Tue, 25 Oct 2016 17:21:22 +0000 (10:21 -0700)]
qseecom: check error return value of ion_map_kernel

ion_map_kernel() is called without checking for or acting upon the
possible error conditions this function may return, make change to
check its error return value.

CRs-fixed: 1081637
Change-Id: I0a34f0bbc9f2049b826777a31e14d2cf62cdc211
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
7 years agomsm: ADSPRPC: Do not pass offset for secure buffers
Sathish Ambley [Fri, 28 Oct 2016 16:50:42 +0000 (09:50 -0700)]
msm: ADSPRPC: Do not pass offset for secure buffers

The secure buffers does not allow passing offset into the buffer
and hence skip calculation of offset for secure buffers.

Change-Id: I2cd3b87aca032d4c5868cc9db35987213349a337
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
7 years agoclk: msm: clock-osm: Request Nominal Fmax frequency after OSM enable
Osvaldo Banuelos [Thu, 27 Oct 2016 00:11:29 +0000 (17:11 -0700)]
clk: msm: clock-osm: Request Nominal Fmax frequency after OSM enable

Index 0 LUT entry must be selected before enabling OSM. The final
desired boot rate should be selected once OSM is enabled.
Fix this.

CRs-Fixed: 1082804
Change-Id: I7901df15ec03273304c5e4d417f272497ad1523c
Signed-off-by: Osvaldo Banuelos <osvaldob@codeaurora.org>
7 years agodt-bindings: power: reset: add document for reboot-mode driver
Andy Yan [Wed, 6 Jul 2016 13:22:45 +0000 (21:22 +0800)]
dt-bindings: power: reset: add document for reboot-mode driver

Add device tree bindings document for reboot-mode driver.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Git-commit: 376e27e485cbe9f903369a002d07d5a01225d1d3
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
Change-Id: Ic0f2a51b5af661fd23576ae5135c920b92f0cdfd
Signed-off-by: Xiaogang Cui <xiaogang@codeaurora.org>
7 years agopower: reset: add reboot mode driver
Andy Yan [Wed, 6 Jul 2016 13:27:26 +0000 (21:27 +0800)]
power: reset: add reboot mode driver

This driver parses the reboot commands like "reboot bootloader"
and "reboot recovery" to get a boot mode described in the
device tree , then call the write interfae to store the boot
mode in some place like special register or sram, which can
be read by the bootloader after system reboot, then the bootloader
can take different action according to the mode stored.

This is commonly used on Android based devices, in order to
reboot the device into fastboot or recovery mode.

Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Tested-by: John Stultz <john.stultz@linaro.org>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Git-commit: 4fcd504edbf7c793325511c2df8dcd083958e28a
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/

Change-Id: Id65f6b9186e7a5209542a380bae31a1d8933b931
Signed-off-by: Wufeng.jiang <wufeng.jiang@codeaurora.org>
Signed-off-by: Xiaogang Cui <xiaogang@codeaurora.org>
7 years agocfg80211: pass struct to interface combination check/iter
Purushottam Kushwaha [Thu, 27 Oct 2016 10:55:38 +0000 (16:25 +0530)]
cfg80211: pass struct to interface combination check/iter

Move the growing parameter list to a structure for the interface
combination check and iteration functions in cfg80211 and mac80211
to make the code easier to understand.

Signed-off-by: Purushottam Kushwaha <pkushwah@qti.qualcomm.com>
[edit commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
Git-commit: e227300c8395dffaa7614ce7c7666a82180ebc60
CRs-fixed: 1025311
Change-Id: Ic4c7f66e84c8898d9db630d373b8a3cc8472e826
Signed-off-by: Purushottam Kushwaha <pkushwah@codeaurora.org>
7 years agobinder: prevent kptr leak by using %pK format specifier
Nick Desaulniers [Wed, 17 Aug 2016 23:00:08 +0000 (16:00 -0700)]
binder: prevent kptr leak by using %pK format specifier

Works in conjunction with kptr_restrict.
Bug: 30143283

Change-Id: Ibe0053e8bd4d8219098ba09041d66fcd5b4592fd
Git-repo: https://android.googlesource.com/kernel/msm.git
Git-commit: b884cbf06200b18e660514a30293931a61126ef5
Signed-off-by: Dennis Cagle <d-cagle@codeaurora.org>
Signed-off-by: Ravi Kumar Siddojigari <rsiddoji@codeaurora.org>
7 years agoARM: dts: msm: correct pmicobalt_bob regulator name for msmcobalt
David Collins [Fri, 28 Oct 2016 00:03:21 +0000 (17:03 -0700)]
ARM: dts: msm: correct pmicobalt_bob regulator name for msmcobalt

The regulator name for the PMICOBALT BOB regulators uses the
prefix "pmcobalt_bob".  Change this to "pmicobalt_bob" so that
the regulator name correctly reflects which PMIC the regulator
is found on.

Change-Id: I018729af22dbd787f42fc3788cbff018be7b4014
CRs-Fixed: 1083306
Signed-off-by: David Collins <collinsd@codeaurora.org>
7 years agoMerge "ASoC: msm: Add routes for all TDM modes"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:28 +0000 (15:49 -0700)]
Merge "ASoC: msm: Add routes for all TDM modes"

7 years agoMerge "ASoC: msmcobalt: Add support for all TDM modes"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:27 +0000 (15:49 -0700)]
Merge "ASoC: msmcobalt: Add support for all TDM modes"

7 years agoMerge "ARM: dts: msm: fix sd card detection for msmcobalt QRD SKUK board"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:26 +0000 (15:49 -0700)]
Merge "ARM: dts: msm: fix sd card detection for msmcobalt QRD SKUK board"

7 years agoMerge "ASoC: msm: Enable Media Format converter for all resampling usecases"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:25 +0000 (15:49 -0700)]
Merge "ASoC: msm: Enable Media Format converter for all resampling usecases"

7 years agoMerge "msm: mdss: Fix memleak in framebuffer register and remove"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:22 +0000 (15:49 -0700)]
Merge "msm: mdss: Fix memleak in framebuffer register and remove"

7 years agoMerge "msm: mdss: Correct settings when on/off happens in dest-scaler"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:22 +0000 (15:49 -0700)]
Merge "msm: mdss: Correct settings when on/off happens in dest-scaler"

7 years agoMerge "msm: mdss: Avoid adaptive variable refresh during dynaminc FPS"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:21 +0000 (15:49 -0700)]
Merge "msm: mdss: Avoid adaptive variable refresh during dynaminc FPS"

7 years agoMerge "msm: mdss: dp: remove programming of maud/naud for audio"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:19 +0000 (15:49 -0700)]
Merge "msm: mdss: dp: remove programming of maud/naud for audio"

7 years agoMerge "ARM: dts: msm: enable esd for jdi qhd cmd mode panel in msmcobalt"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:18 +0000 (15:49 -0700)]
Merge "ARM: dts: msm: enable esd for jdi qhd cmd mode panel in msmcobalt"

7 years agoMerge "qcom-charger: set optimal buck switching frequency"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:17 +0000 (15:49 -0700)]
Merge "qcom-charger: set optimal buck switching frequency"