Merge "hwmon: qpnp-adc-current: Update fix for IADC RSENSE trim error"
diff --git a/Documentation/devicetree/bindings/arm/msm/cpr-regulator.txt b/Documentation/devicetree/bindings/arm/msm/cpr-regulator.txt
index aa24dc6..bba4cf7 100644
--- a/Documentation/devicetree/bindings/arm/msm/cpr-regulator.txt
+++ b/Documentation/devicetree/bindings/arm/msm/cpr-regulator.txt
@@ -251,6 +251,8 @@
corresponds to 'scaling' in this equation:
quot_adjust = (freq_turbo - freq_corner) * scaling / 1000.
This property is required if qcom,cpr-speed-bin-max-corners is present.
+- mem-acc-supply: Regulator to vote for the memory accelerator configuration.
+ Not Present: memory accelerator configuration not supported.
Example:
apc_vreg_corner: regulator@f9018000 {
diff --git a/Documentation/devicetree/bindings/regulator/mem-acc-regulator.txt b/Documentation/devicetree/bindings/regulator/mem-acc-regulator.txt
new file mode 100644
index 0000000..8eaa3a1
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/mem-acc-regulator.txt
@@ -0,0 +1,52 @@
+Qualcomm Technologies Memory Accelerator
+
+Memory accelerator configures the power-mode (corner) for the
+accelerator.
+
+Required properties:
+- compatible: Must be "qcom,mem-acc-regulator"
+- regulator-name: A string used to describe the regulator
+- regulator-min-microvolt: Minimum corner value as min constraint, which
+ should be 1 for SVS corner
+- regulator-max-microvolt: Maximum corner value as max constraint, which
+ should be 4 for SUPER_TURBO or 3 for TURBO
+- qcom,corner-acc-map Array which maps the APC (application processor)
+ corner value to the accelerator corner.
+ [0] maps APC SVS corner (1) to accelerator SVS corner
+ [1] maps APC NOMINAL corner (2) to accelerator NOMINAL corner
+ [2] maps APC TURBO corner (3) to accelerator TURBO corner
+
+Optional properties:
+- reg: Register addresses for acc-en and acc-sel-l1 acc-sel-l2 control.
+- reg-names: Register names. Must be "acc-sel-l1", "acc-sel-l2", "acc-en".
+ A given mem-acc-regulator driver must have "acc-sel-l1" or
+ "acc-sel-l2" reg-names property and related register address
+ property.
+- qcom,acc-en-bit-pos Array which specifies bit positions in the
+ 'acc-en' register. Setting these bits forces the
+ the acclerator to use the corner value specified
+ in the 'acc-sel-l1' and 'acc-sel-l2' register.
+- qcom,acc-sel-l1-bit-pos Array which specifies bit positions in the
+ 'acc-sel-l1' register. Each element in this array
+ is the LSB of a 2-bit value. This 2-bit value
+ specifies the corner value used by the
+ accelerator for L1 cache.
+- qcom,acc-sel-l2-bit-pos Array which specifies bit positions in the
+ 'acc-sel-l2' register. Each element in this array
+ is the LSB of a 2-bit value. This 2-bit value
+ specifies the corner value used by the
+ accelerator for L2 cache.
+
+mem_acc_vreg_corner: regulator@fd4aa044 {
+ compatible = "qcom,mem-acc-regulator";
+ reg = <0xfd4aa048 0x1>, <0xfd4aa044 0x1>, <0xfd4af000 0x1>;
+ reg-names = "acc-en", "acc-sel-l1" , "acc-sel-l2";
+ regulator-name = "mem_acc_corner";
+ regulator-min-microvolt = <1>;
+ regulator-max-microvolt = <3>;
+
+ qcom,acc-en-bit-pos = <0>;
+ qcom,acc-sel-l1-bit-pos = <0>;
+ qcom,acc-sel-l2-bit-pos = <0>;
+ qcom,corner-acc-map = <0 1 3>;
+};
diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
index fcafe11..979819f 100644
--- a/Documentation/devicetree/bindings/usb/msm-hsusb.txt
+++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
@@ -196,12 +196,15 @@
turnaround timeout is observed on enabling streaming. Hence it is required
to see these errors and number of erros on enabling this at USB level to make
final decision to enable this feature or not.
+- qcom,android-usb-uicc-nluns : Number of mass storage LUNs required for
+ the UICC card.
Example Android USB device node :
android_usb@fc42b0c8 {
compatible = "qcom,android-usb";
reg = <0xfc42b0c8 0xc8>;
qcom,android-usb-swfi-latency = <1>;
qcom,streaming-func = "rndis","mtp";
+ qcom,android-usb-uicc-nluns = <1>;
};
diff --git a/arch/arm/boot/dts/apq8074-v1.dtsi b/arch/arm/boot/dts/apq8074-v1.dtsi
index a74674b..be7dee8 100644
--- a/arch/arm/boot/dts/apq8074-v1.dtsi
+++ b/arch/arm/boot/dts/apq8074-v1.dtsi
@@ -27,6 +27,7 @@
qcom,disk-encrypt-pipe-pair = <2>;
qcom,hlos-ce-hw-instance = <1>;
qcom,qsee-ce-hw-instance = <0>;
+ qcom,support-bus-scaling;
qcom,msm-bus,name = "qseecom-noc";
qcom,msm-bus,num-cases = <4>;
qcom,msm-bus,active-only = <0>;
@@ -34,9 +35,9 @@
qcom,support-fde;
qcom,msm-bus,vectors-KBps =
<55 512 0 0>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>;
+ <55 512 0 0>,
+ <55 512 120000 1200000>,
+ <55 512 393600 3936000>;
};
};
diff --git a/arch/arm/boot/dts/apq8074-v2.0-1.dtsi b/arch/arm/boot/dts/apq8074-v2.0-1.dtsi
index 2b2af09..064a28c 100644
--- a/arch/arm/boot/dts/apq8074-v2.0-1.dtsi
+++ b/arch/arm/boot/dts/apq8074-v2.0-1.dtsi
@@ -32,11 +32,12 @@
qcom,msm-bus,active-only = <0>;
qcom,msm-bus,num-paths = <1>;
qcom,support-fde;
+ qcom,support-bus-scaling;
qcom,msm-bus,vectors-KBps =
<55 512 0 0>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>;
+ <55 512 0 0>,
+ <55 512 120000 1200000>,
+ <55 512 393600 3936000>;
};
sound {
diff --git a/arch/arm/boot/dts/apq8074-v2.2.dtsi b/arch/arm/boot/dts/apq8074-v2.2.dtsi
index 8f46270..010d574 100644
--- a/arch/arm/boot/dts/apq8074-v2.2.dtsi
+++ b/arch/arm/boot/dts/apq8074-v2.2.dtsi
@@ -32,11 +32,12 @@
qcom,msm-bus,active-only = <0>;
qcom,msm-bus,num-paths = <1>;
qcom,support-fde;
+ qcom,support-bus-scaling;
qcom,msm-bus,vectors-KBps =
<55 512 0 0>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>;
+ <55 512 0 0>,
+ <55 512 120000 1200000>,
+ <55 512 393600 3936000>;
};
sound {
diff --git a/arch/arm/boot/dts/msm8226-bus.dtsi b/arch/arm/boot/dts/msm8226-bus.dtsi
index a2f91cf..8abe795 100644
--- a/arch/arm/boot/dts/msm8226-bus.dtsi
+++ b/arch/arm/boot/dts/msm8226-bus.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,7 @@
qcom,qos-freq = <4800>;
qcom,hw-sel = "NoC";
qcom,rpm-en;
+ qcom,nfab = <6>;
mas-gfx3d {
cell-id = <26>;
@@ -261,6 +262,7 @@
qcom,qos-freq = <4800>;
qcom,hw-sel = "NoC";
qcom,rpm-en;
+ qcom,nfab = <6>;
mas-lpass-ahb {
cell-id = <52>;
@@ -473,6 +475,7 @@
qcom,ntieredslaves = <0>;
qcom,hw-sel = "NoC";
qcom,rpm-en;
+ qcom,nfab = <6>;
mas-pnoc-cfg {
cell-id = <88>;
@@ -678,6 +681,7 @@
qcom,ntieredslaves = <0>;
qcom,hw-sel = "NoC";
qcom,rpm-en;
+ qcom,nfab = <6>;
mas-rpm-inst {
cell-id = <72>;
@@ -1001,6 +1005,7 @@
qcom,qos-freq = <19200>;
qcom,hw-sel = "BIMC";
qcom,rpm-en;
+ qcom,nfab = <6>;
mas-ampss-m0 {
cell-id = <1>;
@@ -1088,6 +1093,7 @@
qcom,hw-sel = "NoC";
qcom,rpm-en;
qcom,virt;
+ qcom,nfab = <6>;
mas-v-ocmem-gfx3d {
cell-id = <89>;
diff --git a/arch/arm/boot/dts/msm8226.dtsi b/arch/arm/boot/dts/msm8226.dtsi
index c31f2d3..993da79 100644
--- a/arch/arm/boot/dts/msm8226.dtsi
+++ b/arch/arm/boot/dts/msm8226.dtsi
@@ -300,6 +300,7 @@
reg = <0xfe8050c8 0xc8>;
qcom,android-usb-swfi-latency = <1>;
qcom,streaming-func = "rndis";
+ qcom,android-usb-uicc-nluns = <1>;
};
smsc_hub: hsic_hub {
diff --git a/arch/arm/boot/dts/msm8610.dtsi b/arch/arm/boot/dts/msm8610.dtsi
index 2938c69..a409510 100644
--- a/arch/arm/boot/dts/msm8610.dtsi
+++ b/arch/arm/boot/dts/msm8610.dtsi
@@ -256,6 +256,7 @@
reg = <0xfe8050c8 0xc8>;
qcom,android-usb-swfi-latency = <1>;
qcom,streaming-func = "rndis";
+ qcom,android-usb-uicc-nluns = <1>;
};
rmtfs_sharedmem {
@@ -929,15 +930,16 @@
qcom,disk-encrypt-pipe-pair = <2>;
qcom,hlos-ce-hw-instance = <0>;
qcom,qsee-ce-hw-instance = <0>;
+ qcom,support-bus-scaling;
qcom,msm-bus,name = "qseecom-noc";
qcom,msm-bus,num-cases = <4>;
qcom,msm-bus,active-only = <0>;
qcom,msm-bus,num-paths = <1>;
qcom,msm-bus,vectors-KBps =
<55 512 0 0>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>,
- <55 512 3936000 393600>;
+ <55 512 0 0>,
+ <55 512 120000 1200000>,
+ <55 512 393600 3936000>;
};
qcom,msm-rng@f9bff000 {
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 60078ac..b85af9f 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -2142,7 +2142,7 @@
qcom,qcedev@fd440000 {
compatible = "qcom,qcedev";
reg = <0xfd440000 0x20000>,
- <0xfd444000 0x8000>;
+ <0xfd444000 0x1b000>;
reg-names = "crypto-base","crypto-bam-base";
interrupts = <0 236 0>;
qcom,bam-pipe-pair = <1>;
@@ -2156,10 +2156,10 @@
<56 512 3936000 393600>;
};
- qcom,qcrypto@fd444000 {
+ qcom,qcrypto@fd440000 {
compatible = "qcom,qcrypto";
reg = <0xfd440000 0x20000>,
- <0xfd444000 0x8000>;
+ <0xfd444000 0x1b000>;
reg-names = "crypto-base","crypto-bam-base";
interrupts = <0 236 0>;
qcom,bam-pipe-pair = <2>;
@@ -2177,6 +2177,27 @@
<56 512 3936000 393600>;
};
+ qcom,qcrypto1@fd440000 {
+ compatible = "qcom,qcrypto";
+ reg = <0xfd440000 0x20000>,
+ <0xfd444000 0x1b000>;
+ reg-names = "crypto-base","crypto-bam-base";
+ interrupts = <0 236 0>;
+ qcom,bam-pipe-pair = <0>;
+ qcom,ce-hw-instance = <1>;
+ qcom,ce-device = <1>;
+ qcom,clk-mgmt-sus-res;
+ qcom,msm-bus,name = "qcrypto-noc";
+ qcom,msm-bus,num-cases = <2>;
+ qcom,msm-bus,num-paths = <1>;
+ qcom,use-sw-aes-cbc-ecb-ctr-algo;
+ qcom,use-sw-aes-xts-algo;
+ qcom,use-sw-ahash-algo;
+ qcom,msm-bus,vectors-KBps =
+ <56 512 0 0>,
+ <56 512 3936000 393600>;
+ };
+
qcom,usbbam@f9304000 {
compatible = "qcom,usb-bam-msm";
reg = <0xf9304000 0x5000>,
diff --git a/arch/arm/configs/msm8226-perf_defconfig b/arch/arm/configs/msm8226-perf_defconfig
index ef7a5db..dd355af 100644
--- a/arch/arm/configs/msm8226-perf_defconfig
+++ b/arch/arm/configs/msm8226-perf_defconfig
@@ -304,6 +304,7 @@
CONFIG_WCD9306_CODEC=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR_MEM_ACC=y
CONFIG_REGULATOR_ONSEMI_NCP6335D=y
CONFIG_REGULATOR_STUB=y
CONFIG_REGULATOR_QPNP=y
diff --git a/arch/arm/configs/msm8226_defconfig b/arch/arm/configs/msm8226_defconfig
index d7719eb..a26e247 100644
--- a/arch/arm/configs/msm8226_defconfig
+++ b/arch/arm/configs/msm8226_defconfig
@@ -306,6 +306,7 @@
CONFIG_WCD9306_CODEC=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR_MEM_ACC=y
CONFIG_REGULATOR_ONSEMI_NCP6335D=y
CONFIG_REGULATOR_STUB=y
CONFIG_REGULATOR_QPNP=y
@@ -467,7 +468,7 @@
CONFIG_CORESIGHT_MODEM_ETM=y
CONFIG_CORESIGHT_WCN_ETM=y
CONFIG_CORESIGHT_RPM_ETM=y
-CONFIG_CORESIGHT_EVENT=m
+CONFIG_CORESIGHT_EVENT=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT3_FS=y
diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index 2a2988b..a908217 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -433,7 +433,7 @@
CONFIG_CORESIGHT_MODEM_ETM=y
CONFIG_CORESIGHT_WCN_ETM=y
CONFIG_CORESIGHT_RPM_ETM=y
-CONFIG_CORESIGHT_EVENT=m
+CONFIG_CORESIGHT_EVENT=y
CONFIG_SENSORS=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
index a749766..478e766 100755
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -396,6 +396,7 @@
CONFIG_USB_EHCI_MSM=y
CONFIG_USB_EHCI_MSM_HSIC=y
CONFIG_USB_ACM=y
+CONFIG_USB_CCID_BRIDGE=y
CONFIG_USB_STORAGE=y
CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_USB_STORAGE_FREECOM=y
diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index b002e45..a27baba 100755
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -420,6 +420,7 @@
CONFIG_USB_EHCI_MSM=y
CONFIG_USB_EHCI_MSM_HSIC=y
CONFIG_USB_ACM=y
+CONFIG_USB_CCID_BRIDGE=y
CONFIG_USB_STORAGE=y
CONFIG_USB_STORAGE_DATAFAB=y
CONFIG_USB_STORAGE_FREECOM=y
@@ -500,7 +501,7 @@
CONFIG_CORESIGHT_MODEM_ETM=y
CONFIG_CORESIGHT_WCN_ETM=y
CONFIG_CORESIGHT_RPM_ETM=y
-CONFIG_CORESIGHT_EVENT=m
+CONFIG_CORESIGHT_EVENT=y
CONFIG_BIF=y
CONFIG_BIF_QPNP=y
CONFIG_EXT2_FS=y
diff --git a/arch/arm/configs/msm9625_defconfig b/arch/arm/configs/msm9625_defconfig
index d6811df..59057f0 100644
--- a/arch/arm/configs/msm9625_defconfig
+++ b/arch/arm/configs/msm9625_defconfig
@@ -298,7 +298,7 @@
CONFIG_CORESIGHT_AUDIO_ETM=y
CONFIG_CORESIGHT_MODEM_ETM=y
CONFIG_CORESIGHT_RPM_ETM=y
-CONFIG_CORESIGHT_EVENT=m
+CONFIG_CORESIGHT_EVENT=y
CONFIG_EXT3_FS=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
diff --git a/arch/arm/mach-msm/batterydata-lib.c b/arch/arm/mach-msm/batterydata-lib.c
index 42a59d1..a1ae553 100644
--- a/arch/arm/mach-msm/batterydata-lib.c
+++ b/arch/arm/mach-msm/batterydata-lib.c
@@ -34,32 +34,33 @@
return 0;
}
-static int interpolate_single_lut(struct single_row_lut *lut, int x)
+static int interpolate_single_lut_scaled(struct single_row_lut *lut,
+ int x, int scale)
{
int i, result;
- if (x < lut->x[0]) {
+ if (x < lut->x[0] * scale) {
pr_debug("x %d less than known range return y = %d lut = %pS\n",
x, lut->y[0], lut);
return lut->y[0];
}
- if (x > lut->x[lut->cols - 1]) {
+ if (x > lut->x[lut->cols - 1] * scale) {
pr_debug("x %d more than known range return y = %d lut = %pS\n",
x, lut->y[lut->cols - 1], lut);
return lut->y[lut->cols - 1];
}
for (i = 0; i < lut->cols; i++)
- if (x <= lut->x[i])
+ if (x <= lut->x[i] * scale)
break;
- if (x == lut->x[i]) {
+ if (x == lut->x[i] * scale) {
result = lut->y[i];
} else {
result = linear_interpolate(
lut->y[i - 1],
- lut->x[i - 1],
+ lut->x[i - 1] * scale,
lut->y[i],
- lut->x[i],
+ lut->x[i] * scale,
x);
}
return result;
@@ -67,9 +68,9 @@
int interpolate_fcc(struct single_row_lut *fcc_temp_lut, int batt_temp)
{
- /* batt_temp is in tenths of degC - convert it to degC for lookups */
- batt_temp = batt_temp/10;
- return interpolate_single_lut(fcc_temp_lut, batt_temp);
+ return interpolate_single_lut_scaled(fcc_temp_lut,
+ batt_temp,
+ DEGC_SCALE);
}
int interpolate_scalingfactor_fcc(struct single_row_lut *fcc_sf_lut,
@@ -80,7 +81,7 @@
* that case return 100%
*/
if (fcc_sf_lut)
- return interpolate_single_lut(fcc_sf_lut, cycles);
+ return interpolate_single_lut_scaled(fcc_sf_lut, cycles, 1);
else
return 100;
}
@@ -123,15 +124,15 @@
}
}
- if (row_entry < sf_lut->row_entries[0])
- row_entry = sf_lut->row_entries[0];
- if (row_entry > sf_lut->row_entries[cols - 1])
- row_entry = sf_lut->row_entries[cols - 1];
+ if (row_entry < sf_lut->row_entries[0] * DEGC_SCALE)
+ row_entry = sf_lut->row_entries[0] * DEGC_SCALE;
+ if (row_entry > sf_lut->row_entries[cols - 1] * DEGC_SCALE)
+ row_entry = sf_lut->row_entries[cols - 1] * DEGC_SCALE;
for (i = 0; i < cols; i++)
- if (row_entry <= sf_lut->row_entries[i])
+ if (row_entry <= sf_lut->row_entries[i] * DEGC_SCALE)
break;
- if (row_entry == sf_lut->row_entries[i]) {
+ if (row_entry == sf_lut->row_entries[i] * DEGC_SCALE) {
scalefactor = linear_interpolate(
sf_lut->sf[row1][i],
sf_lut->percent[row1],
@@ -143,16 +144,16 @@
scalefactorrow1 = linear_interpolate(
sf_lut->sf[row1][i - 1],
- sf_lut->row_entries[i - 1],
+ sf_lut->row_entries[i - 1] * DEGC_SCALE,
sf_lut->sf[row1][i],
- sf_lut->row_entries[i],
+ sf_lut->row_entries[i] * DEGC_SCALE,
row_entry);
scalefactorrow2 = linear_interpolate(
sf_lut->sf[row2][i - 1],
- sf_lut->row_entries[i - 1],
+ sf_lut->row_entries[i - 1] * DEGC_SCALE,
sf_lut->sf[row2][i],
- sf_lut->row_entries[i],
+ sf_lut->row_entries[i] * DEGC_SCALE,
row_entry);
scalefactor = linear_interpolate(
@@ -167,7 +168,7 @@
/* get ocv given a soc -- reverse lookup */
int interpolate_ocv(struct pc_temp_ocv_lut *pc_temp_ocv,
- int batt_temp_degc, int pc)
+ int batt_temp, int pc)
{
int i, ocvrow1, ocvrow2, ocv, rows, cols;
int row1 = 0;
@@ -198,15 +199,15 @@
}
}
- if (batt_temp_degc < pc_temp_ocv->temp[0])
- batt_temp_degc = pc_temp_ocv->temp[0];
- if (batt_temp_degc > pc_temp_ocv->temp[cols - 1])
- batt_temp_degc = pc_temp_ocv->temp[cols - 1];
+ if (batt_temp < pc_temp_ocv->temp[0] * DEGC_SCALE)
+ batt_temp = pc_temp_ocv->temp[0] * DEGC_SCALE;
+ if (batt_temp > pc_temp_ocv->temp[cols - 1] * DEGC_SCALE)
+ batt_temp = pc_temp_ocv->temp[cols - 1] * DEGC_SCALE;
for (i = 0; i < cols; i++)
- if (batt_temp_degc <= pc_temp_ocv->temp[i])
+ if (batt_temp <= pc_temp_ocv->temp[i] * DEGC_SCALE)
break;
- if (batt_temp_degc == pc_temp_ocv->temp[i]) {
+ if (batt_temp == pc_temp_ocv->temp[i] * DEGC_SCALE) {
ocv = linear_interpolate(
pc_temp_ocv->ocv[row1][i],
pc_temp_ocv->percent[row1],
@@ -218,17 +219,17 @@
ocvrow1 = linear_interpolate(
pc_temp_ocv->ocv[row1][i - 1],
- pc_temp_ocv->temp[i - 1],
+ pc_temp_ocv->temp[i - 1] * DEGC_SCALE,
pc_temp_ocv->ocv[row1][i],
- pc_temp_ocv->temp[i],
- batt_temp_degc);
+ pc_temp_ocv->temp[i] * DEGC_SCALE,
+ batt_temp);
ocvrow2 = linear_interpolate(
pc_temp_ocv->ocv[row2][i - 1],
- pc_temp_ocv->temp[i - 1],
+ pc_temp_ocv->temp[i - 1] * DEGC_SCALE,
pc_temp_ocv->ocv[row2][i],
- pc_temp_ocv->temp[i],
- batt_temp_degc);
+ pc_temp_ocv->temp[i] * DEGC_SCALE,
+ batt_temp);
ocv = linear_interpolate(
ocvrow1,
@@ -241,26 +242,26 @@
}
int interpolate_pc(struct pc_temp_ocv_lut *pc_temp_ocv,
- int batt_temp_degc, int ocv)
+ int batt_temp, int ocv)
{
int i, j, pcj, pcj_minus_one, pc;
int rows = pc_temp_ocv->rows;
int cols = pc_temp_ocv->cols;
- if (batt_temp_degc < pc_temp_ocv->temp[0]) {
- pr_debug("batt_temp %d < known temp range\n", batt_temp_degc);
- batt_temp_degc = pc_temp_ocv->temp[0];
+ if (batt_temp < pc_temp_ocv->temp[0] * DEGC_SCALE) {
+ pr_debug("batt_temp %d < known temp range\n", batt_temp);
+ batt_temp = pc_temp_ocv->temp[0] * DEGC_SCALE;
}
- if (batt_temp_degc > pc_temp_ocv->temp[cols - 1]) {
- pr_debug("batt_temp %d > known temp range\n", batt_temp_degc);
- batt_temp_degc = pc_temp_ocv->temp[cols - 1];
+ if (batt_temp > pc_temp_ocv->temp[cols - 1] * DEGC_SCALE) {
+ pr_debug("batt_temp %d > known temp range\n", batt_temp);
+ batt_temp = pc_temp_ocv->temp[cols - 1] * DEGC_SCALE;
}
for (j = 0; j < cols; j++)
- if (batt_temp_degc <= pc_temp_ocv->temp[j])
+ if (batt_temp <= pc_temp_ocv->temp[j] * DEGC_SCALE)
break;
- if (batt_temp_degc == pc_temp_ocv->temp[j]) {
+ if (batt_temp == pc_temp_ocv->temp[j] * DEGC_SCALE) {
/* found an exact match for temp in the table */
if (ocv >= pc_temp_ocv->ocv[0][j])
return pc_temp_ocv->percent[0];
@@ -282,7 +283,7 @@
}
/*
- * batt_temp_degc is within temperature for
+ * batt_temp is within temperature for
* column j-1 and j
*/
if (ocv >= pc_temp_ocv->ocv[0][j])
@@ -318,10 +319,10 @@
if (pcj && pcj_minus_one) {
pc = linear_interpolate(
pcj_minus_one,
- pc_temp_ocv->temp[j-1],
+ pc_temp_ocv->temp[j-1] * DEGC_SCALE,
pcj,
- pc_temp_ocv->temp[j],
- batt_temp_degc);
+ pc_temp_ocv->temp[j] * DEGC_SCALE,
+ batt_temp);
return pc;
}
}
@@ -333,6 +334,6 @@
return pcj_minus_one;
pr_debug("%d ocv wasn't found for temp %d in the LUT returning 100%%\n",
- ocv, batt_temp_degc);
+ ocv, batt_temp);
return 100;
}
diff --git a/arch/arm/mach-msm/cpr-regulator.c b/arch/arm/mach-msm/cpr-regulator.c
index d15da59f..e50f865 100644
--- a/arch/arm/mach-msm/cpr-regulator.c
+++ b/arch/arm/mach-msm/cpr-regulator.c
@@ -183,6 +183,9 @@
int vdd_mx_vmin;
int vdd_mx_corner_map[CPR_FUSE_CORNER_MAX];
+ /* mem-acc regulator */
+ struct regulator *mem_acc_vreg;
+
/* CPR parameters */
u64 cpr_fuse_bits;
bool cpr_fuse_disable;
@@ -557,15 +560,15 @@
int new_apc_volt, enum voltage_change_dir dir)
{
int rc = 0, vdd_mx_vmin = 0;
+ int fuse_corner = cpr_vreg->corner_map[corner];
- /* No MX scaling if no vdd_mx */
- if (cpr_vreg->vdd_mx == NULL)
- dir = NO_CHANGE;
-
- if (dir != NO_CHANGE) {
- /* Determine the vdd_mx voltage */
+ /* Determine the vdd_mx voltage */
+ if (dir != NO_CHANGE && cpr_vreg->vdd_mx != NULL)
vdd_mx_vmin = cpr_mx_get(cpr_vreg, corner, new_apc_volt);
- }
+
+ if (cpr_vreg->mem_acc_vreg && dir == DOWN)
+ rc = regulator_set_voltage(cpr_vreg->mem_acc_vreg,
+ fuse_corner, fuse_corner);
if (vdd_mx_vmin && dir == UP) {
if (vdd_mx_vmin != cpr_vreg->vdd_mx_vmin)
@@ -575,6 +578,10 @@
if (!rc)
rc = cpr_apc_set(cpr_vreg, new_apc_volt);
+ if (!rc && cpr_vreg->mem_acc_vreg && dir == UP)
+ rc = regulator_set_voltage(cpr_vreg->mem_acc_vreg,
+ fuse_corner, fuse_corner);
+
if (!rc && vdd_mx_vmin && dir == DOWN) {
if (vdd_mx_vmin != cpr_vreg->vdd_mx_vmin)
rc = cpr_mx_set(cpr_vreg, corner, vdd_mx_vmin);
@@ -2014,6 +2021,25 @@
return 0;
}
+static int cpr_mem_acc_init(struct platform_device *pdev,
+ struct cpr_regulator *cpr_vreg)
+{
+ int rc;
+
+ if (of_property_read_bool(pdev->dev.of_node, "mem-acc-supply")) {
+ cpr_vreg->mem_acc_vreg = devm_regulator_get(&pdev->dev,
+ "mem-acc");
+ if (IS_ERR_OR_NULL(cpr_vreg->mem_acc_vreg)) {
+ rc = PTR_RET(cpr_vreg->mem_acc_vreg);
+ if (rc != -EPROBE_DEFER)
+ pr_err("devm_regulator_get: mem-acc: rc=%d\n",
+ rc);
+ return rc;
+ }
+ }
+ return 0;
+}
+
static int __devinit cpr_regulator_probe(struct platform_device *pdev)
{
struct cpr_regulator *cpr_vreg;
@@ -2044,6 +2070,12 @@
return -ENOMEM;
}
+ rc = cpr_mem_acc_init(pdev, cpr_vreg);
+ if (rc) {
+ pr_err("mem_acc intialization error rc=%d\n", rc);
+ return rc;
+ }
+
rc = cpr_efuse_init(pdev, cpr_vreg);
if (rc) {
pr_err("Wrong eFuse address specified: rc=%d\n", rc);
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 235c386..698c93e 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -675,6 +675,8 @@
if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
return;
+ trace_unhandled_abort(regs, addr, fsr);
+
printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
inf->name, fsr, addr);
@@ -707,6 +709,8 @@
if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
return;
+ trace_unhandled_abort(regs, addr, ifsr);
+
printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
inf->name, ifsr, addr);
diff --git a/drivers/coresight/coresight-event.c b/drivers/coresight/coresight-event.c
index aa8bfc5..95cadc2 100644
--- a/drivers/coresight/coresight-event.c
+++ b/drivers/coresight/coresight-event.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -10,9 +10,6 @@
* GNU General Public License for more details.
*/
-/*
- * DLKM to register a callback with a ftrace event
- */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -23,49 +20,101 @@
#include <trace/events/exception.h>
-static void abort_coresight_tracing(void *ignore, struct task_struct *task,\
- unsigned long addr, unsigned int fsr)
+static int event_abort_enable;
+static int event_abort_set(const char *val, struct kernel_param *kp);
+module_param_call(event_abort_enable, event_abort_set, param_get_int,
+ &event_abort_enable, 0644);
+
+static void event_abort_user_fault(void *ignore,
+ struct task_struct *task,
+ unsigned long addr,
+ unsigned int fsr)
{
coresight_abort();
- pr_debug("control_trace: task_name: %s, addr: %lu, fsr:%u",\
+ pr_debug("coresight_event: task_name: %s, addr: %lu, fsr:%u",
(char *)task->comm, addr, fsr);
}
-static void abort_tracing_undef_instr(void *ignore, struct pt_regs *regs,\
- void *pc)
+static void event_abort_undef_instr(void *ignore,
+ struct pt_regs *regs,
+ void *pc)
{
if (user_mode(regs)) {
coresight_abort();
- pr_debug("control_trace: pc: %p", pc);
+ pr_debug("coresight_event: pc: %p", pc);
}
}
-static int __init control_trace_init(void)
+static void event_abort_unhandled_abort(void *ignore,
+ struct pt_regs *regs,
+ unsigned long addr,
+ unsigned int fsr)
{
- int ret_user_fault, ret_undef_instr;
- ret_user_fault = register_trace_user_fault(abort_coresight_tracing,\
- NULL);
- ret_undef_instr = register_trace_undef_instr(abort_tracing_undef_instr,\
- NULL);
- if (ret_user_fault != 0 || ret_undef_instr != 0) {
- pr_info("control_trace: Module Not Registered\n");
- return (ret_user_fault < 0 ?\
- ret_user_fault : ret_undef_instr);
+ if (user_mode(regs)) {
+ coresight_abort();
+ pr_debug("coresight_event: addr: %lu, fsr:%u", addr, fsr);
}
- pr_info("control_trace: Module Registered\n");
+}
+
+static int event_abort_register(void)
+{
+ int ret;
+
+ ret = register_trace_user_fault(event_abort_user_fault, NULL);
+ if (ret)
+ goto err_usr_fault;
+ ret = register_trace_undef_instr(event_abort_undef_instr, NULL);
+ if (ret)
+ goto err_undef_instr;
+ ret = register_trace_unhandled_abort(event_abort_unhandled_abort, NULL);
+ if (ret)
+ goto err_unhandled_abort;
+
+ return 0;
+
+err_unhandled_abort:
+ unregister_trace_undef_instr(event_abort_undef_instr, NULL);
+err_undef_instr:
+ unregister_trace_user_fault(event_abort_user_fault, NULL);
+err_usr_fault:
+ return ret;
+}
+
+static void event_abort_unregister(void)
+{
+ unregister_trace_user_fault(event_abort_user_fault, NULL);
+ unregister_trace_undef_instr(event_abort_undef_instr, NULL);
+ unregister_trace_unhandled_abort(event_abort_unhandled_abort, NULL);
+}
+
+static int event_abort_set(const char *val, struct kernel_param *kp)
+{
+ int ret;
+
+ ret = param_set_int(val, kp);
+ if (ret) {
+ pr_err("coresight_event: error setting value %d\n", ret);
+ return ret;
+ }
+
+ if (event_abort_enable)
+ ret = event_abort_register();
+ else
+ event_abort_unregister();
+
+ return ret;
+}
+
+static int __init event_init(void)
+{
return 0;
}
+module_init(event_init);
-module_init(control_trace_init);
-
-static void __exit control_trace_exit(void)
+static void __exit event_exit(void)
{
- unregister_trace_user_fault(abort_coresight_tracing, NULL);
- unregister_trace_undef_instr(abort_tracing_undef_instr, NULL);
- pr_info("control_trace: Module Removed\n");
}
-
-module_exit(control_trace_exit);
+module_exit(event_exit);
MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("Kernel Module to abort tracing");
+MODULE_DESCRIPTION("Coresight Event driver to abort tracing");
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 695095f..9d7bb96 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -272,7 +272,7 @@
struct adreno_device, input_work);
struct kgsl_device *device = &adreno_dev->dev;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
device->flags |= KGSL_FLAG_WAKE_ON_TOUCH;
@@ -290,7 +290,7 @@
*/
mod_timer(&device->idle_timer,
jiffies + msecs_to_jiffies(_wake_timeout));
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
/*
@@ -2103,7 +2103,7 @@
/* Nice ourselves to be higher priority but not too high priority */
set_user_nice(current, _wake_nice);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
/*
* If adreno start is already called, no need to call it again
* it can lead to unpredictable behavior if we try to start
@@ -2123,7 +2123,7 @@
_status = _adreno_start(adreno_dev);
else
_status = 0;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
/**
@@ -2148,9 +2148,9 @@
* higher priority work queue and wait for it to finish
*/
queue_work(adreno_wq, &adreno_dev->start_work);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
flush_work(&adreno_dev->start_work);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
return _status;
}
diff --git a/drivers/gpu/msm/adreno_a3xx.c b/drivers/gpu/msm/adreno_a3xx.c
index 2faa278..a535a97 100644
--- a/drivers/gpu/msm/adreno_a3xx.c
+++ b/drivers/gpu/msm/adreno_a3xx.c
@@ -4250,7 +4250,7 @@
*/
int a3xx_coresight_enable(struct kgsl_device *device)
{
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (!kgsl_active_count_get(device)) {
kgsl_regwrite(device, A3XX_RBBM_DEBUG_BUS_CTL, 0x0001093F);
kgsl_regwrite(device, A3XX_RBBM_DEBUG_BUS_STB_CTL0,
@@ -4271,7 +4271,7 @@
0x00000001);
kgsl_active_count_put(device);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
@@ -4282,7 +4282,7 @@
*/
void a3xx_coresight_disable(struct kgsl_device *device)
{
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (!kgsl_active_count_get(device)) {
kgsl_regwrite(device, A3XX_RBBM_DEBUG_BUS_CTL, 0x0);
kgsl_regwrite(device, A3XX_RBBM_DEBUG_BUS_STB_CTL0, 0x0);
@@ -4295,18 +4295,18 @@
kgsl_regwrite(device, A3XX_RBBM_EXT_TRACE_CMD, 0x0);
kgsl_active_count_put(device);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
static void a3xx_coresight_write_reg(struct kgsl_device *device,
unsigned int wordoffset, unsigned int val)
{
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (!kgsl_active_count_get(device)) {
kgsl_regwrite(device, wordoffset, val);
kgsl_active_count_put(device);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
void a3xx_coresight_config_debug_reg(struct kgsl_device *device,
diff --git a/drivers/gpu/msm/adreno_coresight.c b/drivers/gpu/msm/adreno_coresight.c
index d0ba145..d374e23 100644
--- a/drivers/gpu/msm/adreno_coresight.c
+++ b/drivers/gpu/msm/adreno_coresight.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -117,12 +117,12 @@
{
unsigned int regval = 0;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (!kgsl_active_count_get(device)) {
kgsl_regread(device, offset, ®val);
kgsl_active_count_put(device);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return snprintf(buf, PAGE_SIZE, "0x%X", regval);
}
diff --git a/drivers/gpu/msm/adreno_dispatch.c b/drivers/gpu/msm/adreno_dispatch.c
index 7aae397..9a5e692 100644
--- a/drivers/gpu/msm/adreno_dispatch.c
+++ b/drivers/gpu/msm/adreno_dispatch.c
@@ -49,7 +49,7 @@
static unsigned int _cmdbatch_timeout = 2000;
/* Interval for reading and comparing fault detection registers */
-static unsigned int _fault_timer_interval = 50;
+static unsigned int _fault_timer_interval = 200;
/* Local array for the current set of fault detect registers */
static unsigned int fault_detect_regs[FT_DETECT_REGS_COUNT];
@@ -269,7 +269,7 @@
dispatcher->inflight++;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (dispatcher->inflight == 1 &&
!test_bit(ADRENO_DISPATCHER_POWER, &dispatcher->priv)) {
@@ -277,7 +277,7 @@
ret = kgsl_active_count_get(device);
if (ret) {
dispatcher->inflight--;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return ret;
}
@@ -300,7 +300,7 @@
}
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
if (ret) {
dispatcher->inflight--;
@@ -852,10 +852,10 @@
drawctxt->state == ADRENO_CONTEXT_STATE_INVALID) {
replay[i] = NULL;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_cancel_events_timestamp(device, cmd->context,
cmd->timestamp);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
kgsl_cmdbatch_destroy(cmd);
}
@@ -960,7 +960,7 @@
del_timer_sync(&dispatcher->timer);
del_timer_sync(&dispatcher->fault_timer);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
cmdbatch = dispatcher->cmdqueue[dispatcher->head];
@@ -993,7 +993,7 @@
kgsl_device_snapshot(device, 1);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
/* Allocate memory to store the inflight commands */
replay = kzalloc(sizeof(*replay) * dispatcher->inflight, GFP_KERNEL);
@@ -1185,10 +1185,10 @@
dispatcher->head = dispatcher->tail = 0;
/* Reset the GPU */
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
ret = adreno_reset(device);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
/* if any other fault got in until reset then ignore */
fault = atomic_xchg(&dispatcher->fault, 0);
@@ -1424,9 +1424,9 @@
* stragglers
*/
if (dispatcher->inflight == 0 && count) {
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
queue_work(device->work_queue, &device->ts_expired_ws);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
/* Dispatch new commands if we have the room */
@@ -1443,12 +1443,12 @@
mod_timer(&dispatcher->timer, cmdbatch->expires);
/* There are still things in flight - update the idle counts */
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_pwrscale_idle(device);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
} else {
/* There is nothing left in the pipeline. Shut 'er down boys */
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
/*
* Stop the fault timer before decrementing the active count to
* avoid reading the hardware registers while we are trying to
@@ -1461,13 +1461,13 @@
clear_bit(ADRENO_DISPATCHER_POWER, &dispatcher->priv);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
/* Before leaving update the pwrscale information */
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_pwrscale_idle(device);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
mutex_unlock(&dispatcher->mutex);
}
@@ -1565,14 +1565,8 @@
*/
void adreno_dispatcher_start(struct kgsl_device *device)
{
- struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
-
complete_all(&device->cmdbatch_gate);
- /* a305b & a305c GPUs are slower than a330 and needs a larger timer */
- if (adreno_is_a305b(adreno_dev) || adreno_is_a305c(adreno_dev))
- _fault_timer_interval = 200;
-
/* Schedule the work loop to get things going */
adreno_dispatcher_schedule(device);
}
diff --git a/drivers/gpu/msm/adreno_drawctxt.c b/drivers/gpu/msm/adreno_drawctxt.c
index 136456a..f702c36 100644
--- a/drivers/gpu/msm/adreno_drawctxt.c
+++ b/drivers/gpu/msm/adreno_drawctxt.c
@@ -171,9 +171,9 @@
drawctxt->state != ADRENO_CONTEXT_STATE_ACTIVE)
return 1;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
ret = kgsl_check_timestamp(device, &drawctxt->base, timestamp);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return ret;
}
@@ -227,7 +227,7 @@
io = (io_cnt < pwr->pwrlevels[pwr->active_pwrlevel].io_fraction)
? 0 : 1;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
if (timeout) {
ret = (int) adreno_wait_event_interruptible_timeout(
@@ -245,7 +245,7 @@
io);
}
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
/* -EDEADLK if the context was invalidated while we were waiting */
if (drawctxt->state == ADRENO_CONTEXT_STATE_INVALID)
@@ -314,7 +314,7 @@
goto done;
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
if (timeout) {
ret = (int) wait_event_timeout(drawctxt->waiting,
@@ -330,7 +330,7 @@
_check_global_timestamp(device, drawctxt, timestamp));
}
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (ret)
kgsl_cancel_events_timestamp(device, NULL, timestamp);
@@ -381,10 +381,10 @@
mutex_unlock(&drawctxt->mutex);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_cancel_events_timestamp(device, context,
cmdbatch->timestamp);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
kgsl_cmdbatch_destroy(cmdbatch);
mutex_lock(&drawctxt->mutex);
diff --git a/drivers/gpu/msm/adreno_profile.c b/drivers/gpu/msm/adreno_profile.c
index 26c8b69..38e0af8 100644
--- a/drivers/gpu/msm/adreno_profile.c
+++ b/drivers/gpu/msm/adreno_profile.c
@@ -479,9 +479,9 @@
struct kgsl_device *device = data;
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
*val = adreno_profile_enabled(&adreno_dev->profile);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
@@ -492,10 +492,10 @@
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct adreno_profile *profile = &adreno_dev->profile;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (adreno_is_a2xx(adreno_dev)) {
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
@@ -503,7 +503,7 @@
check_close_profile(profile);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
@@ -522,11 +522,11 @@
if (adreno_is_a2xx(adreno_dev))
return -EINVAL;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
buf = kmalloc(max_size, GFP_KERNEL);
if (!buf) {
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return -ENOMEM;
}
@@ -546,7 +546,7 @@
kfree(buf);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return size;
}
@@ -679,7 +679,7 @@
if (adreno_is_a2xx(adreno_dev))
return -ENOSPC;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (adreno_profile_enabled(profile)) {
size = -EINVAL;
@@ -745,7 +745,7 @@
error_put:
kgsl_active_count_put(device);
error_unlock:
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return size;
}
@@ -883,7 +883,7 @@
* for each perf counter <cntr_reg_off> <start hi & lo> <end hi & low>
*/
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
while (1) {
/* process any results that are available into the log_buffer */
@@ -905,10 +905,10 @@
}
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(HZ / 10);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (signal_pending(current)) {
status = 0;
@@ -917,7 +917,7 @@
}
check_close_profile(profile);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return status;
}
@@ -934,7 +934,7 @@
if (adreno_is_a2xx(adreno_dev))
return -EINVAL;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
for (i = 0; i < counters->group_count; ++i) {
group = &(counters->groups[i]);
@@ -950,7 +950,7 @@
group->reg_count, used);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index 11b7429..a96ab2b 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -628,7 +628,7 @@
KGSL_PWR_WARN(device, "suspend start\n");
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_pwrctrl_request_state(device, KGSL_STATE_SUSPEND);
/* Tell the device to drain the submission queue */
@@ -683,7 +683,7 @@
device->ftbl->resume(device);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
KGSL_PWR_WARN(device, "suspend end\n");
return status;
}
@@ -694,7 +694,7 @@
return -EINVAL;
KGSL_PWR_WARN(device, "resume start\n");
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (device->state == KGSL_STATE_SUSPEND) {
kgsl_pwrctrl_set_state(device, KGSL_STATE_SLUMBER);
complete_all(&device->hwaccess_gate);
@@ -718,7 +718,7 @@
if (device->ftbl->resume)
device->ftbl->resume(device);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
KGSL_PWR_WARN(device, "resume end\n");
return 0;
}
@@ -953,7 +953,7 @@
filep->private_data = NULL;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
while (1) {
read_lock(&device->context_lock);
@@ -1005,7 +1005,7 @@
kgsl_cancel_events(device, dev_priv);
result = kgsl_close_device(device);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
kfree(dev_priv);
@@ -1087,12 +1087,12 @@
dev_priv->device = device;
filep->private_data = dev_priv;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
result = kgsl_open_device(device);
if (result)
goto err_freedevpriv;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
/*
* Get file (per process) private struct. This must be done
@@ -1112,7 +1112,7 @@
return result;
err_stop:
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
device->open_count--;
if (device->open_count == 0) {
/* make sure power is on to stop the device */
@@ -1122,7 +1122,7 @@
atomic_dec(&device->active_cnt);
}
err_freedevpriv:
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
filep->private_data = NULL;
kfree(dev_priv);
err_pmruntime:
@@ -1789,10 +1789,10 @@
list_add(&event->node, &cmdbatch->synclist);
spin_unlock(&cmdbatch->lock);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
ret = kgsl_add_event(device, context->id, sync->timestamp,
kgsl_cmdbatch_sync_func, event, NULL);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
if (ret) {
spin_lock(&cmdbatch->lock);
@@ -3525,12 +3525,14 @@
}
if (lock)
- mutex_lock(&dev_priv->device->mutex);
+ kgsl_mutex_lock(&dev_priv->device->mutex,
+ &dev_priv->device->mutex_owner);
ret = func(dev_priv, cmd, uptr);
if (lock)
- mutex_unlock(&dev_priv->device->mutex);
+ kgsl_mutex_unlock(&dev_priv->device->mutex,
+ &dev_priv->device->mutex_owner);
/*
* Still copy back on failure, but assume function took
diff --git a/drivers/gpu/msm/kgsl_cffdump.c b/drivers/gpu/msm/kgsl_cffdump.c
index 43bcc30..171435a 100644
--- a/drivers/gpu/msm/kgsl_cffdump.c
+++ b/drivers/gpu/msm/kgsl_cffdump.c
@@ -631,20 +631,20 @@
}
}
if (!device->cff_dump_enable) {
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
device->cff_dump_enable = 1;
ret = kgsl_open_device(device);
if (!ret)
ret = kgsl_active_count_get(device);
if (ret)
device->cff_dump_enable = 0;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
} else if (device->cff_dump_enable && !val) {
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
ret = kgsl_close_device(device);
device->cff_dump_enable = 0;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
done:
mutex_unlock(&kgsl_driver.devlock);
diff --git a/drivers/gpu/msm/kgsl_debugfs.c b/drivers/gpu/msm/kgsl_debugfs.c
index 2d833e4..c1b3139 100644
--- a/drivers/gpu/msm/kgsl_debugfs.c
+++ b/drivers/gpu/msm/kgsl_debugfs.c
@@ -30,9 +30,9 @@
struct kgsl_device *device = data;
if (val) {
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_postmortem_dump(device, 1);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
return 0;
diff --git a/drivers/gpu/msm/kgsl_device.h b/drivers/gpu/msm/kgsl_device.h
index fc4b77e..47801a4 100644
--- a/drivers/gpu/msm/kgsl_device.h
+++ b/drivers/gpu/msm/kgsl_device.h
@@ -251,6 +251,7 @@
int open_count;
struct mutex mutex;
+ atomic64_t mutex_owner;
uint32_t state;
uint32_t requested_state;
@@ -745,4 +746,35 @@
return 0;
}
+
+/**
+ * kgsl_mutex_lock() -- try to acquire the mutex if current thread does not
+ * already own it
+ * @mutex: mutex to lock
+ * @owner: current mutex owner
+ */
+
+static inline int kgsl_mutex_lock(struct mutex *mutex, atomic64_t *owner)
+{
+
+ if (atomic64_read(owner) != (long)current) {
+ mutex_lock(mutex);
+ atomic64_set(owner, (long)current);
+ /* Barrier to make sure owner is updated */
+ smp_wmb();
+ return 0;
+ }
+ return 1;
+}
+
+/**
+ * kgsl_mutex_unlock() -- Clear the owner and unlock the mutex
+ * @mutex: mutex to unlock
+ * @owner: current mutex owner
+ */
+static inline void kgsl_mutex_unlock(struct mutex *mutex, atomic64_t *owner)
+{
+ atomic64_set(owner, 0);
+ mutex_unlock(mutex);
+}
#endif /* __KGSL_DEVICE_H */
diff --git a/drivers/gpu/msm/kgsl_events.c b/drivers/gpu/msm/kgsl_events.c
index ccd13d5..6cea80f 100644
--- a/drivers/gpu/msm/kgsl_events.c
+++ b/drivers/gpu/msm/kgsl_events.c
@@ -409,7 +409,7 @@
struct kgsl_context *context, *tmp;
uint32_t timestamp;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
timestamp = kgsl_readtimestamp(device, NULL, KGSL_TIMESTAMP_RETIRED);
_retire_events(device, &device->events, timestamp);
@@ -436,6 +436,6 @@
}
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
EXPORT_SYMBOL(kgsl_process_events);
diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
old mode 100755
new mode 100644
index 69b953f..cef2805
--- a/drivers/gpu/msm/kgsl_iommu.c
+++ b/drivers/gpu/msm/kgsl_iommu.c
@@ -1744,16 +1744,42 @@
return status;
}
+static void kgsl_iommu_flush_tlb_pt_current(struct kgsl_pagetable *pt)
+{
+ int lock_taken = 0;
+ struct kgsl_device *device = pt->mmu->device;
+ struct kgsl_iommu *iommu = pt->mmu->priv;
+
+ /*
+ * Check to see if the current thread already holds the device mutex.
+ * If it does not, then take the device mutex which is required for
+ * flushing the tlb
+ */
+ if (!kgsl_mutex_lock(&device->mutex, &device->mutex_owner))
+ lock_taken = 1;
+
+ /*
+ * Flush the tlb only if the iommu device is attached and the pagetable
+ * hasn't been switched yet
+ */
+ if (kgsl_mmu_is_perprocess(pt->mmu) &&
+ iommu->iommu_units[0].dev[KGSL_IOMMU_CONTEXT_USER].attached &&
+ kgsl_iommu_pt_equal(pt->mmu, pt,
+ kgsl_iommu_get_current_ptbase(pt->mmu)))
+ kgsl_iommu_default_setstate(pt->mmu, KGSL_MMUFLAGS_TLBFLUSH);
+
+ if (lock_taken)
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
+}
+
static int
kgsl_iommu_unmap(struct kgsl_pagetable *pt,
struct kgsl_memdesc *memdesc,
unsigned int *tlb_flags)
{
- int ret = 0, lock_taken = 0;
+ int ret = 0;
unsigned int range = memdesc->size;
struct kgsl_iommu_pt *iommu_pt = pt->priv;
- struct kgsl_device *device = pt->mmu->device;
- struct kgsl_iommu *iommu = pt->mmu->priv;
/* All GPU addresses as assigned are page aligned, but some
functions purturb the gpuaddr with an offset, so apply the
@@ -1775,29 +1801,7 @@
return ret;
}
- /*
- * Check to see if the current thread already holds the device mutex.
- * If it does not, then take the device mutex which is required for
- * flushing the tlb
- */
- if (!mutex_is_locked(&device->mutex) ||
- device->mutex.owner != current) {
- mutex_lock(&device->mutex);
- lock_taken = 1;
- }
-
- /*
- * Flush the tlb only if the iommu device is attached and the pagetable
- * hasn't been switched yet
- */
- if (kgsl_mmu_is_perprocess(pt->mmu) &&
- iommu->iommu_units[0].dev[KGSL_IOMMU_CONTEXT_USER].attached &&
- kgsl_iommu_pt_equal(pt->mmu, pt,
- kgsl_iommu_get_current_ptbase(pt->mmu)))
- kgsl_iommu_default_setstate(pt->mmu, KGSL_MMUFLAGS_TLBFLUSH);
-
- if (lock_taken)
- mutex_unlock(&device->mutex);
+ kgsl_iommu_flush_tlb_pt_current(pt);
return ret;
}
@@ -1839,6 +1843,23 @@
size);
}
}
+
+ /*
+ * IOMMU V1 BFBs pre-fetch data beyond what is being used by the core.
+ * This can include both allocated pages and un-allocated pages.
+ * If an un-allocated page is cached, and later used (if it has been
+ * newly dynamically allocated by SW) the SMMU HW should automatically
+ * re-fetch the pages from memory (rather than using the cached
+ * un-allocated page). This logic is known as the re-fetch logic.
+ * In current chips we suspect this re-fetch logic is broken,
+ * it can result in bad translations which can either cause downstream
+ * bus errors, or upstream cores being hung (because of garbage data
+ * being read) -> causing TLB sync stuck issues. As a result SW must
+ * implement the invalidate+map.
+ */
+ if (!msm_soc_version_supports_iommu_v0())
+ kgsl_iommu_flush_tlb_pt_current(pt);
+
return ret;
}
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index fb9bdb1..563f7ef 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -233,7 +233,7 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (level > pwr->num_pwrlevels - 2)
level = pwr->num_pwrlevels - 2;
@@ -249,7 +249,7 @@
*/
if (pwr->thermal_pwrlevel > pwr->active_pwrlevel)
kgsl_pwrctrl_pwrlevel_change(device, pwr->thermal_pwrlevel);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -285,7 +285,7 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
/* You can't set a maximum power level lower than the minimum */
if (level > pwr->min_pwrlevel)
@@ -302,7 +302,7 @@
*/
if (max_level > pwr->active_pwrlevel)
kgsl_pwrctrl_pwrlevel_change(device, max_level);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -337,7 +337,7 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (level > pwr->num_pwrlevels - 2)
level = pwr->num_pwrlevels - 2;
@@ -356,7 +356,7 @@
if (min_level < pwr->active_pwrlevel)
kgsl_pwrctrl_pwrlevel_change(device, min_level);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -418,7 +418,7 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
level = _get_nearest_pwrlevel(pwr, val);
if (level < 0)
goto done;
@@ -434,7 +434,7 @@
kgsl_pwrctrl_pwrlevel_change(device, pwr->thermal_pwrlevel);
done:
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -470,12 +470,12 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
level = _get_nearest_pwrlevel(pwr, val);
if (level >= 0)
kgsl_pwrctrl_pwrlevel_change(device, level);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -509,13 +509,13 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
/* Let the timeout be requested in ms, but convert to jiffies. */
val /= div;
pwr->interval_timeout = val;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -548,9 +548,9 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
device->pwrctrl.pm_qos_latency = val;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -692,9 +692,9 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
__force_on(device, flag, val);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -767,9 +767,9 @@
if (ret)
return ret;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
device->pwrctrl.bus_control = val ? true : false;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return count;
}
@@ -1242,7 +1242,7 @@
if (device == NULL)
return;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_pwrscale_update(device);
@@ -1266,10 +1266,10 @@
if (!device->pwrctrl.irq_last)
break;
kgsl_pwrctrl_request_state(device, requested_state);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
udelay(delay);
delay *= 2;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
}
@@ -1293,7 +1293,7 @@
}
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
EXPORT_SYMBOL(kgsl_idle_check);
@@ -1627,9 +1627,9 @@
if ((atomic_read(&device->active_cnt) == 0) &&
(device->state != KGSL_STATE_ACTIVE)) {
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
wait_for_completion(&device->hwaccess_gate);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
ret = kgsl_pwrctrl_wake(device, 1);
}
@@ -1719,10 +1719,10 @@
if (atomic_read(&device->active_cnt) > count) {
int ret;
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
ret = wait_event_timeout(device->active_cnt_wq,
_check_active_count(device, count), HZ);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
result = ret == 0 ? -ETIMEDOUT : 0;
}
diff --git a/drivers/gpu/msm/kgsl_pwrscale.c b/drivers/gpu/msm/kgsl_pwrscale.c
index 0bb13a4..b0b1474 100644
--- a/drivers/gpu/msm/kgsl_pwrscale.c
+++ b/drivers/gpu/msm/kgsl_pwrscale.c
@@ -197,7 +197,7 @@
pwr = &device->pwrctrl;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
cur_freq = kgsl_pwrctrl_active_freq(pwr);
level = pwr->active_pwrlevel;
@@ -247,7 +247,7 @@
*freq = kgsl_pwrctrl_active_freq(pwr);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
EXPORT_SYMBOL(kgsl_devfreq_target);
@@ -274,7 +274,7 @@
pwrscale = &device->pwrscale;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
/* make sure we don't turn on clocks just to read stats */
if (device->state == KGSL_STATE_ACTIVE) {
struct kgsl_power_stats extra;
@@ -302,7 +302,7 @@
trace_kgsl_pwrstats(device, stat->total_time, &pwrscale->accum_stats);
memset(&pwrscale->accum_stats, 0, sizeof(pwrscale->accum_stats));
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
@@ -325,9 +325,9 @@
if (freq == NULL)
return -EINVAL;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
*freq = kgsl_pwrctrl_active_freq(&device->pwrctrl);
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return 0;
}
diff --git a/drivers/gpu/msm/kgsl_snapshot.c b/drivers/gpu/msm/kgsl_snapshot.c
index 333089a..76f0507 100644
--- a/drivers/gpu/msm/kgsl_snapshot.c
+++ b/drivers/gpu/msm/kgsl_snapshot.c
@@ -660,7 +660,7 @@
return 0;
/* Get the mutex to keep things from changing while we are dumping */
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
obj_itr_init(&itr, buf, off, count);
@@ -699,7 +699,7 @@
}
done:
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return itr.write;
}
@@ -731,12 +731,12 @@
size_t count)
{
if (device && count > 0) {
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
if (!kgsl_active_count_get(device)) {
kgsl_device_snapshot(device, 0);
kgsl_active_count_put(device);
}
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
}
return count;
diff --git a/drivers/gpu/msm/z180.c b/drivers/gpu/msm/z180.c
index 270a7a6..622bd92 100644
--- a/drivers/gpu/msm/z180.c
+++ b/drivers/gpu/msm/z180.c
@@ -404,7 +404,7 @@
unsigned int numibs;
struct kgsl_ibdesc *ibdesc;
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
result = kgsl_active_count_get(device);
if (result)
@@ -518,7 +518,7 @@
kgsl_active_count_put(device);
error_active_count:
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
return (int)result;
}
@@ -866,9 +866,9 @@
status = kgsl_active_count_get(device);
if (!status) {
- mutex_unlock(&device->mutex);
+ kgsl_mutex_unlock(&device->mutex, &device->mutex_owner);
status = z180_wait(device, context, timestamp, msecs);
- mutex_lock(&device->mutex);
+ kgsl_mutex_lock(&device->mutex, &device->mutex_owner);
kgsl_active_count_put(device);
}
diff --git a/drivers/input/misc/mma8x5x.c b/drivers/input/misc/mma8x5x.c
index d576752..85b4317 100644
--- a/drivers/input/misc/mma8x5x.c
+++ b/drivers/input/misc/mma8x5x.c
@@ -394,9 +394,14 @@
static int mma8x5x_device_set_odr(struct i2c_client *client, u32 delay_ms)
{
+ struct mma8x5x_data *pdata = i2c_get_clientdata(client);
int result;
u8 val;
+ /* set ODR is only required for interrupt mode */
+ if (!pdata->use_int)
+ return 0;
+
result = mma8x5x_delay2odr(delay_ms);
if (result < 0)
goto out;
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 2b98145..dc3bbe0 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -80,7 +80,7 @@
obj-$(CONFIG_TOUCHSCREEN_CY8C_TS) += cy8c_ts.o
obj-$(CONFIG_TOUCHSCREEN_CYTTSP_I2C_QC) += cyttsp-i2c-qc.o
obj-$(CONFIG_TOUCHSCREEN_FT5X06) += ft5x06_ts.o
-obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV) += synaptics_rmi_dev.o
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE) += synaptics_fw_update.o
+obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
obj-$(CONFIG_TOUCHSCREEN_GT9XX) += gt9xx/
diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
index bba774d..84e5538 100755
--- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
+++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
@@ -1120,9 +1120,6 @@
}
this_frame = cpp_timer.data.processed_frame;
- pr_err("ReInstalling cpp_timer\n");
- setup_timer(&cpp_timer.cpp_timer, cpp_timer_callback,
- (unsigned long)&cpp_timer);
pr_err("Starting timer to fire in %d ms. (jiffies=%lu)\n",
CPP_CMD_TIMEOUT_MS, jiffies);
ret = mod_timer(&cpp_timer.cpp_timer,
diff --git a/drivers/media/platform/msm/vidc/msm_vdec.c b/drivers/media/platform/msm/vidc/msm_vdec.c
index e69743b..710bb73 100644
--- a/drivers/media/platform/msm/vidc/msm_vdec.c
+++ b/drivers/media/platform/msm/vidc/msm_vdec.c
@@ -1193,6 +1193,12 @@
struct vidc_frame_data frame_data = {0};
struct hal_buffer_requirements *output_buf, *extradata_buf;
int rc = 0;
+
+ if (!inst || !inst->core || !inst->core->device) {
+ dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);
+ return -EINVAL;
+ }
+
hdev = inst->core->device;
output_buf = get_buff_req_buffer(inst, HAL_BUFFER_OUTPUT);
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index 7960298..a6b7f1e 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc.c
@@ -63,8 +63,14 @@
struct poll_table_struct *wait)
{
struct msm_vidc_inst *inst = instance;
- struct vb2_queue *outq = &inst->bufq[OUTPUT_PORT].vb2_bufq;
- struct vb2_queue *capq = &inst->bufq[CAPTURE_PORT].vb2_bufq;
+ struct vb2_queue *outq = NULL;
+ struct vb2_queue *capq = NULL;
+
+ if (!inst)
+ return -EINVAL;
+
+ outq = &inst->bufq[OUTPUT_PORT].vb2_bufq;
+ capq = &inst->bufq[CAPTURE_PORT].vb2_bufq;
poll_wait(filp, &inst->event_handler.wait, wait);
poll_wait(filp, &capq->done_wq, wait);
@@ -78,6 +84,9 @@
struct msm_vidc_inst *inst = instance;
int rc = 0;
+ if (!inst)
+ return -EINVAL;
+
wait_event(inst->kernel_event_queue, (rc = get_poll_flags(inst)));
return rc;
}
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index a9d6949..8204340 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -1521,6 +1521,13 @@
pr_err("response buffer address not within shared bufffer\n");
return -EINVAL;
}
+
+ if (req.cmd_req_len == 0 || req.cmd_req_len > data->client.sb_length ||
+ req.resp_len > data->client.sb_length) {
+ pr_err("cmd or response buffer length not valid\n");
+ return -EINVAL;
+ }
+
send_cmd_req.cmd_req_buf = req.cmd_req_buf;
send_cmd_req.cmd_req_len = req.cmd_req_len;
send_cmd_req.resp_buf = req.resp_buf;
@@ -4209,10 +4216,9 @@
if (qseecom.cumulative_mode != INACTIVE) {
ret = msm_bus_scale_client_update_request(
- qseecom.qsee_perf_client, qseecom.cumulative_mode);
+ qseecom.qsee_perf_client, mode);
if (ret)
- pr_err("Fail to scale up bus to %d\n",
- qseecom.cumulative_mode);
+ pr_err("Fail to scale up bus to %d\n", mode);
}
mutex_lock(&clk_access_lock);
diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c
index 0f3eaea..ec513e5 100644
--- a/drivers/net/wireless/wcnss/wcnss_wlan.c
+++ b/drivers/net/wireless/wcnss/wcnss_wlan.c
@@ -186,6 +186,7 @@
#define WCNSS_USR_CTRL_MSG_START 0x00000000
#define WCNSS_USR_SERIAL_NUM (WCNSS_USR_CTRL_MSG_START + 1)
#define WCNSS_USR_HAS_CAL_DATA (WCNSS_USR_CTRL_MSG_START + 2)
+#define WCNSS_USR_WLAN_MAC_ADDR (WCNSS_USR_CTRL_MSG_START + 3)
#define MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
@@ -2090,6 +2091,16 @@
has_calibrated_data = buf[2];
break;
+ case WCNSS_USR_WLAN_MAC_ADDR:
+ memcpy(&penv->wlan_nv_macAddr, &buf[2],
+ sizeof(penv->wlan_nv_macAddr));
+
+ pr_debug("%s: MAC Addr:" MAC_ADDRESS_STR "\n", __func__,
+ penv->wlan_nv_macAddr[0], penv->wlan_nv_macAddr[1],
+ penv->wlan_nv_macAddr[2], penv->wlan_nv_macAddr[3],
+ penv->wlan_nv_macAddr[4], penv->wlan_nv_macAddr[5]);
+ break;
+
default:
pr_err("%s: Invalid command %d\n", __func__, cmd);
break;
diff --git a/drivers/power/qpnp-bms.c b/drivers/power/qpnp-bms.c
index ed0279e..030f8d3 100644
--- a/drivers/power/qpnp-bms.c
+++ b/drivers/power/qpnp-bms.c
@@ -751,13 +751,18 @@
static int get_battery_status(struct qpnp_bms_chip *chip)
{
union power_supply_propval ret = {0,};
+ int rc;
if (chip->batt_psy == NULL)
chip->batt_psy = power_supply_get_by_name("battery");
if (chip->batt_psy) {
/* if battery has been registered, use the status property */
- chip->batt_psy->get_property(chip->batt_psy,
+ rc = chip->batt_psy->get_property(chip->batt_psy,
POWER_SUPPLY_PROP_STATUS, &ret);
+ if (rc) {
+ pr_debug("Battery does not export status: %d\n", rc);
+ return POWER_SUPPLY_STATUS_UNKNOWN;
+ }
return ret.intval;
}
@@ -768,20 +773,7 @@
static bool is_battery_charging(struct qpnp_bms_chip *chip)
{
- union power_supply_propval ret = {0,};
-
- if (chip->batt_psy == NULL)
- chip->batt_psy = power_supply_get_by_name("battery");
- if (chip->batt_psy) {
- /* if battery has been registered, use the status property */
- chip->batt_psy->get_property(chip->batt_psy,
- POWER_SUPPLY_PROP_CHARGE_TYPE, &ret);
- return ret.intval != POWER_SUPPLY_CHARGE_TYPE_NONE;
- }
-
- /* Default to false if the battery power supply is not registered. */
- pr_debug("battery power supply is not registered\n");
- return false;
+ return get_battery_status(chip) == POWER_SUPPLY_STATUS_CHARGING;
}
static bool is_battery_full(struct qpnp_bms_chip *chip)
@@ -809,8 +801,12 @@
chip->batt_psy = power_supply_get_by_name("battery");
if (chip->batt_psy) {
/* if battery has been registered, use the present property */
- chip->batt_psy->get_property(chip->batt_psy,
+ rc = chip->batt_psy->get_property(chip->batt_psy,
POWER_SUPPLY_PROP_PRESENT, &ret);
+ if (rc) {
+ pr_debug("battery does not export present: %d\n", rc);
+ return true;
+ }
return ret.intval;
}
@@ -851,13 +847,18 @@
static bool is_batfet_closed(struct qpnp_bms_chip *chip)
{
union power_supply_propval ret = {0,};
+ int rc;
if (chip->batt_psy == NULL)
chip->batt_psy = power_supply_get_by_name("battery");
if (chip->batt_psy) {
/* if battery has been registered, use the online property */
- chip->batt_psy->get_property(chip->batt_psy,
+ rc = chip->batt_psy->get_property(chip->batt_psy,
POWER_SUPPLY_PROP_ONLINE, &ret);
+ if (rc) {
+ pr_debug("Battery does not export online: %d\n", rc);
+ return true;
+ }
return !!ret.intval;
}
@@ -907,13 +908,32 @@
return 0;
}
-static int estimate_ocv(struct qpnp_bms_chip *chip)
+static int get_rbatt(struct qpnp_bms_chip *chip,
+ int soc_rbatt_mohm, int batt_temp)
{
- int ibat_ua, vbat_uv, ocv_est_uv;
- int rc;
- int rbatt_mohm = chip->default_rbatt_mohm + chip->r_conn_mohm
- + chip->rbatt_capacitive_mohm;
+ int rbatt_mohm, scalefactor;
+ rbatt_mohm = chip->default_rbatt_mohm;
+ if (chip->rbatt_sf_lut == NULL) {
+ pr_debug("RBATT = %d\n", rbatt_mohm);
+ return rbatt_mohm;
+ }
+ /* Convert the batt_temp to DegC from deciDegC */
+ scalefactor = interpolate_scalingfactor(chip->rbatt_sf_lut,
+ batt_temp, soc_rbatt_mohm);
+ rbatt_mohm = (rbatt_mohm * scalefactor) / 100;
+
+ rbatt_mohm += chip->r_conn_mohm;
+ rbatt_mohm += chip->rbatt_capacitive_mohm;
+ return rbatt_mohm;
+}
+
+#define DEFAULT_RBATT_SOC 50
+static int estimate_ocv(struct qpnp_bms_chip *chip, int batt_temp)
+{
+ int ibat_ua, vbat_uv, ocv_est_uv, rbatt_mohm, rc;
+
+ rbatt_mohm = get_rbatt(chip, DEFAULT_RBATT_SOC, batt_temp);
rc = get_simultaneous_batt_v_and_i(chip, &ibat_ua, &vbat_uv);
if (rc) {
pr_err("simultaneous failed rc = %d\n", rc);
@@ -921,10 +941,12 @@
}
ocv_est_uv = vbat_uv + (ibat_ua * rbatt_mohm) / 1000;
- pr_debug("estimated pon ocv = %d\n", ocv_est_uv);
+ pr_debug("estimated pon ocv = %d, vbat_uv = %d ibat_ua = %d rbatt_mohm = %d\n",
+ ocv_est_uv, vbat_uv, ibat_ua, rbatt_mohm);
return ocv_est_uv;
}
+#define MIN_IAVG_MA 250
static void reset_for_new_battery(struct qpnp_bms_chip *chip, int batt_temp)
{
chip->last_ocv_uv = chip->insertion_ocv_uv;
@@ -935,7 +957,7 @@
chip->soc_at_cv = -EINVAL;
chip->shutdown_soc_invalid = true;
chip->shutdown_soc = 0;
- chip->shutdown_iavg_ma = 0;
+ chip->shutdown_iavg_ma = MIN_IAVG_MA;
chip->prev_pc_unusable = -EINVAL;
reset_cc(chip, CLEAR_CC | CLEAR_SHDW_CC);
chip->software_cc_uah = 0;
@@ -963,16 +985,15 @@
static int find_ocv_for_pc(struct qpnp_bms_chip *chip, int batt_temp, int pc)
{
int new_pc;
- int batt_temp_degc = batt_temp / 10;
int ocv_mv;
int delta_mv = 5;
int max_spin_count;
int count = 0;
int sign, new_sign;
- ocv_mv = interpolate_ocv(chip->pc_temp_ocv_lut, batt_temp_degc, pc);
+ ocv_mv = interpolate_ocv(chip->pc_temp_ocv_lut, batt_temp, pc);
- new_pc = interpolate_pc(chip->pc_temp_ocv_lut, batt_temp_degc, ocv_mv);
+ new_pc = interpolate_pc(chip->pc_temp_ocv_lut, batt_temp, ocv_mv);
pr_debug("test revlookup pc = %d for ocv = %d\n", new_pc, ocv_mv);
max_spin_count = 1 + (chip->max_voltage_uv - chip->v_cutoff_uv)
/ UV_PER_SPIN;
@@ -1003,7 +1024,7 @@
ocv_mv = ocv_mv + delta_mv * sign;
new_pc = interpolate_pc(chip->pc_temp_ocv_lut,
- batt_temp_degc, ocv_mv);
+ batt_temp, ocv_mv);
pr_debug("test revlookup pc = %d for ocv = %d\n",
new_pc, ocv_mv);
count++;
@@ -1028,14 +1049,14 @@
chip->base + BMS1_OCV_FOR_SOC_DATA0, 2);
if (rc) {
pr_err("Error reading ocv: rc = %d\n", rc);
- return -ENXIO;
+ goto param_err;
}
rc = read_cc_raw(chip, &raw->cc, CC);
rc = read_cc_raw(chip, &raw->shdw_cc, SHDW_CC);
if (rc) {
pr_err("Failed to read raw cc data, rc = %d\n", rc);
- return rc;
+ goto param_err;
}
unlock_output_data(chip);
@@ -1046,10 +1067,9 @@
pr_debug("PON_OCV_UV = %d, cc = %llx\n",
chip->last_ocv_uv, raw->cc);
warm_reset = qpnp_pon_is_warm_reset();
- if (raw->last_good_ocv_uv < MIN_OCV_UV
- || warm_reset > 0) {
+ if (raw->last_good_ocv_uv < MIN_OCV_UV || warm_reset > 0) {
pr_debug("OCV is stale or bad, estimating new OCV.\n");
- chip->last_ocv_uv = estimate_ocv(chip);
+ chip->last_ocv_uv = estimate_ocv(chip, batt_temp);
raw->last_good_ocv_uv = chip->last_ocv_uv;
reset_cc(chip, CLEAR_CC | CLEAR_SHDW_CC);
pr_debug("New PON_OCV_UV = %d, cc = %llx\n",
@@ -1093,6 +1113,11 @@
raw->last_good_ocv_raw, raw->last_good_ocv_uv);
pr_debug("cc_raw= 0x%llx\n", raw->cc);
return 0;
+
+param_err:
+ unlock_output_data(chip);
+ mutex_unlock(&chip->bms_output_lock);
+ return rc;
}
static int calculate_pc(struct qpnp_bms_chip *chip, int ocv_uv,
@@ -1101,7 +1126,7 @@
int pc;
pc = interpolate_pc(chip->pc_temp_ocv_lut,
- batt_temp / 10, ocv_uv / 1000);
+ batt_temp, ocv_uv / 1000);
pr_debug("pc = %u %% for ocv = %d uv batt_temp = %d\n",
pc, ocv_uv, batt_temp);
/* Multiply the initial FCC value by the scale factor. */
@@ -1213,27 +1238,6 @@
}
}
-static int get_rbatt(struct qpnp_bms_chip *chip,
- int soc_rbatt_mohm, int batt_temp)
-{
- int rbatt_mohm, scalefactor;
-
- rbatt_mohm = chip->default_rbatt_mohm;
- if (chip->rbatt_sf_lut == NULL) {
- pr_debug("RBATT = %d\n", rbatt_mohm);
- return rbatt_mohm;
- }
- /* Convert the batt_temp to DegC from deciDegC */
- batt_temp = batt_temp / 10;
- scalefactor = interpolate_scalingfactor(chip->rbatt_sf_lut,
- batt_temp, soc_rbatt_mohm);
- rbatt_mohm = (rbatt_mohm * scalefactor) / 100;
-
- rbatt_mohm += chip->r_conn_mohm;
- rbatt_mohm += chip->rbatt_capacitive_mohm;
- return rbatt_mohm;
-}
-
#define IAVG_MINIMAL_TIME 2
static void calculate_iavg(struct qpnp_bms_chip *chip, int cc_uah,
int *iavg_ua, int delta_time_s)
@@ -1268,7 +1272,6 @@
int unusable_uv, pc_unusable, uuc_uah;
int i = 0;
int ocv_mv;
- int batt_temp_degc = batt_temp / 10;
int rbatt_mohm;
int delta_uv;
int prev_delta_uv = 0;
@@ -1277,7 +1280,7 @@
for (i = 0; i <= 100; i++) {
ocv_mv = interpolate_ocv(chip->pc_temp_ocv_lut,
- batt_temp_degc, i);
+ batt_temp, i);
rbatt_mohm = get_rbatt(chip, i, batt_temp);
unusable_uv = (rbatt_mohm * uuc_iavg_ma)
+ (chip->v_cutoff_uv);
@@ -1314,13 +1317,12 @@
int batt_temp)
{
int new_unusable_mv, new_iavg_ma;
- int batt_temp_degc = batt_temp / 10;
int max_percent_change;
max_percent_change = max(params->delta_time_s
/ TIME_PER_PERCENT_UUC, 1);
- if (chip->prev_pc_unusable == -EINVAL
+ if (chip->first_time_calc_uuc || chip->prev_pc_unusable == -EINVAL
|| abs(chip->prev_pc_unusable - new_pc_unusable)
<= max_percent_change) {
chip->prev_pc_unusable = new_pc_unusable;
@@ -1337,7 +1339,7 @@
/* also find update the iavg_ma accordingly */
new_unusable_mv = interpolate_ocv(chip->pc_temp_ocv_lut,
- batt_temp_degc, chip->prev_pc_unusable);
+ batt_temp, chip->prev_pc_unusable);
if (new_unusable_mv < chip->v_cutoff_uv/1000)
new_unusable_mv = chip->v_cutoff_uv/1000;
@@ -1353,7 +1355,6 @@
return new_uuc_uah;
}
-#define MIN_IAVG_MA 250
static int calculate_unusable_charge_uah(struct qpnp_bms_chip *chip,
struct soc_params *params,
int batt_temp)
@@ -1503,7 +1504,7 @@
mutex_lock(&chip->bms_output_lock);
lock_output_data(chip);
- read_cc_raw(chip, &cc_raw, false);
+ read_cc_raw(chip, &cc_raw, CC);
unlock_output_data(chip);
mutex_unlock(&chip->bms_output_lock);
@@ -1517,7 +1518,7 @@
mutex_lock(&chip->bms_output_lock);
lock_output_data(chip);
- read_cc_raw(chip, &cc_raw, true);
+ read_cc_raw(chip, &cc_raw, SHDW_CC);
unlock_output_data(chip);
mutex_unlock(&chip->bms_output_lock);
@@ -1809,7 +1810,7 @@
last_change_sec = chip->last_soc_change_sec;
calculate_delta_time(&last_change_sec, &time_since_last_change_sec);
- charging = is_battery_charging(chip);
+ charging = chip->battery_status == POWER_SUPPLY_STATUS_CHARGING;
charging_since_last_report = charging || (chip->last_soc_unbound
&& chip->was_charging_at_sleep);
/*
@@ -3138,7 +3139,7 @@
if (start) {
chip->start_pc = interpolate_pc(chip->pc_temp_ocv_lut,
- batt_temp / 10, raw.last_good_ocv_uv / 1000);
+ batt_temp, raw.last_good_ocv_uv / 1000);
chip->start_cc_uah = calculate_cc(chip, raw.cc, CC, NORESET);
chip->start_real_soc = calculate_real_soc(chip,
batt_temp, &raw, chip->start_cc_uah);
@@ -3532,6 +3533,7 @@
* Do a quick run of SoC calculation to find whether the shutdown soc
* is close enough.
*/
+ chip->shutdown_iavg_ma = MIN_IAVG_MA;
calculated_soc = recalculate_raw_soc(chip);
shutdown_soc_out_of_limit = (abs(shutdown_soc - calculated_soc)
> chip->shutdown_soc_valid_limit);
@@ -3905,8 +3907,10 @@
int rc;
SPMI_REQUEST_IRQ(chip, rc, sw_cc_thr);
+ disable_bms_irq(&chip->sw_cc_thr_irq);
enable_irq_wake(chip->sw_cc_thr_irq.irq);
SPMI_REQUEST_IRQ(chip, rc, ocv_thr);
+ disable_bms_irq(&chip->ocv_thr_irq);
enable_irq_wake(chip->ocv_thr_irq.irq);
return 0;
}
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index e9994c2..f721a25 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -140,6 +140,15 @@
Say y here to support the regulators found on the Freescale MC13892
PMIC.
+config REGULATOR_MEM_ACC
+ tristate "QTI Memory accelerator regulator driver"
+ help
+ Say y here to enable the memory accelerator driver for Qualcomm
+ Technologies (QTI) chips. The accelerator controls delays applied
+ for memory accesses.
+ This driver configures the power-mode (corner) for the memory
+ accelerator.
+
config REGULATOR_ISL6271A
tristate "Intersil ISL6271A Power regulator"
depends on I2C
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index d96e793..1393f23 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -34,6 +34,7 @@
obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
+obj-$(CONFIG_REGULATOR_MEM_ACC) += mem-acc-regulator.o
obj-$(CONFIG_REGULATOR_ONSEMI_NCP6335D) += onsemi-ncp6335d.o
obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
diff --git a/drivers/regulator/mem-acc-regulator.c b/drivers/regulator/mem-acc-regulator.c
new file mode 100644
index 0000000..b66285a
--- /dev/null
+++ b/drivers/regulator/mem-acc-regulator.c
@@ -0,0 +1,461 @@
+/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#define pr_fmt(fmt) "ACC: %s: " fmt, __func__
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
+
+#define MEM_ACC_SEL_MASK 0x3
+
+enum {
+ MEMORY_L1,
+ MEMORY_L2,
+ MEMORY_MAX,
+};
+
+struct mem_acc_regulator {
+ struct device *dev;
+ struct regulator_desc rdesc;
+ struct regulator_dev *rdev;
+
+ int corner;
+ bool mem_acc_supported[MEMORY_MAX];
+
+ u32 acc_sel_reg[MEMORY_MAX];
+ u32 *acc_sel_mask[MEMORY_MAX];
+ u32 *acc_sel_bit_pos[MEMORY_MAX];
+ u32 num_acc_sel[MEMORY_MAX];
+ u32 *acc_en_bit_pos;
+ u32 num_acc_en;
+ u32 *corner_acc_map;
+ u32 num_corners;
+
+ void __iomem *acc_sel_base[MEMORY_MAX];
+ void __iomem *acc_en_base;
+ phys_addr_t acc_sel_addr[MEMORY_MAX];
+ phys_addr_t acc_en_addr;
+};
+
+static inline u32 apc_to_acc_corner(struct mem_acc_regulator *mem_acc_vreg,
+ int corner)
+{
+ /*
+ * corner_acc_map maps the corner from index 0 and APC corner value
+ * starts from the value 1
+ */
+ return mem_acc_vreg->corner_acc_map[corner - 1];
+}
+
+static void __update_acc_sel(struct mem_acc_regulator *mem_acc_vreg,
+ int corner, int mem_type)
+{
+ u32 acc_data, i, bit, acc_corner;
+
+ acc_data = mem_acc_vreg->acc_sel_reg[mem_type];
+ for (i = 0; i < mem_acc_vreg->num_acc_sel[mem_type]; i++) {
+ bit = mem_acc_vreg->acc_sel_bit_pos[mem_type][i];
+ acc_data &= ~mem_acc_vreg->acc_sel_mask[mem_type][i];
+ acc_corner = apc_to_acc_corner(mem_acc_vreg, corner);
+ acc_data |= (acc_corner << bit) &
+ mem_acc_vreg->acc_sel_mask[mem_type][i];
+ }
+ pr_debug("corner=%d old_acc_sel=0x%02x new_acc_sel=0x%02x mem_type=%d\n",
+ corner, mem_acc_vreg->acc_sel_reg[mem_type],
+ acc_data, mem_type);
+ writel_relaxed(acc_data, mem_acc_vreg->acc_sel_base[mem_type]);
+ mem_acc_vreg->acc_sel_reg[mem_type] = acc_data;
+}
+
+static void update_acc_sel(struct mem_acc_regulator *mem_acc_vreg, int corner)
+{
+ int i;
+
+ for (i = 0; i < MEMORY_MAX; i++) {
+ if (mem_acc_vreg->mem_acc_supported[i])
+ __update_acc_sel(mem_acc_vreg, corner, i);
+ }
+}
+
+static int mem_acc_regulator_set_voltage(struct regulator_dev *rdev,
+ int corner, int corner_max, unsigned *selector)
+{
+ struct mem_acc_regulator *mem_acc_vreg = rdev_get_drvdata(rdev);
+ int i;
+
+ if (corner > mem_acc_vreg->num_corners) {
+ pr_err("Invalid corner=%d requested\n", corner);
+ return -EINVAL;
+ }
+
+ pr_debug("old corner=%d, new corner=%d\n",
+ mem_acc_vreg->corner, corner);
+
+ if (corner == mem_acc_vreg->corner)
+ return 0;
+
+ /* go up or down one level at a time */
+ if (corner > mem_acc_vreg->corner) {
+ for (i = mem_acc_vreg->corner + 1; i <= corner; i++) {
+ pr_debug("UP: to corner %d\n", i);
+ update_acc_sel(mem_acc_vreg, i);
+ }
+ } else {
+ for (i = mem_acc_vreg->corner - 1; i >= corner; i--) {
+ pr_debug("DOWN: to corner %d\n", i);
+ update_acc_sel(mem_acc_vreg, i);
+ }
+ }
+
+ pr_debug("new voltage corner set %d\n", corner);
+
+ mem_acc_vreg->corner = corner;
+
+ return 0;
+}
+
+static int mem_acc_regulator_get_voltage(struct regulator_dev *rdev)
+{
+ struct mem_acc_regulator *mem_acc_vreg = rdev_get_drvdata(rdev);
+
+ return mem_acc_vreg->corner;
+}
+
+static struct regulator_ops mem_acc_corner_ops = {
+ .set_voltage = mem_acc_regulator_set_voltage,
+ .get_voltage = mem_acc_regulator_get_voltage,
+};
+
+static int __mem_acc_sel_init(struct mem_acc_regulator *mem_acc_vreg,
+ int mem_type)
+{
+ int i;
+ u32 bit;
+
+ mem_acc_vreg->acc_sel_mask[mem_type] = devm_kzalloc(mem_acc_vreg->dev,
+ mem_acc_vreg->num_acc_sel[mem_type] * sizeof(u32), GFP_KERNEL);
+ if (!mem_acc_vreg->acc_sel_mask[mem_type]) {
+ pr_err("Unable to allocate memory for mem_type=%d\n", mem_type);
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < mem_acc_vreg->num_acc_sel[mem_type]; i++) {
+ bit = mem_acc_vreg->acc_sel_bit_pos[mem_type][i];
+ mem_acc_vreg->acc_sel_mask[mem_type][i] =
+ MEM_ACC_SEL_MASK << bit;
+ }
+
+ mem_acc_vreg->acc_sel_reg[mem_type] =
+ readl_relaxed(mem_acc_vreg->acc_sel_base[mem_type]);
+
+ return 0;
+}
+
+static int mem_acc_sel_init(struct mem_acc_regulator *mem_acc_vreg)
+{
+ int i, rc;
+
+ for (i = 0; i < MEMORY_MAX; i++) {
+ if (mem_acc_vreg->mem_acc_supported[i]) {
+ rc = __mem_acc_sel_init(mem_acc_vreg, i);
+ if (rc) {
+ pr_err("Unable to intialize mem_type=%d rc=%d\n",
+ i, rc);
+ return rc;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void mem_acc_en_init(struct mem_acc_regulator *mem_acc_vreg)
+{
+ int i, bit;
+ u32 acc_data;
+
+ acc_data = readl_relaxed(mem_acc_vreg->acc_en_base);
+ pr_debug("init: acc_en_register=%x\n", acc_data);
+ for (i = 0; i < mem_acc_vreg->num_acc_en; i++) {
+ bit = mem_acc_vreg->acc_en_bit_pos[i];
+ acc_data |= BIT(bit);
+ }
+ pr_debug("final: acc_en_register=%x\n", acc_data);
+ writel_relaxed(acc_data, mem_acc_vreg->acc_en_base);
+}
+
+static int populate_acc_data(struct mem_acc_regulator *mem_acc_vreg,
+ const char *prop_name, u32 **value, u32 *len)
+{
+ int rc;
+
+ if (!of_get_property(mem_acc_vreg->dev->of_node, prop_name, len)) {
+ pr_err("Unable to find %s property\n", prop_name);
+ return -EINVAL;
+ }
+ *len /= sizeof(u32);
+ if (!(*len)) {
+ pr_err("Incorrect entries in %s\n", prop_name);
+ return -EINVAL;
+ }
+
+ *value = devm_kzalloc(mem_acc_vreg->dev, (*len) * sizeof(u32),
+ GFP_KERNEL);
+ if (!(*value)) {
+ pr_err("Unable to allocate memory for %s\n", prop_name);
+ return -ENOMEM;
+ }
+
+ pr_debug("Found %s, data-length = %d\n", prop_name, *len);
+
+ rc = of_property_read_u32_array(mem_acc_vreg->dev->of_node,
+ prop_name, *value, *len);
+ if (rc) {
+ pr_err("Unable to populate %s rc=%d\n", prop_name, rc);
+ return rc;
+ }
+
+ return 0;
+}
+
+static int mem_acc_sel_setup(struct mem_acc_regulator *mem_acc_vreg,
+ struct resource *res, int mem_type)
+{
+ int len, rc;
+ char *mem_select_str;
+
+ mem_acc_vreg->acc_sel_addr[mem_type] = res->start;
+ len = res->end - res->start + 1;
+ pr_debug("'acc_sel_addr' = %pa mem_type=%d (len=%d)\n",
+ &res->start, mem_type, len);
+
+ mem_acc_vreg->acc_sel_base[mem_type] = devm_ioremap(mem_acc_vreg->dev,
+ mem_acc_vreg->acc_sel_addr[mem_type], len);
+ if (!mem_acc_vreg->acc_sel_base[mem_type]) {
+ pr_err("Unable to map 'acc_sel_addr' %pa for mem_type=%d\n",
+ &mem_acc_vreg->acc_sel_addr[mem_type], mem_type);
+ return -EINVAL;
+ }
+
+ switch (mem_type) {
+ case MEMORY_L1:
+ mem_select_str = "qcom,acc-sel-l1-bit-pos";
+ break;
+ case MEMORY_L2:
+ mem_select_str = "qcom,acc-sel-l2-bit-pos";
+ break;
+ }
+
+ rc = populate_acc_data(mem_acc_vreg, mem_select_str,
+ &mem_acc_vreg->acc_sel_bit_pos[mem_type],
+ &mem_acc_vreg->num_acc_sel[mem_type]);
+ if (rc)
+ pr_err("Unable to populate '%s' rc=%d\n", mem_select_str, rc);
+
+ return rc;
+}
+
+static int mem_acc_init(struct platform_device *pdev,
+ struct mem_acc_regulator *mem_acc_vreg)
+{
+ struct resource *res;
+ int len, rc, i;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "acc-en");
+ if (!res || !res->start) {
+ pr_debug("'acc-en' resource missing or not used.\n");
+ } else {
+ mem_acc_vreg->acc_en_addr = res->start;
+ len = res->end - res->start + 1;
+ pr_debug("'acc_en_addr' = %pa (len=0x%x)\n", &res->start, len);
+
+ mem_acc_vreg->acc_en_base = devm_ioremap(mem_acc_vreg->dev,
+ mem_acc_vreg->acc_en_addr, len);
+ if (!mem_acc_vreg->acc_en_base) {
+ pr_err("Unable to map 'acc_en_addr' %pa\n",
+ &mem_acc_vreg->acc_en_addr);
+ return -EINVAL;
+ }
+
+ rc = populate_acc_data(mem_acc_vreg, "qcom,acc-en-bit-pos",
+ &mem_acc_vreg->acc_en_bit_pos,
+ &mem_acc_vreg->num_acc_en);
+ if (rc) {
+ pr_err("Unable to populate 'qcom,acc-en-bit-pos' rc=%d\n",
+ rc);
+ return rc;
+ }
+ }
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "acc-sel-l1");
+ if (!res || !res->start) {
+ pr_debug("'acc-sel-l1' resource missing or not used.\n");
+ } else {
+ rc = mem_acc_sel_setup(mem_acc_vreg, res, MEMORY_L1);
+ if (rc) {
+ pr_err("Unable to setup mem-acc for mem_type=%d rc=%d\n",
+ MEMORY_L1, rc);
+ return rc;
+ }
+ mem_acc_vreg->mem_acc_supported[MEMORY_L1] = true;
+ }
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "acc-sel-l2");
+ if (!res || !res->start) {
+ pr_debug("'acc-sel-l2' resource missing or not used.\n");
+ } else {
+ rc = mem_acc_sel_setup(mem_acc_vreg, res, MEMORY_L2);
+ if (rc) {
+ pr_err("Unable to setup mem-acc for mem_type=%d rc=%d\n",
+ MEMORY_L2, rc);
+ return rc;
+ }
+ mem_acc_vreg->mem_acc_supported[MEMORY_L2] = true;
+ }
+
+ rc = populate_acc_data(mem_acc_vreg, "qcom,corner-acc-map",
+ &mem_acc_vreg->corner_acc_map,
+ &mem_acc_vreg->num_corners);
+ if (rc) {
+ pr_err("Unable to find 'qcom,corner-acc-map' rc=%d\n", rc);
+ return rc;
+ }
+
+ pr_debug("num_corners = %d\n", mem_acc_vreg->num_corners);
+
+ /* Check if at least one valid mem-acc config. is specified */
+ for (i = 0; i < MEMORY_MAX; i++) {
+ if (mem_acc_vreg->mem_acc_supported[i])
+ break;
+ }
+ if (i == MEMORY_MAX) {
+ pr_err("No mem-acc configuration specified\n");
+ return -EINVAL;
+ }
+
+ if (mem_acc_vreg->num_acc_en)
+ mem_acc_en_init(mem_acc_vreg);
+
+ rc = mem_acc_sel_init(mem_acc_vreg);
+ if (rc) {
+ pr_err("Unable to intialize mem_acc_sel reg rc=%d\n", rc);
+ return rc;
+ }
+
+ return 0;
+}
+
+static int mem_acc_regulator_probe(struct platform_device *pdev)
+{
+ struct mem_acc_regulator *mem_acc_vreg;
+ struct regulator_desc *rdesc;
+ struct regulator_init_data *init_data;
+ int rc;
+
+ if (!pdev->dev.of_node) {
+ pr_err("Device tree node is missing\n");
+ return -EINVAL;
+ }
+
+ init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node);
+ if (!init_data) {
+ pr_err("regulator init data is missing\n");
+ return -EINVAL;
+ } else {
+ init_data->constraints.input_uV
+ = init_data->constraints.max_uV;
+ init_data->constraints.valid_ops_mask
+ |= REGULATOR_CHANGE_VOLTAGE;
+ }
+
+ mem_acc_vreg = devm_kzalloc(&pdev->dev, sizeof(*mem_acc_vreg),
+ GFP_KERNEL);
+ if (!mem_acc_vreg) {
+ pr_err("Can't allocate mem_acc_vreg memory\n");
+ return -ENOMEM;
+ }
+ mem_acc_vreg->dev = &pdev->dev;
+
+ rc = mem_acc_init(pdev, mem_acc_vreg);
+ if (rc) {
+ pr_err("Unable to initialize mem_acc configuration rc=%d\n",
+ rc);
+ return rc;
+ }
+
+ rdesc = &mem_acc_vreg->rdesc;
+ rdesc->owner = THIS_MODULE;
+ rdesc->type = REGULATOR_VOLTAGE;
+ rdesc->ops = &mem_acc_corner_ops;
+ rdesc->name = init_data->constraints.name;
+
+ mem_acc_vreg->rdev = regulator_register(rdesc, &pdev->dev,
+ init_data, mem_acc_vreg, pdev->dev.of_node);
+ if (IS_ERR(mem_acc_vreg->rdev)) {
+ rc = PTR_ERR(mem_acc_vreg->rdev);
+ if (rc != -EPROBE_DEFER)
+ pr_err("regulator_register failed: rc=%d\n", rc);
+ return rc;
+ }
+
+ platform_set_drvdata(pdev, mem_acc_vreg);
+
+ return 0;
+}
+
+static int mem_acc_regulator_remove(struct platform_device *pdev)
+{
+ struct mem_acc_regulator *mem_acc_vreg = platform_get_drvdata(pdev);
+
+ regulator_unregister(mem_acc_vreg->rdev);
+
+ return 0;
+}
+
+static struct of_device_id mem_acc_regulator_match_table[] = {
+ { .compatible = "qcom,mem-acc-regulator", },
+ {}
+};
+
+static struct platform_driver mem_acc_regulator_driver = {
+ .probe = mem_acc_regulator_probe,
+ .remove = mem_acc_regulator_remove,
+ .driver = {
+ .name = "qcom,mem-acc-regulator",
+ .of_match_table = mem_acc_regulator_match_table,
+ .owner = THIS_MODULE,
+ },
+};
+
+int __init mem_acc_regulator_init(void)
+{
+ return platform_driver_register(&mem_acc_regulator_driver);
+}
+postcore_initcall(mem_acc_regulator_init);
+
+static void __exit mem_acc_regulator_exit(void)
+{
+ platform_driver_unregister(&mem_acc_regulator_driver);
+}
+module_exit(mem_acc_regulator_exit);
+
+MODULE_DESCRIPTION("MEM-ACC-SEL regulator driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/slimbus/slim-msm-ngd.c b/drivers/slimbus/slim-msm-ngd.c
index aa61ab9..1247808 100644
--- a/drivers/slimbus/slim-msm-ngd.c
+++ b/drivers/slimbus/slim-msm-ngd.c
@@ -1115,6 +1115,7 @@
wait_for_completion(&dev->qmi.slave_notify);
/* Probe devices for first notification */
if (!i) {
+ i++;
dev->err = 0;
if (dev->dev->of_node)
of_register_slim_devices(&dev->ctrl);
@@ -1127,12 +1128,12 @@
} else {
slim_framer_booted(ctrl);
}
- i++;
mutex_lock(&ctrl->m_ctrl);
list_for_each_safe(pos, next, &ctrl->devs) {
+ int j;
sbdev = list_entry(pos, struct slim_device, dev_list);
mutex_unlock(&ctrl->m_ctrl);
- for (i = 0; i < LADDR_RETRY; i++) {
+ for (j = 0; j < LADDR_RETRY; j++) {
ret = slim_get_logical_addr(sbdev,
sbdev->e_addr,
6, &sbdev->laddr);
diff --git a/drivers/thermal/msm_thermal.c b/drivers/thermal/msm_thermal.c
index 73513ec..6e6457c 100644
--- a/drivers/thermal/msm_thermal.c
+++ b/drivers/thermal/msm_thermal.c
@@ -92,9 +92,16 @@
THRESHOLD_MAX_NR,
};
+enum sensor_id_type {
+ THERM_ZONE_ID,
+ THERM_TSENS_ID,
+ THERM_ID_MAX_NR,
+};
+
struct cpu_info {
uint32_t cpu;
const char *sensor_type;
+ enum sensor_id_type id_type;
uint32_t sensor_id;
bool offline;
bool user_offline;
@@ -635,7 +642,7 @@
static int check_sensor_id(int sensor_id)
{
int i = 0;
- bool hw_id_found;
+ bool hw_id_found = false;
int ret = 0;
for (i = 0; i < max_tsens_num; i++) {
@@ -774,31 +781,63 @@
return ret;
}
-static int set_threshold(uint32_t sensor_id,
+static int therm_get_temp(uint32_t id, enum sensor_id_type type, long *temp)
+{
+ int ret = 0;
+ struct tsens_device tsens_dev;
+
+ if (!temp) {
+ pr_err("Invalid value\n");
+ ret = -EINVAL;
+ goto get_temp_exit;
+ }
+
+ switch (type) {
+ case THERM_ZONE_ID:
+ tsens_dev.sensor_num = tsens_id_map[id];
+ break;
+ case THERM_TSENS_ID:
+ tsens_dev.sensor_num = id;
+ break;
+ default:
+ pr_err("Invalid type\n");
+ ret = -EINVAL;
+ goto get_temp_exit;
+ break;
+ }
+
+ ret = tsens_get_temp(&tsens_dev, temp);
+ if (ret) {
+ pr_err("Unable to read TSENS sensor %d\n",
+ tsens_dev.sensor_num);
+ goto get_temp_exit;
+ }
+
+get_temp_exit:
+ return ret;
+}
+
+static int set_threshold(uint32_t zone_id,
struct sensor_threshold *threshold)
{
- struct tsens_device tsens_dev;
int i = 0, ret = 0;
long temp;
- if ((!threshold) || check_sensor_id(sensor_id)) {
+ if ((!threshold) || (zone_id >= max_tsens_num)) {
pr_err("%s: Invalid input\n", KBUILD_MODNAME);
ret = -EINVAL;
goto set_threshold_exit;
}
- tsens_dev.sensor_num = sensor_id;
- ret = tsens_get_temp(&tsens_dev, &temp);
- if (ret) {
- pr_err("%s: Unable to read TSENS sensor %d\n",
- KBUILD_MODNAME, tsens_dev.sensor_num);
+ ret = therm_get_temp(zone_id, THERM_ZONE_ID, &temp);
+ if (ret)
goto set_threshold_exit;
- }
+
while (i < MAX_THRESHOLD) {
switch (threshold[i].trip) {
case THERMAL_TRIP_CONFIGURABLE_HI:
if (threshold[i].temp >= temp) {
- ret = set_and_activate_threshold(sensor_id,
+ ret = set_and_activate_threshold(zone_id,
&threshold[i]);
if (ret)
goto set_threshold_exit;
@@ -806,7 +845,7 @@
break;
case THERMAL_TRIP_CONFIGURABLE_LOW:
if (threshold[i].temp <= temp) {
- ret = set_and_activate_threshold(sensor_id,
+ ret = set_and_activate_threshold(zone_id,
&threshold[i]);
if (ret)
goto set_threshold_exit;
@@ -942,7 +981,6 @@
static int do_ocr(void)
{
- struct tsens_device tsens_dev;
long temp = 0;
int ret = 0;
int i = 0, j = 0;
@@ -953,11 +991,10 @@
mutex_lock(&ocr_mutex);
for (i = 0; i < max_tsens_num; i++) {
- tsens_dev.sensor_num = tsens_id_map[i];
- ret = tsens_get_temp(&tsens_dev, &temp);
+ ret = therm_get_temp(tsens_id_map[i], THERM_TSENS_ID, &temp);
if (ret) {
pr_debug("%s: Unable to read TSENS sensor %d\n",
- __func__, tsens_dev.sensor_num);
+ __func__, tsens_id_map[i]);
auto_cnt++;
continue;
}
@@ -999,7 +1036,6 @@
static int do_vdd_restriction(void)
{
- struct tsens_device tsens_dev;
long temp = 0;
int ret = 0;
int i = 0;
@@ -1015,11 +1051,10 @@
mutex_lock(&vdd_rstr_mutex);
for (i = 0; i < max_tsens_num; i++) {
- tsens_dev.sensor_num = tsens_id_map[i];
- ret = tsens_get_temp(&tsens_dev, &temp);
+ ret = therm_get_temp(tsens_id_map[i], THERM_TSENS_ID, &temp);
if (ret) {
- pr_debug("%s: Unable to read TSENS sensor %d\n",
- __func__, tsens_dev.sensor_num);
+ pr_debug("Unable to read TSENS sensor %d\n",
+ tsens_id_map[i]);
dis_cnt++;
continue;
}
@@ -1048,7 +1083,6 @@
static int do_psm(void)
{
- struct tsens_device tsens_dev;
long temp = 0;
int ret = 0;
int i = 0;
@@ -1056,11 +1090,10 @@
mutex_lock(&psm_mutex);
for (i = 0; i < max_tsens_num; i++) {
- tsens_dev.sensor_num = tsens_id_map[i];
- ret = tsens_get_temp(&tsens_dev, &temp);
+ ret = therm_get_temp(tsens_id_map[i], THERM_TSENS_ID, &temp);
if (ret) {
pr_debug("%s: Unable to read TSENS sensor %d\n",
- __func__, tsens_dev.sensor_num);
+ __func__, tsens_id_map[i]);
auto_cnt++;
continue;
}
@@ -1137,15 +1170,13 @@
static void __ref check_temp(struct work_struct *work)
{
static int limit_init;
- struct tsens_device tsens_dev;
long temp = 0;
int ret = 0;
- tsens_dev.sensor_num = msm_thermal_info.sensor_id;
- ret = tsens_get_temp(&tsens_dev, &temp);
+ ret = therm_get_temp(msm_thermal_info.sensor_id, THERM_TSENS_ID, &temp);
if (ret) {
- pr_debug("%s: Unable to read TSENS sensor %d\n",
- KBUILD_MODNAME, tsens_dev.sensor_num);
+ pr_debug("Unable to read TSENS sensor %d\n",
+ msm_thermal_info.sensor_id);
goto reschedule;
}
@@ -1258,7 +1289,6 @@
/* Adjust cpus offlined bit based on temperature reading. */
static int hotplug_init_cpu_offlined(void)
{
- struct tsens_device tsens_dev;
long temp = 0;
uint32_t cpu = 0;
@@ -1269,10 +1299,10 @@
for_each_possible_cpu(cpu) {
if (!(msm_thermal_info.core_control_mask & BIT(cpus[cpu].cpu)))
continue;
- tsens_dev.sensor_num = cpus[cpu].sensor_id;
- if (tsens_get_temp(&tsens_dev, &temp)) {
+ if (therm_get_temp(cpus[cpu].sensor_id, cpus[cpu].id_type,
+ &temp)) {
pr_err("%s: Unable to read TSENS sensor %d\n",
- KBUILD_MODNAME, tsens_dev.sensor_num);
+ KBUILD_MODNAME, cpus[cpu].sensor_id);
mutex_unlock(&core_control_mutex);
return -EINVAL;
}
@@ -1309,6 +1339,7 @@
for_each_possible_cpu(cpu) {
cpus[cpu].sensor_id =
sensor_get_id((char *)cpus[cpu].sensor_type);
+ cpus[cpu].id_type = THERM_ZONE_ID;
if (!(msm_thermal_info.core_control_mask & BIT(cpus[cpu].cpu)))
continue;
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index 877b944..6b01472 100644
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -1762,6 +1762,7 @@
struct fsg_common *common;
};
+#define MAX_LUN_NAME 8
static int mass_storage_function_init(struct android_usb_function *f,
struct usb_composite_dev *cdev)
{
@@ -1769,8 +1770,9 @@
struct mass_storage_function_config *config;
struct fsg_common *common;
int err;
- int i;
- const char *name[3];
+ int i, n;
+ char name[FSG_MAX_LUNS][MAX_LUN_NAME];
+ u8 uicc_nluns = dev->pdata ? dev->pdata->uicc_nluns : 0;
config = kzalloc(sizeof(struct mass_storage_function_config),
GFP_KERNEL);
@@ -1778,23 +1780,35 @@
return -ENOMEM;
config->fsg.nluns = 1;
- name[0] = "lun";
+ snprintf(name[0], MAX_LUN_NAME, "lun");
+ config->fsg.luns[0].removable = 1;
+
if (dev->pdata && dev->pdata->cdrom) {
config->fsg.luns[config->fsg.nluns].cdrom = 1;
config->fsg.luns[config->fsg.nluns].ro = 1;
config->fsg.luns[config->fsg.nluns].removable = 0;
- name[config->fsg.nluns] = "lun0";
+ snprintf(name[config->fsg.nluns], MAX_LUN_NAME, "lun0");
config->fsg.nluns++;
}
if (dev->pdata && dev->pdata->internal_ums) {
config->fsg.luns[config->fsg.nluns].cdrom = 0;
config->fsg.luns[config->fsg.nluns].ro = 0;
config->fsg.luns[config->fsg.nluns].removable = 1;
- name[config->fsg.nluns] = "lun1";
+ snprintf(name[config->fsg.nluns], MAX_LUN_NAME, "lun1");
config->fsg.nluns++;
}
- config->fsg.luns[0].removable = 1;
+ if (uicc_nluns > FSG_MAX_LUNS - config->fsg.nluns) {
+ uicc_nluns = FSG_MAX_LUNS - config->fsg.nluns;
+ pr_debug("limiting uicc luns to %d\n", uicc_nluns);
+ }
+
+ for (i = 0; i < uicc_nluns; i++) {
+ n = config->fsg.nluns;
+ snprintf(name[n], MAX_LUN_NAME, "uicc%d", i);
+ config->fsg.luns[n].removable = 1;
+ config->fsg.nluns++;
+ }
common = fsg_common_init(NULL, cdev, &config->fsg);
if (IS_ERR(common)) {
@@ -2973,6 +2987,10 @@
}
pdata->streaming_func_count = len;
+
+ ret = of_property_read_u32(pdev->dev.of_node,
+ "qcom,android-usb-uicc-nluns",
+ &pdata->uicc_nluns);
} else {
pdata = pdev->dev.platform_data;
}
diff --git a/drivers/usb/gadget/f_diag.c b/drivers/usb/gadget/f_diag.c
index 16f961e..993d9fb 100644
--- a/drivers/usb/gadget/f_diag.c
+++ b/drivers/usb/gadget/f_diag.c
@@ -511,11 +511,11 @@
/* If error add the link to linked list again*/
spin_lock_irqsave(&ctxt->lock, flags);
list_add_tail(&req->list, &ctxt->write_pool);
- spin_unlock_irqrestore(&ctxt->lock, flags);
/* 1 error message for every 10 sec */
if (__ratelimit(&rl))
ERROR(ctxt->cdev, "%s: cannot queue"
" read request\n", __func__);
+ spin_unlock_irqrestore(&ctxt->lock, flags);
return -EIO;
}
diff --git a/drivers/video/msm/mdss/Makefile b/drivers/video/msm/mdss/Makefile
index fd03b63..cba7c22b 100644
--- a/drivers/video/msm/mdss/Makefile
+++ b/drivers/video/msm/mdss/Makefile
@@ -13,7 +13,7 @@
obj-$(CONFIG_FB_MSM_MDSS) += mdss-mdp.o
ifeq ($(CONFIG_FB_MSM_MDSS),y)
-obj-$(CONFIG_DEBUG_FS) += mdss_debug.o
+obj-$(CONFIG_DEBUG_FS) += mdss_debug.o mdss_debug_xlog.o
endif
dsi-v2-objs = dsi_v2.o dsi_host_v2.o dsi_io_v2.o
diff --git a/drivers/video/msm/mdss/mdp3_ctrl.c b/drivers/video/msm/mdss/mdp3_ctrl.c
index 697ac40..2a8cb6a 100644
--- a/drivers/video/msm/mdss/mdp3_ctrl.c
+++ b/drivers/video/msm/mdss/mdp3_ctrl.c
@@ -478,6 +478,7 @@
video->hsync_polarity = 1;
video->vsync_polarity = 1;
video->de_polarity = 1;
+ video->underflow_color = p->lcdc.underflow_clr;
} else if (cfg.type == MDP3_DMA_OUTPUT_SEL_DSI_CMD) {
cfg.dsi_cmd.primary_dsi_cmd_id = 0;
cfg.dsi_cmd.secondary_dsi_cmd_id = 1;
diff --git a/drivers/video/msm/mdss/mdp3_dma.c b/drivers/video/msm/mdss/mdp3_dma.c
index 8a13de2..4135406 100644
--- a/drivers/video/msm/mdss/mdp3_dma.c
+++ b/drivers/video/msm/mdss/mdp3_dma.c
@@ -1060,7 +1060,9 @@
temp |= BIT(2);
MDP3_REG_WRITE(MDP3_REG_DSI_VIDEO_CTL_POLARITY, temp);
- MDP3_REG_WRITE(MDP3_REG_DSI_VIDEO_UNDERFLOW_CTL, 0x800000ff);
+ v->underflow_color |= 0x80000000;
+ MDP3_REG_WRITE(MDP3_REG_DSI_VIDEO_UNDERFLOW_CTL, v->underflow_color);
+
return 0;
}
diff --git a/drivers/video/msm/mdss/mdp3_dma.h b/drivers/video/msm/mdss/mdp3_dma.h
index 80ebb9b..d244735 100644
--- a/drivers/video/msm/mdss/mdp3_dma.h
+++ b/drivers/video/msm/mdss/mdp3_dma.h
@@ -319,6 +319,7 @@
int hsync_polarity;
int vsync_polarity;
int de_polarity;
+ int underflow_color;
};
struct mdp3_dsi_cmd_intf_cfg {
diff --git a/drivers/video/msm/mdss/mdss_debug.c b/drivers/video/msm/mdss/mdss_debug.c
index 0d0240f..aeb3f86 100644
--- a/drivers/video/msm/mdss/mdss_debug.c
+++ b/drivers/video/msm/mdss/mdss_debug.c
@@ -30,21 +30,6 @@
#define GROUP_BYTES 4
#define ROW_BYTES 16
#define MAX_VSYNC_COUNT 0xFFFFFFF
-struct mdss_debug_data {
- struct dentry *root;
- struct list_head base_list;
-};
-
-struct mdss_debug_base {
- struct mdss_debug_data *mdd;
- void __iomem *base;
- size_t off;
- size_t cnt;
- size_t max_offset;
- char *buf;
- size_t buf_len;
- struct list_head head;
-};
static int mdss_debug_base_open(struct inode *inode, struct file *file)
{
@@ -265,12 +250,14 @@
if (!dbg)
return -ENOMEM;
+ if (name)
+ strlcpy(dbg->name, name, sizeof(dbg->name));
dbg->base = base;
dbg->max_offset = max_offset;
dbg->off = 0;
dbg->cnt = DEFAULT_BASE_REG_CNT;
- if (name)
+ if (name && strcmp(name, "mdp"))
prefix_len = snprintf(dn, sizeof(dn), "%s_", name);
strlcpy(dn + prefix_len, "off", sizeof(dn) - prefix_len);
@@ -395,6 +382,11 @@
debugfs_create_u32("min_mdp_clk", 0644, mdd->root,
(u32 *)&mdata->min_mdp_clk);
+ if (mdss_create_xlog_debug(mdd)) {
+ mdss_debugfs_cleanup(mdd);
+ return -ENODEV;
+ }
+
mdata->debug_inf.debug_data = mdd;
return 0;
@@ -410,6 +402,29 @@
return 0;
}
+void mdss_dump_reg(char __iomem *base, int len)
+{
+ char *addr;
+ u32 x0, x4, x8, xc;
+ int i;
+
+ addr = base;
+ if (len % 16)
+ len += 16;
+ len /= 16;
+
+ mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
+ for (i = 0; i < len; i++) {
+ x0 = readl_relaxed(addr+0x0);
+ x4 = readl_relaxed(addr+0x4);
+ x8 = readl_relaxed(addr+0x8);
+ xc = readl_relaxed(addr+0xc);
+ pr_info("%p : %08x %08x %08x %08x\n", addr, x0, x4, x8, xc);
+ addr += 16;
+ }
+ mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
+}
+
int vsync_count;
static struct mdss_mdp_misr_map {
u32 ctrl_reg;
diff --git a/drivers/video/msm/mdss/mdss_debug.h b/drivers/video/msm/mdss/mdss_debug.h
index 984caab..e2c9edd 100644
--- a/drivers/video/msm/mdss/mdss_debug.h
+++ b/drivers/video/msm/mdss/mdss_debug.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -14,13 +14,48 @@
#ifndef MDSS_DEBUG_H
#define MDSS_DEBUG_H
+#include <stdarg.h>
#include "mdss.h"
#define MISR_POLL_SLEEP 2000
#define MISR_POLL_TIMEOUT 32000
#define MISR_CRC_BATCH_CFG 0x101
+#define DATA_LIMITER (-1)
+#define XLOG_TOUT_DATA_LIMITER (NULL)
+#define XLOG_FUNC_ENTRY 0x1111
+#define XLOG_FUNC_EXIT 0x2222
+#define MDSS_REG_BLOCK_NAME_LEN (5)
+
+#define MDSS_XLOG(...) mdss_xlog(__func__, ##__VA_ARGS__, DATA_LIMITER)
+#define MDSS_XLOG_TOUT_HANDLER(...) \
+ mdss_xlog_tout_handler(__func__, ##__VA_ARGS__, XLOG_TOUT_DATA_LIMITER)
#ifdef CONFIG_DEBUG_FS
+struct mdss_debug_base {
+ struct mdss_debug_data *mdd;
+ char name[80];
+ void __iomem *base;
+ size_t off;
+ size_t cnt;
+ size_t max_offset;
+ char *buf;
+ size_t buf_len;
+ struct list_head head;
+};
+
+struct debug_log {
+ struct dentry *xlog;
+ u32 xlog_enable;
+ u32 panic_on_err;
+ u32 enable_reg_dump;
+};
+
+struct mdss_debug_data {
+ struct dentry *root;
+ struct list_head base_list;
+ struct debug_log logd;
+};
+
int mdss_debugfs_init(struct mdss_data_type *mdata);
int mdss_debugfs_remove(struct mdss_data_type *mdata);
int mdss_debug_register_base(const char *name, void __iomem *base,
@@ -30,6 +65,13 @@
int mdss_misr_get(struct mdss_data_type *mdata, struct mdp_misr *resp,
struct mdss_mdp_ctl *ctl);
void mdss_misr_crc_collect(struct mdss_data_type *mdata, int block_id);
+
+int mdss_create_xlog_debug(struct mdss_debug_data *mdd);
+void mdss_xlog(const char *name, ...);
+void mdss_xlog_dump(void);
+void mdss_dump_reg(char __iomem *base, int len);
+void mdss_dsi_debug_check_te(struct mdss_panel_data *pdata);
+void mdss_xlog_tout_handler(const char *name, ...);
#else
static inline int mdss_debugfs_init(struct mdss_data_type *mdata) { return 0; }
static inline int mdss_debugfs_remove(struct mdss_data_type *mdata)
@@ -46,5 +88,12 @@
{ return 0; }
static inline void mdss_misr_crc_collect(struct mdss_data_type *mdata,
int block_id) { }
+
+static inline int create_xlog_debug(struct mdss_data_type *mdata) { }
+static inline void mdss_xlog(const char *name, ...) { }
+static inline void mdss_xlog_dump(void) { }
+static inline void mdss_dump_reg(char __iomem *base, int len) { }
+static inline void mdss_dsi_debug_check_te(struct mdss_panel_data *pdata) { }
+static inline void mdss_xlog_tout_handler(const char *name, ...) { }
#endif
#endif /* MDSS_DEBUG_H */
diff --git a/drivers/video/msm/mdss/mdss_debug_xlog.c b/drivers/video/msm/mdss/mdss_debug_xlog.c
new file mode 100644
index 0000000..0c24e1e
--- /dev/null
+++ b/drivers/video/msm/mdss/mdss_debug_xlog.c
@@ -0,0 +1,196 @@
+/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/ktime.h>
+#include <linux/debugfs.h>
+
+#include "mdss.h"
+#include "mdss_mdp.h"
+#include "mdss_debug.h"
+
+#define MDSS_XLOG_ENTRY 256
+#define MDSS_XLOG_MAX_DATA 6
+#define MDSS_XLOG_BUF_MAX 512
+
+struct tlog {
+ u32 tick;
+ const char *name;
+ u32 data[MDSS_XLOG_MAX_DATA];
+ u32 data_cnt;
+};
+
+struct mdss_dbg_xlog {
+ struct tlog logs[MDSS_XLOG_ENTRY];
+ int first;
+ int last;
+ spinlock_t xlock;
+} mdss_dbg_xlog;
+
+static int mdss_xlog_dump_open(struct inode *inode, struct file *file)
+{
+ /* non-seekable */
+ file->f_mode &= ~(FMODE_LSEEK | FMODE_PREAD | FMODE_PWRITE);
+ file->private_data = inode->i_private;
+ return 0;
+}
+
+static ssize_t mdss_xlog_dump_read(struct file *file, char __user *buff,
+ size_t count, loff_t *ppos)
+{
+ MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1", "edp", "hdmi", "panic");
+ return 0;
+}
+
+static const struct file_operations mdss_xlog_fops = {
+ .open = mdss_xlog_dump_open,
+ .read = mdss_xlog_dump_read,
+};
+
+int mdss_create_xlog_debug(struct mdss_debug_data *mdd)
+{
+ spin_lock_init(&mdss_dbg_xlog.xlock);
+
+ mdd->logd.xlog = debugfs_create_dir("xlog", mdd->root);
+ if (IS_ERR_OR_NULL(mdd->logd.xlog)) {
+ pr_err("debugfs_create_dir fail, error %ld\n",
+ PTR_ERR(mdd->logd.xlog));
+ mdd->logd.xlog = NULL;
+ return -ENODEV;
+ }
+ debugfs_create_file("dump", 0644, mdd->logd.xlog, NULL,
+ &mdss_xlog_fops);
+ debugfs_create_bool("enable", 0644, mdd->logd.xlog,
+ &mdd->logd.xlog_enable);
+ debugfs_create_bool("panic", 0644, mdd->logd.xlog,
+ &mdd->logd.panic_on_err);
+ debugfs_create_bool("reg_dump", 0644, mdd->logd.xlog,
+ &mdd->logd.enable_reg_dump);
+ return 0;
+}
+
+void mdss_xlog(const char *name, ...)
+{
+ struct mdss_data_type *mdata = mdss_mdp_get_mdata();
+ struct mdss_debug_data *mdd = mdata->debug_inf.debug_data;
+ unsigned long flags;
+ int i, val = 0;
+ va_list args;
+ struct tlog *log;
+ ktime_t time;
+
+ if (!mdd->logd.xlog_enable)
+ return;
+
+ spin_lock_irqsave(&mdss_dbg_xlog.xlock, flags);
+
+ time = ktime_get();
+
+ log = &mdss_dbg_xlog.logs[mdss_dbg_xlog.first];
+ log->tick = ktime_to_us(time);
+ log->name = name;
+ log->data_cnt = 0;
+
+ va_start(args, name);
+ for (i = 0; i < MDSS_XLOG_MAX_DATA; i++) {
+
+ val = va_arg(args, int);
+ if (val == DATA_LIMITER)
+ break;
+
+ log->data[i] = val;
+ }
+ va_end(args);
+
+ log->data_cnt = i;
+
+ mdss_dbg_xlog.last = mdss_dbg_xlog.first;
+ mdss_dbg_xlog.first++;
+ mdss_dbg_xlog.first %= MDSS_XLOG_ENTRY;
+
+ spin_unlock_irqrestore(&mdss_dbg_xlog.xlock, flags);
+}
+
+void mdss_xlog_dump(void)
+{
+ struct mdss_data_type *mdata = mdss_mdp_get_mdata();
+ struct mdss_debug_data *mdd = mdata->debug_inf.debug_data;
+ int i, n, d_cnt, off;
+ unsigned long flags;
+ struct tlog *log;
+ char xlog_buf[MDSS_XLOG_BUF_MAX];
+
+ if (!mdd->logd.xlog_enable)
+ return;
+
+ spin_lock_irqsave(&mdss_dbg_xlog.xlock, flags);
+ i = mdss_dbg_xlog.first;
+ for (n = 0; n < MDSS_XLOG_ENTRY; n++) {
+ log = &mdss_dbg_xlog.logs[i];
+ off = snprintf(xlog_buf, MDSS_XLOG_BUF_MAX, "%-32s => %08d: ",
+ log->name, log->tick);
+ for (d_cnt = 0; d_cnt < log->data_cnt;) {
+ off += snprintf((xlog_buf + off),
+ (MDSS_XLOG_BUF_MAX - off),
+ "%x ", log->data[d_cnt]);
+ d_cnt++;
+ }
+ pr_err("%s\n", xlog_buf);
+
+ i = (i + 1) % MDSS_XLOG_ENTRY;
+ }
+ spin_unlock_irqrestore(&mdss_dbg_xlog.xlock, flags);
+}
+
+void mdss_xlog_tout_handler(const char *name, ...)
+{
+ struct mdss_data_type *mdata = mdss_mdp_get_mdata();
+ struct mdss_debug_data *mdd = mdata->debug_inf.debug_data;
+ struct mdss_debug_base *blk_base, *tmp;
+ int i, dead = 0;
+ va_list args;
+ char *blk_name = NULL;
+
+ if (!mdd->logd.xlog_enable)
+ return;
+
+ va_start(args, name);
+ for (i = 0; i < MDSS_XLOG_MAX_DATA; i++) {
+
+ blk_name = va_arg(args, char*);
+ if (IS_ERR_OR_NULL(blk_name))
+ break;
+
+ list_for_each_entry_safe(blk_base, tmp, &mdd->base_list, head) {
+
+ if (blk_base->name &&
+ !strcmp(blk_base->name, blk_name) &&
+ mdd->logd.enable_reg_dump) {
+ pr_info("\n%s : =========%s DUMP=========\n",
+ __func__, blk_base->name);
+ mdss_dump_reg(blk_base->base,
+ blk_base->max_offset);
+ }
+ }
+ if (!strcmp(blk_name, "panic"))
+ dead = 1;
+ }
+ va_end(args);
+
+ MDSS_XLOG(0xffff, 0xffff, 0xffff, 0xffff, 0xffff);
+ mdss_xlog_dump();
+
+ if (dead && mdd->logd.panic_on_err)
+ panic(name);
+}
diff --git a/drivers/video/msm/mdss/mdss_dsi.c b/drivers/video/msm/mdss/mdss_dsi.c
index 553ae09..dd8eec5 100644
--- a/drivers/video/msm/mdss/mdss_dsi.c
+++ b/drivers/video/msm/mdss/mdss_dsi.c
@@ -773,6 +773,12 @@
}
}
+ if (pdata->panel_info.type == MIPI_VIDEO_PANEL &&
+ ctrl_pdata->off_cmds.link_state == DSI_LP_MODE) {
+ mdss_dsi_sw_reset(pdata);
+ mdss_dsi_host_init(pdata);
+ }
+
mdss_dsi_op_mode_config(DSI_CMD_MODE, pdata);
if (pdata->panel_info.type == MIPI_CMD_PANEL) {
@@ -821,15 +827,6 @@
mdss_dsi_sw_reset(pdata);
mdss_dsi_host_init(pdata);
mdss_dsi_op_mode_config(mipi->mode, pdata);
-
- if (ctrl_pdata->on_cmds.link_state == DSI_LP_MODE) {
- ret = mdss_dsi_unblank(pdata);
- if (ret) {
- pr_err("%s: unblank failed\n", __func__);
- return ret;
- }
- }
-
pr_debug("%s-:End\n", __func__);
return ret;
}
@@ -969,6 +966,8 @@
panel_data);
pr_debug("%s+:event=%d\n", __func__, event);
+ MDSS_XLOG(event, arg, ctrl_pdata->ndx, 0x3333);
+
switch (event) {
case MDSS_EVENT_UNBLANK:
rc = mdss_dsi_on(pdata);
@@ -993,15 +992,10 @@
rc = mdss_dsi_off(pdata);
break;
case MDSS_EVENT_CONT_SPLASH_FINISH:
+ if (ctrl_pdata->off_cmds.link_state == DSI_LP_MODE)
+ rc = mdss_dsi_blank(pdata);
ctrl_pdata->ctrl_state &= ~CTRL_STATE_MDP_ACTIVE;
- if (ctrl_pdata->on_cmds.link_state == DSI_LP_MODE) {
- rc = mdss_dsi_cont_splash_on(pdata);
- } else {
- pr_debug("%s:event=%d, Dsi On not called: ctrl_state: %d\n",
- __func__, event,
- ctrl_pdata->on_cmds.link_state);
- rc = -EINVAL;
- }
+ rc = mdss_dsi_cont_splash_on(pdata);
break;
case MDSS_EVENT_PANEL_CLK_CTRL:
mdss_dsi_clk_req(ctrl_pdata, (int)arg);
diff --git a/drivers/video/msm/mdss/mdss_dsi.h b/drivers/video/msm/mdss/mdss_dsi.h
index b0b884f..f6f6cd4 100644
--- a/drivers/video/msm/mdss/mdss_dsi.h
+++ b/drivers/video/msm/mdss/mdss_dsi.h
@@ -330,7 +330,7 @@
irqreturn_t mdss_dsi_isr(int irq, void *ptr);
void mdss_dsi_irq_handler_config(struct mdss_dsi_ctrl_pdata *ctrl_pdata);
-void mipi_set_tx_power_mode(int mode, struct mdss_panel_data *pdata);
+void mdss_dsi_set_tx_power_mode(int mode, struct mdss_panel_data *pdata);
int mdss_dsi_clk_div_config(struct mdss_panel_info *panel_info,
int frame_rate);
int mdss_dsi_clk_init(struct platform_device *pdev,
diff --git a/drivers/video/msm/mdss/mdss_dsi_host.c b/drivers/video/msm/mdss/mdss_dsi_host.c
index a570914..3cd014c 100644
--- a/drivers/video/msm/mdss/mdss_dsi_host.c
+++ b/drivers/video/msm/mdss/mdss_dsi_host.c
@@ -26,6 +26,7 @@
#include "mdss.h"
#include "mdss_dsi.h"
#include "mdss_panel.h"
+#include "mdss_debug.h"
#define VSYNC_PERIOD 17
@@ -110,6 +111,7 @@
void mdss_dsi_clk_req(struct mdss_dsi_ctrl_pdata *ctrl, int enable)
{
+ MDSS_XLOG(ctrl->ndx, enable, ctrl->mdp_busy, current->pid);
if (enable == 0) {
/* need wait before disable */
mutex_lock(&ctrl->cmd_mutex);
@@ -117,6 +119,7 @@
mutex_unlock(&ctrl->cmd_mutex);
}
+ MDSS_XLOG(ctrl->ndx, enable, ctrl->mdp_busy, current->pid);
mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, enable);
}
@@ -149,6 +152,7 @@
return;
}
if (ctrl->dsi_irq_mask == 0) {
+ MDSS_XLOG(ctrl->ndx, term);
mdss_enable_irq(ctrl->dsi_hw);
pr_debug("%s: IRQ Enable, ndx=%d mask=%x term=%x\n", __func__,
ctrl->ndx, (int)ctrl->dsi_irq_mask, (int)term);
@@ -168,6 +172,7 @@
}
ctrl->dsi_irq_mask &= ~term;
if (ctrl->dsi_irq_mask == 0) {
+ MDSS_XLOG(ctrl->ndx, term);
mdss_disable_irq(ctrl->dsi_hw);
pr_debug("%s: IRQ Disable, ndx=%d mask=%x term=%x\n", __func__,
ctrl->ndx, (int)ctrl->dsi_irq_mask, (int)term);
@@ -188,6 +193,7 @@
}
ctrl->dsi_irq_mask &= ~term;
if (ctrl->dsi_irq_mask == 0) {
+ MDSS_XLOG(ctrl->ndx, term);
mdss_disable_irq_nosync(ctrl->dsi_hw);
pr_debug("%s: IRQ Disable, ndx=%d mask=%x term=%x\n", __func__,
ctrl->ndx, (int)ctrl->dsi_irq_mask, (int)term);
@@ -365,7 +371,7 @@
wmb();
}
-void mdss_set_tx_power_mode(int mode, struct mdss_panel_data *pdata)
+void mdss_dsi_set_tx_power_mode(int mode, struct mdss_panel_data *pdata)
{
struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL;
u32 data;
@@ -1153,6 +1159,7 @@
mdss_dsi_enable_irq(ctrl, DSI_MDP_TERM);
ctrl->mdp_busy = true;
INIT_COMPLETION(ctrl->mdp_comp);
+ MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, current->pid);
spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
}
@@ -1163,6 +1170,8 @@
pr_debug("%s: start pid=%d\n",
__func__, current->pid);
+
+ MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, current->pid, XLOG_FUNC_ENTRY);
spin_lock_irqsave(&ctrl->mdp_lock, flags);
if (ctrl->mdp_busy == true)
need_wait++;
@@ -1173,11 +1182,14 @@
pr_debug("%s: pending pid=%d\n",
__func__, current->pid);
if (!wait_for_completion_timeout(&ctrl->mdp_comp,
- msecs_to_jiffies(DMA_TX_TIMEOUT)))
+ msecs_to_jiffies(DMA_TX_TIMEOUT))) {
pr_err("%s: timeout error\n", __func__);
+ MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
+ "edp", "hdmi", "panic");
+ }
}
- pr_debug("%s: done pid=%d\n",
- __func__, current->pid);
+ pr_debug("%s: done pid=%d\n", __func__, current->pid);
+ MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, current->pid, XLOG_FUNC_EXIT);
}
int mdss_dsi_cmdlist_tx(struct mdss_dsi_ctrl_pdata *ctrl,
@@ -1231,6 +1243,9 @@
mutex_lock(&ctrl->cmd_mutex);
req = mdss_dsi_cmdlist_get(ctrl);
+ MDSS_XLOG(ctrl->ndx, from_mdp, ctrl->mdp_busy, current->pid,
+ XLOG_FUNC_ENTRY);
+
/* make sure dsi_cmd_mdp is idle */
mdss_dsi_cmd_mdp_busy(ctrl);
@@ -1239,6 +1254,8 @@
if (req == NULL)
goto need_lock;
+ MDSS_XLOG(ctrl->ndx, req->flags, req->cmds_cnt, from_mdp, current->pid);
+
/*
* mdss interrupt is generated in mdp core clock domain
* mdp clock need to be enabled to receive dsi interrupt
@@ -1263,10 +1280,46 @@
if (from_mdp) /* from pipe_commit */
mdss_dsi_cmd_mdp_start(ctrl);
+ MDSS_XLOG(ctrl->ndx, from_mdp, ctrl->mdp_busy, current->pid,
+ XLOG_FUNC_EXIT);
mutex_unlock(&ctrl->cmd_mutex);
return ret;
}
+void mdss_dsi_debug_check_te(struct mdss_panel_data *pdata)
+{
+ struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL;
+ u8 rc, te_count = 0;
+ u8 te_max = 250;
+
+ if (pdata == NULL) {
+ pr_err("%s: Invalid input data\n", __func__);
+ return;
+ }
+ ctrl_pdata = container_of(pdata, struct mdss_dsi_ctrl_pdata,
+ panel_data);
+
+ pr_info(" ============ start waiting for TE ============\n");
+ for (te_count = 0; te_count < te_max; te_count++) {
+ rc = gpio_get_value(ctrl_pdata->disp_te_gpio);
+ if (rc != 0) {
+ pr_info("%s: gpio_get_value(disp_te_gpio) = %d ",
+ __func__, rc);
+ pr_info("te_count = %d\n", te_count);
+ break;
+ }
+ /* usleep suspends the calling thread whereas udelay is a
+ * busy wait. Here the value of te_gpio is checked in a loop of
+ * max count = 250. If this loop has to iterate multiple
+ * times before the te_gpio is 1, the calling thread will end
+ * up in suspend/wakeup sequence multiple times if usleep is
+ * used, which is an overhead. So use udelay instead of usleep.
+ */
+ udelay(80);
+ }
+ pr_info(" ============ finish waiting for TE ============\n");
+}
+
static void dsi_send_events(struct mdss_dsi_ctrl_pdata *ctrl, u32 events)
{
struct dsi_event_q *evq;
@@ -1405,6 +1458,8 @@
pr_err("%s: status=%x\n", __func__, status);
if (status & 0x0080) /* CMD_DMA_FIFO_UNDERFLOW */
dsi_send_events(ctrl, DSI_EV_MDP_FIFO_UNDERFLOW);
+ MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
+ "edp", "hdmi", "panic");
}
}
@@ -1486,6 +1541,7 @@
pr_debug("%s: ndx=%d isr=%x\n", __func__, ctrl->ndx, isr);
if (isr & DSI_INTR_ERROR) {
+ MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, isr, 0x97);
pr_err("%s: ndx=%d isr=%x\n", __func__, ctrl->ndx, isr);
mdss_dsi_error(ctrl);
}
@@ -1498,6 +1554,7 @@
}
if (isr & DSI_INTR_CMD_DMA_DONE) {
+ MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, isr, 0x98);
spin_lock(&ctrl->mdp_lock);
mdss_dsi_disable_irq_nosync(ctrl, DSI_CMD_TERM);
complete(&ctrl->dma_comp);
@@ -1505,6 +1562,7 @@
}
if (isr & DSI_INTR_CMD_MDP_DONE) {
+ MDSS_XLOG(ctrl->ndx, ctrl->mdp_busy, isr, 0x99);
spin_lock(&ctrl->mdp_lock);
ctrl->mdp_busy = false;
mdss_dsi_disable_irq_nosync(ctrl, DSI_MDP_TERM);
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
index 8a215bc..8d82952 100644
--- a/drivers/video/msm/mdss/mdss_mdp.c
+++ b/drivers/video/msm/mdss/mdss_mdp.c
@@ -689,6 +689,7 @@
}
}
+ MDSS_XLOG(mdp_clk_cnt, changed, enable, current->pid);
pr_debug("%s: clk_cnt=%d changed=%d enable=%d\n",
__func__, mdp_clk_cnt, changed, enable);
@@ -792,6 +793,8 @@
int i;
mutex_lock(&mdp_iommu_lock);
+ MDSS_XLOG(mdata->iommu_attached);
+
if (mdata->iommu_attached) {
pr_debug("mdp iommu already attached\n");
mutex_unlock(&mdp_iommu_lock);
@@ -823,6 +826,8 @@
int i;
mutex_lock(&mdp_iommu_lock);
+ MDSS_XLOG(mdata->iommu_attached);
+
if (!mdata->iommu_attached) {
pr_debug("mdp iommu already dettached\n");
mutex_unlock(&mdp_iommu_lock);
@@ -965,7 +970,7 @@
if (rc)
return rc;
- mdss_debug_register_base(NULL, mdata->mdp_base, mdata->mdp_reg_size);
+ mdss_debug_register_base("mdp", mdata->mdp_base, mdata->mdp_reg_size);
return 0;
}
diff --git a/drivers/video/msm/mdss/mdss_mdp.h b/drivers/video/msm/mdss/mdss_mdp.h
index beb3cac..025713d 100644
--- a/drivers/video/msm/mdss/mdss_mdp.h
+++ b/drivers/video/msm/mdss/mdss_mdp.h
@@ -194,6 +194,7 @@
struct mdss_mdp_vsync_handler vsync_handler;
struct mdss_mdp_img_rect roi;
+ struct mdss_mdp_img_rect roi_bkup;
u8 roi_changed;
int (*start_fnc) (struct mdss_mdp_ctl *ctl);
@@ -695,7 +696,7 @@
void mdss_mdp_set_roi(struct mdss_mdp_ctl *ctl,
struct mdp_display_commit *data);
-int mdss_mdp_wb_set_format(struct msm_fb_data_type *mfd, int dst_format);
+int mdss_mdp_wb_set_format(struct msm_fb_data_type *mfd, u32 dst_format);
int mdss_mdp_wb_get_format(struct msm_fb_data_type *mfd,
struct mdp_mixer_cfg *mixer_cfg);
diff --git a/drivers/video/msm/mdss/mdss_mdp_ctl.c b/drivers/video/msm/mdss/mdss_mdp_ctl.c
index 96e9bc7..92c787b 100644
--- a/drivers/video/msm/mdss/mdss_mdp_ctl.c
+++ b/drivers/video/msm/mdss/mdss_mdp_ctl.c
@@ -22,7 +22,9 @@
#include "mdss_fb.h"
#include "mdss_mdp.h"
+#include "mdss_debug.h"
+static void mdss_mdp_xlog_mixer_reg(struct mdss_mdp_ctl *ctl);
static inline u64 fudge_factor(u64 val, u32 numer, u32 denom)
{
u64 result = (val * (u64)numer);
@@ -2500,6 +2502,9 @@
if (ctl->wait_pingpong)
ctl->wait_pingpong(ctl, NULL);
+ ctl->roi_bkup.w = ctl->roi.w;
+ ctl->roi_bkup.h = ctl->roi.h;
+
if (ctl->mfd && ctl->mfd->dcm_state != DTM_ENTER)
/* postprocessing setup, including dspp */
mdss_mdp_pp_setup_locked(ctl);
@@ -2512,6 +2517,8 @@
wmb();
ctl->flush_bits = 0;
+ mdss_mdp_xlog_mixer_reg(ctl);
+
if (ctl->display_fnc)
ret = ctl->display_fnc(ctl, arg); /* kickoff */
if (ret)
@@ -2677,3 +2684,18 @@
return rc;
}
+
+static void mdss_mdp_xlog_mixer_reg(struct mdss_mdp_ctl *ctl)
+{
+ int i, off;
+ u32 data[MDSS_MDP_INTF_MAX_LAYERMIXER];
+
+ for (i = 0; i < MDSS_MDP_INTF_MAX_LAYERMIXER; i++) {
+ off = MDSS_MDP_REG_CTL_LAYER(i);
+ data[i] = mdss_mdp_ctl_read(ctl, off);
+ }
+ MDSS_XLOG(data[MDSS_MDP_INTF_LAYERMIXER0],
+ data[MDSS_MDP_INTF_LAYERMIXER1],
+ data[MDSS_MDP_INTF_LAYERMIXER2],
+ data[MDSS_MDP_INTF_LAYERMIXER3], off);
+}
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c b/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
index 96da27e..58e8762 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
@@ -15,6 +15,7 @@
#include "mdss_mdp.h"
#include "mdss_panel.h"
+#include "mdss_debug.h"
#define VSYNC_EXPIRE_TICK 4
@@ -205,6 +206,8 @@
return;
mutex_lock(&ctx->clk_mtx);
+ MDSS_XLOG(ctx->pp_num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
if (!ctx->clk_enabled) {
ctx->clk_enabled = 1;
if (cancel_delayed_work_sync(&ctx->ulps_work))
@@ -240,6 +243,8 @@
int set_clk_off = 0;
mutex_lock(&ctx->clk_mtx);
+ MDSS_XLOG(ctx->pp_num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
spin_lock_irqsave(&ctx->clk_lock, flags);
if (!ctx->rdptr_enabled)
set_clk_off = 1;
@@ -273,6 +278,8 @@
vsync_time = ktime_get();
ctl->vsync_cnt++;
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
spin_lock(&ctx->clk_lock);
list_for_each_entry(tmp, &ctx->vsync_handlers, list) {
@@ -346,6 +353,8 @@
mdss_mdp_irq_disable_nosync(MDSS_MDP_IRQ_PING_PONG_COMP, ctx->pp_num);
complete_all(&ctx->pp_comp);
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
if (ctx->koff_cnt) {
atomic_inc(&ctx->pp_done_cnt);
@@ -436,6 +445,9 @@
return -ENODEV;
}
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
+
spin_lock_irqsave(&ctx->clk_lock, flags);
if (!handle->enabled) {
handle->enabled = true;
@@ -465,6 +477,9 @@
return -ENODEV;
}
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled, 0x88888);
+
spin_lock_irqsave(&ctx->clk_lock, flags);
if (handle->enabled) {
handle->enabled = false;
@@ -498,6 +513,7 @@
static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl *ctl, void *arg)
{
struct mdss_mdp_cmd_ctx *ctx;
+ struct mdss_panel_data *pdata;
unsigned long flags;
int need_wait = 0;
int rc = 0;
@@ -508,11 +524,20 @@
return -ENODEV;
}
+ pdata = ctl->panel_data;
+
spin_lock_irqsave(&ctx->clk_lock, flags);
if (ctx->koff_cnt > 0)
need_wait = 1;
spin_unlock_irqrestore(&ctx->clk_lock, flags);
+ ctl->roi_bkup.w = ctl->width;
+ ctl->roi_bkup.h = ctl->height;
+
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled, ctl->roi_bkup.w,
+ ctl->roi_bkup.h);
+
pr_debug("%s: need_wait=%d intf_num=%d ctx=%p\n",
__func__, need_wait, ctl->intf_num, ctx);
@@ -523,6 +548,9 @@
if (rc <= 0) {
WARN(1, "cmd kickoff timed out (%d) ctl=%d\n",
rc, ctl->num);
+ mdss_dsi_debug_check_te(pdata);
+ MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
+ "edp", "hdmi", "panic");
rc = -EPERM;
mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_TIMEOUT);
} else {
@@ -530,6 +558,8 @@
}
}
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled, rc);
return rc;
}
@@ -571,6 +601,9 @@
WARN(rc, "intf %d panel on error (%d)\n", ctl->intf_num, rc);
}
+ MDSS_XLOG(ctl->num, ctl->roi.x, ctl->roi.y, ctl->roi.w,
+ ctl->roi.h);
+
spin_lock_irqsave(&ctx->clk_lock, flags);
ctx->koff_cnt++;
spin_unlock_irqrestore(&ctx->clk_lock, flags);
@@ -588,6 +621,8 @@
mdss_mdp_irq_enable(MDSS_MDP_IRQ_PING_PONG_COMP, ctx->pp_num);
mdss_mdp_ctl_write(ctl, MDSS_MDP_REG_CTL_START, 1);
mb();
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
return 0;
}
@@ -609,6 +644,8 @@
list_for_each_entry_safe(handle, tmp, &ctx->vsync_handlers, list)
mdss_mdp_cmd_remove_vsync_handler(ctl, handle);
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled, XLOG_FUNC_ENTRY);
spin_lock_irqsave(&ctx->clk_lock, flags);
if (ctx->rdptr_enabled) {
@@ -668,6 +705,8 @@
ctl->add_vsync_handler = NULL;
ctl->remove_vsync_handler = NULL;
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled, XLOG_FUNC_EXIT);
pr_debug("%s:-\n", __func__);
return 0;
@@ -722,6 +761,8 @@
pr_debug("%s: ctx=%p num=%d mixer=%d\n", __func__,
ctx, ctx->pp_num, mixer->num);
+ MDSS_XLOG(ctl->num, ctx->koff_cnt, ctx->clk_enabled,
+ ctx->rdptr_enabled);
mdss_mdp_set_intr_callback(MDSS_MDP_IRQ_PING_PONG_RD_PTR, ctx->pp_num,
mdss_mdp_cmd_readptr_done, ctl);
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
index f8bdc04..4c1de32 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
@@ -22,6 +22,7 @@
#include "mdss_fb.h"
#include "mdss_mdp.h"
#include "mdss_panel.h"
+#include "mdss_debug.h"
/* wait for at least 2 vsyncs for lowest refresh rate (24hz) */
#define VSYNC_TIMEOUT_US 100000
@@ -256,6 +257,8 @@
goto exit;
}
+ MDSS_XLOG(ctl->num, ctl->vsync_cnt, handle->enabled);
+
spin_lock_irqsave(&ctx->vsync_lock, flags);
if (!handle->enabled) {
handle->enabled = true;
@@ -282,6 +285,8 @@
return -ENODEV;
}
+ MDSS_XLOG(ctl->num, ctl->vsync_cnt, handle->enabled);
+
spin_lock_irqsave(&ctx->vsync_lock, flags);
if (handle->enabled) {
handle->enabled = false;
@@ -309,7 +314,7 @@
pr_err("invalid ctx for ctl=%d\n", ctl->num);
return -ENODEV;
}
-
+ MDSS_XLOG(ctl->num, ctl->vsync_cnt);
if (ctx->timegen_en) {
rc = mdss_mdp_ctl_intf_event(ctl, MDSS_EVENT_BLANK, NULL);
if (rc == -EBUSY) {
@@ -372,6 +377,8 @@
vsync_time = ktime_get();
ctl->vsync_cnt++;
+ MDSS_XLOG(ctl->num, ctl->vsync_cnt, ctl->vsync_cnt);
+
pr_debug("intr ctl=%d vsync cnt=%u vsync_time=%d\n",
ctl->num, ctl->vsync_cnt, (int)ktime_to_ms(vsync_time));
@@ -401,6 +408,7 @@
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
if (rc == 0) {
+ MDSS_XLOG(ctl->num, ctl->vsync_cnt);
pr_debug("vsync poll successful! rc=%d status=0x%x\n",
rc, status);
ctx->poll_cnt++;
@@ -467,6 +475,8 @@
return;
ctl->underrun_cnt++;
+ MDSS_XLOG(ctl->num, ctl->underrun_cnt);
+ MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1", "edp", "hdmi", "panic");
pr_debug("display underrun detected for ctl=%d count=%d\n", ctl->num,
ctl->underrun_cnt);
}
@@ -640,9 +650,6 @@
return rc;
}
-
-
-
static int mdss_mdp_video_display(struct mdss_mdp_ctl *ctl, void *arg)
{
struct mdss_mdp_video_ctx *ctx;
@@ -665,6 +672,8 @@
WARN(1, "commit without wait! ctl=%d", ctl->num);
}
+ MDSS_XLOG(ctl->num, ctl->underrun_cnt);
+
if (!ctx->timegen_en) {
rc = mdss_mdp_ctl_intf_event(ctl, MDSS_EVENT_UNBLANK, NULL);
if (rc) {
@@ -783,6 +792,7 @@
return -EINVAL;
}
+ MDSS_XLOG(ctl->num, ctl->vsync_cnt);
pr_debug("start ctl=%u\n", ctl->num);
ctl->priv_data = ctx;
diff --git a/drivers/video/msm/mdss/mdss_mdp_pp.c b/drivers/video/msm/mdss/mdss_mdp_pp.c
index 96f9c06..8c2cc74 100644
--- a/drivers/video/msm/mdss/mdss_mdp_pp.c
+++ b/drivers/video/msm/mdss/mdss_mdp_pp.c
@@ -4823,6 +4823,7 @@
if ((unsigned int)addr % 4) {
ret = 0;
} else if (ptr == (mdss_res->mdp_base + MDSS_MDP_REG_HW_VERSION) ||
+ ptr == (mdss_res->mdp_base + MDSS_REG_HW_VERSION) ||
ptr == (mdss_res->mdp_base + MDSS_MDP_REG_DISP_INTF_SEL)) {
ret = MDP_PP_OPS_READ;
/* IGC DSPP range */
diff --git a/drivers/video/msm/mdss/mdss_mdp_wb.c b/drivers/video/msm/mdss/mdss_mdp_wb.c
index 454183d..aa17472 100644
--- a/drivers/video/msm/mdss/mdss_mdp_wb.c
+++ b/drivers/video/msm/mdss/mdss_mdp_wb.c
@@ -671,77 +671,30 @@
int mdss_mdp_wb_get_format(struct msm_fb_data_type *mfd,
struct mdp_mixer_cfg *mixer_cfg)
{
- int dst_format;
struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
if (!ctl) {
pr_err("No panel data!\n");
return -EINVAL;
+ } else {
+ mixer_cfg->writeback_format = ctl->dst_format;
}
- switch (ctl->dst_format) {
- case MDP_RGB_888:
- dst_format = WB_FORMAT_RGB_888;
- break;
- case MDP_RGB_565:
- dst_format = WB_FORMAT_RGB_565;
- break;
- case MDP_XRGB_8888:
- dst_format = WB_FORMAT_xRGB_8888;
- break;
- case MDP_ARGB_8888:
- dst_format = WB_FORMAT_ARGB_8888;
- break;
- case MDP_BGRA_8888:
- dst_format = WB_FORMAT_BGRA_8888;
- break;
- case MDP_BGRX_8888:
- dst_format = WB_FORMAT_BGRX_8888;
- break;
- case MDP_Y_CBCR_H2V2_VENUS:
- dst_format = WB_FORMAT_NV12;
- break;
- default:
- return -EINVAL;
- }
- mixer_cfg->writeback_format = dst_format;
return 0;
}
-int mdss_mdp_wb_set_format(struct msm_fb_data_type *mfd, int dst_format)
+int mdss_mdp_wb_set_format(struct msm_fb_data_type *mfd, u32 dst_format)
{
struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
if (!ctl) {
pr_err("No panel data!\n");
return -EINVAL;
- }
-
- switch (dst_format) {
- case WB_FORMAT_RGB_888:
- ctl->dst_format = MDP_RGB_888;
- break;
- case WB_FORMAT_RGB_565:
- ctl->dst_format = MDP_RGB_565;
- break;
- case WB_FORMAT_xRGB_8888:
- ctl->dst_format = MDP_XRGB_8888;
- break;
- case WB_FORMAT_ARGB_8888:
- ctl->dst_format = MDP_ARGB_8888;
- break;
- case WB_FORMAT_BGRA_8888:
- ctl->dst_format = MDP_BGRA_8888;
- break;
- case WB_FORMAT_BGRX_8888:
- ctl->dst_format = MDP_BGRX_8888;
- break;
- case WB_FORMAT_NV12:
- ctl->dst_format = MDP_Y_CBCR_H2V2_VENUS;
- break;
- default:
- pr_err("wfd format not supported\n");
+ } else if (dst_format >= MDP_IMGTYPE_LIMIT2) {
+ pr_err("Invalid dst format=%u\n", dst_format);
return -EINVAL;
+ } else {
+ ctl->dst_format = dst_format;
}
pr_debug("wfd format %d\n", ctl->dst_format);
diff --git a/include/linux/batterydata-lib.h b/include/linux/batterydata-lib.h
index ff38eb6..f556236 100644
--- a/include/linux/batterydata-lib.h
+++ b/include/linux/batterydata-lib.h
@@ -27,6 +27,7 @@
#define MAX_SINGLE_LUT_COLS 20
#define MAX_BATT_ID_NUM 4
+#define DEGC_SCALE 10
struct single_row_lut {
int x[MAX_SINGLE_LUT_COLS];
diff --git a/include/linux/usb/android.h b/include/linux/usb/android.h
index 8d5e51b..4accfa0 100644
--- a/include/linux/usb/android.h
+++ b/include/linux/usb/android.h
@@ -29,6 +29,7 @@
bool internal_ums;
char streaming_func[MAX_STREAMING_FUNCS][FUNC_NAME_LEN];
int streaming_func_count;
+ u32 uicc_nluns;
};
#ifndef CONFIG_TARGET_CORE
diff --git a/include/trace/events/exception.h b/include/trace/events/exception.h
index 110e920..69dbf7c 100644
--- a/include/trace/events/exception.h
+++ b/include/trace/events/exception.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -63,6 +63,27 @@
TP_printk("pc:%p", __entry->prog_cnt)
);
+TRACE_EVENT(unhandled_abort,
+
+ TP_PROTO(struct pt_regs *regs, unsigned long addr, unsigned int fsr),
+
+ TP_ARGS(regs, addr, fsr),
+
+ TP_STRUCT__entry(
+ __field(struct pt_regs *, regs)
+ __field(unsigned long, addr)
+ __field(unsigned int, fsr)
+ ),
+
+ TP_fast_assign(
+ __entry->regs = regs;
+ __entry->addr = addr;
+ __entry->fsr = fsr;
+ ),
+
+ TP_printk("addr:%lu, fsr:%u", __entry->addr, __entry->fsr)
+);
+
#endif
#include <trace/define_trace.h>
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 78aa256..1924758 100755
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -302,6 +302,11 @@
return true;
}
+static bool is_cfg80211_regdom_intersected(void)
+{
+ return is_intersected_alpha2(cfg80211_regdomain->alpha2);
+}
+
static int reg_copy_regd(const struct ieee80211_regdomain **dst_regd,
const struct ieee80211_regdomain *src_regd)
{
@@ -1381,11 +1386,15 @@
* Process user requests only after previous user/driver/core
* requests have been processed
*/
- if (last_request->initiator == NL80211_REGDOM_SET_BY_CORE ||
- last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
- last_request->initiator == NL80211_REGDOM_SET_BY_USER) {
- if (regdom_changes(last_request->alpha2))
+ if ((last_request->initiator == NL80211_REGDOM_SET_BY_CORE ||
+ last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
+ last_request->initiator == NL80211_REGDOM_SET_BY_USER)) {
+ if (last_request->intersect) {
+ if (!is_cfg80211_regdom_intersected())
+ return -EAGAIN;
+ } else if (regdom_changes(last_request->alpha2)) {
return -EAGAIN;
+ }
}
if (!regdom_changes(pending_request->alpha2))
diff --git a/sound/soc/codecs/msm8x10-wcd.c b/sound/soc/codecs/msm8x10-wcd.c
index 2286e34..a5e0bb3 100644
--- a/sound/soc/codecs/msm8x10-wcd.c
+++ b/sound/soc/codecs/msm8x10-wcd.c
@@ -3151,9 +3151,25 @@
return 0;
}
+static const struct wcd9xxx_mbhc_intr cdc_intr_ids = {
+ .poll_plug_rem = MSM8X10_WCD_IRQ_MBHC_REMOVAL,
+ .shortavg_complete = MSM8X10_WCD_IRQ_MBHC_SHORT_TERM,
+ .potential_button_press = MSM8X10_WCD_IRQ_MBHC_PRESS,
+ .button_release = MSM8X10_WCD_IRQ_MBHC_RELEASE,
+ .dce_est_complete = MSM8X10_WCD_IRQ_MBHC_POTENTIAL,
+ .insertion = MSM8X10_WCD_IRQ_MBHC_INSERTION,
+ .hph_left_ocp = MSM8X10_WCD_IRQ_HPH_PA_OCPL_FAULT,
+ .hph_right_ocp = MSM8X10_WCD_IRQ_HPH_PA_OCPR_FAULT,
+ .hs_jack_switch = MSM8X10_WCD_IRQ_MBHC_HS_DET,
+};
+
static int msm8x10_wcd_device_up(struct snd_soc_codec *codec)
{
- dev_dbg(codec->dev, "%s: device up!\n", __func__);
+ int ret = 0;
+ struct msm8x10_wcd_priv *msm8x10_wcd_priv =
+ snd_soc_codec_get_drvdata(codec);
+
+ dev_err(codec->dev, "%s: device up!\n", __func__);
snd_soc_card_change_online_state(codec->card, 1);
/* delay is required to make sure sound card state updated */
@@ -3162,9 +3178,27 @@
mutex_lock(&codec->mutex);
msm8x10_wcd_bringup(codec);
- msm8x10_wcd_codec_init_reg(codec);
+
msm8x10_wcd_update_reg_defaults(codec);
+ msm8x10_wcd_codec_init_reg(codec);
+
+ wcd9xxx_resmgr_post_ssr(&msm8x10_wcd_priv->resmgr);
+
+ wcd9xxx_mbhc_deinit(&msm8x10_wcd_priv->mbhc);
+
+ ret = wcd9xxx_mbhc_init(&msm8x10_wcd_priv->mbhc,
+ &msm8x10_wcd_priv->resmgr,
+ codec, msm8x10_wcd_enable_mbhc_micbias,
+ &mbhc_cb, &cdc_intr_ids,
+ HELICON_MCLK_CLK_9P6MHZ, true);
+ if (ret)
+ dev_err(codec->dev, "%s: Failed to initialize mbhc\n",
+ __func__);
+ else
+ wcd9xxx_mbhc_start(&msm8x10_wcd_priv->mbhc,
+ msm8x10_wcd_priv->mbhc.mbhc_cfg);
+
mutex_unlock(&codec->mutex);
return 0;
@@ -3203,18 +3237,6 @@
.priority = -INT_MAX,
};
-static const struct wcd9xxx_mbhc_intr cdc_intr_ids = {
- .poll_plug_rem = MSM8X10_WCD_IRQ_MBHC_REMOVAL,
- .shortavg_complete = MSM8X10_WCD_IRQ_MBHC_SHORT_TERM,
- .potential_button_press = MSM8X10_WCD_IRQ_MBHC_PRESS,
- .button_release = MSM8X10_WCD_IRQ_MBHC_RELEASE,
- .dce_est_complete = MSM8X10_WCD_IRQ_MBHC_POTENTIAL,
- .insertion = MSM8X10_WCD_IRQ_MBHC_INSERTION,
- .hph_left_ocp = MSM8X10_WCD_IRQ_HPH_PA_OCPL_FAULT,
- .hph_right_ocp = MSM8X10_WCD_IRQ_HPH_PA_OCPR_FAULT,
- .hs_jack_switch = MSM8X10_WCD_IRQ_MBHC_HS_DET,
-};
-
static int msm8x10_wcd_handle_pdata(struct snd_soc_codec *codec,
struct msm8x10_wcd_pdata *pdata)
{
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index 157d63a..077dbe3 100644
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@ -104,6 +104,10 @@
static const DECLARE_TLV_DB_LINEAR(fm_rx_vol_gain, 0,
INT_RX_VOL_MAX_STEPS);
+static int msm_route_hfp_vol_control;
+static const DECLARE_TLV_DB_LINEAR(hfp_rx_vol_gain, 0,
+ INT_RX_VOL_MAX_STEPS);
+
static int msm_route_multimedia2_vol_control;
static const DECLARE_TLV_DB_LINEAR(multimedia2_rx_vol_gain, 0,
INT_RX_VOL_MAX_STEPS);
@@ -1095,6 +1099,23 @@
return 0;
}
+static int msm_routing_get_hfp_vol_mixer(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ ucontrol->value.integer.value[0] = msm_route_hfp_vol_control;
+ return 0;
+}
+
+static int msm_routing_set_hfp_vol_mixer(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ afe_loopback_gain(INT_BT_SCO_TX , ucontrol->value.integer.value[0]);
+
+ msm_route_hfp_vol_control = ucontrol->value.integer.value[0];
+
+ return 0;
+}
+
static int msm_routing_get_multimedia2_vol_mixer(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -2757,6 +2778,12 @@
msm_routing_set_fm_vol_mixer, fm_rx_vol_gain),
};
+static const struct snd_kcontrol_new int_hfp_vol_mixer_controls[] = {
+ SOC_SINGLE_EXT_TLV("Internal HFP RX Volume", SND_SOC_NOPM, 0,
+ INT_RX_VOL_GAIN, 0, msm_routing_get_hfp_vol_mixer,
+ msm_routing_set_hfp_vol_mixer, hfp_rx_vol_gain),
+};
+
static const struct snd_kcontrol_new multimedia2_vol_mixer_controls[] = {
SOC_SINGLE_EXT_TLV("HIFI2 RX Volume", SND_SOC_NOPM, 0,
INT_RX_VOL_GAIN, 0, msm_routing_get_multimedia2_vol_mixer,
@@ -4329,6 +4356,10 @@
ARRAY_SIZE(int_fm_vol_mixer_controls));
snd_soc_add_platform_controls(platform,
+ int_hfp_vol_mixer_controls,
+ ARRAY_SIZE(int_hfp_vol_mixer_controls));
+
+ snd_soc_add_platform_controls(platform,
eq_enable_mixer_controls,
ARRAY_SIZE(eq_enable_mixer_controls));