Merge "net: ipv6: ping: Use socket mark in routing lookup"
diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt
index d62d0c6..019b476 100644
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
@@ -76,3 +76,28 @@
buffering, no pre-fetching). This has severe performance penalties and
should not be used for general purpose DMA allocations. It should only
be used if one of the restrictions on strongly ordered memory is required.
+
+DMA_ATTR_SKIP_CPU_SYNC
+----------------------
+
+By default dma_map_{single,page,sg} functions family transfer a given
+buffer from CPU domain to device domain. Some advanced use cases might
+require sharing a buffer between more than one device. This requires
+having a mapping created separately for each device and is usually
+performed by calling dma_map_{single,page,sg} function more than once
+for the given buffer with device pointer to each device taking part in
+the buffer sharing. The first call transfers a buffer from 'CPU' domain
+to 'device' domain, what synchronizes CPU caches for the given region
+(usually it means that the cache has been flushed or invalidated
+depending on the dma direction). However, next calls to
+dma_map_{single,page,sg}() for other devices will perform exactly the
+same sychronization operation on the CPU cache. CPU cache sychronization
+might be a time consuming operation, especially if the buffers are
+large, so it is highly recommended to avoid it if possible.
+DMA_ATTR_SKIP_CPU_SYNC allows platform code to skip synchronization of
+the CPU cache for the given buffer assuming that it has been already
+transferred to 'device' domain. This attribute can be also used for
+dma_unmap_{single,page,sg} functions family to force buffer to stay in
+device domain after releasing a mapping for it. Use this attribute with
+care!
+
diff --git a/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt b/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
index afbae5e..31e0b6b 100644
--- a/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
+++ b/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
@@ -302,6 +302,28 @@
- qcom,cmd-to-video-mode-switch-commands: List of commands that need to be sent
to panel in order to switch from command mode to video mode dynamically.
Refer to "qcom,mdss-dsi-on-command" section for adding commands.
+- qcom,esd-check-enabled: Boolean used to enable ESD recovery feature.
+- qcom,mdss-dsi-panel-status-command: A byte stream formed by multiple dcs packets based on
+ qcom dsi controller protocol, to read the panel status.
+ This value is used to kick in the ESD recovery.
+ byte 0: dcs data type
+ byte 1: set to indicate this is an individual packet
+ (no chain)
+ byte 2: virtual channel number
+ byte 3: expect ack from client (dcs read command)
+ byte 4: wait number of specified ms after dcs command
+ transmitted
+ byte 5, 6: 16 bits length in network byte order
+ byte 7 and beyond: number byte of payload
+- qcom,mdss-dsi-panel-status-command-mode:
+ String that specifies the ctrl state for reading the panel status.
+ "dsi_lp_mode" = DSI low power mode
+ "dsi_hs_mode" = DSI high speed mode
+- qcom,mdss-dsi-panel-status-check-mode:Specifies the panel status check method for ESD recovery.
+ "bta_check" = Uses BTA to check the panel status
+ "reg_read" = Reads panel status register to check the panel status
+- qcom,mdss-dsi-panel-status-value: Specifies the value of the panel status register when the panel is
+ in good state.
Note, if a given optional qcom,* binding is not present, then the driver will configure
the default values specified.
@@ -412,5 +434,10 @@
qcom,video-to-cmd-mode-switch-commands = [15 01 00 00 00 00 02 C2 0B
15 01 00 00 00 00 02 C2 08];
qcom,cmd-to-video-mode-switch-commands = [15 01 00 00 00 00 02 C2 03];
+ qcom,esd-check-enabled;
+ qcom,mdss-dsi-panel-status-command = [06 01 00 01 05 00 02 0A 08];
+ qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode";
+ qcom,mdss-dsi-panel-status-check-mode = "reg_read";
+ qcom,mdss-dsi-panel-status-value = <0x9c>;
};
};
diff --git a/Documentation/devicetree/bindings/hwmon/qpnp-adc-current.txt b/Documentation/devicetree/bindings/hwmon/qpnp-adc-current.txt
index 3e6d060..9bc44f5 100644
--- a/Documentation/devicetree/bindings/hwmon/qpnp-adc-current.txt
+++ b/Documentation/devicetree/bindings/hwmon/qpnp-adc-current.txt
@@ -58,43 +58,6 @@
1 : 1K
2 : 2K
3 : 4K
-- qcom,pre-div-channel-scaling : Pre-div used for the channel before the signal
- is being measured.
-- qcom,calibration-type : Calibration point values vary with temperature.
- For improved accuracy fresh gain and offset point values
- can be used for calibration. Reading fresh values for ever
- read affects the reading time. Application can use the historic
- values used from the trim register values.
- Select from the following strings.
- "absolute" : Uses TRIM gain and offset values for calibration.
- "ratiometric" : Calculate the gain and offset calibration value when an ADC
- request is issued.
-- qcom,scale-function : Scaling fuction used to convert raw ADC code to units specific to
- a given channel.
- Select from the following unsigned int.
- 0 : Default scaling to convert raw adc code to voltage.
- 1 : Conversion to temperature based on btm parameters.
- 2 : Returns result in milli degree's Centigrade.
- 3 : Returns current across 0.1 ohm resistor.
- 4 : Returns XO thermistor voltage in degree's Centigrade.
-- qcom,hw-settle-time : Settling period for the channel before ADC read.
- Select from the following unsigned int.
- 0 : 0us
- 1 : 100us
- 2 : 200us
- 3 : 300us
- 4 : 400us
- 5 : 500us
- 6 : 600us
- 7 : 700us
- 8 : 800us
- 9 : 900us
- 0xa : 1ms
- 0xb : 2ms
- 0xc : 4ms
- 0xd : 6ms
- 0xe : 8ms
- 0xf : 10ms
- qcom,fast-avg-setup : Average number of samples to be used for measurement. Fast averaging
provides the option to obtain a single measurement from the ADC that
is an average of multiple samples. The value selected is 2^(value)
@@ -130,10 +93,6 @@
label = "rsense";
reg = <0>;
qcom,decimation = <0>;
- qcom,pre-div-channel-scaling = <20>;
- qcom,calibration-type = "fresh";
- qcom,scale-function = <0>;
- qcom,hw-settle-time = <0>;
qcom,fast-avg-setup = <0>;
};
};
diff --git a/Documentation/devicetree/bindings/leds/leds-qpnp.txt b/Documentation/devicetree/bindings/leds/leds-qpnp.txt
index 1aca300..8c91db0 100644
--- a/Documentation/devicetree/bindings/leds/leds-qpnp.txt
+++ b/Documentation/devicetree/bindings/leds/leds-qpnp.txt
@@ -19,6 +19,9 @@
- qcom,max-current : maximum current that the LED can sustain in mA
- linux,name : name of the led that is used in led framework
+Optional properties for each child node, WLED, Flash, MPP, RGB and KPDBL:
+- qcom,in-order-command-processing : specify if user space requests leds in order
+
WLED is primarily used as display backlight. Display subsystem uses
LED triggers for WLED to control the brightness as needed.
@@ -48,6 +51,7 @@
- qcom,torch-enable: set flash led to torch mode functionality and triggers software workaround for torch if hardware does not support
- flash-boost-supply: SMBB regulator for LED flash mode
- torch-boost-supply: SMBB regulator for LED torch mode
+- flash-wa-supply: SMBB regulator for flash workarounds.
RGB Led is a tri-colored led, Red, Blue & Green.
@@ -117,6 +121,7 @@
for vph_pwr.
- qcom,row-src-en: specify to enable row source
- qcom,always-on: specify if the module has to be always on
+- qcom,use-blink: Use blink sysfs entry for switching into lpg mode. For optimal use, set default mode to pwm. All required lpg parameters must be supplied.
Required properties for PWM mode only:
- qcom,pwm-channel: pwm channel the led will operate on
diff --git a/Documentation/devicetree/bindings/power/qpnp-charger.txt b/Documentation/devicetree/bindings/power/qpnp-charger.txt
index ff89757..c21d8fe 100644
--- a/Documentation/devicetree/bindings/power/qpnp-charger.txt
+++ b/Documentation/devicetree/bindings/power/qpnp-charger.txt
@@ -210,6 +210,10 @@
qcom,batfet:
- regulator-name: A string used as a descriptive name
for the batfet regulator.
+
+ qcom,chgr:
+ - regulator-name: A string used as a descriptive name
+ for the flash workarounds regulator.
Example:
pm8941-chg {
spmi-dev-container;
diff --git a/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt b/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
index 8eb9b64..2cb528c 100644
--- a/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
+++ b/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt
@@ -27,6 +27,10 @@
should be performed during boot up.
- qcom,wlan-rx-buff-count: WLAN RX buffer count is a configurable value,
using a smaller count for this buffer will reduce the memory usage.
+=======
+- qcom,is-pronto-v3: boolean flag to determine the pronto hardware version
+in use. subsequently correct workqueue will be used by DXE engine to push frames
+in TX data path.
- qcom,wcnss-pm : <Core rail LDO#, PA rail LDO#, XO settling time,
RPM power collapse enabled, standalone power collapse enabled>
Power manager related parameter for LDO configuration.
diff --git a/arch/arm/boot/dts/dsi-panel-nt35590-720p-cmd.dtsi b/arch/arm/boot/dts/dsi-panel-nt35590-720p-cmd.dtsi
index cbc38f2..996fcae 100644
--- a/arch/arm/boot/dts/dsi-panel-nt35590-720p-cmd.dtsi
+++ b/arch/arm/boot/dts/dsi-panel-nt35590-720p-cmd.dtsi
@@ -508,6 +508,7 @@
05 01 00 00 78 00 02 10 00];
qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
+ qcom,mdss-dsi-panel-status-check-mode = "bta_check";
qcom,mdss-dsi-h-sync-pulse = <1>;
qcom,mdss-dsi-traffic-mode = "burst_mode";
qcom,mdss-dsi-bllp-eof-power-mode;
diff --git a/arch/arm/boot/dts/dsi-panel-nt35590-720p-video.dtsi b/arch/arm/boot/dts/dsi-panel-nt35590-720p-video.dtsi
index bab1735..b5189d4 100644
--- a/arch/arm/boot/dts/dsi-panel-nt35590-720p-video.dtsi
+++ b/arch/arm/boot/dts/dsi-panel-nt35590-720p-video.dtsi
@@ -511,6 +511,7 @@
05 01 00 00 78 00 02 10 00];
qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
qcom,mdss-dsi-off-command-state = "dsi_hs_mode";
+ qcom,mdss-dsi-panel-status-check-mode = "bta_check";
qcom,dynamic-mode-switch-enabled;
qcom,video-to-cmd-mode-switch-commands = [15 01 00 00 14 00 02 C2 0B
15 01 00 00 00 00 02 C2 08];
diff --git a/arch/arm/boot/dts/msm-pm8110.dtsi b/arch/arm/boot/dts/msm-pm8110.dtsi
index 5ccecfa..39b29bb 100644
--- a/arch/arm/boot/dts/msm-pm8110.dtsi
+++ b/arch/arm/boot/dts/msm-pm8110.dtsi
@@ -39,7 +39,11 @@
qcom,pon_1 {
qcom,pon-type = <0>;
+ qcom,support-reset = <1>;
qcom,pull-up = <1>;
+ qcom,s1-timer = <10256>;
+ qcom,s2-timer = <2000>;
+ qcom,s2-type = <1>;
linux,code = <116>;
};
@@ -275,10 +279,6 @@
label = "internal_rsense";
reg = <0>;
qcom,decimation = <0>;
- qcom,pre-div-channel-scaling = <1>;
- qcom,calibration-type = "absolute";
- qcom,scale-function = <0>;
- qcom,hw-settle-time = <0>;
qcom,fast-avg-setup = <0>;
};
};
diff --git a/arch/arm/boot/dts/msm-pm8226.dtsi b/arch/arm/boot/dts/msm-pm8226.dtsi
index 6e1b985..15c6680 100644
--- a/arch/arm/boot/dts/msm-pm8226.dtsi
+++ b/arch/arm/boot/dts/msm-pm8226.dtsi
@@ -43,7 +43,11 @@
qcom,pon_1 {
qcom,pon-type = <0>;
+ qcom,support-reset = <1>;
qcom,pull-up = <1>;
+ qcom,s1-timer = <10256>;
+ qcom,s2-timer = <2000>;
+ qcom,s2-type = <1>;
linux,code = <116>;
};
@@ -91,7 +95,7 @@
qcom,cool-bat-mv = <4100>;
qcom,ibatmax-cool-ma = <350>;
- qcom,chgr@1000 {
+ pm8226_chg_chgr: qcom,chgr@1000 {
status = "disabled";
reg = <0x1000 0x100>;
interrupts = <0x0 0x10 0x0>,
@@ -435,20 +439,12 @@
label = "internal_rsense";
reg = <0>;
qcom,decimation = <0>;
- qcom,pre-div-channel-scaling = <1>;
- qcom,calibration-type = "absolute";
- qcom,scale-function = <0>;
- qcom,hw-settle-time = <0>;
qcom,fast-avg-setup = <0>;
};
chan@1 {
label = "external_rsense";
reg = <1>;
qcom,decimation = <0>;
- qcom,pre-div-channel-scaling = <1>;
- qcom,calibration-type = "absolute";
- qcom,scale-function = <0>;
- qcom,hw-settle-time = <0>;
qcom,fast-avg-setup = <0>;
};
};
@@ -852,6 +848,7 @@
reg = <0xd300 0x100>;
label = "flash";
flash-boost-supply = <&pm8226_chg_boost>;
+ flash-wa-supply = <&pm8226_chg_chgr>;
pm8226_flash0: qcom,flash_0 {
qcom,max-current = <1000>;
qcom,default-state = "off";
diff --git a/arch/arm/boot/dts/msm-pm8941.dtsi b/arch/arm/boot/dts/msm-pm8941.dtsi
index d8046c5..34591b8 100644
--- a/arch/arm/boot/dts/msm-pm8941.dtsi
+++ b/arch/arm/boot/dts/msm-pm8941.dtsi
@@ -57,7 +57,11 @@
qcom,pon_1 {
qcom,pon-type = <0>;
+ qcom,support-reset = <1>;
qcom,pull-up = <1>;
+ qcom,s1-timer = <10256>;
+ qcom,s2-timer = <2000>;
+ qcom,s2-type = <1>;
linux,code = <116>;
};
@@ -217,7 +221,7 @@
qcom,chg-adc_tm = <&pm8941_adc_tm>;
qcom,ibat-calibration-enabled;
- qcom,chgr@1000 {
+ pm8941_chg_chgr: qcom,chgr@1000 {
status = "disabled";
reg = <0x1000 0x100>;
interrupts = <0x0 0x10 0x0>,
@@ -835,10 +839,6 @@
label = "internal_rsense";
reg = <0>;
qcom,decimation = <0>;
- qcom,pre-div-channel-scaling = <1>;
- qcom,calibration-type = "absolute";
- qcom,scale-function = <0>;
- qcom,hw-settle-time = <0>;
qcom,fast-avg-setup = <0>;
};
};
@@ -1270,6 +1270,7 @@
label = "flash";
flash-boost-supply = <&pm8941_chg_boost>;
torch-boost-supply = <&pm8941_boost>;
+ flash-wa-supply = <&pm8941_chg_chgr>;
};
qcom,leds@d400 {
diff --git a/arch/arm/boot/dts/msm8226-720p-mtp.dtsi b/arch/arm/boot/dts/msm8226-720p-mtp.dtsi
index b4d9139..3f79fab 100644
--- a/arch/arm/boot/dts/msm8226-720p-mtp.dtsi
+++ b/arch/arm/boot/dts/msm8226-720p-mtp.dtsi
@@ -296,6 +296,7 @@
00 00 00 00 00
00];
qcom,use-blink;
+ qcom,in-order-command-processing;
};
};
@@ -322,6 +323,7 @@
00 00 00 00 00
00];
qcom,use-blink;
+ qcom,in-order-command-processing;
};
};
};
diff --git a/arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi b/arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi
index 05a3f07..a227802 100644
--- a/arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi
+++ b/arch/arm/boot/dts/msm8226-camera-sensor-cdp.dtsi
@@ -38,124 +38,6 @@
qcom,cci-master = <0>;
};
- qcom,camera@6f {
- compatible = "qcom,ov8825";
- reg = <0x6f>;
- qcom,slave-id = <0x6c 0x300a 0x8825>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,actuator-src = <&actuator0>;
- qcom,led-flash-src = <&led_flash0>;
- qcom,mount-angle = <180>;
- qcom,sensor-name = "ov8825";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- cam_vaf-supply = <&pm8226_l15>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-op-mode = <200000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 37 0>,
- <&msmgpio 36 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1f>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- };
-
- qcom,camera@20 {
- compatible = "qcom,imx135";
- reg = <0x20>;
- qcom,slave-id = <0x20 0x0016 0x0135>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,actuator-src = <&actuator1>;
- qcom,mount-angle = <90>;
- qcom,sensor-name = "imx135";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- cam_vaf-supply = <&pm8226_l15>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-op-mode = <200000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 37 0>,
- <&msmgpio 36 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 30000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1F>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <0>;
- qcom,sensor-type = <0>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
- qcom,camera@6d {
- compatible = "qcom,ov9724";
- reg = <0x6d>;
- qcom,slave-id = <0x20 0x0 0x9724>;
- qcom,csiphy-sd-index = <1>;
- qcom,csid-sd-index = <1>;
- qcom,mount-angle = <0>;
- qcom,sensor-name = "ov9724";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
- qcom,cam-vreg-type = <0 1 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-op-mode = <200000 0 80000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 28 0>,
- <&msmgpio 35 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET",
- "CAM_STANDBY";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 4000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x3>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
qcom,camera@90 {
compatible = "qcom,mt9m114";
reg = <0x90 0x0>;
diff --git a/arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi b/arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi
index a6af2c2..6b305a5 100644
--- a/arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi
+++ b/arch/arm/boot/dts/msm8226-camera-sensor-mtp.dtsi
@@ -31,81 +31,6 @@
qcom,cci-master = <0>;
};
- qcom,camera@6f {
- compatible = "qcom,ov8825";
- reg = <0x6f>;
- qcom,slave-id = <0x6c 0x300a 0x8825>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,actuator-src = <&actuator0>;
- qcom,led-flash-src = <&led_flash0>;
- qcom,mount-angle = <270>;
- qcom,sensor-name = "ov8825";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- cam_vaf-supply = <&pm8226_l15>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-op-mode = <200000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 37 0>,
- <&msmgpio 35 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1f>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- };
-
- qcom,camera@6d {
- compatible = "qcom,ov9724";
- reg = <0x6d>;
- qcom,slave-id = <0x20 0x0 0x9724>;
- qcom,csiphy-sd-index = <1>;
- qcom,csid-sd-index = <1>;
- qcom,mount-angle = <270>;
- qcom,sensor-name = "ov9724";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
- qcom,cam-vreg-type = <0 1 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-op-mode = <200000 0 80000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 28 0>,
- <&msmgpio 36 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET",
- "CAM_STANDBY";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 4000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x3>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
qcom,camera@0 {
cell-index = <0>;
compatible = "qcom,camera";
diff --git a/arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi b/arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi
index dab92ff..4115959 100644
--- a/arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi
+++ b/arch/arm/boot/dts/msm8226-camera-sensor-qrd.dtsi
@@ -104,45 +104,6 @@
qcom,cam-power-seq-delay = <1 1 5 5 10>;
};
- qcom,camera@6f {
- compatible = "qcom,ov8825";
- reg = <0x6f>;
- qcom,slave-id = <0x6c 0x300a 0x8825>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,actuator-src = <&actuator0>;
- qcom,led-flash-src = <&led_flash0>;
- qcom,eeprom-src = <&eeprom0>;
- qcom,mount-angle = <90>;
- qcom,sensor-name = "ov8825";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- cam_vaf-supply = <&pm8226_l15>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-op-mode = <200000 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 37 0>,
- <&msmgpio 36 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY";
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1f>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- };
-
actuator1: qcom,actuator@18 {
cell-index = <4>;
reg = <0x18>;
@@ -252,89 +213,6 @@
qcom,cam-power-seq-delay = <1 1 10 10 10 5>;
};
- qcom,camera@6c {
- compatible = "qcom,ov12830";
- reg = <0x6c>;
- qcom,slave-id = <0x20 0x300a 0xc830>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,actuator-src = <&actuator1>;
- qcom,led-flash-src = <&led_flash0>;
- qcom,eeprom-src = <&eeprom1>;
- qcom,mount-angle = <90>;
- qcom,sensor-name = "skuf_ov12830_p12v01c";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- cam_vaf-supply = <&pm8226_l15>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana",
- "cam_vaf";
- qcom,cam-vreg-type = <0 1 0 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000 2800000>;
- qcom,cam-vreg-op-mode = <120000 0 0 80000 100000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 37 0>,
- <&msmgpio 36 0>,
- <&msmgpio 22 0>,
- <&msmgpio 34 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-vdig = <3>;
- qcom,gpio-af-pwdm = <4>;
- qcom,gpio-req-tbl-num = <0 1 2 3 4>;
- qcom,gpio-req-tbl-flags = <1 0 0 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET1",
- "CAM_STANDBY",
- "CAM_VDIG",
- "CAM_AF_PWDM";
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1f>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- };
-
- qcom,camera@6d {
- compatible = "qcom,ov9724";
- reg = <0x6d>;
- qcom,slave-id = <0x20 0x0 0x9724>;
- qcom,csiphy-sd-index = <1>;
- qcom,csid-sd-index = <1>;
- qcom,mount-angle = <270>;
- qcom,sensor-name = "ov9724";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
- qcom,cam-vreg-type = <0 1 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-op-mode = <200000 0 80000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 28 0>,
- <&msmgpio 35 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <1 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET",
- "CAM_STANDBY";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 4000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x3>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
-
eeprom2: qcom,eeprom@6b{
cell-index = <2>;
reg = <0x6b 0x0>;
@@ -401,47 +279,6 @@
qcom,cam-power-seq-delay = <1 1 10 10 10 5>;
};
- qcom,camera@6a {
- compatible = "ovti,ov5648";
- reg = <0x6a>;
- qcom,slave-id = <0x6c 0x300a 0x5648>;
- qcom,csiphy-sd-index = <1>;
- qcom,csid-sd-index = <1>;
- qcom,eeprom-src = <&eeprom2>;
- qcom,mount-angle = <270>;
- qcom,sensor-name = "skuf_ov5648_p5v23c";
- cam_vdig-supply = <&pm8226_l5>;
- cam_vana-supply = <&pm8226_l19>;
- cam_vio-supply = <&pm8226_lvs1>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
- qcom,cam-vreg-type = <0 1 0>;
- qcom,cam-vreg-min-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-max-voltage = <1200000 0 2850000>;
- qcom,cam-vreg-op-mode = <200000 0 80000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 26 0>,
- <&msmgpio 28 0>,
- <&msmgpio 35 0>,
- <&msmgpio 21 0>;
- qcom,gpio-reset = <1>;
- qcom,gpio-standby = <2>;
- qcom,gpio-vdig = <3>;
- qcom,gpio-req-tbl-num = <0 1 2 3>;
- qcom,gpio-req-tbl-flags = <1 0 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK",
- "CAM_RESET",
- "CAM_STANDBY",
- "CAM_VDIG";
- qcom,gpio-set-tbl-num = <1 1>;
- qcom,gpio-set-tbl-flags = <0 2>;
- qcom,gpio-set-tbl-delay = <1000 4000>;
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x3>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <0>;
- status = "ok";
- };
qcom,camera@0 {
cell-index = <0>;
compatible = "qcom,camera";
diff --git a/arch/arm/boot/dts/msm8226-regulator.dtsi b/arch/arm/boot/dts/msm8226-regulator.dtsi
index 78e1a63..6ac7189 100644
--- a/arch/arm/boot/dts/msm8226-regulator.dtsi
+++ b/arch/arm/boot/dts/msm8226-regulator.dtsi
@@ -528,3 +528,7 @@
&pm8226_chg_otg {
regulator-name = "8226_smbbp_otg";
};
+
+&pm8226_chg_chgr {
+ regulator-name = "flash_wa";
+};
diff --git a/arch/arm/boot/dts/msm8974-leds.dtsi b/arch/arm/boot/dts/msm8974-leds.dtsi
index 06abbd8..4be97d8 100644
--- a/arch/arm/boot/dts/msm8974-leds.dtsi
+++ b/arch/arm/boot/dts/msm8974-leds.dtsi
@@ -138,21 +138,31 @@
qcom,row-id = <0>;
qcom,row-src-en;
qcom,always-on;
+ qcom,start-idx = <1>;
+ qcom,ramp-step-ms = <120>;
+ qcom,duty-pcts = [00 00 00 00 64
+ 64 00 00 00 00];
+ qcom,use-blink;
+ qcom,in-order-command-processing;
};
qcom,kpdbl2 {
label = "kpdbl";
- linux,name = "kpdbl-lut-2";
- qcom,mode = "lpg";
+ linux,name = "kpdbl-pwm-2";
+ qcom,mode = "pwm";
qcom,pwm-channel = <9>;
qcom,pwm-us = <1000>;
- qcom,start-idx = <1>;
- qcom,duty-pcts = [00 00 00 00 64
- 64 00 00 00 00];
qcom,id = <7>;
qcom,max-current = <20>;
qcom,row-id = <1>;
qcom,row-src-en;
+ qcom,start-idx = <1>;
+ qcom,ramp-step-ms = <120>;
+ qcom,duty-pcts = [00 00 00 00 64
+ 64 00 00 00 00];
+ qcom,use-blink;
+ qcom,in-order-command-processing;
+
};
qcom,kpdbl3 {
@@ -165,6 +175,13 @@
qcom,max-current = <20>;
qcom,row-id = <2>;
qcom,row-src-en;
+ qcom,start-idx = <1>;
+ qcom,ramp-step-ms = <120>;
+ qcom,duty-pcts = [00 00 00 00 64
+ 64 00 00 00 00];
+ qcom,use-blink;
+ qcom,in-order-command-processing;
+
};
qcom,kpdbl4 {
@@ -177,6 +194,13 @@
qcom,max-current = <20>;
qcom,row-id = <3>;
qcom,row-src-en;
+ qcom,start-idx = <1>;
+ qcom,ramp-step-ms = <120>;
+ qcom,duty-pcts = [00 00 00 00 64
+ 64 00 00 00 00];
+ qcom,use-blink;
+ qcom,in-order-command-processing;
+
};
};
};
diff --git a/arch/arm/boot/dts/msm8974-regulator.dtsi b/arch/arm/boot/dts/msm8974-regulator.dtsi
index 45b716a..254a779 100644
--- a/arch/arm/boot/dts/msm8974-regulator.dtsi
+++ b/arch/arm/boot/dts/msm8974-regulator.dtsi
@@ -569,3 +569,7 @@
&pm8941_chg_otg {
regulator-name = "8941_smbb_otg";
};
+
+&pm8941_chg_chgr {
+ regulator-name = "flash_wa";
+};
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index 99dbec8..495117f 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -214,7 +214,7 @@
interrupts = <0 44 0>;
vdd-supply = <&gdsc_venus>;
qcom,hfi = "venus";
- qcom,has-ocmem;
+ qcom,ocmem-size = <524288>; /* 512 * 1024*/
qcom,max-hw-load = <1216800>; /* 3840 x 2160 @ 30 + 1080p @ 30*/
};
diff --git a/arch/arm/boot/dts/msm8974pro.dtsi b/arch/arm/boot/dts/msm8974pro.dtsi
index 7a08ca6..3d03d9d 100644
--- a/arch/arm/boot/dts/msm8974pro.dtsi
+++ b/arch/arm/boot/dts/msm8974pro.dtsi
@@ -1669,6 +1669,7 @@
qcom,mdss-has-bwc;
qcom,mdss-has-decimation;
qcom,mdss-ad-off = <0x0013100 0x00013300>;
+ vdd-cx-supply = <&pm8841_s2_corner>;
};
&mdss_hdmi_tx {
diff --git a/arch/arm/mach-msm/msm_bus/msm_bus_arb.c b/arch/arm/mach-msm/msm_bus/msm_bus_arb.c
index 72e3ec3..ca4b079 100644
--- a/arch/arm/mach-msm/msm_bus/msm_bus_arb.c
+++ b/arch/arm/mach-msm/msm_bus/msm_bus_arb.c
@@ -629,7 +629,8 @@
pdata = client->pdata;
if (!pdata) {
MSM_BUS_ERR("Null pdata passed to update-request\n");
- return -ENXIO;
+ ret = -ENXIO;
+ goto err;
}
if (index >= pdata->num_usecases) {
diff --git a/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c b/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
index 5bdd10a..b996d29 100644
--- a/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
+++ b/arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
@@ -1,6 +1,6 @@
/* Copyright (C) 2008 Google, Inc.
* Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -1242,7 +1242,7 @@
}
case AUDIO_ASYNC_READ: {
mutex_lock(&audio->read_lock);
- if ((audio->feedback) && (audio->enabled))
+ if (audio->feedback)
rc = audio_aio_buf_add(audio, 0,
(void __user *)arg);
else
diff --git a/arch/arm/mach-msm/rpm_log.c b/arch/arm/mach-msm/rpm_log.c
index 1809cea..3cc012e 100755
--- a/arch/arm/mach-msm/rpm_log.c
+++ b/arch/arm/mach-msm/rpm_log.c
@@ -227,9 +227,10 @@
&(buf->read_idx));
}
- if ((file->f_flags & O_NONBLOCK) && buf->len == 0)
+ if ((file->f_flags & O_NONBLOCK) && buf->len == 0) {
mutex_unlock(&buf->mutex);
return -EAGAIN;
+ }
/* loop until new messages arrive */
while (buf->len == 0) {
diff --git a/arch/arm/mach-msm/rpm_rbcpr_stats_v2.c b/arch/arm/mach-msm/rpm_rbcpr_stats_v2.c
index 8f0ccd4..bfa2570 100644
--- a/arch/arm/mach-msm/rpm_rbcpr_stats_v2.c
+++ b/arch/arm/mach-msm/rpm_rbcpr_stats_v2.c
@@ -42,9 +42,12 @@
enum {
CORNER_OFF,
- CORNER_SVS,
+ CORNER_RETENTION,
+ CORNER_SVS_KRAIT,
+ CORNER_SVS_SOC,
CORNER_NOMINAL,
CORNER_TURBO,
+ CORNER_SUPER_TURBO,
CORNER_MAX,
};
@@ -54,7 +57,7 @@
};
struct rbcpr_corners_data_type {
- uint32_t efuse_adjustment;
+ int32_t efuse_adjustment;
uint32_t programmed_voltage;
uint32_t isr_count;
uint32_t min_count;
@@ -62,10 +65,12 @@
struct rbcpr_recmnd_data_type rbcpr_recmnd[RBCPR_NUM_RECMNDS];
};
-struct rbcpr_rail_stats_type {
+struct rbcpr_rail_stats_header_type {
uint32_t num_corners;
uint32_t num_latest_recommends;
- struct rbcpr_corners_data_type rbcpr_corners[RBCPR_NUM_CORNERS];
+};
+
+struct rbcpr_rail_stats_footer_type {
uint32_t current_corner;
uint32_t railway_voltage;
uint32_t off_corner;
@@ -75,7 +80,6 @@
struct rbcpr_stats_type {
uint32_t num_rails;
uint32_t status;
- struct rbcpr_rail_stats_type *rbcpr_rail;
};
struct rbcpr_data_type {
@@ -91,106 +95,158 @@
static char *rbcpr_corner_string[] = {
[CORNER_OFF] = "CORNERS_OFF",
- [CORNER_SVS] = "SVS",
+ [CORNER_RETENTION] = "RETENTION",
+ [CORNER_SVS_KRAIT] = "SVS",
+ [CORNER_SVS_SOC] = "SVS_SOC",
[CORNER_NOMINAL] = "NOMINAL",
[CORNER_TURBO] = "TURBO",
+ [CORNER_SUPER_TURBO] = "SUPER_TURBO",
};
+
#define CORNER_STRING(a) \
((a >= CORNER_MAX) ? "INVALID Corner" : rbcpr_corner_string[a])
static struct rbcpr_data_type *rbcpr_data;
-static struct rbcpr_stats_type *rbcpr_stats;
-static void msm_rpmrbcpr_read_rpm_data(void)
+static void msm_rpmrbcpr_print_stats_header(
+ struct rbcpr_stats_type *rbcpr_stats, char *buf,
+ uint32_t *pos)
{
- uint32_t start_offset;
- uint32_t stats_size;
-
- start_offset = offsetof(struct rbcpr_stats_type, rbcpr_rail);
- stats_size =
- rbcpr_stats->num_rails * sizeof(struct rbcpr_rail_stats_type);
-
- if (stats_size > RBCPR_STATS_MAX_SIZE) {
- pr_err("%s: Max copy size exceeded. stats size %d max %d",
- __func__, stats_size, RBCPR_STATS_MAX_SIZE);
- return;
- }
-
- memcpy_fromio(rbcpr_stats->rbcpr_rail,
- (rbcpr_data->start + start_offset), stats_size);
-}
-
-static uint32_t msm_rpmrbcpr_print_data(void)
-{
- uint32_t pos = 0;
- uint32_t i, j, k;
- struct rbcpr_rail_stats_type *rail;
- struct rbcpr_corners_data_type *corner;
- struct rbcpr_recmnd_data_type *rbcpr_recmnd;
- char *buf = rbcpr_data->buf;
-
- pos += PRINT(buf, pos, ":RBCPR STATS\n");
- pos += PRINT(buf, pos, "(%s: %d)", FIELD(rbcpr_stats->num_rails),
+ *pos += PRINT(buf, *pos, "\n:RBCPR STATS ");
+ *pos += PRINT(buf, *pos, "(%s: %d)", FIELD(rbcpr_stats->num_rails),
rbcpr_stats->num_rails);
- pos += PRINT(buf, pos, "(%s: %d)\n", FIELD(rbcpr_stats->status),
+ *pos += PRINT(buf, *pos, "(%s: %d)", FIELD(rbcpr_stats->status),
rbcpr_stats->status);
-
-
- for (i = 0; i < rbcpr_stats->num_rails; i++) {
- rail = &rbcpr_stats->rbcpr_rail[i];
- pos += PRINT(buf, pos, ":%s Rail Data\n", rbcpr_rail_labels[i]);
- pos += PRINT(buf, pos, "(%s: %s)",
- FIELD(rail->current_corner),
- CORNER_STRING(rail->current_corner));
- pos += PRINT(buf, pos, "(%s: %d)",
- FIELD(rail->railway_voltage), rail->railway_voltage);
- pos += PRINT(buf, pos, "(%s: %d)",
- FIELD(rail->off_corner), rail->off_corner);
- pos += PRINT(buf, pos, "(%s: %d)\n",
- FIELD(rail->margin), rail->margin);
-
- for (j = 0; j < RBCPR_NUM_CORNERS; j++) {
- pos += PRINT(buf, pos, "\t\tCorner Data:%s ",
- CORNER_STRING(j + 1));
- corner = &rail->rbcpr_corners[j];
- pos += PRINT(buf, pos, "(%s: %d)",
- FIELD(corner->efuse_adjustment),
- corner->efuse_adjustment);
- pos += PRINT(buf, pos, "(%s: %d)",
- FIELD(corner->programmed_voltage),
- corner->programmed_voltage);
- pos += PRINT(buf, pos, "(%s: %d)",
- FIELD(corner->isr_count), corner->isr_count);
- pos += PRINT(buf, pos, "(%s: %d)",
- FIELD(corner->min_count), corner->min_count);
- pos += PRINT(buf, pos, "(%s: %d)\n",
- FIELD(corner->max_count), corner->max_count);
-
-
- for (k = 0; k < RBCPR_NUM_RECMNDS; k++) {
- rbcpr_recmnd = &corner->rbcpr_recmnd[k];
- pos += PRINT(buf, pos,
- "\t\t\t\tVoltage History[%d] ", k);
- pos += PRINT(buf, pos, " (%s: %d) ",
- FIELD(rbcpr_recmd->microvolts),
- rbcpr_recmnd->microvolts);
- pos += PRINT(buf, pos, " (%s: %lld)\n",
- FIELD(rbcpr_recmd->timestamp),
- rbcpr_recmnd->timestamp);
- }
- }
- }
-
- return pos;
}
-
-static int msm_rpmrbcpr_file_read(struct file *file, char __user *bufu,
- size_t count, loff_t *ppos)
+static void msm_rpmrbcpr_print_rail_header(
+ struct rbcpr_rail_stats_header_type *rail_header, char *buf,
+ uint32_t *pos)
{
- struct rbcpr_data_type *pdata = file->private_data;
+ *pos += PRINT(buf, *pos, "(%s: %d)", FIELD(rail_header->num_corners),
+ rail_header->num_corners);
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(rail_header->num_latest_recommends),
+ rail_header->num_latest_recommends);
+}
+
+static void msm_rpmrbcpr_print_corner_recmnds(
+ struct rbcpr_recmnd_data_type *rbcpr_recmnd, char *buf,
+ uint32_t *pos)
+{
+ *pos += PRINT(buf, *pos, "\n\t\t\t :(%s: %d) ",
+ FIELD(rbcpr_recmd->microvolts),
+ rbcpr_recmnd->microvolts);
+ *pos += PRINT(buf, *pos, " (%s: %lld)", FIELD(rbcpr_recmd->timestamp),
+ rbcpr_recmnd->timestamp);
+}
+
+static void msm_rpmrbcpr_print_corner_data(
+ struct rbcpr_corners_data_type *corner, char *buf,
+ uint32_t num_corners, uint32_t *pos)
+{
+ int i;
+
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(corner->efuse_adjustment),
+ corner->efuse_adjustment);
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(corner->programmed_voltage),
+ corner->programmed_voltage);
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(corner->isr_count), corner->isr_count);
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(corner->min_count), corner->min_count);
+ *pos += PRINT(buf, *pos, "(%s: %d)\n",
+ FIELD(corner->max_count), corner->max_count);
+ *pos += PRINT(buf, *pos, "\t\t\t:Latest Recommends");
+ for (i = 0; i < num_corners; i++)
+ msm_rpmrbcpr_print_corner_recmnds(&corner->rbcpr_recmnd[i], buf,
+ pos);
+}
+
+static void msm_rpmrbcpr_print_rail_footer(
+ struct rbcpr_rail_stats_footer_type *rail, char *buf,
+ uint32_t *pos)
+{
+ *pos += PRINT(buf, *pos, "(%s: %s)", FIELD(rail->current_corner),
+ CORNER_STRING(rail->current_corner));
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(rail->railway_voltage), rail->railway_voltage);
+ *pos += PRINT(buf, *pos, "(%s: %d)",
+ FIELD(rail->off_corner), rail->off_corner);
+ *pos += PRINT(buf, *pos, "(%s: %d)\n",
+ FIELD(rail->margin), rail->margin);
+}
+
+static uint32_t msm_rpmrbcpr_read_rpm_data(void)
+{
+ uint32_t read_offset = 0;
+ static struct rbcpr_stats_type rbcpr_stats_header;
+ uint32_t buffer_offset = 0;
+ char *buf = rbcpr_data->buf;
+ int i, j;
+
+ memcpy_fromio(&rbcpr_stats_header, rbcpr_data->start,
+ sizeof(rbcpr_stats_header));
+ read_offset += sizeof(rbcpr_stats_header);
+ msm_rpmrbcpr_print_stats_header(&rbcpr_stats_header, buf,
+ &buffer_offset);
+
+ for (i = 0; i < rbcpr_stats_header.num_rails; i++) {
+ static struct rbcpr_rail_stats_header_type rail_header;
+ static struct rbcpr_rail_stats_footer_type rail_footer;
+
+ memcpy_fromio(&rail_header, (rbcpr_data->start + read_offset),
+ sizeof(rail_header));
+ read_offset += sizeof(rail_header);
+ buffer_offset += PRINT(buf, buffer_offset, "\n:%s Rail Data ",
+ rbcpr_rail_labels[i]);
+ msm_rpmrbcpr_print_rail_header(&rail_header, buf,
+ &buffer_offset);
+
+ for (j = 0; j < rail_header.num_corners; j++) {
+ static struct rbcpr_corners_data_type corner;
+ uint32_t corner_index;
+
+ memcpy_fromio(&corner,
+ (rbcpr_data->start + read_offset),
+ sizeof(corner));
+ read_offset += sizeof(corner);
+
+ /*
+ * RPM doesn't include corner type in the data for the
+ * corner. For now add this hack to know which corners
+ * are used based on number of corners for the rail.
+ */
+ corner_index = j + 3;
+ if (rail_header.num_corners == 3 && j == 2)
+ corner_index++;
+
+ buffer_offset += PRINT(buf, buffer_offset,
+ "\n\t\t:Corner Data: %s ",
+ CORNER_STRING(corner_index));
+ msm_rpmrbcpr_print_corner_data(&corner, buf,
+ rail_header.num_latest_recommends,
+ &buffer_offset);
+ }
+ buffer_offset += PRINT(buf, buffer_offset,
+ "\n\t\t");
+ memcpy_fromio(&rail_footer, (rbcpr_data->start + read_offset),
+ sizeof(rail_footer));
+ read_offset += sizeof(rail_footer);
+ msm_rpmrbcpr_print_rail_footer(&rail_footer, buf,
+ &buffer_offset);
+ }
+ return buffer_offset;
+}
+
+static int msm_rpmrbcpr_file_read(struct seq_file *m, void *data)
+{
+ struct rbcpr_data_type *pdata = m->private;
int ret = 0;
- int status_counter;
+ int curr_status_counter;
+ static int prev_status_counter;
static DEFINE_MUTEX(rbcpr_lock);
mutex_lock(&rbcpr_lock);
@@ -200,27 +256,17 @@
goto exit_rpmrbcpr_file_read;
}
- if (!bufu || count < 0) {
- pr_err("%s count %d ", __func__, count);
- ret = -EINVAL;
- goto exit_rpmrbcpr_file_read;
+ /* Read RPM stats */
+ curr_status_counter = readl_relaxed(pdata->start +
+ offsetof(struct rbcpr_stats_type, status));
+ if (curr_status_counter != prev_status_counter) {
+ pdata->len = msm_rpmrbcpr_read_rpm_data();
+ pdata->len = 0;
+ prev_status_counter = curr_status_counter;
}
- if (*ppos > pdata->len || !*ppos) {
- /* Read RPM stats */
- status_counter = readl_relaxed(pdata->start +
- offsetof(struct rbcpr_stats_type, status));
- if (status_counter != rbcpr_stats->status) {
- msm_rpmrbcpr_read_rpm_data();
- rbcpr_stats->status = status_counter;
- }
- pdata->len = msm_rpmrbcpr_print_data();
- *ppos = 0;
- }
+ seq_printf(m, "%s", pdata->buf);
- /* copy to user data*/
- ret = simple_read_from_buffer(bufu, count, ppos, pdata->buf,
- pdata->len);
exit_rpmrbcpr_file_read:
mutex_unlock(&rbcpr_lock);
return ret;
@@ -228,77 +274,31 @@
static int msm_rpmrbcpr_file_open(struct inode *inode, struct file *file)
{
- file->private_data = rbcpr_data;
-
if (!rbcpr_data->start)
return -ENODEV;
-
- return 0;
-}
-
-static int msm_rpmrbcpr_file_close(struct inode *inode, struct file *file)
-{
- return 0;
+ return single_open(file, msm_rpmrbcpr_file_read, inode->i_private);
}
static const struct file_operations msm_rpmrbcpr_fops = {
- .owner = THIS_MODULE,
- .open = msm_rpmrbcpr_file_open,
- .read = msm_rpmrbcpr_file_read,
- .release = msm_rpmrbcpr_file_close,
- .llseek = no_llseek,
+ .open = msm_rpmrbcpr_file_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
};
-static int msm_rpmrbcpr_memalloc(struct platform_device *pdev)
+static int msm_rpmrbcpr_validate(struct platform_device *pdev)
{
- void *addr = NULL;
int ret = 0;
- uint32_t num_latest_recommends = 0;
- uint32_t num_corners = 0;
+ uint32_t num_rails;
- rbcpr_stats->num_rails = readl_relaxed(rbcpr_data->start);
+ num_rails = readl_relaxed(rbcpr_data->start);
- if (rbcpr_stats->num_rails > RBCPR_MAX_RAILS) {
+ if (num_rails > RBCPR_MAX_RAILS) {
pr_err("%s: Invalid number of RPM RBCPR rails %d",
- __func__, rbcpr_stats->num_rails);
- rbcpr_stats->num_rails = 0;
+ __func__, num_rails);
ret = -EFAULT;
- goto rbcpr_memalloc_fail;
}
- rbcpr_stats->rbcpr_rail =
- devm_kzalloc(&pdev->dev,
- sizeof(struct rbcpr_rail_stats_type) *
- rbcpr_stats->num_rails, GFP_KERNEL);
-
- if (!rbcpr_stats->rbcpr_rail) {
- ret = -ENOMEM;
- goto rbcpr_memalloc_fail;
- }
-
- addr = rbcpr_data->start + offsetof(struct rbcpr_stats_type,
- rbcpr_rail);
-
- /* Each rail has the same number of corners and number of latest
- recommended values. Read these from the first rail and check them
- to make sure the values are valid. (RPM doesn't 0 initialize this
- memory region, so its possible we end up with bogus values if the
- rbcpr driver is not initialized.).
- */
- num_corners = readl_relaxed(addr);
- num_latest_recommends = readl_relaxed(addr +
- offsetof(struct rbcpr_rail_stats_type,
- num_latest_recommends));
-
- if ((num_latest_recommends != RBCPR_NUM_RECMNDS)
- || (num_corners != RBCPR_NUM_CORNERS)) {
- pr_err("%s: Invalid num corners %d, num recmnds %d",
- __func__, num_corners, num_latest_recommends);
- ret = -EFAULT;
- goto rbcpr_memalloc_fail;
- }
-
-rbcpr_memalloc_fail:
return ret;
}
@@ -318,15 +318,6 @@
if (!rbcpr_data)
return -ENOMEM;
- rbcpr_stats = devm_kzalloc(&pdev->dev,
- sizeof(struct rbcpr_stats_type), GFP_KERNEL);
-
- if (!rbcpr_stats) {
- pr_err("%s: Failed to allocate memory for RBCPR stats",
- __func__);
- return -ENOMEM;
- }
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
@@ -371,13 +362,13 @@
goto rbcpr_probe_fail;
}
- ret = msm_rpmrbcpr_memalloc(pdev);
+ ret = msm_rpmrbcpr_validate(pdev);
if (ret)
goto rbcpr_probe_fail;
dent = debugfs_create_file("rpm_rbcpr", S_IRUGO, NULL,
- pdev->dev.platform_data, &msm_rpmrbcpr_fops);
+ rbcpr_data, &msm_rpmrbcpr_fops);
if (!dent) {
pr_err("%s: error debugfs_create_file failed\n", __func__);
diff --git a/arch/arm/mach-msm/smd_pkt.c b/arch/arm/mach-msm/smd_pkt.c
index 1c44f9a..d70b9d4 100644
--- a/arch/arm/mach-msm/smd_pkt.c
+++ b/arch/arm/mach-msm/smd_pkt.c
@@ -101,8 +101,6 @@
SMD_PKT_STATUS = 1U << 0,
SMD_PKT_READ = 1U << 1,
SMD_PKT_WRITE = 1U << 2,
- SMD_PKT_READ_DUMP_BUFFER = 1U << 3,
- SMD_PKT_WRITE_DUMP_BUFFER = 1U << 4,
SMD_PKT_POLL = 1U << 5,
};
@@ -116,18 +114,6 @@
ipc_log_string(smd_pkt_ilctxt, "<SMD_PKT>: "x); \
} while (0)
-#define SMD_PKT_LOG_BUF(buf, cnt) \
-do { \
- char log_buf[128]; \
- int i; \
- if (smd_pkt_ilctxt) { \
- i = cnt < 16 ? cnt : 16; \
- hex_dump_to_buffer(buf, i, 16, 1, log_buf, \
- sizeof(log_buf), false); \
- ipc_log_string(smd_pkt_ilctxt, "<SMD_PKT>: %s", log_buf); \
- } \
-} while (0)
-
#define D_STATUS(x...) \
do { \
if (msm_smd_pkt_debug_mask & SMD_PKT_STATUS) \
@@ -149,24 +135,6 @@
SMD_PKT_LOG_STRING(x); \
} while (0)
-#define D_READ_DUMP_BUFFER(prestr, cnt, buf) \
-do { \
- if (msm_smd_pkt_debug_mask & SMD_PKT_READ_DUMP_BUFFER) \
- print_hex_dump(KERN_INFO, prestr, \
- DUMP_PREFIX_NONE, 16, 1, \
- buf, cnt, 1); \
- SMD_PKT_LOG_BUF(buf, cnt); \
-} while (0)
-
-#define D_WRITE_DUMP_BUFFER(prestr, cnt, buf) \
-do { \
- if (msm_smd_pkt_debug_mask & SMD_PKT_WRITE_DUMP_BUFFER) \
- print_hex_dump(KERN_INFO, prestr, \
- DUMP_PREFIX_NONE, 16, 1, \
- buf, cnt, 1); \
- SMD_PKT_LOG_BUF(buf, cnt); \
-} while (0)
-
#define D_POLL(x...) \
do { \
if (msm_smd_pkt_debug_mask & SMD_PKT_POLL) \
@@ -184,8 +152,6 @@
#define D_STATUS(x...) do {} while (0)
#define D_READ(x...) do {} while (0)
#define D_WRITE(x...) do {} while (0)
-#define D_READ_DUMP_BUFFER(prestr, cnt, buf) do {} while (0)
-#define D_WRITE_DUMP_BUFFER(prestr, cnt, buf) do {} while (0)
#define D_POLL(x...) do {} while (0)
#define E_SMD_PKT_SSR(x) do {} while (0)
#endif
@@ -432,7 +398,6 @@
return notify_reset(smd_pkt_devp);
}
} while (pkt_size != bytes_read);
- D_READ_DUMP_BUFFER("Read: ", (bytes_read > 16 ? 16 : bytes_read), buf);
mutex_unlock(&smd_pkt_devp->rx_lock);
mutex_lock(&smd_pkt_devp->ch_lock);
@@ -540,8 +505,6 @@
} while (bytes_written != count);
smd_write_end(smd_pkt_devp->ch);
mutex_unlock(&smd_pkt_devp->tx_lock);
- D_WRITE_DUMP_BUFFER("Write: ",
- (bytes_written > 16 ? 16 : bytes_written), buf);
D_WRITE("Finished %s on smd_pkt_dev id:%d %d bytes\n",
__func__, smd_pkt_devp->i, count);
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 7ad6401..f055aa7 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -164,7 +164,8 @@
return mask;
}
-static void __dma_clear_buffer(struct page *page, size_t size)
+static void __dma_clear_buffer(struct page *page, size_t size,
+ struct dma_attrs *attrs)
{
/*
* Ensure that the allocated pages are zeroed, and that any data
@@ -173,7 +174,8 @@
if (!PageHighMem(page)) {
void *ptr = page_address(page);
if (ptr) {
- memset(ptr, 0, size);
+ if (!dma_get_attr(DMA_ATTR_SKIP_ZEROING, attrs))
+ memset(ptr, 0, size);
dmac_flush_range(ptr, ptr + size);
outer_flush_range(__pa(ptr), __pa(ptr) + size);
}
@@ -182,7 +184,8 @@
phys_addr_t end = base + size;
while (size > 0) {
void *ptr = kmap_atomic(page);
- memset(ptr, 0, PAGE_SIZE);
+ if (!dma_get_attr(DMA_ATTR_SKIP_ZEROING, attrs))
+ memset(ptr, 0, PAGE_SIZE);
dmac_flush_range(ptr, ptr + PAGE_SIZE);
kunmap_atomic(ptr);
page++;
@@ -212,7 +215,7 @@
for (p = page + (size >> PAGE_SHIFT), e = page + (1 << order); p < e; p++)
__free_page(p);
- __dma_clear_buffer(page, size);
+ __dma_clear_buffer(page, size, NULL);
return page;
}
@@ -523,8 +526,12 @@
if (!page)
return NULL;
- if (!dma_get_attr(DMA_ATTR_SKIP_ZEROING, attrs))
- __dma_clear_buffer(page, size);
+ /*
+ * skip completely if we neither need to zero nor sync.
+ */
+ if (!(dma_get_attr(DMA_ATTR_SKIP_CPU_SYNC, attrs) &&
+ dma_get_attr(DMA_ATTR_SKIP_ZEROING, attrs)))
+ __dma_clear_buffer(page, size, attrs);
if (!PageHighMem(page)) {
__dma_remap(page, size, prot, no_kernel_mapping);
@@ -1020,7 +1027,7 @@
while (--j)
pages[i + j] = pages[i] + j;
- __dma_clear_buffer(pages[i], PAGE_SIZE << order);
+ __dma_clear_buffer(pages[i], PAGE_SIZE << order, NULL);
i += 1 << order;
count -= 1 << order;
}
diff --git a/drivers/char/diag/diag_dci.c b/drivers/char/diag/diag_dci.c
index 653e299..28b066b 100644
--- a/drivers/char/diag/diag_dci.c
+++ b/drivers/char/diag/diag_dci.c
@@ -610,9 +610,13 @@
curr_client_pid = req_entry->pid;
/* Remove the headers and send only the response to this function */
+ mutex_lock(&driver->dci_mutex);
delete_flag = diag_dci_remove_req_entry(temp, rsp_len, req_entry);
- if (delete_flag < 0)
+ if (delete_flag < 0) {
+ mutex_unlock(&driver->dci_mutex);
return;
+ }
+ mutex_unlock(&driver->dci_mutex);
entry = __diag_dci_get_client_entry(curr_client_pid);
if (!entry) {
diff --git a/drivers/char/diag/diagchar.h b/drivers/char/diag/diagchar.h
index eda745f..0141a63 100644
--- a/drivers/char/diag/diagchar.h
+++ b/drivers/char/diag/diagchar.h
@@ -237,14 +237,6 @@
int pid;
};
-struct diag_nrt_wake_lock {
- int enabled;
- int ref_count;
- int copy_count;
- struct wake_lock read_lock;
- spinlock_t read_spinlock;
-};
-
struct real_time_vote_t {
uint16_t proc;
uint8_t real_time_vote;
@@ -291,8 +283,6 @@
struct diag_request *write_ptr_1;
struct diag_request *write_ptr_2;
- struct diag_nrt_wake_lock nrt_lock;
-
struct workqueue_struct *wq;
struct work_struct diag_read_smd_work;
@@ -469,6 +459,10 @@
int smux_connected;
struct diag_request *write_ptr_mdm;
#endif
+ /* Wakeup source related variables */
+ spinlock_t ws_lock;
+ int ws_ref_count;
+ int copy_count;
};
extern struct diag_bridge_dev *diag_bridge;
diff --git a/drivers/char/diag/diagchar_core.c b/drivers/char/diag/diagchar_core.c
index 263715d..81a6655 100644
--- a/drivers/char/diag/diagchar_core.c
+++ b/drivers/char/diag/diagchar_core.c
@@ -300,6 +300,7 @@
driver->logging_mode = USB_MODE;
diag_update_proc_vote(DIAG_PROC_MEMORY_DEVICE, VOTE_DOWN);
diagfwd_connect();
+ diag_ws_reset();
#ifdef CONFIG_DIAGFWD_BRIDGE_CODE
diag_clear_hsic_tbl();
diagfwd_cancel_hsic(REOPEN_HSIC);
@@ -636,10 +637,9 @@
}
entry->in_service = 0;
- mutex_unlock(&entry->write_buf_mutex);
-
exit_stat = 0;
exit:
+ mutex_unlock(&entry->write_buf_mutex);
*pret = ret;
return exit_stat;
@@ -1145,8 +1145,8 @@
int num_data = 0, data_type;
int remote_token;
int exit_stat;
- int clear_read_wakelock;
unsigned long flags;
+ int copy_data = 0;
for (i = 0; i < driver->num_clients; i++)
if (driver->client_map[i].pid == current->tgid)
@@ -1164,7 +1164,6 @@
mutex_lock(&driver->diagchar_mutex);
- clear_read_wakelock = 0;
if ((driver->data_ready[index] & USER_SPACE_DATA_TYPE) && (driver->
logging_mode == MEMORY_DEVICE_MODE)) {
remote_token = 0;
@@ -1225,10 +1224,8 @@
COPY_USER_SPACE_OR_EXIT(buf+ret,
*(data->buf_in_1),
data->write_ptr_1->length);
- if (!driver->real_time_mode) {
- process_lock_on_copy(&data->nrt_lock);
- clear_read_wakelock++;
- }
+ diag_ws_on_copy();
+ copy_data = 1;
spin_lock_irqsave(&data->in_busy_lock, flags);
data->in_busy_1 = 0;
spin_unlock_irqrestore(&data->in_busy_lock,
@@ -1243,10 +1240,8 @@
COPY_USER_SPACE_OR_EXIT(buf+ret,
*(data->buf_in_2),
data->write_ptr_2->length);
- if (!driver->real_time_mode) {
- process_lock_on_copy(&data->nrt_lock);
- clear_read_wakelock++;
- }
+ diag_ws_on_copy();
+ copy_data = 1;
spin_lock_irqsave(&data->in_busy_lock, flags);
data->in_busy_2 = 0;
spin_unlock_irqrestore(&data->in_busy_lock,
@@ -1434,12 +1429,18 @@
goto exit;
}
exit:
- if (clear_read_wakelock) {
- for (i = 0; i < NUM_SMD_DATA_CHANNELS; i++)
- process_lock_on_copy_complete(
- &driver->smd_data[i].nrt_lock);
- }
mutex_unlock(&driver->diagchar_mutex);
+ if (copy_data) {
+ /*
+ * Flush any work that is currently pending on the data
+ * channels. This will ensure that the next read is not
+ * missed.
+ */
+ for (i = 0; i < NUM_SMD_DATA_CHANNELS; i++)
+ flush_workqueue(driver->smd_data[i].wq);
+ wake_up(&driver->smd_wait_q);
+ diag_ws_on_copy_complete();
+ }
return ret;
}
diff --git a/drivers/char/diag/diagfwd.c b/drivers/char/diag/diagfwd.c
index 831f033..9c767c6 100644
--- a/drivers/char/diag/diagfwd.c
+++ b/drivers/char/diag/diagfwd.c
@@ -374,91 +374,62 @@
return buf_size;
}
-void process_lock_enabling(struct diag_nrt_wake_lock *lock, int real_time)
+void diag_ws_on_notify()
{
- unsigned long read_lock_flags;
-
- spin_lock_irqsave(&lock->read_spinlock, read_lock_flags);
- if (real_time)
- lock->enabled = 0;
- else
- lock->enabled = 1;
- lock->ref_count = 0;
- lock->copy_count = 0;
- wake_unlock(&lock->read_lock);
- spin_unlock_irqrestore(&lock->read_spinlock, read_lock_flags);
-}
-
-void process_lock_on_notify(struct diag_nrt_wake_lock *lock)
-{
- unsigned long read_lock_flags;
-
- spin_lock_irqsave(&lock->read_spinlock, read_lock_flags);
/*
- * Do not work with ref_count here in case
- * of spurious interrupt
+ * Do not deal with reference count here as there can be
+ * spurious interrupts
*/
- if (lock->enabled && !wake_lock_active(&lock->read_lock))
- wake_lock(&lock->read_lock);
- spin_unlock_irqrestore(&lock->read_spinlock, read_lock_flags);
+ pm_stay_awake(driver->diag_dev);
}
-void process_lock_on_read(struct diag_nrt_wake_lock *lock, int pkt_len)
+void diag_ws_on_read(int pkt_len)
{
- unsigned long read_lock_flags;
+ unsigned long flags;
- spin_lock_irqsave(&lock->read_spinlock, read_lock_flags);
- if (lock->enabled) {
- if (pkt_len > 0) {
- /*
- * We have an data that is read that
- * needs to be processed, make sure the
- * processor does not go to sleep
- */
- lock->ref_count++;
- if (!wake_lock_active(&lock->read_lock))
- wake_lock(&lock->read_lock);
- } else {
- /*
- * There was no data associated with the
- * read from the smd, unlock the wake lock
- * if it is not needed.
- */
- if (lock->ref_count < 1) {
- if (wake_lock_active(&lock->read_lock))
- wake_unlock(&lock->read_lock);
- lock->ref_count = 0;
- lock->copy_count = 0;
- }
+ spin_lock_irqsave(&driver->ws_lock, flags);
+ if (pkt_len > 0) {
+ driver->ws_ref_count++;
+ } else {
+ if (driver->ws_ref_count < 1) {
+ pm_relax(driver->diag_dev);
+ driver->ws_ref_count = 0;
+ driver->copy_count = 0;
}
}
- spin_unlock_irqrestore(&lock->read_spinlock, read_lock_flags);
+ spin_unlock_irqrestore(&driver->ws_lock, flags);
}
-void process_lock_on_copy(struct diag_nrt_wake_lock *lock)
+void diag_ws_on_copy()
{
- unsigned long read_lock_flags;
-
- spin_lock_irqsave(&lock->read_spinlock, read_lock_flags);
- if (lock->enabled)
- lock->copy_count++;
- spin_unlock_irqrestore(&lock->read_spinlock, read_lock_flags);
+ unsigned long flags;
+ spin_lock_irqsave(&driver->ws_lock, flags);
+ driver->copy_count++;
+ spin_unlock_irqrestore(&driver->ws_lock, flags);
}
-void process_lock_on_copy_complete(struct diag_nrt_wake_lock *lock)
+void diag_ws_on_copy_complete()
{
- unsigned long read_lock_flags;
-
- spin_lock_irqsave(&lock->read_spinlock, read_lock_flags);
- if (lock->enabled) {
- lock->ref_count -= lock->copy_count;
- if (lock->ref_count < 1) {
- wake_unlock(&lock->read_lock);
- lock->ref_count = 0;
- }
- lock->copy_count = 0;
+ unsigned long flags;
+ spin_lock_irqsave(&driver->ws_lock, flags);
+ driver->ws_ref_count -= driver->copy_count;
+ if (driver->ws_ref_count < 1) {
+ pm_relax(driver->diag_dev);
+ driver->ws_ref_count = 0;
}
- spin_unlock_irqrestore(&lock->read_spinlock, read_lock_flags);
+ driver->copy_count = 0;
+ spin_unlock_irqrestore(&driver->ws_lock, flags);
+}
+
+void diag_ws_reset()
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&driver->ws_lock, flags);
+ pm_relax(driver->diag_dev);
+ driver->ws_ref_count = 0;
+ driver->copy_count = 0;
+ spin_unlock_irqrestore(&driver->ws_lock, flags);
}
/* Process the data read from the smd data channel */
@@ -479,7 +450,7 @@
/* This print is for debugging */
pr_err("diag, In %s, received data on non-designated command channel: %d\n",
__func__, smd_info->peripheral);
- return 0;
+ goto err;
}
/* If the data is already hdlc encoded */
@@ -493,6 +464,7 @@
} else {
pr_err("diag: In %s, no match for in_busy_1, peripheral: %d\n",
__func__, smd_info->peripheral);
+ goto err;
}
if (write_ptr_modem) {
@@ -504,6 +476,7 @@
if (err) {
pr_err_ratelimited("diag: In %s, diag_device_write error: %d\n",
__func__, err);
+ goto err;
}
spin_unlock_irqrestore(&smd_info->in_busy_lock, flags);
}
@@ -518,6 +491,7 @@
} else {
pr_err("diag: In %s, no match for in_busy_1, peripheral: %d\n",
__func__, smd_info->peripheral);
+ goto err;
}
if (write_ptr_modem) {
@@ -533,26 +507,64 @@
success = diag_add_hdlc_encoding(smd_info, buf,
total_recd, write_buf,
&write_length);
- spin_lock_irqsave(&smd_info->in_busy_lock,
- flags);
if (success) {
+ spin_lock_irqsave(
+ &smd_info->in_busy_lock, flags);
write_ptr_modem->length = write_length;
*in_busy_ptr = 1;
err = diag_device_write(write_buf,
smd_info->peripheral,
write_ptr_modem);
+ spin_unlock_irqrestore(
+ &smd_info->in_busy_lock, flags);
if (err) {
pr_err_ratelimited("diag: In %s, diag_device_write error: %d\n",
__func__, err);
+ goto err;
}
}
- spin_unlock_irqrestore(&smd_info->in_busy_lock,
- flags);
+ } else {
+ goto err;
}
}
}
return 0;
+err:
+ if (driver->logging_mode == MEMORY_DEVICE_MODE)
+ diag_ws_on_read(0);
+ return 0;
+}
+
+void diag_smd_queue_read(struct diag_smd_info *smd_info)
+{
+ if (!smd_info || !smd_info->ch)
+ return;
+
+ switch (smd_info->type) {
+ case SMD_DCI_TYPE:
+ case SMD_DCI_CMD_TYPE:
+ queue_work(driver->diag_dci_wq,
+ &(smd_info->diag_read_smd_work));
+ break;
+ case SMD_DATA_TYPE:
+ queue_work(smd_info->wq,
+ &(smd_info->diag_read_smd_work));
+ break;
+ case SMD_CNTL_TYPE:
+ case SMD_CMD_TYPE:
+ queue_work(driver->diag_wq,
+ &(smd_info->diag_read_smd_work));
+ break;
+ default:
+ pr_err("diag: In %s, invalid type: %d\n", __func__,
+ smd_info->type);
+ return;
+ }
+
+ if (driver->logging_mode == MEMORY_DEVICE_MODE &&
+ smd_info->type == SMD_DATA_TYPE)
+ diag_ws_on_notify();
}
static int diag_smd_resize_buf(struct diag_smd_info *smd_info, void **buf,
@@ -775,8 +787,9 @@
}
}
}
- if (!driver->real_time_mode && smd_info->type == SMD_DATA_TYPE)
- process_lock_on_read(&smd_info->nrt_lock, pkt_len);
+ if (smd_info->type == SMD_DATA_TYPE &&
+ driver->logging_mode == MEMORY_DEVICE_MODE)
+ diag_ws_on_read(pkt_len);
if (total_recd > 0) {
if (!buf) {
@@ -805,6 +818,10 @@
return;
fail_return:
+ if (smd_info->type == SMD_DATA_TYPE &&
+ driver->logging_mode == MEMORY_DEVICE_MODE)
+ diag_ws_on_read(0);
+
if (smd_info->type == SMD_DCI_TYPE ||
smd_info->type == SMD_DCI_CMD_TYPE)
diag_dci_try_deactivate_wakeup_source();
@@ -1114,15 +1131,6 @@
mutex_unlock(&driver->diagchar_mutex);
}
-static int diag_check_mode_reset(unsigned char *buf)
-{
- int is_mode_reset = 0;
- if (chk_apps_master() && (int)(*(char *)buf) == MODE_CMD)
- if ((int)(*(char *)(buf+1)) == RESET_ID)
- is_mode_reset = 1;
- return is_mode_reset;
-}
-
int diag_send_data(struct diag_master_table entry, unsigned char *buf,
int len, int type)
{
@@ -1148,14 +1156,7 @@
__func__, entry.client_id);
return 0;
}
- /*
- * Mode reset should work even if
- * modem is down
- */
- if ((index == MODEM_DATA) &&
- diag_check_mode_reset(buf)) {
- return 1;
- }
+
smd_info = (driver->separate_cmdrsp[index] &&
index < NUM_SMD_CMD_CHANNELS) ?
&driver->smd_cmd[index] :
@@ -1350,6 +1351,11 @@
cmd_code &&
entry.
cmd_code_hi >= cmd_code) {
+ if (cmd_code == MODE_CMD &&
+ subsys_id == RESET_ID &&
+ entry.process_id ==
+ NON_APPS_PROC)
+ continue;
status = diag_send_data(entry, buf, len,
data_type);
if (status)
@@ -2208,24 +2214,15 @@
diag_dci_notify_client(smd_info->peripheral_mask,
DIAG_STATUS_OPEN);
}
- } else if (event == SMD_EVENT_DATA && !driver->real_time_mode &&
- smd_info->type == SMD_DATA_TYPE) {
- process_lock_on_notify(&smd_info->nrt_lock);
- }
-
- wake_up(&driver->smd_wait_q);
-
- if (smd_info->type == SMD_DCI_TYPE ||
- smd_info->type == SMD_DCI_CMD_TYPE) {
- if (event == SMD_EVENT_DATA)
+ wake_up(&driver->smd_wait_q);
+ diag_smd_queue_read(smd_info);
+ } else if (event == SMD_EVENT_DATA) {
+ wake_up(&driver->smd_wait_q);
+ diag_smd_queue_read(smd_info);
+ if (smd_info->type == SMD_DCI_TYPE ||
+ smd_info->type == SMD_DCI_CMD_TYPE) {
diag_dci_try_activate_wakeup_source();
- queue_work(driver->diag_dci_wq,
- &(smd_info->diag_read_smd_work));
- } else if (smd_info->type == SMD_DATA_TYPE) {
- queue_work(smd_info->wq,
- &(smd_info->diag_read_smd_work));
- } else {
- queue_work(driver->diag_wq, &(smd_info->diag_read_smd_work));
+ }
}
}
@@ -2354,10 +2351,8 @@
void diag_smd_destructor(struct diag_smd_info *smd_info)
{
- if (smd_info->type == SMD_DATA_TYPE) {
- wake_lock_destroy(&smd_info->nrt_lock.read_lock);
+ if (smd_info->type == SMD_DATA_TYPE)
destroy_workqueue(smd_info->wq);
- }
if (smd_info->ch)
smd_close(smd_info->ch);
@@ -2550,30 +2545,6 @@
goto err;
}
- smd_info->nrt_lock.enabled = 0;
- smd_info->nrt_lock.ref_count = 0;
- smd_info->nrt_lock.copy_count = 0;
- if (type == SMD_DATA_TYPE) {
- spin_lock_init(&smd_info->nrt_lock.read_spinlock);
-
- switch (peripheral) {
- case MODEM_DATA:
- wake_lock_init(&smd_info->nrt_lock.read_lock,
- WAKE_LOCK_SUSPEND, "diag_nrt_modem_read");
- break;
- case LPASS_DATA:
- wake_lock_init(&smd_info->nrt_lock.read_lock,
- WAKE_LOCK_SUSPEND, "diag_nrt_lpass_read");
- break;
- case WCNSS_DATA:
- wake_lock_init(&smd_info->nrt_lock.read_lock,
- WAKE_LOCK_SUSPEND, "diag_nrt_wcnss_read");
- break;
- default:
- break;
- }
- }
-
return 1;
err:
kfree(smd_info->buf_in_1);
@@ -2607,6 +2578,9 @@
driver->supports_apps_hdlc_encoding = 1;
mutex_init(&driver->diag_hdlc_mutex);
mutex_init(&driver->diag_cntl_mutex);
+ spin_lock_init(&driver->ws_lock);
+ driver->ws_ref_count = 0;
+ driver->copy_count = 0;
for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++) {
driver->separate_cmdrsp[i] = 0;
diff --git a/drivers/char/diag/diagfwd.h b/drivers/char/diag/diagfwd.h
index 7b2ded3..8ca8955 100644
--- a/drivers/char/diag/diagfwd.h
+++ b/drivers/char/diag/diagfwd.h
@@ -26,11 +26,6 @@
void diagfwd_exit(void);
void diag_process_hdlc(void *data, unsigned len);
void diag_smd_send_req(struct diag_smd_info *smd_info);
-void process_lock_enabling(struct diag_nrt_wake_lock *lock, int real_time);
-void process_lock_on_notify(struct diag_nrt_wake_lock *lock);
-void process_lock_on_read(struct diag_nrt_wake_lock *lock, int pkt_len);
-void process_lock_on_copy(struct diag_nrt_wake_lock *lock);
-void process_lock_on_copy_complete(struct diag_nrt_wake_lock *lock);
void diag_usb_legacy_notifier(void *, unsigned, struct diag_request *);
long diagchar_ioctl(struct file *, unsigned int, unsigned long);
int diag_device_write(void *, int, struct diag_request *);
@@ -56,6 +51,12 @@
int diag_apps_responds(void);
void diag_update_pkt_buffer(unsigned char *buf, int type);
int diag_process_stm_cmd(unsigned char *buf, unsigned char *dest_buf);
+void diag_ws_on_notify(void);
+void diag_ws_on_read(int pkt_len);
+void diag_ws_on_copy(void);
+void diag_ws_on_copy_complete(void);
+void diag_ws_reset(void);
+void diag_smd_queue_read(struct diag_smd_info *smd_info);
/* State for diag forwarding */
#ifdef CONFIG_DIAG_OVER_USB
int diagfwd_connect(void);
diff --git a/drivers/char/diag/diagfwd_cntl.c b/drivers/char/diag/diagfwd_cntl.c
index a75f7f69..9d6dfbb 100644
--- a/drivers/char/diag/diagfwd_cntl.c
+++ b/drivers/char/diag/diagfwd_cntl.c
@@ -418,7 +418,6 @@
pr_err("diag: ch invalid, feature update on proc %d\n",
smd_info->peripheral);
}
- process_lock_enabling(&data->nrt_lock, real_time);
mutex_unlock(&driver->diag_cntl_mutex);
}
diff --git a/drivers/char/hw_random/msm_rng.c b/drivers/char/hw_random/msm_rng.c
index e7b9a27..b13de3a 100644
--- a/drivers/char/hw_random/msm_rng.c
+++ b/drivers/char/hw_random/msm_rng.c
@@ -516,8 +516,6 @@
{
struct msm_rng_device *msm_rng_dev = platform_get_drvdata(pdev);
- fips_drbg_final(msm_rng_dev->drbg_ctx);
-
unregister_chrdev(QRNG_IOC_MAGIC, DRIVER_NAME);
hwrng_unregister(&msm_rng);
clk_put(msm_rng_dev->prng_clk);
@@ -525,7 +523,9 @@
platform_set_drvdata(pdev, NULL);
if (msm_rng_dev->qrng_perf_client)
msm_bus_scale_unregister_client(msm_rng_dev->qrng_perf_client);
+
if (msm_rng_dev->drbg_ctx) {
+ fips_drbg_final(msm_rng_dev->drbg_ctx);
kzfree(msm_rng_dev->drbg_ctx);
msm_rng_dev->drbg_ctx = NULL;
}
diff --git a/drivers/crypto/msm/qcrypto.c b/drivers/crypto/msm/qcrypto.c
index b8975aa..383ddd7 100644
--- a/drivers/crypto/msm/qcrypto.c
+++ b/drivers/crypto/msm/qcrypto.c
@@ -514,7 +514,8 @@
(unsigned long)(pengine);
pengine->bw_reaper_timer.expires = jiffies +
msecs_to_jiffies(QCRYPTO_HIGH_BANDWIDTH_TIMEOUT);
- add_timer(&(pengine->bw_reaper_timer));
+ mod_timer(&(pengine->bw_reaper_timer),
+ pengine->bw_reaper_timer.expires);
}
static void qcrypto_ce_bw_allocate_req(struct crypto_engine *pengine)
@@ -537,7 +538,7 @@
spin_unlock_irqrestore(&cp->lock, flags);
qcrypto_ce_set_bus(pengine, true);
-
+ qcrypto_bw_set_timeout(pengine);
spin_lock_irqsave(&cp->lock, flags);
pengine->bw_state = BUS_HAS_BANDWIDTH;
pengine->high_bw_req = false;
@@ -598,7 +599,8 @@
spin_unlock_irqrestore(&cp->lock, flags);
if (restart)
_start_qcrypto_process(cp, pengine);
- qcrypto_bw_set_timeout(pengine);
+ if (pengine->bw_state != BUS_NO_BANDWIDTH)
+ qcrypto_bw_set_timeout(pengine);
}
static int qcrypto_count_sg(struct scatterlist *sg, int nbytes)
@@ -1692,12 +1694,12 @@
rctx->orig_src = req->src;
rctx->orig_dst = req->dst;
- if ((MAX_ALIGN_SIZE*2 > ULONG_MAX - req->assoclen) ||
- ((MAX_ALIGN_SIZE*2 + req->assoclen) >
- ULONG_MAX - qreq.authsize) ||
- ((MAX_ALIGN_SIZE*2 + req->assoclen +
+ if ((MAX_ALIGN_SIZE*2 > UINT_MAX - qreq.assoclen) ||
+ ((MAX_ALIGN_SIZE*2 + qreq.assoclen) >
+ UINT_MAX - qreq.authsize) ||
+ ((MAX_ALIGN_SIZE*2 + qreq.assoclen +
qreq.authsize) >
- ULONG_MAX - req->cryptlen)) {
+ UINT_MAX - req->cryptlen)) {
pr_err("Integer overflow on aead req length.\n");
return -EINVAL;
}
@@ -4303,7 +4305,6 @@
pengine->active_seq = 0;
pengine->last_active_seq = 0;
pengine->check_flag = false;
- qcrypto_bw_set_timeout(pengine);
tasklet_init(&pengine->done_tasklet, req_done, (unsigned long)pengine);
crypto_init_queue(&pengine->req_queue, MSM_QCRYPTO_REQ_QUEUE_LENGTH);
@@ -4706,38 +4707,32 @@
struct crypto_engine *pengine;
struct crypto_priv *cp;
unsigned long flags;
- bool restart = false;
pengine = platform_get_drvdata(pdev);
if (!pengine)
return -EINVAL;
-
cp = pengine->pcp;
if (!cp->ce_support.clk_mgmt_sus_res)
return 0;
-
spin_lock_irqsave(&cp->lock, flags);
if (pengine->bw_state == BUS_SUSPENDED) {
- pengine->bw_state = BUS_BANDWIDTH_ALLOCATING;
spin_unlock_irqrestore(&cp->lock, flags);
-
if (qce_pm_table.resume)
qce_pm_table.resume(pengine->qce);
- qcrypto_ce_set_bus(pengine, true);
-
spin_lock_irqsave(&cp->lock, flags);
- pengine->bw_state = BUS_HAS_BANDWIDTH;
- pengine->high_bw_req = false;
- restart = true;
+ pengine->bw_state = BUS_NO_BANDWIDTH;
pengine->active_seq++;
- pengine->check_flag = true;
+ pengine->check_flag = false;
+ if (cp->req_queue.qlen || pengine->req_queue.qlen) {
+ if (pengine->high_bw_req == false) {
+ qcrypto_ce_bw_allocate_req(pengine);
+ pengine->high_bw_req = true;
+ }
+ }
}
spin_unlock_irqrestore(&cp->lock, flags);
- if (restart)
- _start_qcrypto_process(cp, pengine);
-
return 0;
}
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 4fbbda4..ed1ee8d 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -3158,15 +3158,30 @@
return desc;
}
+/*
+ * adreno_find_region() - Find corresponding allocation for a given address
+ * @device: Device on which address operates
+ * @pt_base: The pagetable in which address is mapped
+ * @gpuaddr: The gpu address
+ * @size: Size in bytes of the address
+ * @entry: If the allocation is part of user space allocation then the mem
+ * entry is returned in this parameter. Caller is supposed to decrement
+ * refcount on this entry after its done using it.
+ *
+ * Finds an allocation descriptor for a given gpu address range
+ *
+ * Returns the descriptor on success else NULL
+ */
struct kgsl_memdesc *adreno_find_region(struct kgsl_device *device,
phys_addr_t pt_base,
unsigned int gpuaddr,
- unsigned int size)
+ unsigned int size,
+ struct kgsl_mem_entry **entry)
{
- struct kgsl_mem_entry *entry;
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct adreno_ringbuffer *ringbuffer = &adreno_dev->ringbuffer;
+ *entry = NULL;
if (kgsl_gpuaddr_in_memdesc(&ringbuffer->buffer_desc, gpuaddr, size))
return &ringbuffer->buffer_desc;
@@ -3180,20 +3195,33 @@
size))
return &device->mmu.setstate_memory;
- entry = kgsl_get_mem_entry(device, pt_base, gpuaddr, size);
+ *entry = kgsl_get_mem_entry(device, pt_base, gpuaddr, size);
- if (entry)
- return &entry->memdesc;
+ if (*entry)
+ return &((*entry)->memdesc);
return adreno_find_ctxtmem(device, pt_base, gpuaddr, size);
}
+/*
+ * adreno_convertaddr() - Convert a gpu address to kernel mapped address
+ * @device: Device on which the address operates
+ * @pt_base: The pagetable in which address is mapped
+ * @gpuaddr: The start address
+ * @size: The length of address range
+ * @entry: If the allocation is part of user space allocation then the mem
+ * entry is returned in this parameter. Caller is supposed to decrement
+ * refcount on this entry after its done using it.
+ *
+ * Returns the converted host pointer on success else NULL
+ */
uint8_t *adreno_convertaddr(struct kgsl_device *device, phys_addr_t pt_base,
- unsigned int gpuaddr, unsigned int size)
+ unsigned int gpuaddr, unsigned int size,
+ struct kgsl_mem_entry **entry)
{
struct kgsl_memdesc *memdesc;
- memdesc = adreno_find_region(device, pt_base, gpuaddr, size);
+ memdesc = adreno_find_region(device, pt_base, gpuaddr, size, entry);
return memdesc ? kgsl_gpuaddr_to_vaddr(memdesc, gpuaddr) : NULL;
}
diff --git a/drivers/gpu/msm/adreno.h b/drivers/gpu/msm/adreno.h
index c690801..b97c1b5 100644
--- a/drivers/gpu/msm/adreno.h
+++ b/drivers/gpu/msm/adreno.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2008-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
@@ -311,6 +311,7 @@
ADRENO_REG_CP_IB2_BASE,
ADRENO_REG_CP_IB2_BUFSZ,
ADRENO_REG_CP_TIMESTAMP,
+ ADRENO_REG_CP_HW_FAULT,
ADRENO_REG_SCRATCH_ADDR,
ADRENO_REG_SCRATCH_UMSK,
ADRENO_REG_SCRATCH_REG2,
@@ -487,10 +488,12 @@
struct kgsl_memdesc *adreno_find_region(struct kgsl_device *device,
phys_addr_t pt_base,
unsigned int gpuaddr,
- unsigned int size);
+ unsigned int size,
+ struct kgsl_mem_entry **entry);
uint8_t *adreno_convertaddr(struct kgsl_device *device,
- phys_addr_t pt_base, unsigned int gpuaddr, unsigned int size);
+ phys_addr_t pt_base, unsigned int gpuaddr, unsigned int size,
+ struct kgsl_mem_entry **entry);
struct kgsl_memdesc *adreno_find_ctxtmem(struct kgsl_device *device,
phys_addr_t pt_base, unsigned int gpuaddr, unsigned int size);
diff --git a/drivers/gpu/msm/adreno_a3xx.c b/drivers/gpu/msm/adreno_a3xx.c
index b0851a2..6189c20 100644
--- a/drivers/gpu/msm/adreno_a3xx.c
+++ b/drivers/gpu/msm/adreno_a3xx.c
@@ -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
@@ -13,6 +13,7 @@
#include <linux/delay.h>
#include <linux/sched.h>
+#include <linux/ratelimit.h>
#include <mach/socinfo.h>
#include "kgsl.h"
@@ -3061,7 +3062,6 @@
static void a3xx_err_callback(struct adreno_device *adreno_dev, int bit)
{
struct kgsl_device *device = &adreno_dev->dev;
- const char *err = "";
switch (bit) {
case A3XX_INT_RBBM_AHB_ERROR: {
@@ -3082,35 +3082,46 @@
/* Clear the error */
kgsl_regwrite(device, A3XX_RBBM_AHB_CMD, (1 << 3));
- return;
+ break;
}
case A3XX_INT_RBBM_REG_TIMEOUT:
- err = "RBBM: AHB register timeout";
+ KGSL_DRV_CRIT_RATELIMIT(device, "RBBM: AHB register timeout\n");
break;
case A3XX_INT_RBBM_ME_MS_TIMEOUT:
- err = "RBBM: ME master split timeout";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "RBBM: ME master split timeout\n");
break;
case A3XX_INT_RBBM_PFP_MS_TIMEOUT:
- err = "RBBM: PFP master split timeout";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "RBBM: PFP master split timeout\n");
break;
case A3XX_INT_RBBM_ATB_BUS_OVERFLOW:
- err = "RBBM: ATB bus oveflow";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "RBBM: ATB bus oveflow\n");
break;
case A3XX_INT_VFD_ERROR:
- err = "VFD: Out of bounds access";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "VFD: Out of bounds access\n");
break;
case A3XX_INT_CP_T0_PACKET_IN_IB:
- err = "ringbuffer TO packet in IB interrupt";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "ringbuffer TO packet in IB interrupt\n");
break;
case A3XX_INT_CP_OPCODE_ERROR:
- err = "ringbuffer opcode error interrupt";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "ringbuffer opcode error interrupt\n");
break;
case A3XX_INT_CP_RESERVED_BIT_ERROR:
- err = "ringbuffer reserved bit error interrupt";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "ringbuffer reserved bit error interrupt\n");
break;
- case A3XX_INT_CP_HW_FAULT:
- err = "ringbuffer hardware fault";
+ case A3XX_INT_CP_HW_FAULT: {
+ unsigned int reg;
+ adreno_readreg(adreno_dev, ADRENO_REG_CP_HW_FAULT, ®);
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "CP | Ringbuffer HW fault | status=%x\n", reg);
break;
+ }
case A3XX_INT_CP_REG_PROTECT_FAULT: {
unsigned int reg;
kgsl_regread(device, A3XX_CP_PROTECT_STATUS, ®);
@@ -3119,17 +3130,16 @@
"CP | Protected mode error| %s | addr=%x\n",
reg & (1 << 24) ? "WRITE" : "READ",
(reg & 0x1FFFF) >> 2);
+ break;
}
case A3XX_INT_CP_AHB_ERROR_HALT:
- err = "ringbuffer AHB error interrupt";
+ KGSL_DRV_CRIT(device, "ringbuffer AHB error interrupt\n");
break;
case A3XX_INT_UCHE_OOB_ACCESS:
- err = "UCHE: Out of bounds access";
+ KGSL_DRV_CRIT_RATELIMIT(device,
+ "UCHE: Out of bounds access\n");
break;
- default:
- return;
}
- KGSL_DRV_CRIT(device, "%s\n", err);
}
static void a3xx_cp_callback(struct adreno_device *adreno_dev, int irq)
@@ -4563,6 +4573,7 @@
ADRENO_REG_DEFINE(ADRENO_REG_CP_TIMESTAMP, REG_CP_TIMESTAMP),
ADRENO_REG_DEFINE(ADRENO_REG_SCRATCH_ADDR, REG_SCRATCH_ADDR),
ADRENO_REG_DEFINE(ADRENO_REG_SCRATCH_UMSK, REG_SCRATCH_UMSK),
+ ADRENO_REG_DEFINE(ADRENO_REG_CP_HW_FAULT, A3XX_CP_HW_FAULT),
ADRENO_REG_DEFINE(ADRENO_REG_RBBM_STATUS, A3XX_RBBM_STATUS),
ADRENO_REG_DEFINE(ADRENO_REG_RBBM_PERFCTR_CTL, A3XX_RBBM_PERFCTR_CTL),
ADRENO_REG_DEFINE(ADRENO_REG_RBBM_PERFCTR_LOAD_CMD0,
diff --git a/drivers/gpu/msm/adreno_postmortem.c b/drivers/gpu/msm/adreno_postmortem.c
index 0397cca..08c8b1f 100644
--- a/drivers/gpu/msm/adreno_postmortem.c
+++ b/drivers/gpu/msm/adreno_postmortem.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-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
@@ -199,8 +199,9 @@
phys_addr_t pt_base, uint32_t base_offset, uint32_t ib_base,
uint32_t ib_size, bool dump)
{
+ struct kgsl_mem_entry *ent = NULL;
uint8_t *base_addr = adreno_convertaddr(device, pt_base,
- ib_base, ib_size*sizeof(uint32_t));
+ ib_base, ib_size*sizeof(uint32_t), &ent);
if (base_addr && dump)
print_hex_dump(KERN_ERR, buffId, DUMP_PREFIX_OFFSET,
@@ -210,6 +211,10 @@
"offset:%5.5X%s\n",
buffId, ib_base, ib_size*4, base_offset,
base_addr ? "" : " [Invalid]");
+ if (ent) {
+ kgsl_memdesc_unmap(&ent->memdesc);
+ kgsl_mem_entry_put(ent);
+ }
}
#define IB_LIST_SIZE 64
@@ -228,13 +233,14 @@
int i, j;
uint32_t value;
uint32_t *ib1_addr;
+ struct kgsl_mem_entry *ent = NULL;
dump_ib(device, "IB1:", pt_base, base_offset, ib1_base,
ib1_size, dump);
/* fetch virtual address for given IB base */
ib1_addr = (uint32_t *)adreno_convertaddr(device, pt_base,
- ib1_base, ib1_size*sizeof(uint32_t));
+ ib1_base, ib1_size*sizeof(uint32_t), &ent);
if (!ib1_addr)
return;
@@ -261,6 +267,10 @@
++ib_list->count;
}
}
+ if (ent) {
+ kgsl_memdesc_unmap(&ent->memdesc);
+ kgsl_mem_entry_put(ent);
+ }
}
static void adreno_dump_rb_buffer(struct kgsl_device *device, const void *buf,
diff --git a/drivers/gpu/msm/adreno_snapshot.c b/drivers/gpu/msm/adreno_snapshot.c
index b7c2237..bc37bf2 100644
--- a/drivers/gpu/msm/adreno_snapshot.c
+++ b/drivers/gpu/msm/adreno_snapshot.c
@@ -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
@@ -37,6 +37,7 @@
phys_addr_t ptbase;
void *ptr;
int dwords;
+ struct kgsl_mem_entry *entry;
} objbuf[SNAPSHOT_OBJ_BUFSIZE];
/* Pointer to the next open entry in the object list */
@@ -49,6 +50,7 @@
{
int index;
void *ptr;
+ struct kgsl_mem_entry *entry = NULL;
/*
* Sometimes IBs can be reused in the same dump. Because we parse from
@@ -74,7 +76,7 @@
* adreno_convertaddr verifies that the IB size is valid - at least in
* the context of it being smaller then the allocated memory space
*/
- ptr = adreno_convertaddr(device, ptbase, gpuaddr, dwords << 2);
+ ptr = adreno_convertaddr(device, ptbase, gpuaddr, dwords << 2, &entry);
if (ptr == NULL) {
KGSL_DRV_ERR(device,
@@ -87,6 +89,7 @@
objbuf[objbufptr].gpuaddr = gpuaddr;
objbuf[objbufptr].ptbase = ptbase;
objbuf[objbufptr].dwords = dwords;
+ objbuf[objbufptr].entry = entry;
objbuf[objbufptr++].ptr = ptr;
}
@@ -562,6 +565,7 @@
{
int i, ret, rem = dwords;
unsigned int *src;
+ struct kgsl_mem_entry *entry = NULL;
/*
* If the object is already in the list, we don't need to parse it again
@@ -571,7 +575,7 @@
return 0;
src = (unsigned int *) adreno_convertaddr(device, ptbase, gpuaddr,
- dwords << 2);
+ dwords << 2, &entry);
if (src == NULL)
return -EINVAL;
@@ -626,6 +630,11 @@
if (ret >= 0)
snapshot_frozen_objsize += ret;
+ if (entry) {
+ kgsl_memdesc_unmap(&entry->memdesc);
+ kgsl_mem_entry_put(entry);
+ }
+
return ret;
}
@@ -944,6 +953,10 @@
snapshot = kgsl_snapshot_add_section(device,
KGSL_SNAPSHOT_SECTION_IB, snapshot, remain,
snapshot_ib, &objbuf[obj]);
+ if (objbuf[obj].entry) {
+ kgsl_memdesc_unmap(&(objbuf[obj].entry->memdesc));
+ kgsl_mem_entry_put(objbuf[obj].entry);
+ }
break;
default:
KGSL_DRV_ERR(device,
diff --git a/drivers/gpu/msm/kgsl.h b/drivers/gpu/msm/kgsl.h
index 0bd71cb..2ee4c2c 100644
--- a/drivers/gpu/msm/kgsl.h
+++ b/drivers/gpu/msm/kgsl.h
@@ -130,7 +130,8 @@
int (*vmfault)(struct kgsl_memdesc *, struct vm_area_struct *,
struct vm_fault *);
void (*free)(struct kgsl_memdesc *memdesc);
- int (*map_kernel_mem)(struct kgsl_memdesc *);
+ int (*map_kernel)(struct kgsl_memdesc *);
+ void (*unmap_kernel)(struct kgsl_memdesc *);
};
/* Internal definitions for memdesc->priv */
@@ -146,6 +147,7 @@
struct kgsl_memdesc {
struct kgsl_pagetable *pagetable;
void *hostptr; /* kernel virtual address */
+ unsigned int hostptr_count; /* number of threads using hostptr */
unsigned long useraddr; /* userspace address */
unsigned int gpuaddr;
phys_addr_t physaddr;
@@ -262,13 +264,17 @@
static inline void *kgsl_memdesc_map(struct kgsl_memdesc *memdesc)
{
- if (memdesc->hostptr == NULL && memdesc->ops &&
- memdesc->ops->map_kernel_mem)
- memdesc->ops->map_kernel_mem(memdesc);
+ if (memdesc->ops && memdesc->ops->map_kernel)
+ memdesc->ops->map_kernel(memdesc);
return memdesc->hostptr;
}
+static inline void kgsl_memdesc_unmap(struct kgsl_memdesc *memdesc)
+{
+ if (memdesc->ops && memdesc->ops->unmap_kernel)
+ memdesc->ops->unmap_kernel(memdesc);
+}
static inline uint8_t *kgsl_gpuaddr_to_vaddr(struct kgsl_memdesc *memdesc,
unsigned int gpuaddr)
{
diff --git a/drivers/gpu/msm/kgsl_log.h b/drivers/gpu/msm/kgsl_log.h
index f90627e..04ca7a5 100644
--- a/drivers/gpu/msm/kgsl_log.h
+++ b/drivers/gpu/msm/kgsl_log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002,2008-2011,2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2002,2008-2011,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
@@ -56,6 +56,26 @@
} \
})
+#define dev_crit_ratelimited(dev, fmt, ...) \
+ dev_level_ratelimited(dev_crit, dev, fmt, ##__VA_ARGS__)
+
+#define dev_level_ratelimited(dev_level, dev, fmt, ...) \
+do { \
+ static DEFINE_RATELIMIT_STATE(_rs, \
+ DEFAULT_RATELIMIT_INTERVAL, \
+ DEFAULT_RATELIMIT_BURST); \
+ if (__ratelimit(&_rs)) \
+ dev_level(dev, fmt, ##__VA_ARGS__); \
+} while (0)
+
+#define KGSL_LOG_CRIT_RATELIMITED(dev, lvl, fmt, args...) \
+ do { \
+ if ((lvl) >= 2) \
+ dev_crit_ratelimited(dev, "|%s| " fmt, \
+ __func__, ##args);\
+ } while (0)
+
+
#define KGSL_DRV_INFO(_dev, fmt, args...) \
KGSL_LOG_INFO(_dev->dev, _dev->drv_log, fmt, ##args)
#define KGSL_DRV_WARN(_dev, fmt, args...) \
@@ -64,6 +84,8 @@
KGSL_LOG_ERR(_dev->dev, _dev->drv_log, fmt, ##args)
#define KGSL_DRV_CRIT(_dev, fmt, args...) \
KGSL_LOG_CRIT(_dev->dev, _dev->drv_log, fmt, ##args)
+#define KGSL_DRV_CRIT_RATELIMIT(_dev, fmt, args...) \
+KGSL_LOG_CRIT_RATELIMITED(_dev->dev, _dev->drv_log, fmt, ##args)
#define KGSL_CMD_INFO(_dev, fmt, args...) \
KGSL_LOG_INFO(_dev->dev, _dev->cmd_log, fmt, ##args)
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index 563f7ef..e931a24 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-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
@@ -1428,6 +1428,7 @@
del_timer_sync(&device->idle_timer);
/* make sure power is on to stop the device*/
kgsl_pwrctrl_enable(device);
+ kgsl_pwrctrl_irq(device, KGSL_PWRFLAGS_ON);
device->ftbl->suspend_context(device);
device->ftbl->stop(device);
_sleep_accounting(device);
diff --git a/drivers/gpu/msm/kgsl_sharedmem.c b/drivers/gpu/msm/kgsl_sharedmem.c
index c8ea471..896fb19 100644
--- a/drivers/gpu/msm/kgsl_sharedmem.c
+++ b/drivers/gpu/msm/kgsl_sharedmem.c
@@ -24,6 +24,8 @@
#include "kgsl_cffdump.h"
#include "kgsl_device.h"
+DEFINE_MUTEX(kernel_map_global_lock);
+
/* An attribute for showing per-process memory statistics */
struct kgsl_mem_entry_attribute {
struct attribute attr;
@@ -390,7 +392,31 @@
static int kgsl_page_alloc_vmflags(struct kgsl_memdesc *memdesc)
{
- return VM_RESERVED | VM_DONTEXPAND;
+ return VM_RESERVED | VM_DONTEXPAND | VM_DONTCOPY;
+}
+
+/*
+ * kgsl_page_alloc_unmap_kernel() - Unmap the memory in memdesc
+ *
+ * @memdesc: The memory descriptor which contains information about the memory
+ *
+ * Unmaps the memory mapped into kernel address space
+ */
+static void kgsl_page_alloc_unmap_kernel(struct kgsl_memdesc *memdesc)
+{
+ mutex_lock(&kernel_map_global_lock);
+ if (!memdesc->hostptr) {
+ BUG_ON(memdesc->hostptr_count);
+ goto done;
+ }
+ memdesc->hostptr_count--;
+ if (memdesc->hostptr_count)
+ goto done;
+ vunmap(memdesc->hostptr);
+ kgsl_driver.stats.vmalloc -= memdesc->size;
+ memdesc->hostptr = NULL;
+done:
+ mutex_unlock(&kernel_map_global_lock);
}
static void kgsl_page_alloc_free(struct kgsl_memdesc *memdesc)
@@ -401,10 +427,11 @@
kgsl_driver.stats.page_alloc -= memdesc->size;
- if (memdesc->hostptr) {
- vunmap(memdesc->hostptr);
- kgsl_driver.stats.vmalloc -= memdesc->size;
- }
+ kgsl_page_alloc_unmap_kernel(memdesc);
+
+ /* we certainly do not expect the hostptr to still be mapped */
+ BUG_ON(memdesc->hostptr);
+
if (memdesc->sg)
for_each_sg(memdesc->sg, sg, sglen, i)
__free_pages(sg_page(sg), get_order(sg->length));
@@ -412,7 +439,7 @@
static int kgsl_contiguous_vmflags(struct kgsl_memdesc *memdesc)
{
- return VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND;
+ return VM_RESERVED | VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTCOPY;
}
/*
@@ -425,6 +452,9 @@
*/
static int kgsl_page_alloc_map_kernel(struct kgsl_memdesc *memdesc)
{
+ int ret = 0;
+
+ mutex_lock(&kernel_map_global_lock);
if (!memdesc->hostptr) {
pgprot_t page_prot = pgprot_writecombine(PAGE_KERNEL);
struct page **pages = NULL;
@@ -438,7 +468,8 @@
if (!pages) {
KGSL_CORE_ERR("vmalloc(%d) failed\n",
npages * sizeof(struct page *));
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto done;
}
for_each_sg(memdesc->sg, sg, sglen, i) {
@@ -452,14 +483,19 @@
memdesc->hostptr = vmap(pages, count,
VM_IOREMAP, page_prot);
- KGSL_STATS_ADD(memdesc->size, kgsl_driver.stats.vmalloc,
+ if (memdesc->hostptr)
+ KGSL_STATS_ADD(memdesc->size, kgsl_driver.stats.vmalloc,
kgsl_driver.stats.vmalloc_max);
+ else
+ ret = -ENOMEM;
vfree(pages);
}
- if (!memdesc->hostptr)
- return -ENOMEM;
+ if (memdesc->hostptr)
+ memdesc->hostptr_count++;
+done:
+ mutex_unlock(&kernel_map_global_lock);
- return 0;
+ return ret;
}
static int kgsl_contiguous_vmfault(struct kgsl_memdesc *memdesc,
@@ -483,28 +519,51 @@
return VM_FAULT_NOPAGE;
}
+static void kgsl_ebimem_unmap_kernel(struct kgsl_memdesc *memdesc)
+{
+ mutex_lock(&kernel_map_global_lock);
+ if (!memdesc->hostptr) {
+ BUG_ON(memdesc->hostptr_count);
+ goto done;
+ }
+ memdesc->hostptr_count--;
+ if (memdesc->hostptr_count)
+ goto done;
+
+ iounmap(memdesc->hostptr);
+ memdesc->hostptr = NULL;
+done:
+ mutex_unlock(&kernel_map_global_lock);
+}
+
static void kgsl_ebimem_free(struct kgsl_memdesc *memdesc)
{
kgsl_driver.stats.coherent -= memdesc->size;
- if (memdesc->hostptr)
- iounmap(memdesc->hostptr);
+ kgsl_ebimem_unmap_kernel(memdesc);
+ /* we certainly do not expect the hostptr to still be mapped */
+ BUG_ON(memdesc->hostptr);
free_contiguous_memory_by_paddr(memdesc->physaddr);
}
static int kgsl_ebimem_map_kernel(struct kgsl_memdesc *memdesc)
{
+ int ret = 0;
+ mutex_lock(&kernel_map_global_lock);
if (!memdesc->hostptr) {
memdesc->hostptr = ioremap(memdesc->physaddr, memdesc->size);
if (!memdesc->hostptr) {
KGSL_CORE_ERR("ioremap failed, addr:0x%p, size:0x%x\n",
memdesc->hostptr, memdesc->size);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto done;
}
}
-
- return 0;
+ memdesc->hostptr_count++;
+done:
+ mutex_unlock(&kernel_map_global_lock);
+ return ret;
}
static void kgsl_coherent_free(struct kgsl_memdesc *memdesc)
@@ -519,7 +578,8 @@
.free = kgsl_page_alloc_free,
.vmflags = kgsl_page_alloc_vmflags,
.vmfault = kgsl_page_alloc_vmfault,
- .map_kernel_mem = kgsl_page_alloc_map_kernel,
+ .map_kernel = kgsl_page_alloc_map_kernel,
+ .unmap_kernel = kgsl_page_alloc_unmap_kernel,
};
EXPORT_SYMBOL(kgsl_page_alloc_ops);
@@ -527,7 +587,8 @@
.free = kgsl_ebimem_free,
.vmflags = kgsl_contiguous_vmflags,
.vmfault = kgsl_contiguous_vmfault,
- .map_kernel_mem = kgsl_ebimem_map_kernel,
+ .map_kernel = kgsl_ebimem_map_kernel,
+ .unmap_kernel = kgsl_ebimem_unmap_kernel,
};
static struct kgsl_memdesc_ops kgsl_coherent_ops = {
@@ -892,12 +953,12 @@
if (result)
return result;
- memdesc->hostptr = ioremap(memdesc->physaddr, size);
+ result = kgsl_ebimem_map_kernel(memdesc);
- if (memdesc->hostptr == NULL) {
- KGSL_CORE_ERR("ioremap failed\n");
+ if (result) {
+ KGSL_CORE_ERR("hostptr mapping failed\n");
kgsl_sharedmem_free(memdesc);
- return -ENOMEM;
+ return result;
}
return 0;
diff --git a/drivers/gpu/msm/kgsl_snapshot.c b/drivers/gpu/msm/kgsl_snapshot.c
index 76f0507..6dba0bb 100644
--- a/drivers/gpu/msm/kgsl_snapshot.c
+++ b/drivers/gpu/msm/kgsl_snapshot.c
@@ -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
@@ -304,6 +304,8 @@
list_del(&obj->node);
obj->entry->memdesc.priv &= ~KGSL_MEMDESC_FROZEN;
+
+ kgsl_memdesc_unmap(&obj->entry->memdesc);
kgsl_mem_entry_put(obj->entry);
kfree(obj);
@@ -418,7 +420,7 @@
if (obj == NULL) {
KGSL_DRV_ERR(device, "Unable to allocate memory\n");
- goto err_put;
+ goto err_unmap;
}
obj->type = type;
@@ -444,6 +446,9 @@
entry->memdesc.priv |= KGSL_MEMDESC_FROZEN;
return ret;
+
+err_unmap:
+ kgsl_memdesc_unmap(&entry->memdesc);
err_put:
kgsl_mem_entry_put(entry);
return ret;
diff --git a/drivers/hwmon/qpnp-adc-common.c b/drivers/hwmon/qpnp-adc-common.c
index 96b058b..5847b4b 100644
--- a/drivers/hwmon/qpnp-adc-common.c
+++ b/drivers/hwmon/qpnp-adc-common.c
@@ -1128,7 +1128,7 @@
for_each_child_of_node(node, child) {
int channel_num, scaling, post_scaling, hw_settle_time;
- int fast_avg_setup, calib_type, rc;
+ int fast_avg_setup, calib_type = 0, rc;
const char *calibration_param, *channel_name;
channel_name = of_get_property(child,
@@ -1149,23 +1149,40 @@
pr_err("Invalid channel decimation property\n");
return -EINVAL;
}
- rc = of_property_read_u32(child,
- "qcom,pre-div-channel-scaling", &scaling);
- if (rc) {
- pr_err("Invalid channel scaling property\n");
- return -EINVAL;
- }
- rc = of_property_read_u32(child,
- "qcom,scale-function", &post_scaling);
- if (rc) {
- pr_err("Invalid channel post scaling property\n");
- return -EINVAL;
- }
- rc = of_property_read_u32(child,
+ if (!of_device_is_compatible(node, "qcom,qpnp-iadc")) {
+ rc = of_property_read_u32(child,
"qcom,hw-settle-time", &hw_settle_time);
- if (rc) {
- pr_err("Invalid channel hw settle time property\n");
- return -EINVAL;
+ if (rc) {
+ pr_err("Invalid channel hw settle time property\n");
+ return -EINVAL;
+ }
+ rc = of_property_read_u32(child,
+ "qcom,pre-div-channel-scaling", &scaling);
+ if (rc) {
+ pr_err("Invalid channel scaling property\n");
+ return -EINVAL;
+ }
+ rc = of_property_read_u32(child,
+ "qcom,scale-function", &post_scaling);
+ if (rc) {
+ pr_err("Invalid channel post scaling property\n");
+ return -EINVAL;
+ }
+ rc = of_property_read_string(child,
+ "qcom,calibration-type", &calibration_param);
+ if (rc) {
+ pr_err("Invalid calibration type\n");
+ return -EINVAL;
+ }
+ if (!strcmp(calibration_param, "absolute"))
+ calib_type = CALIB_ABSOLUTE;
+ else if (!strcmp(calibration_param, "ratiometric"))
+ calib_type = CALIB_RATIOMETRIC;
+ else {
+ pr_err("%s: Invalid calibration property\n",
+ __func__);
+ return -EINVAL;
+ }
}
rc = of_property_read_u32(child,
"qcom,fast-avg-setup", &fast_avg_setup);
@@ -1173,29 +1190,17 @@
pr_err("Invalid channel fast average setup\n");
return -EINVAL;
}
- rc = of_property_read_string(child, "qcom,calibration-type",
- &calibration_param);
- if (rc) {
- pr_err("Invalid calibration type\n");
- return -EINVAL;
- }
- if (!strncmp(calibration_param, "absolute", 8))
- calib_type = CALIB_ABSOLUTE;
- else if (!strncmp(calibration_param, "ratiometric", 11))
- calib_type = CALIB_RATIOMETRIC;
- else {
- pr_err("%s: Invalid calibration property\n", __func__);
- return -EINVAL;
- }
/* Individual channel properties */
adc_channel_list[i].name = (char *)channel_name;
adc_channel_list[i].channel_num = channel_num;
- adc_channel_list[i].chan_path_prescaling = scaling;
adc_channel_list[i].adc_decimation = decimation;
- adc_channel_list[i].adc_scale_fn = post_scaling;
- adc_channel_list[i].hw_settle_time = hw_settle_time;
adc_channel_list[i].fast_avg_setup = fast_avg_setup;
- adc_channel_list[i].calib_type = calib_type;
+ if (!of_device_is_compatible(node, "qcom,qpnp-iadc")) {
+ adc_channel_list[i].chan_path_prescaling = scaling;
+ adc_channel_list[i].adc_scale_fn = post_scaling;
+ adc_channel_list[i].hw_settle_time = hw_settle_time;
+ adc_channel_list[i].calib_type = calib_type;
+ }
i++;
}
diff --git a/drivers/hwmon/qpnp-adc-current.c b/drivers/hwmon/qpnp-adc-current.c
index dddbbd0..1354907 100644
--- a/drivers/hwmon/qpnp-adc-current.c
+++ b/drivers/hwmon/qpnp-adc-current.c
@@ -70,7 +70,6 @@
#define QPNP_ADC_DEC_RATIO_SEL_MASK 0xc
#define QPNP_ADC_DIG_DEC_RATIO_SEL_SHIFT 2
-#define QPNP_HW_SETTLE_DELAY 0x51
#define QPNP_CONV_REQ 0x52
#define QPNP_CONV_REQ_SET BIT(7)
#define QPNP_CONV_SEQ_CTL 0x54
@@ -163,6 +162,7 @@
bool iadc_poll_eoc;
u16 batt_id_trim_cnst_rds;
int rds_trim_default_type;
+ int max_channels_available;
bool rds_trim_default_check;
int32_t rsense_workaround_value;
struct sensor_device_attribute sens_attr[0];
@@ -802,13 +802,6 @@
return rc;
}
- rc = qpnp_iadc_write_reg(iadc, QPNP_HW_SETTLE_DELAY,
- iadc->adc->amux_prop->hw_settle_time);
- if (rc < 0) {
- pr_err("qpnp adc configure error for hw settling time setup\n");
- return rc;
- }
-
rc = qpnp_iadc_write_reg(iadc, QPNP_FAST_AVG_CTL,
iadc->adc->amux_prop->fast_avg_setup);
if (rc < 0) {
@@ -927,6 +920,9 @@
pm_stay_awake(iadc->dev);
}
+ iadc->adc->amux_prop->decimation = DECIMATION_TYPE1;
+ iadc->adc->amux_prop->fast_avg_setup = ADC_FAST_AVG_SAMPLE_1;
+
rc = qpnp_iadc_configure(iadc, GAIN_CALIBRATION_17P857MV,
&raw_data, mode_sel);
if (rc < 0) {
@@ -1170,6 +1166,7 @@
int32_t rsense_u_ohms = 0;
int64_t result_current;
uint16_t raw_data;
+ int dt_index = 0;
if (qpnp_iadc_is_valid(iadc) < 0)
return -EPROBE_DEFER;
@@ -1187,6 +1184,22 @@
mutex_lock(&iadc->adc->adc_lock);
+ while (((enum qpnp_iadc_channels)
+ iadc->adc->adc_channels[dt_index].channel_num
+ != channel) && (dt_index < iadc->max_channels_available))
+ dt_index++;
+
+ if (dt_index >= iadc->max_channels_available) {
+ pr_err("not a valid IADC channel\n");
+ rc = -EINVAL;
+ goto fail;
+ }
+
+ iadc->adc->amux_prop->decimation =
+ iadc->adc->adc_channels[dt_index].adc_decimation;
+ iadc->adc->amux_prop->fast_avg_setup =
+ iadc->adc->adc_channels[dt_index].fast_avg_setup;
+
if (iadc->iadc_poll_eoc) {
pr_debug("acquiring iadc eoc wakelock\n");
pm_stay_awake(iadc->dev);
@@ -1289,6 +1302,7 @@
enum qpnp_vadc_channels v_channel, struct qpnp_vadc_result *v_result)
{
int rc = 0, mode_sel = 0, num = 0, rsense_n_ohms = 0, sign = 0;
+ int dt_index = 0;
uint16_t raw_data;
int32_t rsense_u_ohms = 0;
int64_t result_current;
@@ -1316,6 +1330,22 @@
goto fail;
}
+ while (((enum qpnp_iadc_channels)
+ iadc->adc->adc_channels[dt_index].channel_num
+ != i_channel) && (dt_index < iadc->max_channels_available))
+ dt_index++;
+
+ if (dt_index >= iadc->max_channels_available) {
+ pr_err("not a valid IADC channel\n");
+ rc = -EINVAL;
+ goto fail;
+ }
+
+ iadc->adc->amux_prop->decimation =
+ iadc->adc->adc_channels[dt_index].adc_decimation;
+ iadc->adc->amux_prop->fast_avg_setup =
+ iadc->adc->adc_channels[dt_index].fast_avg_setup;
+
rc = qpnp_iadc_configure(iadc, i_channel, &raw_data, mode_sel);
if (rc < 0) {
pr_err("qpnp adc result read failed with %d\n", rc);
@@ -1529,6 +1559,7 @@
goto fail;
}
+ iadc->max_channels_available = count_adc_channel_list;
INIT_WORK(&iadc->trigger_completion_work, qpnp_iadc_trigger_completion);
INIT_DELAYED_WORK(&iadc->iadc_work, qpnp_iadc_work);
rc = qpnp_iadc_comp_info(iadc);
diff --git a/drivers/hwmon/qpnp-adc-voltage.c b/drivers/hwmon/qpnp-adc-voltage.c
index ee69840..54ad1ff 100644
--- a/drivers/hwmon/qpnp-adc-voltage.c
+++ b/drivers/hwmon/qpnp-adc-voltage.c
@@ -1048,11 +1048,6 @@
mutex_lock(&vadc->adc->adc_lock);
- if (vadc->vadc_poll_eoc) {
- pr_debug("requesting vadc eoc stay awake\n");
- pm_stay_awake(vadc->dev);
- }
-
if (!vadc->vadc_init_calib) {
rc = qpnp_vadc_version_check(vadc);
if (rc)
@@ -1188,11 +1183,6 @@
vadc->adc->adc_prop, vadc->adc->amux_prop->chan_prop, result);
fail_unlock:
- if (vadc->vadc_poll_eoc) {
- pr_debug("requesting vadc eoc stay awake\n");
- pm_relax(vadc->dev);
- }
-
mutex_unlock(&vadc->adc->adc_lock);
return rc;
@@ -1528,8 +1518,6 @@
}
hwmon_device_unregister(vadc->vadc_hwmon);
list_del(&vadc->list);
- if (vadc->vadc_poll_eoc)
- pm_relax(vadc->dev);
dev_set_drvdata(&spmi->dev, NULL);
return 0;
@@ -1541,10 +1529,33 @@
{}
};
+static int qpnp_vadc_suspend_noirq(struct device *dev)
+{
+ struct qpnp_vadc_chip *vadc = dev_get_drvdata(dev);
+ u8 status = 0;
+
+ if (vadc->vadc_poll_eoc) {
+ qpnp_vadc_read_reg(vadc, QPNP_VADC_STATUS1, &status);
+ status &= QPNP_VADC_STATUS1_REQ_STS_EOC_MASK;
+ pr_debug("vadc conversion status=%d\n", status);
+ if (status != QPNP_VADC_STATUS1_EOC) {
+ pr_err(
+ "Aborting suspend, adc conversion requested while suspending\n");
+ return -EBUSY;
+ }
+ }
+ return 0;
+}
+
+static const struct dev_pm_ops qpnp_vadc_pm_ops = {
+ .suspend_noirq = qpnp_vadc_suspend_noirq,
+};
+
static struct spmi_driver qpnp_vadc_driver = {
.driver = {
.name = "qcom,qpnp-vadc",
.of_match_table = qpnp_vadc_match_table,
+ .pm = &qpnp_vadc_pm_ops,
},
.probe = qpnp_vadc_probe,
.remove = qpnp_vadc_remove,
diff --git a/drivers/leds/leds-qpnp.c b/drivers/leds/leds-qpnp.c
old mode 100644
new mode 100755
index 0413472..059e488
--- a/drivers/leds/leds-qpnp.c
+++ b/drivers/leds/leds-qpnp.c
@@ -221,6 +221,8 @@
#define KPDBL_MODULE_EN 0x80
#define KPDBL_MODULE_DIS 0x00
#define KPDBL_MODULE_EN_MASK 0x80
+#define NUM_KPDBL_LEDS 4
+#define KPDBL_MASTER_BIT_INDEX 0
/**
* enum qpnp_leds - QPNP supported led ids
@@ -392,10 +394,12 @@
* @safety_timer - enable safety timer or watchdog timer
* @torch_enable - enable flash LED torch mode
* @flash_reg_get - flash regulator attached or not
+ * @flash_wa_reg_get - workaround regulator attached or not
* @flash_on - flash status, on or off
* @torch_on - torch status, on or off
* @flash_boost_reg - boost regulator for flash
* @torch_boost_reg - boost regulator for torch
+ * @flash_wa_reg - flash regulator for wa
*/
struct flash_config_data {
u8 current_prgm;
@@ -412,10 +416,12 @@
bool safety_timer;
bool torch_enable;
bool flash_reg_get;
+ bool flash_wa_reg_get;
bool flash_on;
bool torch_on;
struct regulator *flash_boost_reg;
struct regulator *torch_boost_reg;
+ struct regulator *flash_wa_reg;
};
/**
@@ -428,6 +434,7 @@
* @always_on - always on row
* @lut_params - lut parameters to be used by pwm driver
* @duty_cycles - duty cycles for lut
+ * @pwm_mode - pwm mode in use
*/
struct kpdbl_config_data {
struct pwm_config_data *pwm_cfg;
@@ -437,6 +444,7 @@
bool always_on;
struct pwm_duty_cycles *duty_cycles;
struct lut_params lut_params;
+ u8 pwm_mode;
};
/**
@@ -453,6 +461,7 @@
* struct qpnp_led_data - internal led data structure
* @led_classdev - led class device
* @delayed_work - delayed work for turning off the LED
+ * @workqueue - dedicated workqueue to handle concurrency
* @work - workqueue for led
* @id - led index
* @base_reg - base register given in device tree
@@ -467,6 +476,7 @@
struct led_classdev cdev;
struct spmi_device *spmi_dev;
struct delayed_work dwork;
+ struct workqueue_struct *workqueue;
struct work_struct work;
int id;
u16 base;
@@ -480,11 +490,15 @@
struct mpp_config_data *mpp_cfg;
int max_current;
bool default_on;
+ bool in_order_command_processing;
int turn_off_delay_ms;
};
-static int num_kpbl_leds_on;
static DEFINE_MUTEX(flash_lock);
+static struct pwm_device *kpdbl_master;
+static u32 kpdbl_master_period_us;
+DECLARE_BITMAP(kpdbl_leds_in_use, NUM_KPDBL_LEDS);
+static bool is_kpdbl_master_turn_on;
static int
qpnp_led_masked_write(struct qpnp_led_data *led, u16 addr, u8 mask, u8 val)
@@ -832,13 +846,35 @@
if (!regulator_on && !led->flash_cfg->flash_on) {
for (i = 0; i < led->num_leds; i++) {
if (led_array[i].flash_cfg->flash_reg_get) {
+ if (led_array[i].flash_cfg->flash_wa_reg_get) {
+ rc = regulator_enable(
+ led_array[i].flash_cfg->
+ flash_wa_reg);
+ if (rc) {
+ dev_err(&led->spmi_dev->dev,
+ "Flash wa regulator"
+ "enable failed(%d)\n",
+ rc);
+ return rc;
+ }
+ }
+
rc = regulator_enable(
led_array[i].flash_cfg->\
flash_boost_reg);
if (rc) {
+ if (led_array[i].flash_cfg->
+ flash_wa_reg_get)
+ /* Disable flash wa regulator
+ * when flash boost regulator
+ * enable fails
+ */
+ regulator_disable(
+ led_array[i].flash_cfg->
+ flash_wa_reg);
dev_err(&led->spmi_dev->dev,
- "Regulator enable failed(%d)\n",
- rc);
+ "Flash boost regulator enable"
+ "failed(%d)\n", rc);
return rc;
}
led->flash_cfg->flash_on = true;
@@ -867,10 +903,22 @@
flash_boost_reg);
if (rc) {
dev_err(&led->spmi_dev->dev,
- "Regulator disable failed(%d)\n",
- rc);
+ "Flash boost regulator disable"
+ "failed(%d)\n", rc);
return rc;
}
+ if (led_array[i].flash_cfg->flash_wa_reg_get) {
+ rc = regulator_disable(
+ led_array[i].flash_cfg->
+ flash_wa_reg);
+ if (rc) {
+ dev_err(&led->spmi_dev->dev,
+ "Flash_wa regulator"
+ "disable failed(%d)\n",
+ rc);
+ return rc;
+ }
+ }
led->flash_cfg->flash_on = false;
}
break;
@@ -1237,7 +1285,8 @@
if (!led->kpdbl_cfg->pwm_cfg->blinking)
led->kpdbl_cfg->pwm_cfg->mode =
led->kpdbl_cfg->pwm_cfg->default_mode;
- if (!num_kpbl_leds_on) {
+
+ if (bitmap_empty(kpdbl_leds_in_use, NUM_KPDBL_LEDS)) {
rc = qpnp_led_masked_write(led, KPDBL_ENABLE(led->base),
KPDBL_MODULE_EN_MASK, KPDBL_MODULE_EN);
if (rc) {
@@ -1247,6 +1296,33 @@
}
}
+ /* On some platforms, GPLED1 channel should always be enabled
+ * for the other GPLEDs 2/3/4 to glow. Before enabling GPLED
+ * 2/3/4, first check if GPLED1 is already enabled. If GPLED1
+ * channel is not enabled, then enable the GPLED1 channel but
+ * with a 0 brightness
+ */
+ if (!led->kpdbl_cfg->always_on &&
+ !test_bit(KPDBL_MASTER_BIT_INDEX, kpdbl_leds_in_use) &&
+ kpdbl_master) {
+ rc = pwm_config_us(kpdbl_master, 0,
+ kpdbl_master_period_us);
+ if (rc < 0) {
+ dev_err(&led->spmi_dev->dev,
+ "pwm config failed\n");
+ return rc;
+ }
+
+ rc = pwm_enable(kpdbl_master);
+ if (rc < 0) {
+ dev_err(&led->spmi_dev->dev,
+ "pwm enable failed\n");
+ return rc;
+ }
+ set_bit(KPDBL_MASTER_BIT_INDEX,
+ kpdbl_leds_in_use);
+ }
+
if (led->kpdbl_cfg->pwm_cfg->mode == PWM_MODE) {
period_us = led->kpdbl_cfg->pwm_cfg->pwm_period_us;
if (period_us > INT_MAX / NSEC_PER_USEC) {
@@ -1276,39 +1352,77 @@
return rc;
}
- num_kpbl_leds_on++;
+ set_bit(led->kpdbl_cfg->row_id, kpdbl_leds_in_use);
+
+ /* is_kpdbl_master_turn_on will be set to true when GPLED1
+ * channel is enabled and has a valid brightness value
+ */
+ if (led->kpdbl_cfg->always_on)
+ is_kpdbl_master_turn_on = true;
} else {
led->kpdbl_cfg->pwm_cfg->mode =
led->kpdbl_cfg->pwm_cfg->default_mode;
+ /* Before disabling GPLED1, check if any other GPLED 2/3/4 is
+ * on. If any of the other GPLED 2/3/4 is on, then have the
+ * GPLED1 channel enabled with 0 brightness.
+ */
if (led->kpdbl_cfg->always_on) {
- rc = pwm_config_us(led->kpdbl_cfg->pwm_cfg->pwm_dev, 0,
- led->kpdbl_cfg->pwm_cfg->pwm_period_us);
- if (rc < 0) {
- dev_err(&led->spmi_dev->dev,
+ if (bitmap_weight(kpdbl_leds_in_use,
+ NUM_KPDBL_LEDS) > 1) {
+ rc = pwm_config_us(
+ led->kpdbl_cfg->pwm_cfg->pwm_dev, 0,
+ led->kpdbl_cfg->pwm_cfg->pwm_period_us);
+ if (rc < 0) {
+ dev_err(&led->spmi_dev->dev,
"pwm config failed\n");
- return rc;
- }
+ return rc;
+ }
- rc = pwm_enable(led->kpdbl_cfg->pwm_cfg->pwm_dev);
- if (rc < 0) {
- dev_err(&led->spmi_dev->dev, "pwm enable failed\n");
- return rc;
+ rc = pwm_enable(led->kpdbl_cfg->pwm_cfg->
+ pwm_dev);
+ if (rc < 0) {
+ dev_err(&led->spmi_dev->dev,
+ "pwm enable failed\n");
+ return rc;
+ }
+ } else {
+ if (kpdbl_master) {
+ pwm_disable(kpdbl_master);
+ clear_bit(KPDBL_MASTER_BIT_INDEX,
+ kpdbl_leds_in_use);
+ rc = qpnp_led_masked_write(
+ led, KPDBL_ENABLE(led->base),
+ KPDBL_MODULE_EN_MASK,
+ KPDBL_MODULE_DIS);
+ if (rc) {
+ dev_err(&led->spmi_dev->dev,
+ "Failed to write led"
+ " enable reg\n");
+ return rc;
+ }
+ }
}
- } else
+ is_kpdbl_master_turn_on = false;
+ } else {
pwm_disable(led->kpdbl_cfg->pwm_cfg->pwm_dev);
-
- if (num_kpbl_leds_on > 0)
- num_kpbl_leds_on--;
-
- if (!num_kpbl_leds_on) {
- rc = qpnp_led_masked_write(led, KPDBL_ENABLE(led->base),
+ clear_bit(led->kpdbl_cfg->row_id, kpdbl_leds_in_use);
+ if (bitmap_weight(kpdbl_leds_in_use,
+ NUM_KPDBL_LEDS) == 1 && kpdbl_master &&
+ !is_kpdbl_master_turn_on) {
+ pwm_disable(kpdbl_master);
+ clear_bit(KPDBL_MASTER_BIT_INDEX,
+ kpdbl_leds_in_use);
+ rc = qpnp_led_masked_write(
+ led, KPDBL_ENABLE(led->base),
KPDBL_MODULE_EN_MASK, KPDBL_MODULE_DIS);
- if (rc) {
- dev_err(&led->spmi_dev->dev,
+ if (rc) {
+ dev_err(&led->spmi_dev->dev,
"Failed to write led enable reg\n");
- return rc;
+ return rc;
+ }
+ is_kpdbl_master_turn_on = false;
}
}
}
@@ -1401,7 +1515,10 @@
value = led->cdev.max_brightness;
led->cdev.brightness = value;
- schedule_work(&led->work);
+ if (led->in_order_command_processing)
+ queue_work(led->workqueue, &led->work);
+ else
+ schedule_work(&led->work);
}
static void __qpnp_led_work(struct qpnp_led_data *led,
@@ -1720,7 +1837,7 @@
struct spmi_device *spmi_dev,
const char *name)
{
- int rc, start_idx, idx_len;
+ int rc, start_idx, idx_len, lut_max_size;
if (pwm_cfg->pwm_channel != -1) {
pwm_cfg->pwm_dev =
@@ -1742,14 +1859,18 @@
idx_len =
pwm_cfg->duty_cycles->num_duty_pcts;
- if (idx_len >= PWM_LUT_MAX_SIZE &&
- start_idx) {
+ if (strnstr(name, "kpdbl", sizeof("kpdbl")))
+ lut_max_size = PWM_GPLED_LUT_MAX_SIZE;
+ else
+ lut_max_size = PWM_LUT_MAX_SIZE;
+
+ if (idx_len >= lut_max_size && start_idx) {
dev_err(&spmi_dev->dev,
"Wrong LUT size or index\n");
return -EINVAL;
}
- if ((start_idx + idx_len) >
- PWM_LUT_MAX_SIZE) {
+
+ if ((start_idx + idx_len) > lut_max_size) {
dev_err(&spmi_dev->dev,
"Exceed LUT limit\n");
return -EINVAL;
@@ -1799,6 +1920,9 @@
case QPNP_ID_RGB_BLUE:
pwm_cfg = led->rgb_cfg->pwm_cfg;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for pwm_us\n");
@@ -1851,6 +1975,9 @@
case QPNP_ID_RGB_BLUE:
pwm_cfg = led->rgb_cfg->pwm_cfg;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for pause lo\n");
@@ -1903,6 +2030,9 @@
case QPNP_ID_RGB_BLUE:
pwm_cfg = led->rgb_cfg->pwm_cfg;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for pause hi\n");
@@ -1955,6 +2085,9 @@
case QPNP_ID_RGB_BLUE:
pwm_cfg = led->rgb_cfg->pwm_cfg;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for start idx\n");
@@ -2008,6 +2141,9 @@
case QPNP_ID_RGB_BLUE:
pwm_cfg = led->rgb_cfg->pwm_cfg;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for ramp step\n");
@@ -2060,6 +2196,9 @@
case QPNP_ID_RGB_BLUE:
pwm_cfg = led->rgb_cfg->pwm_cfg;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for lut flags\n");
@@ -2116,6 +2255,10 @@
pwm_cfg = led->rgb_cfg->pwm_cfg;
max_duty_pcts = PWM_LUT_MAX_SIZE;
break;
+ case QPNP_ID_KPDBL:
+ pwm_cfg = led->kpdbl_cfg->pwm_cfg;
+ max_duty_pcts = PWM_GPLED_LUT_MAX_SIZE;
+ break;
default:
dev_err(&led->spmi_dev->dev,
"Invalid LED id type for duty pcts\n");
@@ -2176,22 +2319,48 @@
static void led_blink(struct qpnp_led_data *led,
struct pwm_config_data *pwm_cfg)
{
+ int rc;
+
+ flush_work(&led->work);
+ mutex_lock(&led->lock);
if (pwm_cfg->use_blink) {
if (led->cdev.brightness) {
pwm_cfg->blinking = true;
if (led->id == QPNP_ID_LED_MPP)
led->mpp_cfg->pwm_mode = LPG_MODE;
+ else if (led->id == QPNP_ID_KPDBL)
+ led->kpdbl_cfg->pwm_mode = LPG_MODE;
pwm_cfg->mode = LPG_MODE;
} else {
pwm_cfg->blinking = false;
pwm_cfg->mode = pwm_cfg->default_mode;
if (led->id == QPNP_ID_LED_MPP)
led->mpp_cfg->pwm_mode = pwm_cfg->default_mode;
+ else if (led->id == QPNP_ID_KPDBL)
+ led->kpdbl_cfg->pwm_mode =
+ pwm_cfg->default_mode;
}
pwm_free(pwm_cfg->pwm_dev);
qpnp_pwm_init(pwm_cfg, led->spmi_dev, led->cdev.name);
- qpnp_led_set(&led->cdev, led->cdev.brightness);
+ if (led->id == QPNP_ID_RGB_RED || led->id == QPNP_ID_RGB_GREEN
+ || led->id == QPNP_ID_RGB_BLUE) {
+ rc = qpnp_rgb_set(led);
+ if (rc < 0)
+ dev_err(&led->spmi_dev->dev,
+ "RGB set brightness failed (%d)\n", rc);
+ } else if (led->id == QPNP_ID_LED_MPP) {
+ rc = qpnp_mpp_set(led);
+ if (rc < 0)
+ dev_err(&led->spmi_dev->dev,
+ "MPP set brightness failed (%d)\n", rc);
+ } else if (led->id == QPNP_ID_KPDBL) {
+ rc = qpnp_kpdbl_set(led);
+ if (rc < 0)
+ dev_err(&led->spmi_dev->dev,
+ "KPDBL set brightness failed (%d)\n", rc);
+ }
}
+ mutex_unlock(&led->lock);
}
static ssize_t blink_store(struct device *dev,
@@ -2218,6 +2387,9 @@
case QPNP_ID_RGB_BLUE:
led_blink(led, led->rgb_cfg->pwm_cfg);
break;
+ case QPNP_ID_KPDBL:
+ led_blink(led, led->kpdbl_cfg->pwm_cfg);
+ break;
default:
dev_err(&led->spmi_dev->dev, "Invalid LED id type for blink\n");
return -EINVAL;
@@ -2451,6 +2623,11 @@
return rc;
}
+ if (led->kpdbl_cfg->always_on) {
+ kpdbl_master = led->kpdbl_cfg->pwm_cfg->pwm_dev;
+ kpdbl_master_period_us = led->kpdbl_cfg->pwm_cfg->pwm_period_us;
+ }
+
/* dump kpdbl registers */
qpnp_dump_regs(led, kpdbl_debug_regs, ARRAY_SIZE(kpdbl_debug_regs));
@@ -2715,6 +2892,21 @@
led->flash_cfg->torch_enable =
of_property_read_bool(node, "qcom,torch-enable");
+ if (of_find_property(of_get_parent(node), "flash-wa-supply",
+ NULL) && (!*reg_set)) {
+ led->flash_cfg->flash_wa_reg =
+ devm_regulator_get(&led->spmi_dev->dev, "flash-wa");
+ if (IS_ERR_OR_NULL(led->flash_cfg->flash_wa_reg)) {
+ rc = PTR_ERR(led->flash_cfg->flash_wa_reg);
+ if (rc != EPROBE_DEFER) {
+ dev_err(&led->spmi_dev->dev,
+ "Flash wa regulator get failed(%d)\n",
+ rc);
+ }
+ } else
+ led->flash_cfg->flash_wa_reg_get = true;
+ }
+
if (led->id == QPNP_ID_FLASH1_LED0) {
led->flash_cfg->enable_module = FLASH_ENABLE_LED_0;
led->flash_cfg->current_addr = FLASH_LED_0_CURR(led->base);
@@ -2852,9 +3044,10 @@
struct device_node *node)
{
struct property *prop;
- int rc, i;
+ int rc, i, lut_max_size;
u32 val;
u8 *temp_cfg;
+ const char *led_label;
rc = of_property_read_u32(node, "qcom,pwm-channel", &val);
if (!rc)
@@ -2898,9 +3091,22 @@
goto bad_lpg_params;
}
+ rc = of_property_read_string(node, "label", &led_label);
+
+ if (rc < 0) {
+ dev_err(&spmi_dev->dev,
+ "Failure reading label, rc = %d\n", rc);
+ return rc;
+ }
+
+ if (strcmp(led_label, "kpdbl") == 0)
+ lut_max_size = PWM_GPLED_LUT_MAX_SIZE;
+ else
+ lut_max_size = PWM_LUT_MAX_SIZE;
+
pwm_cfg->duty_cycles->duty_pcts =
devm_kzalloc(&spmi_dev->dev,
- sizeof(int) * PWM_LUT_MAX_SIZE,
+ sizeof(int) * lut_max_size,
GFP_KERNEL);
if (!pwm_cfg->duty_cycles->duty_pcts) {
dev_err(&spmi_dev->dev,
@@ -2911,7 +3117,7 @@
pwm_cfg->old_duty_pcts =
devm_kzalloc(&spmi_dev->dev,
- sizeof(int) * PWM_LUT_MAX_SIZE,
+ sizeof(int) * lut_max_size,
GFP_KERNEL);
if (!pwm_cfg->old_duty_pcts) {
dev_err(&spmi_dev->dev,
@@ -3308,7 +3514,8 @@
goto fail_id_check;
}
} else if (strncmp(led_label, "kpdbl", sizeof("kpdbl")) == 0) {
- num_kpbl_leds_on = 0;
+ bitmap_zero(kpdbl_leds_in_use, NUM_KPDBL_LEDS);
+ is_kpdbl_master_turn_on = false;
rc = qpnp_get_config_kpdbl(led, temp);
if (rc < 0) {
dev_err(&led->spmi_dev->dev,
@@ -3324,6 +3531,24 @@
if (led->id != QPNP_ID_FLASH1_LED0 &&
led->id != QPNP_ID_FLASH1_LED1)
mutex_init(&led->lock);
+
+ led->in_order_command_processing = of_property_read_bool
+ (temp, "qcom,in-order-command-processing");
+
+ if (led->in_order_command_processing) {
+ /*
+ * the command order from user space needs to be
+ * maintained use ordered workqueue to prevent
+ * concurrency
+ */
+ led->workqueue = alloc_ordered_workqueue
+ ("led_workqueue", 0);
+ if (!led->workqueue) {
+ rc = -ENOMEM;
+ goto fail_id_check;
+ }
+ }
+
INIT_WORK(&led->work, qpnp_led_work);
rc = qpnp_led_initialize(led);
@@ -3400,6 +3625,29 @@
if (rc)
goto fail_id_check;
}
+ } else if (led->id == QPNP_ID_KPDBL) {
+ if (led->kpdbl_cfg->pwm_cfg->mode == PWM_MODE) {
+ rc = sysfs_create_group(&led->cdev.dev->kobj,
+ &pwm_attr_group);
+ if (rc)
+ goto fail_id_check;
+ }
+ if (led->kpdbl_cfg->pwm_cfg->use_blink) {
+ rc = sysfs_create_group(&led->cdev.dev->kobj,
+ &blink_attr_group);
+ if (rc)
+ goto fail_id_check;
+
+ rc = sysfs_create_group(&led->cdev.dev->kobj,
+ &lpg_attr_group);
+ if (rc)
+ goto fail_id_check;
+ } else if (led->kpdbl_cfg->pwm_cfg->mode == LPG_MODE) {
+ rc = sysfs_create_group(&led->cdev.dev->kobj,
+ &lpg_attr_group);
+ if (rc)
+ goto fail_id_check;
+ }
}
/* configure default state */
@@ -3421,6 +3669,8 @@
if (led_array[i].id != QPNP_ID_FLASH1_LED0 &&
led_array[i].id != QPNP_ID_FLASH1_LED1)
mutex_destroy(&led_array[i].lock);
+ if (led_array[i].in_order_command_processing)
+ destroy_workqueue(led_array[i].workqueue);
led_classdev_unregister(&led_array[i].cdev);
}
@@ -3438,6 +3688,8 @@
led_array[i].id != QPNP_ID_FLASH1_LED1)
mutex_destroy(&led_array[i].lock);
+ if (led_array[i].in_order_command_processing)
+ destroy_workqueue(led_array[i].workqueue);
led_classdev_unregister(&led_array[i].cdev);
switch (led_array[i].id) {
case QPNP_ID_WLED:
@@ -3485,6 +3737,20 @@
sysfs_remove_group(&led_array[i].cdev.dev->\
kobj, &lpg_attr_group);
break;
+ case QPNP_ID_KPDBL:
+ if (led_array[i].kpdbl_cfg->pwm_cfg->mode == PWM_MODE)
+ sysfs_remove_group(&led_array[i].cdev.dev->
+ kobj, &pwm_attr_group);
+ if (led_array[i].kpdbl_cfg->pwm_cfg->use_blink) {
+ sysfs_remove_group(&led_array[i].cdev.dev->
+ kobj, &blink_attr_group);
+ sysfs_remove_group(&led_array[i].cdev.dev->
+ kobj, &lpg_attr_group);
+ } else if (led_array[i].kpdbl_cfg->pwm_cfg->mode
+ == LPG_MODE)
+ sysfs_remove_group(&led_array[i].cdev.dev->
+ kobj, &lpg_attr_group);
+ break;
default:
dev_err(&led_array[i].spmi_dev->dev,
"Invalid LED(%d)\n",
diff --git a/drivers/md/dm-req-crypt.c b/drivers/md/dm-req-crypt.c
index ef8f37c..a8f0d18 100644
--- a/drivers/md/dm-req-crypt.c
+++ b/drivers/md/dm-req-crypt.c
@@ -833,13 +833,20 @@
start_sector_orig = tmpll;
- if (argv[5]) {
- if (!strcmp(argv[5], "fde_enabled"))
- is_fde_enabled = true;
- else
- is_fde_enabled = false;
+ /* Allow backward compatible */
+ if (argc >= 6) {
+ if (argv[5]) {
+ if (!strcmp(argv[5], "fde_enabled"))
+ is_fde_enabled = true;
+ else
+ is_fde_enabled = false;
+ } else {
+ DMERR(" %s Arg[5] invalid\n", __func__);
+ err = DM_REQ_CRYPT_ERROR;
+ goto ctr_exit;
+ }
} else {
- DMERR(" %s Arg[5] invalid, set FDE eanbled.\n", __func__);
+ DMERR(" %s Arg[5] missing, set FDE enabled.\n", __func__);
is_fde_enabled = true; /* backward compatible */
}
DMDEBUG("%s is_fde_enabled=%d\n", __func__, is_fde_enabled);
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 3a3c370..c5da40b 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -1784,7 +1784,8 @@
{
struct dmxdev_feed *feed;
- if ((dmxdevfilter->type != DMXDEV_TYPE_PES) ||
+ if (dmxdevfilter->state != DMXDEV_STATE_GO ||
+ (dmxdevfilter->type != DMXDEV_TYPE_PES) ||
(dmxdevfilter->params.pes.output != DMX_OUT_DECODER) ||
(dmxdevfilter->events.event_mask.disable_mask &
DMX_EVENT_NEW_ES_DATA))
@@ -1793,8 +1794,7 @@
/* Only one feed should be in the list in case of decoder */
feed = list_first_entry(&dmxdevfilter->feed.ts,
struct dmxdev_feed, next);
-
- if (feed->ts->reuse_decoder_buffer)
+ if (feed && feed->ts && feed->ts->reuse_decoder_buffer)
return feed->ts->reuse_decoder_buffer(feed->ts, cookie);
return -ENODEV;
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
index a81c7bb..2567657 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
@@ -25,8 +25,8 @@
static DEFINE_MUTEX(bandwidth_mgr_mutex);
static struct msm_isp_bandwidth_mgr isp_bandwidth_mgr;
-#define MSM_ISP_MIN_AB 450000000
-#define MSM_ISP_MIN_IB 900000000
+#define MSM_ISP_MIN_AB 300000000
+#define MSM_ISP_MIN_IB 450000000
#define VFE40_8974V2_VERSION 0x1001001A
static struct msm_bus_vectors msm_isp_init_vectors[] = {
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 b4196e9..106f5eb 100644
--- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
+++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
@@ -298,10 +298,8 @@
return buff->map_info.phy_addr;
QUEUE_BUFF_ERROR2:
- ion_unmap_iommu(cpp_dev->client, buff->map_info.ion_handle,
- cpp_dev->domain_num, 0);
-QUEUE_BUFF_ERROR1:
ion_free(cpp_dev->client, buff->map_info.ion_handle);
+QUEUE_BUFF_ERROR1:
buff->map_info.ion_handle = NULL;
kzfree(buff);
diff --git a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
index 7fb312a..79581ce 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
@@ -283,6 +283,10 @@
int32_t num_steps = move_params->num_steps;
struct msm_camera_i2c_reg_setting reg_setting;
+ if (a_ctrl->step_position_table == NULL) {
+ pr_err("Step Position Table is NULL");
+ return -EFAULT;
+ }
curr_lens_pos = a_ctrl->step_position_table[a_ctrl->curr_step_pos];
move_params->curr_lens_pos = curr_lens_pos;
@@ -381,7 +385,10 @@
for (; data_size > 0; data_size--)
max_code_size *= 2;
- kfree(a_ctrl->step_position_table);
+ if ((a_ctrl->actuator_state == ACTUATOR_POWER_UP) &&
+ (a_ctrl->step_position_table != NULL))
+ kfree(a_ctrl->step_position_table);
+
a_ctrl->step_position_table = NULL;
if (set_info->af_tuning_params.total_steps
@@ -392,7 +399,7 @@
}
/* Fill step position table */
a_ctrl->step_position_table =
- kmalloc(sizeof(uint16_t) *
+ kzalloc(sizeof(uint16_t) *
(set_info->af_tuning_params.total_steps + 1), GFP_KERNEL);
if (a_ctrl->step_position_table == NULL)
@@ -471,10 +478,21 @@
{
int32_t rc = 0;
CDBG("Enter\n");
- if (a_ctrl->vcm_enable) {
- rc = gpio_direction_output(a_ctrl->vcm_pwd, 0);
- if (!rc)
- gpio_free(a_ctrl->vcm_pwd);
+ if (a_ctrl->actuator_state != ACTUATOR_POWER_DOWN) {
+ if (a_ctrl->vcm_enable) {
+ rc = gpio_direction_output(a_ctrl->vcm_pwd, 0);
+ if (!rc)
+ gpio_free(a_ctrl->vcm_pwd);
+ }
+
+ if (a_ctrl->step_position_table != NULL)
+ kfree(a_ctrl->step_position_table);
+ a_ctrl->step_position_table = NULL;
+ if (a_ctrl->i2c_reg_tbl != NULL)
+ kfree(a_ctrl->i2c_reg_tbl);
+ a_ctrl->i2c_reg_tbl = NULL;
+ a_ctrl->i2c_tbl_index = 0;
+ a_ctrl->actuator_state = ACTUATOR_POWER_DOWN;
}
rc = msm_actuator_vreg_control(a_ctrl, 0);
if (rc < 0) {
@@ -592,13 +610,16 @@
return -EFAULT;
}
- kfree(a_ctrl->i2c_reg_tbl);
+ if ((a_ctrl->actuator_state == ACTUATOR_POWER_UP) &&
+ (a_ctrl->i2c_reg_tbl != NULL))
+ kfree(a_ctrl->i2c_reg_tbl);
+ a_ctrl->i2c_reg_tbl = NULL;
a_ctrl->i2c_reg_tbl =
- kmalloc(sizeof(struct msm_camera_i2c_reg_array) *
+ kzalloc(sizeof(struct msm_camera_i2c_reg_array) *
(set_info->af_tuning_params.total_steps + 1), GFP_KERNEL);
if (!a_ctrl->i2c_reg_tbl) {
- pr_err("kmalloc fail\n");
+ pr_err("kzalloc fail\n");
return -ENOMEM;
}
@@ -614,7 +635,7 @@
set_info->actuator_params.init_setting_size
<= MAX_ACTUATOR_REG_TBL_SIZE) {
if (a_ctrl->func_tbl->actuator_init_focus) {
- init_settings = kmalloc(sizeof(struct reg_settings_t) *
+ init_settings = kzalloc(sizeof(struct reg_settings_t) *
(set_info->actuator_params.init_setting_size),
GFP_KERNEL);
if (init_settings == NULL) {
@@ -635,6 +656,7 @@
set_info->actuator_params.init_setting_size,
init_settings);
kfree(init_settings);
+ init_settings = NULL;
if (rc < 0) {
kfree(a_ctrl->i2c_reg_tbl);
pr_err("Error actuator_init_focus\n");
@@ -936,6 +958,7 @@
act_ctrl_t->msm_sd.sd.entity.group_id = MSM_CAMERA_SUBDEV_ACTUATOR;
act_ctrl_t->msm_sd.close_seq = MSM_SD_CLOSE_2ND_CATEGORY | 0x2;
msm_sd_register(&act_ctrl_t->msm_sd);
+ act_ctrl_t->actuator_state = ACTUATOR_POWER_DOWN;
pr_info("msm_actuator_i2c_probe: succeeded\n");
CDBG("Exit\n");
@@ -1025,6 +1048,7 @@
msm_actuator_t->msm_sd.sd.entity.group_id = MSM_CAMERA_SUBDEV_ACTUATOR;
msm_actuator_t->msm_sd.close_seq = MSM_SD_CLOSE_2ND_CATEGORY | 0x2;
msm_sd_register(&msm_actuator_t->msm_sd);
+ msm_actuator_t->actuator_state = ACTUATOR_POWER_DOWN;
CDBG("Exit\n");
return rc;
}
diff --git a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
index b0d9430..2ae1900 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
+++ b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h
@@ -29,6 +29,11 @@
struct msm_actuator_ctrl_t;
+enum msm_actuator_state_t {
+ ACTUATOR_POWER_DOWN,
+ ACTUATOR_POWER_UP,
+};
+
struct msm_actuator_func_tbl {
int32_t (*actuator_i2c_write_b_af)(struct msm_actuator_ctrl_t *,
uint8_t,
@@ -95,6 +100,7 @@
enum cci_i2c_master_t cci_master;
uint32_t subdev_id;
struct msm_actuator_vreg vreg_cfg;
+ enum msm_actuator_state_t actuator_state;
};
#endif
diff --git a/drivers/media/platform/msm/dvb/demux/mpq_sdmx.c b/drivers/media/platform/msm/dvb/demux/mpq_sdmx.c
index 888bbbf..a687779 100644
--- a/drivers/media/platform/msm/dvb/demux/mpq_sdmx.c
+++ b/drivers/media/platform/msm/dvb/demux/mpq_sdmx.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
@@ -21,6 +21,7 @@
static struct qseecom_handle *sdmx_qseecom_handles[SDMX_MAX_SESSIONS];
static struct mutex sdmx_lock[SDMX_MAX_SESSIONS];
+#define QSEECOM_SBUFF_SIZE SZ_16K
#define QSEECOM_ALIGN_SIZE 0x40
#define QSEECOM_ALIGN_MASK (QSEECOM_ALIGN_SIZE - 1)
#define QSEECOM_ALIGN(x) \
@@ -195,22 +196,27 @@
struct sdmx_set_log_level_rsp {
enum sdmx_status ret;
};
-static void get_cmd_rsp_buffers(int handle_index,
+static int get_cmd_rsp_buffers(int handle_index,
void **cmd,
int *cmd_len,
void **rsp,
int *rsp_len)
{
- *cmd = sdmx_qseecom_handles[handle_index]->sbuf;
-
if (*cmd_len & QSEECOM_ALIGN_MASK)
*cmd_len = QSEECOM_ALIGN(*cmd_len);
- *rsp = sdmx_qseecom_handles[handle_index]->sbuf + *cmd_len;
-
if (*rsp_len & QSEECOM_ALIGN_MASK)
*rsp_len = QSEECOM_ALIGN(*rsp_len);
+ if ((*rsp_len + *cmd_len) > QSEECOM_SBUFF_SIZE) {
+ pr_err("%s: shared buffer too small to hold cmd=%d and rsp=%d\n",
+ __func__, *cmd_len, *rsp_len);
+ return SDMX_STATUS_OUT_OF_MEM;
+ }
+
+ *cmd = sdmx_qseecom_handles[handle_index]->sbuf;
+ *rsp = sdmx_qseecom_handles[handle_index]->sbuf + *cmd_len;
+ return SDMX_SUCCESS;
}
/*
@@ -237,8 +243,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_GET_VERSION_CMD;
@@ -254,7 +262,7 @@
ret = rsp->ret;
*version = rsp->version;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -282,7 +290,8 @@
return SDMX_STATUS_GENERAL_FAILURE;
/* Start the TZ app */
- res = qseecom_start_app(&qseecom_handle, "securemm", 4096);
+ res = qseecom_start_app(&qseecom_handle, "securemm",
+ QSEECOM_SBUFF_SIZE);
if (res < 0)
return SDMX_STATUS_GENERAL_FAILURE;
@@ -359,8 +368,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_CLOSE_SESSION_CMD;
@@ -385,7 +396,7 @@
}
sdmx_qseecom_handles[session_handle] = NULL;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -426,8 +437,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_SET_SESSION_CFG_CMD;
@@ -448,7 +461,7 @@
}
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -503,8 +516,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_ADD_FILTER_CMD;
@@ -537,7 +552,7 @@
/* Parse response struct */
*filter_handle = rsp->filter_handle;
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -569,8 +584,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_REMOVE_FILTER_CMD;
@@ -587,7 +604,7 @@
}
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -623,8 +640,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_SET_KL_IDX_CMD;
@@ -642,7 +661,7 @@
}
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -675,8 +694,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_ADD_RAW_PID_CMD;
@@ -694,7 +715,7 @@
}
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -727,8 +748,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_REMOVE_RAW_PID_CMD;
@@ -746,7 +769,7 @@
}
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -797,8 +820,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_PROCESS_CMD;
@@ -829,7 +854,7 @@
memcpy(filter_status, cmd->filters_status,
num_filters * sizeof(struct sdmx_filter_status));
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -869,8 +894,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_GET_DBG_COUNTERS_CMD;
@@ -892,7 +919,7 @@
memcpy(filter_counters, rsp->filter_counters,
*num_filters * sizeof(struct sdmx_filter_dbg_counters));
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -923,8 +950,10 @@
mutex_lock(&sdmx_lock[session_handle]);
/* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
(void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
/* Populate command struct */
cmd->cmd_id = SDMX_RESET_DBG_COUNTERS_CMD;
@@ -940,7 +969,7 @@
}
ret = rsp->ret;
-
+out:
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
@@ -965,13 +994,15 @@
cmd_len = sizeof(struct sdmx_set_log_level_req);
rsp_len = sizeof(struct sdmx_set_log_level_rsp);
- /* Get command and response buffers */
- get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
- (void **)&rsp, &rsp_len);
-
/* Lock shared memory */
mutex_lock(&sdmx_lock[session_handle]);
+ /* Get command and response buffers */
+ ret = get_cmd_rsp_buffers(session_handle, (void **)&cmd, &cmd_len,
+ (void **)&rsp, &rsp_len);
+ if (ret)
+ goto out;
+
/* Populate command struct */
cmd->cmd_id = SDMX_SET_LOG_LEVEL_CMD;
cmd->session_handle = session_handle;
@@ -985,7 +1016,7 @@
return SDMX_STATUS_GENERAL_FAILURE;
}
ret = rsp->ret;
-
+out:
/* Unlock */
mutex_unlock(&sdmx_lock[session_handle]);
return ret;
diff --git a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
index aaed0e9..5801518 100644
--- a/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_v4l2_vidc.c
@@ -327,6 +327,7 @@
init_completion(&core->completions[i]);
}
+ INIT_DELAYED_WORK(&core->fw_unload_work, msm_vidc_fw_unload_handler);
return rc;
}
diff --git a/drivers/media/platform/msm/vidc/msm_vdec.c b/drivers/media/platform/msm/vidc/msm_vdec.c
index bff86a6..30ca194 100644
--- a/drivers/media/platform/msm/vidc/msm_vdec.c
+++ b/drivers/media/platform/msm/vidc/msm_vdec.c
@@ -21,8 +21,9 @@
#define MSM_VDEC_DVC_NAME "msm_vdec_8974"
#define MIN_NUM_OUTPUT_BUFFERS 4
-#define MAX_NUM_OUTPUT_BUFFERS VIDEO_MAX_FRAME
+#define MAX_NUM_OUTPUT_BUFFERS VB2_MAX_FRAME
#define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8010
+#define MB_SIZE_IN_PIXEL (16 * 16)
#define TZ_DYNAMIC_BUFFER_FEATURE_ID 12
#define TZ_FEATURE_VERSION(major, minor, patch) \
@@ -316,6 +317,17 @@
.default_value = DEFAULT_VIDEO_CONCEAL_COLOR_BLACK,
.step = 1,
},
+ {
+ .id = V4L2_CID_MPEG_VIDC_VIDEO_BUFFER_SIZE_LIMIT,
+ .name = "Buffer size limit",
+ .type = V4L2_CTRL_TYPE_INTEGER,
+ .minimum = 0,
+ .maximum = 0x7fffffff,
+ .default_value = 0,
+ .step = 1,
+ .menu_skip_mask = 0,
+ .qmenu = NULL,
+ },
};
#define NUM_CTRLS ARRAY_SIZE(msm_vdec_ctrls)
@@ -327,9 +339,39 @@
}
static u32 get_frame_size_compressed(int plane,
- u32 height, u32 width)
+ u32 max_mbs_per_frame, u32 size_per_mb)
{
- return (width * height * 3/2)/4;
+ return (max_mbs_per_frame * size_per_mb * 3/2)/2;
+}
+
+static u32 get_frame_size(struct msm_vidc_inst *inst,
+ const struct msm_vidc_format *fmt,
+ int fmt_type, int plane)
+{
+ u32 frame_size = 0;
+ if (fmt_type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+ frame_size = fmt->get_frame_size(plane,
+ inst->capability.mbs_per_frame.max,
+ MB_SIZE_IN_PIXEL);
+ if (inst->capability.buffer_size_limit &&
+ (inst->capability.buffer_size_limit < frame_size)) {
+ frame_size = inst->capability.buffer_size_limit;
+ dprintk(VIDC_DBG, "input buffer size limited to %d\n",
+ frame_size);
+ } else {
+ dprintk(VIDC_DBG, "set input buffer size to %d\n",
+ frame_size);
+ }
+ } else if (fmt_type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+ frame_size = fmt->get_frame_size(plane,
+ inst->capability.height.max,
+ inst->capability.width.max);
+ dprintk(VIDC_DBG, "set output buffer size to %d\n",
+ frame_size);
+ } else {
+ dprintk(VIDC_WARN, "Wrong format type\n");
+ }
+ return frame_size;
}
struct msm_vidc_format vdec_formats[] = {
@@ -741,11 +783,11 @@
for (i = 0; i < fmt->num_planes; ++i) {
if (plane_sizes[i] == 0) {
f->fmt.pix_mp.plane_fmt[i].sizeimage =
- fmt->get_frame_size(i,
- inst->capability.height.max,
- inst->capability.width.max);
+ get_frame_size(inst, fmt,
+ f->type, i);
plane_sizes[i] =
- f->fmt.pix_mp.plane_fmt[i].sizeimage;
+ f->fmt.pix_mp.plane_fmt[i].
+ sizeimage;
} else
f->fmt.pix_mp.plane_fmt[i].sizeimage =
plane_sizes[i];
@@ -928,9 +970,7 @@
if (ret) {
for (i = 0; i < fmt->num_planes; ++i) {
f->fmt.pix_mp.plane_fmt[i].sizeimage =
- fmt->get_frame_size(i,
- inst->capability.height.max,
- inst->capability.width.max);
+ get_frame_size(inst, fmt, f->type, i);
}
} else {
buff_req_buffer =
@@ -1012,11 +1052,7 @@
frame_sz.buffer_type, frame_sz.width,
frame_sz.height);
msm_comm_try_set_prop(inst, HAL_PARAM_FRAME_SIZE, &frame_sz);
-
- max_input_size = fmt->get_frame_size(0,
- inst->capability.height.max,
- inst->capability.width.max);
-
+ max_input_size = get_frame_size(inst, fmt, f->type, 0);
if (f->fmt.pix_mp.plane_fmt[0].sizeimage > max_input_size ||
f->fmt.pix_mp.plane_fmt[0].sizeimage == 0) {
f->fmt.pix_mp.plane_fmt[0].sizeimage = max_input_size;
@@ -1115,9 +1151,8 @@
*num_buffers > MAX_NUM_OUTPUT_BUFFERS)
*num_buffers = MIN_NUM_OUTPUT_BUFFERS;
for (i = 0; i < *num_planes; i++) {
- sizes[i] = inst->fmts[OUTPUT_PORT]->get_frame_size(
- i, inst->capability.height.max,
- inst->capability.width.max);
+ sizes[i] = get_frame_size(inst,
+ inst->fmts[OUTPUT_PORT], q->type, i);
}
property_id = HAL_PARAM_BUFFER_COUNT_ACTUAL;
new_buf_count.buffer_type = HAL_BUFFER_INPUT;
@@ -1701,6 +1736,13 @@
property_val = ctrl->val;
pdata = &property_val;
break;
+ case V4L2_CID_MPEG_VIDC_VIDEO_BUFFER_SIZE_LIMIT:
+ {
+ inst->capability.buffer_size_limit = ctrl->val;
+ dprintk(VIDC_DBG,
+ "Limiting input buffer size to :%u\n", ctrl->val);
+ break;
+ }
default:
break;
}
diff --git a/drivers/media/platform/msm/vidc/msm_venc.c b/drivers/media/platform/msm/vidc/msm_venc.c
index 701a8cc..34dcd1d 100644
--- a/drivers/media/platform/msm/vidc/msm_venc.c
+++ b/drivers/media/platform/msm/vidc/msm_venc.c
@@ -931,12 +931,12 @@
}
if (*num_buffers < MIN_NUM_CAPTURE_BUFFERS ||
- *num_buffers > VIDEO_MAX_FRAME) {
+ *num_buffers > VB2_MAX_FRAME) {
int temp = *num_buffers;
*num_buffers = clamp_val(*num_buffers,
MIN_NUM_CAPTURE_BUFFERS,
- VIDEO_MAX_FRAME);
+ VB2_MAX_FRAME);
dprintk(VIDC_INFO,
"Changing buffer count on CAPTURE_MPLANE from %d to %d for best effort encoding\n",
temp, *num_buffers);
@@ -1005,7 +1005,7 @@
return rc;
}
-static int msm_venc_enable_hier_p(struct msm_vidc_inst *inst)
+static int msm_venc_toggle_hier_p(struct msm_vidc_inst *inst, bool enable)
{
int num_enh_layers = 0;
u32 property_id = 0;
@@ -1020,9 +1020,10 @@
if (inst->fmts[CAPTURE_PORT]->fourcc != V4L2_PIX_FMT_VP8)
return 0;
- num_enh_layers = inst->capability.hier_p.max - 1;
- if (!num_enh_layers)
- return 0;
+ num_enh_layers = enable ? inst->capability.hier_p.max - 1 : 0;
+
+ dprintk(VIDC_DBG, "%s Hier-P in firmware\n",
+ num_enh_layers ? "Enable" : "Disable");
hdev = inst->core->device;
property_id = HAL_PARAM_VENC_HIER_P_MAX_ENH_LAYERS;
@@ -1048,10 +1049,6 @@
return -EINVAL;
}
- rc = msm_venc_enable_hier_p(inst);
- if (rc)
- return rc;
-
if (inst->capability.pixelprocess_capabilities &
HAL_VIDEO_ENCODER_SCALING_CAPABILITY)
rc = msm_comm_check_scaling_supported(inst);
@@ -2192,6 +2189,9 @@
case V4L2_CID_MPEG_VIDC_VIDEO_HIER_P_NUM_LAYERS:
property_id = HAL_CONFIG_VENC_HIER_P_NUM_FRAMES;
hier_p_layers = ctrl->val;
+ rc = msm_venc_toggle_hier_p(inst, hier_p_layers ? true : false);
+ if (rc)
+ break;
if (hier_p_layers > (inst->capability.hier_p.max - 1)) {
dprintk(VIDC_ERR,
"Error setting hier p num layers = %d max supported by f/w = %d\n",
@@ -2244,6 +2244,12 @@
for (i = 0; i < ctrl->count; i++) {
switch (control[i].id) {
case V4L2_CID_MPEG_VIDC_VIDEO_LTRMODE:
+ if (control[i].value !=
+ V4L2_MPEG_VIDC_VIDEO_LTR_MODE_DISABLE) {
+ rc = msm_venc_toggle_hier_p(inst, false);
+ if (rc)
+ break;
+ }
ltrmode.ltrmode = control[i].value;
ltrmode.trustmode = 1;
property_id = HAL_PARAM_VENC_LTRMODE;
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index c5d038f..345bd0e 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc.c
@@ -1265,6 +1265,11 @@
"Failed to initialize vb2 queue on capture port\n");
goto fail_bufq_output;
}
+
+ mutex_lock(&core->lock);
+ list_add_tail(&inst->list, &core->instances);
+ mutex_unlock(&core->lock);
+
rc = msm_comm_try_state(inst, MSM_VIDC_CORE_INIT);
if (rc) {
dprintk(VIDC_ERR,
@@ -1276,12 +1281,14 @@
setup_event_queue(inst, &core->vdev[session_type].vdev);
- mutex_lock(&core->lock);
- list_add_tail(&inst->list, &core->instances);
- mutex_unlock(&core->lock);
return inst;
fail_init:
vb2_queue_release(&inst->bufq[OUTPUT_PORT].vb2_bufq);
+
+ mutex_lock(&core->lock);
+ list_del(&inst->list);
+ mutex_unlock(&core->lock);
+
fail_bufq_output:
vb2_queue_release(&inst->bufq[CAPTURE_PORT].vb2_bufq);
fail_bufq_capture:
@@ -1386,6 +1393,9 @@
else if (inst->session_type == MSM_VIDC_ENCODER)
msm_venc_ctrl_deinit(inst);
+ for (i = 0; i < MAX_PORT_NUM; i++)
+ vb2_queue_release(&inst->bufq[i].vb2_bufq);
+
cleanup_instance(inst);
if (inst->state != MSM_VIDC_CORE_INVALID &&
core->state != VIDC_CORE_INVALID)
@@ -1395,8 +1405,6 @@
if (rc)
dprintk(VIDC_ERR,
"Failed to move video instance to uninit state\n");
- for (i = 0; i < MAX_PORT_NUM; i++)
- vb2_queue_release(&inst->bufq[i].vb2_bufq);
msm_smem_delete_client(inst->mem_client);
pr_info(VIDC_DBG_TAG "Closed video instance: %p\n", VIDC_INFO, inst);
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_common.c b/drivers/media/platform/msm/vidc/msm_vidc_common.c
old mode 100755
new mode 100644
index 8176b06..ba17820
--- a/drivers/media/platform/msm/vidc/msm_vidc_common.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_common.c
@@ -14,7 +14,6 @@
#include <linux/jiffies.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/workqueue.h>
#include <asm/div64.h>
#include <mach/subsystem_restart.h>
@@ -491,6 +490,8 @@
inst->capability.hier_p = session_init_done->hier_p;
inst->capability.pixelprocess_capabilities =
call_hfi_op(hdev, get_core_capabilities);
+ inst->capability.mbs_per_frame =
+ session_init_done->mbs_per_frame;
inst->capability.capability_set = true;
inst->capability.buffer_mode[CAPTURE_PORT] =
session_init_done->alloc_mode_out;
@@ -1266,6 +1267,10 @@
vb->v4l2_planes[0].reserved[3] = fill_buf_done->start_y_coord;
vb->v4l2_planes[0].reserved[4] = fill_buf_done->frame_width;
vb->v4l2_planes[0].reserved[5] = fill_buf_done->frame_height;
+ vb->v4l2_planes[0].reserved[6] =
+ inst->prop.width[CAPTURE_PORT];
+ vb->v4l2_planes[0].reserved[7] =
+ inst->prop.height[CAPTURE_PORT];
if (vb->v4l2_planes[0].data_offset > vb->v4l2_planes[0].length)
dprintk(VIDC_INFO,
"fbd:Overflow data_offset = %d; length = %d\n",
@@ -1547,7 +1552,7 @@
dprintk(VIDC_WARN,
"Failed to scale DDR bus. Performance might be impacted\n");
}
- if (core->resources.has_ocmem) {
+ if (core->resources.ocmem_size) {
if (msm_comm_scale_bus(core, inst->session_type,
OCMEM_MEM))
dprintk(VIDC_WARN,
@@ -1555,52 +1560,6 @@
}
}
-static inline unsigned long get_ocmem_requirement(u32 height, u32 width)
-{
- int num_mbs = 0;
- num_mbs = GET_NUM_MBS(height, width);
- /*TODO: This should be changes once the numbers are
- * available from firmware*/
- return 512 * 1024;
-}
-
-static int msm_comm_unset_ocmem(struct msm_vidc_core *core)
-{
- int rc = 0;
- struct hfi_device *hdev;
-
- if (!core || !core->device) {
- dprintk(VIDC_ERR, "%s invalid parameters", __func__);
- return -EINVAL;
- }
- hdev = core->device;
-
- if (core->state == VIDC_CORE_INVALID) {
- dprintk(VIDC_ERR,
- "Core is in bad state. Cannot unset ocmem\n");
- return -EIO;
- }
-
- init_completion(
- &core->completions[SYS_MSG_INDEX(RELEASE_RESOURCE_DONE)]);
-
- rc = call_hfi_op(hdev, unset_ocmem, hdev->hfi_device_data);
- if (rc) {
- dprintk(VIDC_INFO, "Failed to unset OCMEM on driver\n");
- goto release_ocmem_failed;
- }
- rc = wait_for_completion_timeout(
- &core->completions[SYS_MSG_INDEX(RELEASE_RESOURCE_DONE)],
- msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
- if (!rc) {
- dprintk(VIDC_ERR, "%s: Wait interrupted or timeout: %d\n",
- __func__, SYS_MSG_INDEX(RELEASE_RESOURCE_DONE));
- rc = -EIO;
- }
-release_ocmem_failed:
- return rc;
-}
-
static int msm_comm_init_core_done(struct msm_vidc_inst *inst)
{
struct msm_vidc_core *core = inst->core;
@@ -1664,6 +1623,7 @@
goto fail_load_fw;
}
core->state = VIDC_CORE_LOADED;
+ dprintk(VIDC_DBG, "Firmware downloaded\n");
}
mutex_unlock(&core->lock);
@@ -1701,7 +1661,6 @@
static int msm_vidc_deinit_core(struct msm_vidc_inst *inst)
{
- int rc = 0;
struct msm_vidc_core *core;
struct hfi_device *hdev;
@@ -1725,38 +1684,27 @@
mutex_lock(&core->lock);
if (list_empty(&core->instances)) {
- if (core->state > VIDC_CORE_INIT) {
- if (core->resources.has_ocmem) {
- if (inst->state != MSM_VIDC_CORE_INVALID)
- msm_comm_unset_ocmem(core);
- call_hfi_op(hdev, free_ocmem,
- hdev->hfi_device_data);
- }
- dprintk(VIDC_DBG, "Calling vidc_hal_core_release\n");
- rc = call_hfi_op(hdev, core_release,
- hdev->hfi_device_data);
- if (rc) {
- dprintk(VIDC_ERR,
- "Failed to release core, id = %d\n",
- core->id);
- goto exit;
- }
- }
+ cancel_delayed_work(&core->fw_unload_work);
- core->state = VIDC_CORE_UNINIT;
+ /*
+ * Delay unloading of firmware. This is useful
+ * in avoiding firmware download delays in cases where we
+ * will have a burst of back to back video playback sessions
+ * e.g. thumbnail generation.
+ */
+ schedule_delayed_work(&core->fw_unload_work,
+ msecs_to_jiffies(core->state == VIDC_CORE_INVALID ?
+ 0 : msm_vidc_firmware_unload_delay));
- call_hfi_op(hdev, unload_fw, hdev->hfi_device_data);
- if (core->resources.has_ocmem)
- msm_comm_unvote_buses(core, DDR_MEM|OCMEM_MEM);
- else
- msm_comm_unvote_buses(core, DDR_MEM);
+ dprintk(VIDC_DBG, "firmware unload delayed by %u ms\n",
+ core->state == VIDC_CORE_INVALID ?
+ 0 : msm_vidc_firmware_unload_delay);
}
core_already_uninited:
change_inst_state(inst, MSM_VIDC_CORE_UNINIT);
-exit:
mutex_unlock(&core->lock);
- return rc;
+ return 0;
}
int msm_comm_force_cleanup(struct msm_vidc_inst *inst)
@@ -1905,10 +1853,8 @@
struct msm_vidc_inst *inst)
{
int rc = 0;
- u32 ocmem_sz = 0;
struct hfi_device *hdev;
int num_mbs_per_sec = 0;
- int height, width;
if (!inst || !inst->core || !inst->core->device) {
dprintk(VIDC_ERR, "%s invalid parameters", __func__);
@@ -1945,31 +1891,7 @@
inst, inst->state);
goto exit;
}
- if (inst->core->resources.has_ocmem) {
- height = max(inst->prop.height[CAPTURE_PORT],
- inst->prop.height[OUTPUT_PORT]);
- width = max(inst->prop.width[CAPTURE_PORT],
- inst->prop.width[OUTPUT_PORT]);
- ocmem_sz = get_ocmem_requirement(
- height, width);
- rc = msm_comm_scale_bus(inst->core, inst->session_type,
- OCMEM_MEM);
- if (!rc) {
- mutex_lock(&inst->core->lock);
- rc = call_hfi_op(hdev, alloc_ocmem,
- hdev->hfi_device_data,
- ocmem_sz);
- mutex_unlock(&inst->core->lock);
- if (rc) {
- dprintk(VIDC_WARN,
- "Failed to allocate OCMEM. Performance will be impacted\n");
- msm_comm_unvote_buses(inst->core, OCMEM_MEM);
- }
- } else {
- dprintk(VIDC_WARN,
- "Failed to vote for OCMEM BW. Performance will be impacted\n");
- }
- }
+
rc = call_hfi_op(hdev, session_load_res, (void *) inst->session);
if (rc) {
dprintk(VIDC_ERR,
@@ -3697,3 +3619,45 @@
return msm_smem_get_domain_partition(inst->mem_client, flags,
buffer_type, domain_num, partition_num);
}
+
+void msm_vidc_fw_unload_handler(struct work_struct *work)
+{
+ struct msm_vidc_core *core = NULL;
+ struct hfi_device *hdev = NULL;
+ int rc = 0;
+
+ core = container_of(work, struct msm_vidc_core, fw_unload_work.work);
+ if (!core || !core->device) {
+ dprintk(VIDC_ERR, "%s - invalid work or core handle\n",
+ __func__);
+ return;
+ }
+
+ hdev = core->device;
+
+ mutex_lock(&core->lock);
+ if (list_empty(&core->instances) &&
+ core->state != VIDC_CORE_UNINIT) {
+ if (core->state > VIDC_CORE_INIT) {
+ dprintk(VIDC_DBG, "Calling vidc_hal_core_release\n");
+ rc = call_hfi_op(hdev, core_release,
+ hdev->hfi_device_data);
+ if (rc) {
+ dprintk(VIDC_ERR,
+ "Failed to release core, id = %d\n",
+ core->id);
+ return;
+ }
+ }
+
+ core->state = VIDC_CORE_UNINIT;
+
+ call_hfi_op(hdev, unload_fw, hdev->hfi_device_data);
+ dprintk(VIDC_DBG, "Firmware unloaded\n");
+ if (core->resources.ocmem_size)
+ msm_comm_unvote_buses(core, DDR_MEM|OCMEM_MEM);
+ else
+ msm_comm_unvote_buses(core, DDR_MEM);
+ }
+ mutex_unlock(&core->lock);
+}
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_debug.c b/drivers/media/platform/msm/vidc/msm_vidc_debug.c
old mode 100755
new mode 100644
index 0ac6fc4..ee91513
--- a/drivers/media/platform/msm/vidc/msm_vidc_debug.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_debug.c
@@ -21,6 +21,7 @@
int msm_fw_debug_mode = 0x1;
int msm_fw_low_power_mode = 0x1;
int msm_vidc_hw_rsp_timeout = 1000;
+u32 msm_vidc_firmware_unload_delay = 15000;
struct debug_buffer {
char ptr[MAX_DBG_BUF_SIZE];
@@ -193,6 +194,12 @@
dprintk(VIDC_ERR, "debugfs_create_file: fail\n");
goto failed_create_dir;
}
+ if (!debugfs_create_u32("firmware_unload_delay", S_IRUGO | S_IWUSR,
+ parent, &msm_vidc_firmware_unload_delay)) {
+ dprintk(VIDC_ERR,
+ "debugfs_create_file: firmware_unload_delay fail\n");
+ goto failed_create_dir;
+ }
failed_create_dir:
return dir;
}
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_debug.h b/drivers/media/platform/msm/vidc/msm_vidc_debug.h
index c9ecc6f..f7091cf 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_debug.h
+++ b/drivers/media/platform/msm/vidc/msm_vidc_debug.h
@@ -54,6 +54,7 @@
extern int msm_fw_low_power_mode;
extern int msm_vp8_low_tier;
extern int msm_vidc_hw_rsp_timeout;
+extern u32 msm_vidc_firmware_unload_delay;
#define dprintk(__level, __fmt, arg...) \
do { \
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_internal.h b/drivers/media/platform/msm/vidc/msm_vidc_internal.h
index 1677e57..e655d71 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_internal.h
+++ b/drivers/media/platform/msm/vidc/msm_vidc_internal.h
@@ -20,6 +20,7 @@
#include <linux/types.h>
#include <linux/completion.h>
#include <linux/wait.h>
+#include <linux/workqueue.h>
#include <mach/msm_bus.h>
#include <mach/msm_bus_board.h>
#include <mach/ocmem.h>
@@ -193,8 +194,10 @@
struct hal_capability_supported scale_y;
struct hal_capability_supported ltr_count;
struct hal_capability_supported hier_p;
+ struct hal_capability_supported mbs_per_frame;
u32 capability_set;
enum buffer_mode_type buffer_mode[MAX_PORT_NUM];
+ u32 buffer_size_limit;
};
struct msm_vidc_core {
@@ -212,6 +215,7 @@
struct msm_vidc_platform_resources resources;
u32 enc_codec_supported;
u32 dec_codec_supported;
+ struct delayed_work fw_unload_work;
};
struct msm_vidc_inst {
@@ -310,4 +314,5 @@
struct buffer_info *binfo);
int unmap_and_deregister_buf(struct msm_vidc_inst *inst,
struct buffer_info *binfo);
+void msm_vidc_fw_unload_handler(struct work_struct *work);
#endif
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
index ecfff85..10f3797 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c
@@ -348,7 +348,7 @@
goto err_mem_alloc;
}
for (i = 0; i < num_bus_pdata; i++) {
- if (!res->has_ocmem &&
+ if (!res->ocmem_size &&
(!strcmp(bus_pdata_config_vector[i].name,
"qcom,enc-ocmem-ab-ib")
|| !strcmp(bus_pdata_config_vector[i].name,
@@ -567,9 +567,11 @@
kres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
res->irq = kres ? kres->start : -1;
- res->has_ocmem = of_property_read_bool(pdev->dev.of_node,
- "qcom,has-ocmem");
-
+ rc = of_property_read_u32(pdev->dev.of_node,
+ "qcom,ocmem-size", &res->ocmem_size);
+ if (rc) {
+ dprintk(VIDC_INFO, "Failed to read ocmem size: %d\n", rc);
+ }
rc = msm_vidc_load_freq_table(res);
if (rc) {
dprintk(VIDC_ERR, "Failed to load freq table: %d\n", rc);
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_resources.h b/drivers/media/platform/msm/vidc/msm_vidc_resources.h
index e75b410..87d4d42 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc_resources.h
+++ b/drivers/media/platform/msm/vidc/msm_vidc_resources.h
@@ -74,7 +74,7 @@
struct msm_bus_scale_pdata *bus_pdata;
struct iommu_set iommu_group_set;
struct buffer_usage_set buffer_usage_set;
- bool has_ocmem;
+ uint32_t ocmem_size;
uint32_t max_load;
struct platform_device *pdev;
};
diff --git a/drivers/media/platform/msm/vidc/q6_hfi.c b/drivers/media/platform/msm/vidc/q6_hfi.c
old mode 100755
new mode 100644
index 52bbe12..4bc534c
--- a/drivers/media/platform/msm/vidc/q6_hfi.c
+++ b/drivers/media/platform/msm/vidc/q6_hfi.c
@@ -1186,14 +1186,6 @@
return 0;
}
-static int q6_hfi_unset_ocmem(void *dev)
-{
- (void)dev;
-
- /* Q6 does not support ocmem */
- return -EINVAL;
-}
-
static int q6_hfi_iommu_get_domain_partition(void *dev, u32 flags,
u32 buffer_type, int *domain, int *partition)
{
@@ -1374,7 +1366,6 @@
hdev->session_flush = q6_hfi_session_flush;
hdev->session_set_property = q6_hfi_session_set_property;
hdev->session_get_property = q6_hfi_session_get_property;
- hdev->unset_ocmem = q6_hfi_unset_ocmem;
hdev->iommu_get_domain_partition = q6_hfi_iommu_get_domain_partition;
hdev->load_fw = q6_hfi_load_fw;
hdev->unload_fw = q6_hfi_unload_fw;
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
old mode 100755
new mode 100644
index a46dc95..f5587fc
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -904,115 +904,59 @@
return rc;
}
-static int venus_hfi_set_ocmem(void *dev, struct ocmem_buf *ocmem, int locked)
-{
- struct vidc_resource_hdr rhdr;
- struct venus_hfi_device *device = dev;
- int rc = 0;
- if (!device || !ocmem) {
- dprintk(VIDC_ERR, "Invalid params, core:%p, ocmem: %p\n",
- device, ocmem);
- return -EINVAL;
- }
- rhdr.resource_id = VIDC_RESOURCE_OCMEM;
- rhdr.resource_handle = (u32) &device->resources.ocmem;
- rhdr.size = ocmem->len;
- rc = venus_hfi_core_set_resource(device, &rhdr, ocmem, locked);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to set OCMEM on driver\n");
- goto ocmem_set_failed;
- }
- dprintk(VIDC_DBG, "OCMEM set, addr = %lx, size: %ld\n",
- ocmem->addr, ocmem->len);
-ocmem_set_failed:
- return rc;
-}
+static DECLARE_COMPLETION(pc_prep_done);
+static DECLARE_COMPLETION(release_resources_done);
-static int venus_hfi_unset_ocmem(void *dev)
-{
- struct vidc_resource_hdr rhdr;
- struct venus_hfi_device *device = dev;
- int rc = 0;
-
- if (!device) {
- dprintk(VIDC_ERR, "%s Invalid params, device:%p\n",
- __func__, device);
- rc = -EINVAL;
- goto ocmem_unset_failed;
- }
- if (!device->resources.ocmem.buf) {
- dprintk(VIDC_INFO, "%s Trying to free OCMEM which is not set",
- __func__);
- rc = -EINVAL;
- goto ocmem_unset_failed;
- }
- rhdr.resource_id = VIDC_RESOURCE_OCMEM;
- rhdr.resource_handle = (u32) &device->resources.ocmem;
- rc = venus_hfi_core_release_resource(device, &rhdr);
- if (rc)
- dprintk(VIDC_ERR, "Failed to unset OCMEM on driver\n");
-ocmem_unset_failed:
- return rc;
-}
-
-static int __alloc_ocmem(void *dev, unsigned long size, int locked)
+static int __alloc_ocmem(struct venus_hfi_device *device)
{
int rc = 0;
struct ocmem_buf *ocmem_buffer;
- struct venus_hfi_device *device = dev;
+ unsigned long size;
- if (!device || !size) {
- dprintk(VIDC_ERR, "%s Invalid param, core: %p, size: %lu\n",
- __func__, device, size);
+ if (!device || !device->res) {
+ dprintk(VIDC_ERR, "%s Invalid param, device: 0x%p\n",
+ __func__, device);
return -EINVAL;
}
+
+ size = device->res->ocmem_size;
+ if (!size)
+ return rc;
+
ocmem_buffer = device->resources.ocmem.buf;
- if (!ocmem_buffer ||
- ocmem_buffer->len < size) {
+ if (!ocmem_buffer || ocmem_buffer->len < size) {
ocmem_buffer = ocmem_allocate(OCMEM_VIDEO, size);
if (IS_ERR_OR_NULL(ocmem_buffer)) {
dprintk(VIDC_ERR,
- "ocmem_allocate_nb failed: %d\n",
- (u32) ocmem_buffer);
+ "ocmem_allocate failed: %lu\n",
+ (unsigned long)ocmem_buffer);
rc = -ENOMEM;
+ device->resources.ocmem.buf = NULL;
goto ocmem_alloc_failed;
}
device->resources.ocmem.buf = ocmem_buffer;
- rc = venus_hfi_set_ocmem(device, ocmem_buffer, locked);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to set ocmem: %d\n", rc);
- goto ocmem_set_failed;
- }
- device->ocmem_size = size;
- } else
+ } else {
dprintk(VIDC_DBG,
"OCMEM is enough. reqd: %lu, available: %lu\n",
size, ocmem_buffer->len);
-
- return rc;
-ocmem_set_failed:
- ocmem_free(OCMEM_VIDEO, device->resources.ocmem.buf);
- device->resources.ocmem.buf = NULL;
+ }
ocmem_alloc_failed:
return rc;
}
-static int venus_hfi_alloc_ocmem(void *dev, unsigned long size)
+static int __free_ocmem(struct venus_hfi_device *device)
{
- return __alloc_ocmem(dev, size, true);
-}
-
-static int venus_hfi_free_ocmem(void *dev)
-{
- struct venus_hfi_device *device = dev;
int rc = 0;
- if (!device) {
- dprintk(VIDC_ERR, "%s invalid device handle %p",
- __func__, device);
+ if (!device || !device->res) {
+ dprintk(VIDC_ERR, "%s Invalid param, device: 0x%p\n",
+ __func__, device);
return -EINVAL;
}
+ if (!device->res->ocmem_size)
+ return rc;
+
if (device->resources.ocmem.buf) {
rc = ocmem_free(OCMEM_VIDEO, device->resources.ocmem.buf);
if (rc)
@@ -1022,6 +966,147 @@
return rc;
}
+static int __set_ocmem(struct venus_hfi_device *device, bool locked)
+{
+ struct vidc_resource_hdr rhdr;
+ int rc = 0;
+ struct on_chip_mem *ocmem;
+
+ if (!device) {
+ dprintk(VIDC_ERR, "%s Invalid param, device: 0x%p\n",
+ __func__, device);
+ return -EINVAL;
+ }
+
+ ocmem = &device->resources.ocmem;
+ if (!ocmem->buf) {
+ dprintk(VIDC_ERR, "Invalid params, ocmem_buffer: 0x%p\n",
+ ocmem->buf);
+ return -EINVAL;
+ }
+
+ rhdr.resource_id = VIDC_RESOURCE_OCMEM;
+ /*
+ * This handle is just used as a cookie and not(cannot be)
+ * accessed by fw
+ */
+ rhdr.resource_handle = (u32)(unsigned long)ocmem;
+ rhdr.size = ocmem->buf->len;
+ rc = venus_hfi_core_set_resource(device, &rhdr, ocmem->buf, locked);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to set OCMEM on driver\n");
+ goto ocmem_set_failed;
+ }
+ dprintk(VIDC_DBG, "OCMEM set, addr = %lx, size: %ld\n",
+ ocmem->buf->addr, ocmem->buf->len);
+ocmem_set_failed:
+ return rc;
+}
+
+static int __unset_ocmem(struct venus_hfi_device *device)
+{
+ struct vidc_resource_hdr rhdr;
+ int rc = 0;
+
+ if (!device) {
+ dprintk(VIDC_ERR, "%s Invalid param, device: 0x%p\n",
+ __func__, device);
+ rc = -EINVAL;
+ goto ocmem_unset_failed;
+ }
+
+ if (!device->resources.ocmem.buf) {
+ dprintk(VIDC_INFO,
+ "%s Trying to unset OCMEM which is not allocated\n",
+ __func__);
+ rc = -EINVAL;
+ goto ocmem_unset_failed;
+ }
+ rhdr.resource_id = VIDC_RESOURCE_OCMEM;
+ /*
+ * This handle is just used as a cookie and not(cannot be)
+ * accessed by fw
+ */
+ rhdr.resource_handle = (u32)(unsigned long)&device->resources.ocmem;
+ rc = venus_hfi_core_release_resource(device, &rhdr);
+ if (rc)
+ dprintk(VIDC_ERR, "Failed to unset OCMEM on driver\n");
+ocmem_unset_failed:
+ return rc;
+}
+
+static int __alloc_set_ocmem(struct venus_hfi_device *device, bool locked)
+{
+ int rc = 0;
+
+ if (!device || !device->res) {
+ dprintk(VIDC_ERR, "%s Invalid param, device: 0x%p\n",
+ __func__, device);
+ return -EINVAL;
+ }
+
+ if (!device->res->ocmem_size)
+ return rc;
+
+ rc = __alloc_ocmem(device);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to allocate ocmem: %d\n", rc);
+ goto ocmem_alloc_failed;
+ }
+ rc = __set_ocmem(device, locked);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to set ocmem: %d\n", rc);
+ goto ocmem_set_failed;
+ }
+ return rc;
+ocmem_set_failed:
+ __free_ocmem(device);
+ocmem_alloc_failed:
+ return rc;
+}
+
+static int __unset_free_ocmem(struct venus_hfi_device *device)
+{
+ int rc = 0;
+ if (!device || !device->res) {
+ dprintk(VIDC_ERR, "%s Invalid param, device: 0x%p\n",
+ __func__, device);
+ return -EINVAL;
+ }
+
+ if (!device->res->ocmem_size)
+ return rc;
+
+ init_completion(&release_resources_done);
+ rc = __unset_ocmem(device);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to unset OCMEM during PC %d\n", rc);
+ goto ocmem_unset_failed;
+ }
+ rc = wait_for_completion_timeout(&release_resources_done,
+ msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
+ if (!rc) {
+ dprintk(VIDC_ERR,
+ "Wait interrupted or timeout for RELEASE_RESOURCES: %d\n",
+ rc);
+ rc = -EIO;
+ goto release_resources_failed;
+ }
+
+ rc = __free_ocmem(device);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to free OCMEM during PC\n");
+ goto ocmem_free_failed;
+ }
+ return rc;
+
+ocmem_free_failed:
+ __set_ocmem(device, true);
+release_resources_failed:
+ocmem_unset_failed:
+ return rc;
+}
+
static inline int venus_hfi_tzbsp_set_video_state(enum tzbsp_video_state state)
{
struct tzbsp_video_set_state_req cmd = {0};
@@ -1073,24 +1158,28 @@
return 0;
}
- for (i = 0; i <= device->clk_gating_level; i++) {
+ for (i = VCODEC_CLK; i <= device->clk_gating_level; i++) {
cl = &device->resources.clock[i];
rc = clk_enable(cl->clk);
if (rc) {
- dprintk(VIDC_ERR, "Failed to enable clocks\n");
+ dprintk(VIDC_ERR, "%s: Failed to enable %s clock\n",
+ __func__, cl->name);
goto fail_clk_enable;
} else {
- dprintk(VIDC_DBG, "Clock: %s enabled\n", cl->name);
+ dprintk(VIDC_DBG, "%s: Clock: %s enabled\n",
+ __func__, cl->name);
}
}
device->clk_state = ENABLED_PREPARED;
++device->clk_cnt;
return 0;
fail_clk_enable:
- for (i--; i >= 0; i--) {
+ for (i--; i >= VCODEC_CLK; i--) {
cl = &device->resources.clock[i];
usleep(100);
clk_disable(cl->clk);
+ dprintk(VIDC_ERR, "%s: Clock: %s disabled\n",
+ __func__, cl->name);
}
device->clk_state = DISABLED_PREPARED;
return rc;
@@ -1120,18 +1209,17 @@
if (rc)
dprintk(VIDC_WARN, "Failed to set clock rate to min: %d\n", rc);
- for (i = 0; i <= device->clk_gating_level; i++) {
+ for (i = VCODEC_CLK; i <= device->clk_gating_level; i++) {
cl = &device->resources.clock[i];
usleep(100);
clk_disable(cl->clk);
+ dprintk(VIDC_DBG, "%s: Clock: %s disabled\n",
+ __func__, cl->name);
}
device->clk_state = DISABLED_PREPARED;
--device->clk_cnt;
}
-static DECLARE_COMPLETION(pc_prep_done);
-static DECLARE_COMPLETION(release_resources_done);
-
static int venus_hfi_halt_axi(struct venus_hfi_device *device)
{
u32 reg;
@@ -1195,7 +1283,7 @@
dprintk(VIDC_ERR, "Failed to disable GDSC, %d", rc);
return rc;
}
- if (device->res->has_ocmem)
+ if (device->res->ocmem_size)
venus_hfi_unvote_buses(device, DDR_MEM|OCMEM_MEM);
else
venus_hfi_unvote_buses(device, DDR_MEM);
@@ -1215,7 +1303,7 @@
return -EINVAL;
}
- if (device->res->has_ocmem)
+ if (device->res->ocmem_size)
rc = venus_hfi_scale_buses(device, DDR_MEM|OCMEM_MEM);
else
rc = venus_hfi_scale_buses(device, DDR_MEM);
@@ -1230,12 +1318,6 @@
goto err_enable_gdsc;
}
- rc = venus_hfi_iommu_attach(device);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to attach iommu after power on");
- goto err_iommu_attach;
- }
-
if (device->clk_state == DISABLED_UNPREPARED)
rc = venus_hfi_prepare_enable_clks(device);
else if (device->clk_state == DISABLED_PREPARED)
@@ -1246,6 +1328,11 @@
goto err_enable_clk;
}
+ rc = venus_hfi_iommu_attach(device);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to attach iommu after power on");
+ goto err_iommu_attach;
+ }
/*
* Re-program all of the registers that get reset as a result of
@@ -1287,7 +1374,7 @@
* of alloc_ocmem
*/
WARN_ON(!mutex_is_locked(&device->write_lock));
- rc = __alloc_ocmem(device, device->ocmem_size, false);
+ rc = __alloc_set_ocmem(device, false);
if (rc) {
dprintk(VIDC_ERR, "Failed to allocate OCMEM");
goto err_alloc_ocmem;
@@ -1300,13 +1387,13 @@
err_reset_core:
venus_hfi_tzbsp_set_video_state(TZBSP_VIDEO_STATE_SUSPEND);
err_set_video_state:
- venus_hfi_clk_disable(device);
-err_enable_clk:
venus_hfi_iommu_detach(device);
err_iommu_attach:
+ venus_hfi_clk_disable(device);
+err_enable_clk:
regulator_disable(device->gdsc);
err_enable_gdsc:
- if (device->res->has_ocmem)
+ if (device->res->ocmem_size)
venus_hfi_unvote_buses(device, DDR_MEM|OCMEM_MEM);
else
venus_hfi_unvote_buses(device, DDR_MEM);
@@ -1929,13 +2016,26 @@
dprintk(VIDC_ERR, "invalid device");
return -ENODEV;
}
-
if (dev->hal_client) {
mutex_lock(&dev->clk_pwr_lock);
rc = venus_hfi_clk_gating_off(device);
if (rc) {
dprintk(VIDC_ERR,
- "%s : Clock enable failed\n", __func__);
+ "%s : Clock enable failed\n", __func__);
+ mutex_unlock(&dev->clk_pwr_lock);
+ return -EIO;
+ }
+ mutex_unlock(&dev->clk_pwr_lock);
+ rc = __unset_free_ocmem(dev);
+ if (rc)
+ dprintk(VIDC_ERR,
+ "Failed to unset and free OCMEM in core release, rc : %d\n",
+ rc);
+ mutex_lock(&dev->clk_pwr_lock);
+ rc = venus_hfi_clk_gating_off(device);
+ if (rc) {
+ dprintk(VIDC_ERR,
+ "%s : Clock enable failed\n", __func__);
mutex_unlock(&dev->clk_pwr_lock);
return -EIO;
}
@@ -1946,6 +2046,7 @@
dev->intr_status = 0;
mutex_unlock(&dev->clk_pwr_lock);
}
+
VENUS_SET_STATE(dev, VENUS_STATE_DEINIT);
dprintk(VIDC_INFO, "HAL exited\n");
@@ -2738,45 +2839,6 @@
return rc;
}
-static int venus_hfi_unset_free_ocmem(struct venus_hfi_device *device)
-{
- int rc = 0;
-
- if (!device) {
- dprintk(VIDC_ERR, "Invalid param: %p\n", device);
- return -EINVAL;
- }
-
- init_completion(&release_resources_done);
- rc = venus_hfi_unset_ocmem(device);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to unset OCMEM during PC %d\n", rc);
- goto ocmem_unset_failed;
- }
- rc = wait_for_completion_timeout(&release_resources_done,
- msecs_to_jiffies(msm_vidc_hw_rsp_timeout));
- if (!rc) {
- dprintk(VIDC_ERR,
- "Wait interrupted or timeout for RELEASE_RESOURCES: %d\n",
- rc);
- rc = -EIO;
- goto release_resources_failed;
- }
-
- rc = venus_hfi_free_ocmem(device);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to free OCMEM during PC\n");
- goto ocmem_free_failed;
- }
- return rc;
-
-ocmem_free_failed:
- venus_hfi_alloc_ocmem(device, device->ocmem_size);
-release_resources_failed:
-ocmem_unset_failed:
- return rc;
-}
-
static int venus_hfi_prepare_pc(struct venus_hfi_device *device)
{
int rc = 0;
@@ -2814,18 +2876,20 @@
}
mutex_unlock(&device->clk_pwr_lock);
- rc = venus_hfi_unset_free_ocmem(device);
+ rc = __unset_free_ocmem(device);
if (rc) {
dprintk(VIDC_ERR,
- "Failed to unset and free OCMEM for PC %d\n",
- rc);
+ "Failed to unset and free OCMEM for PC, rc : %d\n", rc);
return;
}
rc = venus_hfi_prepare_pc(device);
if (rc) {
- dprintk(VIDC_ERR, "Failed to prepare for PC %d\n", rc);
- venus_hfi_alloc_ocmem(device, device->ocmem_size);
+ dprintk(VIDC_ERR, "Failed to prepare for PC, rc : %d\n", rc);
+ rc = __alloc_set_ocmem(device, true);
+ if (rc)
+ dprintk(VIDC_WARN,
+ "Failed to re-allocate OCMEM. Performance will be impacted\n");
return;
}
@@ -2921,6 +2985,14 @@
dprintk(VIDC_DBG,
"Received HFI_MSG_SYS_RELEASE_RESOURCE\n");
complete(&release_resources_done);
+ } else if (rc == HFI_MSG_SYS_INIT_DONE) {
+ int ret = 0;
+ dprintk(VIDC_DBG,
+ "Received HFI_MSG_SYS_INIT_DONE\n");
+ ret = __alloc_set_ocmem(device, true);
+ if (ret)
+ dprintk(VIDC_WARN,
+ "Failed to allocate OCMEM. Performance will be impacted\n");
}
}
while (!venus_hfi_iface_dbgq_read(device, packet)) {
@@ -3053,7 +3125,7 @@
strlcpy(clock[VCODEC_AXI_CLK].name, "bus_clk",
sizeof(clock[VCODEC_AXI_CLK].name));
- if (res->has_ocmem) {
+ if (res->ocmem_size) {
strlcpy(clock[VCODEC_OCMEM_CLK].name, "mem_clk",
sizeof(clock[VCODEC_OCMEM_CLK].name));
}
@@ -3075,8 +3147,8 @@
);
}
- for (i = 0; i < VCODEC_MAX_CLKS; i++) {
- if (i == VCODEC_OCMEM_CLK && !res->has_ocmem)
+ for (i = VCODEC_CLK; i < VCODEC_MAX_CLKS; i++) {
+ if (i == VCODEC_OCMEM_CLK && !res->ocmem_size)
continue;
cl = &device->resources.clock[i];
if (!cl->clk) {
@@ -3091,8 +3163,8 @@
}
if (i < VCODEC_MAX_CLKS) {
- for (--i; i >= 0; i--) {
- if (i == VCODEC_OCMEM_CLK && !res->has_ocmem)
+ for (--i; i >= VCODEC_CLK; i--) {
+ if (i == VCODEC_OCMEM_CLK && !res->ocmem_size)
continue;
cl = &device->resources.clock[i];
clk_put(cl->clk);
@@ -3110,8 +3182,8 @@
return;
}
- for (i = 0; i < VCODEC_MAX_CLKS; i++) {
- if (i == VCODEC_OCMEM_CLK && !device->res->has_ocmem)
+ for (i = VCODEC_CLK; i < VCODEC_MAX_CLKS; i++) {
+ if (i == VCODEC_OCMEM_CLK && !device->res->ocmem_size)
continue;
clk_put(device->resources.clock[i].clk);
}
@@ -3130,11 +3202,13 @@
WARN_ON(!mutex_is_locked(&device->clk_pwr_lock));
if (device->clk_state == ENABLED_PREPARED) {
for (i = VCODEC_CLK; i < VCODEC_MAX_CLKS; i++) {
- if (i == VCODEC_OCMEM_CLK && !device->res->has_ocmem)
+ if (i == VCODEC_OCMEM_CLK && !device->res->ocmem_size)
continue;
cl = &device->resources.clock[i];
usleep(100);
clk_disable(cl->clk);
+ dprintk(VIDC_DBG, "%s: Clock: %s disabled\n",
+ __func__, cl->name);
}
} else {
for (i = device->clk_gating_level + 1;
@@ -3142,13 +3216,17 @@
cl = &device->resources.clock[i];
usleep(100);
clk_disable(cl->clk);
+ dprintk(VIDC_DBG, "%s: Clock: %s disabled\n",
+ __func__, cl->name);
}
}
for (i = VCODEC_CLK; i < VCODEC_MAX_CLKS; i++) {
- if (i == VCODEC_OCMEM_CLK && !device->res->has_ocmem)
+ if (i == VCODEC_OCMEM_CLK && !device->res->ocmem_size)
continue;
cl = &device->resources.clock[i];
clk_unprepare(cl->clk);
+ dprintk(VIDC_DBG, "%s: Clock: %s unprepared\n",
+ __func__, cl->name);
}
device->clk_state = DISABLED_UNPREPARED;
--device->clk_cnt;
@@ -3170,25 +3248,29 @@
return 0;
}
for (i = VCODEC_CLK; i < VCODEC_MAX_CLKS; i++) {
- if (i == VCODEC_OCMEM_CLK && !device->res->has_ocmem)
+ if (i == VCODEC_OCMEM_CLK && !device->res->ocmem_size)
continue;
cl = &device->resources.clock[i];
rc = clk_prepare_enable(cl->clk);
if (rc) {
- dprintk(VIDC_ERR, "Failed to enable clocks\n");
+ dprintk(VIDC_ERR, "%s: Failed to enable %s clock\n",
+ __func__, cl->name);
goto fail_clk_enable;
} else {
- dprintk(VIDC_DBG, "Clock: %s enabled\n", cl->name);
+ dprintk(VIDC_DBG, "%s: Clock: %s prepare and enabled\n",
+ __func__, cl->name);
}
}
device->clk_state = ENABLED_PREPARED;
++device->clk_cnt;
return rc;
fail_clk_enable:
- for (; i >= 0; i--) {
+ for (; i >= VCODEC_CLK; i--) {
cl = &device->resources.clock[i];
usleep(100);
clk_disable_unprepare(cl->clk);
+ dprintk(VIDC_ERR, "%s: Clock: %s disable and unprepared\n",
+ __func__, cl->name);
}
device->clk_state = DISABLED_UNPREPARED;
return rc;
@@ -3314,7 +3396,7 @@
goto err_init_bus;
}
- if (device->res->has_ocmem) {
+ if (device->res->ocmem_size) {
bus_info->ocmem_handle[MSM_VIDC_ENCODER] =
msm_bus_scale_register_client(
&device->res->bus_pdata[BUS_IDX_ENC_OCMEM]);
@@ -3340,59 +3422,6 @@
return -EINVAL;
}
-static int venus_hfi_ocmem_notify_handler(struct notifier_block *this,
- unsigned long event, void *data)
-{
- struct ocmem_buf *buff = data;
- struct venus_hfi_device *device;
- struct venus_resources *resources;
- struct on_chip_mem *ocmem;
- int rc = NOTIFY_DONE;
- if (event == OCMEM_ALLOC_GROW) {
- ocmem = container_of(this, struct on_chip_mem, vidc_ocmem_nb);
- if (!ocmem) {
- dprintk(VIDC_ERR, "Wrong handler passed\n");
- rc = NOTIFY_BAD;
- goto err_ocmem_notify;
- }
- resources = container_of(ocmem,
- struct venus_resources, ocmem);
- device = container_of(resources,
- struct venus_hfi_device, resources);
- if (venus_hfi_set_ocmem(device, buff, 1)) {
- dprintk(VIDC_ERR, "Failed to set ocmem: %d\n", rc);
- goto err_ocmem_notify;
- }
- rc = NOTIFY_OK;
- }
-
-err_ocmem_notify:
- return rc;
-}
-
-static void venus_hfi_ocmem_init(struct venus_hfi_device *device)
-{
- struct on_chip_mem *ocmem;
-
- ocmem = &device->resources.ocmem;
- ocmem->vidc_ocmem_nb.notifier_call = venus_hfi_ocmem_notify_handler;
- ocmem->handle =
- ocmem_notifier_register(OCMEM_VIDEO, &ocmem->vidc_ocmem_nb);
- if (IS_ERR_OR_NULL(ocmem->handle)) {
- dprintk(VIDC_WARN,
- "Failed to register OCMEM notifier. Performance might be impacted\n");
- ocmem->handle = NULL;
- }
-}
-
-static void venus_hfi_deinit_ocmem(struct venus_hfi_device *device)
-{
- if (device->resources.ocmem.handle)
- ocmem_notifier_unregister(device->resources.ocmem.handle,
- &device->resources.ocmem.vidc_ocmem_nb);
-}
-
-
static int venus_hfi_init_resources(struct venus_hfi_device *device,
struct msm_vidc_platform_resources *res)
{
@@ -3430,9 +3459,6 @@
goto err_register_iommu_domain;
}
- if (res->has_ocmem)
- venus_hfi_ocmem_init(device);
-
return rc;
err_register_iommu_domain:
@@ -3446,8 +3472,6 @@
static void venus_hfi_deinit_resources(struct venus_hfi_device *device)
{
- if (device->res->has_ocmem)
- venus_hfi_deinit_ocmem(device);
venus_hfi_deregister_iommu_domains(device);
venus_hfi_deinit_bus(device);
venus_hfi_deinit_clocks(device);
@@ -3547,63 +3571,60 @@
__func__, device);
return -EINVAL;
}
- device->clk_gating_level = VCODEC_CLK;
+ device->clk_gating_level = VCODEC_NONE;
+
+ mutex_lock(&device->clk_pwr_lock);
+ rc = regulator_enable(device->gdsc);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to enable GDSC %d", rc);
+ goto fail_enable_gdsc;
+ }
+ rc = venus_hfi_prepare_enable_clks(device);
+ if (rc) {
+ dprintk(VIDC_ERR, "Failed to enable clocks: %d\n", rc);
+ goto fail_enable_clks;
+ }
rc = venus_hfi_iommu_attach(device);
if (rc) {
dprintk(VIDC_ERR, "Failed to attach iommu");
goto fail_iommu_attach;
}
- mutex_lock(&device->clk_pwr_lock);
if (!device->resources.fw.cookie) {
- rc = regulator_enable(device->gdsc);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to enable GDSC %d", rc);
- mutex_unlock(&device->clk_pwr_lock);
- goto fail_enable_gdsc;
- }
device->resources.fw.cookie = subsystem_get("venus");
}
-
if (IS_ERR_OR_NULL(device->resources.fw.cookie)) {
dprintk(VIDC_ERR, "Failed to download firmware\n");
rc = -ENOMEM;
- mutex_unlock(&device->clk_pwr_lock);
goto fail_load_fw;
}
+
device->power_enabled = true;
++device->pwr_cnt;
- /*Clocks can be enabled only after pil_get since
- * gdsc is turned-on in pil_get*/
- rc = venus_hfi_prepare_enable_clks(device);
- mutex_unlock(&device->clk_pwr_lock);
- if (rc) {
- dprintk(VIDC_ERR, "Failed to enable clocks: %d\n", rc);
- goto fail_enable_clks;
- }
+
rc = protect_cp_mem(device);
if (rc) {
dprintk(VIDC_ERR, "Failed to protect memory\n");
goto fail_protect_mem;
}
- return rc;
-fail_protect_mem:
- mutex_lock(&device->clk_pwr_lock);
- venus_hfi_disable_unprepare_clks(device);
mutex_unlock(&device->clk_pwr_lock);
-fail_enable_clks:
+ return rc;
+
+fail_protect_mem:
subsystem_put(device->resources.fw.cookie);
-fail_load_fw:
- mutex_lock(&device->clk_pwr_lock);
device->resources.fw.cookie = NULL;
+fail_load_fw:
+ venus_hfi_iommu_detach(device);
+fail_iommu_attach:
+ venus_hfi_disable_unprepare_clks(device);
+fail_enable_clks:
regulator_disable(device->gdsc);
device->power_enabled = false;
--device->pwr_cnt;
- mutex_unlock(&device->clk_pwr_lock);
fail_enable_gdsc:
- venus_hfi_iommu_detach(device);
-fail_iommu_attach:
+ dprintk(VIDC_ERR, "Failed to load firmware\n");
+ mutex_unlock(&device->clk_pwr_lock);
return rc;
}
@@ -3648,10 +3669,6 @@
return -EINVAL;
}
- rc = venus_hfi_free_ocmem(device);
- if (rc)
- dprintk(VIDC_WARN, "%s - failed to free ocmem\n", __func__);
-
rc = venus_hfi_core_release(device);
if (rc) {
dprintk(VIDC_ERR, "%s - failed to release venus core rc = %d\n",
@@ -3917,9 +3934,6 @@
hdev->scale_clocks = venus_hfi_scale_clocks;
hdev->scale_bus = venus_hfi_scale_bus;
hdev->unvote_bus = venus_hfi_unvote_bus;
- hdev->unset_ocmem = venus_hfi_unset_ocmem;
- hdev->alloc_ocmem = venus_hfi_alloc_ocmem;
- hdev->free_ocmem = venus_hfi_free_ocmem;
hdev->iommu_get_domain_partition = venus_hfi_iommu_get_domain_partition;
hdev->load_fw = venus_hfi_load_fw;
hdev->unload_fw = venus_hfi_unload_fw;
diff --git a/drivers/media/platform/msm/vidc/venus_hfi.h b/drivers/media/platform/msm/vidc/venus_hfi.h
index 23a51ba..05d7b6a 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.h
+++ b/drivers/media/platform/msm/vidc/venus_hfi.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
@@ -151,6 +151,7 @@
};
enum vidc_clocks {
+ VCODEC_NONE,
VCODEC_CLK,
VCODEC_AHB_CLK,
VCODEC_AXI_CLK,
@@ -195,7 +196,6 @@
u32 device_id;
u32 clk_load;
u32 bus_load[MSM_VIDC_MAX_DEVICES];
- unsigned long ocmem_size;
enum clock_state clk_state;
bool power_enabled;
enum vidc_clocks clk_gating_level;
diff --git a/drivers/media/platform/msm/vidc/vidc_hfi_api.h b/drivers/media/platform/msm/vidc/vidc_hfi_api.h
old mode 100755
new mode 100644
index 8484bb2..6cc4dee
--- a/drivers/media/platform/msm/vidc/vidc_hfi_api.h
+++ b/drivers/media/platform/msm/vidc/vidc_hfi_api.h
@@ -1156,9 +1156,6 @@
enum session_type type, enum mem_type mtype);
int (*unvote_bus)(void *dev, enum session_type type,
enum mem_type mtype);
- int (*unset_ocmem)(void *dev);
- int (*alloc_ocmem)(void *dev, unsigned long size);
- int (*free_ocmem)(void *dev);
int (*iommu_get_domain_partition)(void *dev, u32 flags, u32 buffer_type,
int *domain_num, int *partition_num);
int (*load_fw)(void *dev);
diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c
index 12897e8..fd5c96b 100644
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/drivers/media/video/mem2mem_testdev.c
@@ -49,7 +49,7 @@
#define MEM2MEM_NAME "m2m-testdev"
/* Per queue */
-#define MEM2MEM_DEF_NUM_BUFS VIDEO_MAX_FRAME
+#define MEM2MEM_DEF_NUM_BUFS VB2_MAX_FRAME
/* In bytes, per queue */
#define MEM2MEM_VID_MEM_LIMIT (16 * 1024 * 1024)
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c
index 2e3f4b4..851768a 100644
--- a/drivers/media/video/saa7134/saa7134-ts.c
+++ b/drivers/media/video/saa7134/saa7134-ts.c
@@ -197,8 +197,8 @@
/* sanitycheck insmod options */
if (tsbufs < 2)
tsbufs = 2;
- if (tsbufs > VIDEO_MAX_FRAME)
- tsbufs = VIDEO_MAX_FRAME;
+ if (tsbufs > VB2_MAX_FRAME)
+ tsbufs = VB2_MAX_FRAME;
if (ts_nr_packets < 4)
ts_nr_packets = 4;
if (ts_nr_packets > 312)
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index e9aa94b..3702928 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -214,8 +214,8 @@
if (vbibufs < 2)
vbibufs = 2;
- if (vbibufs > VIDEO_MAX_FRAME)
- vbibufs = VIDEO_MAX_FRAME;
+ if (vbibufs > VB2_MAX_FRAME)
+ vbibufs = VB2_MAX_FRAME;
return 0;
}
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 417034e..e63ffda 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -2509,7 +2509,7 @@
int saa7134_video_init1(struct saa7134_dev *dev)
{
/* sanitycheck insmod options */
- if (gbuffers < 2 || gbuffers > VIDEO_MAX_FRAME)
+ if (gbuffers < 2 || gbuffers > VB2_MAX_FRAME)
gbuffers = 2;
if (gbufsize < 0 || gbufsize > gbufsize_max)
gbufsize = gbufsize_max;
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index 6cea218..ae544a4 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -536,7 +536,7 @@
/*
* Make sure the requested values and current defaults are sane.
*/
- num_buffers = min_t(unsigned int, req->count, VIDEO_MAX_FRAME);
+ num_buffers = min_t(unsigned int, req->count, VB2_MAX_FRAME);
memset(q->plane_sizes, 0, sizeof(q->plane_sizes));
memset(q->alloc_ctx, 0, sizeof(q->alloc_ctx));
q->memory = req->memory;
@@ -644,7 +644,7 @@
return -EINVAL;
}
- if (q->num_buffers == VIDEO_MAX_FRAME) {
+ if (q->num_buffers == VB2_MAX_FRAME) {
dprintk(1, "%s(): maximum number of buffers already allocated\n",
__func__);
return -ENOBUFS;
@@ -658,7 +658,7 @@
q->memory = create->memory;
}
- num_buffers = min(create->count, VIDEO_MAX_FRAME - q->num_buffers);
+ num_buffers = min(create->count, VB2_MAX_FRAME - q->num_buffers);
/*
* Ask the driver, whether the requested number of buffers, planes per
@@ -1774,7 +1774,7 @@
struct vb2_fileio_data {
struct v4l2_requestbuffers req;
struct v4l2_buffer b;
- struct vb2_fileio_buf bufs[VIDEO_MAX_FRAME];
+ struct vb2_fileio_buf bufs[VB2_MAX_FRAME];
unsigned int index;
unsigned int q_count;
unsigned int dq_count;
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index 9d294f0..3a93469 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -616,6 +616,25 @@
return ret;
}
+static int qseecom_perf_enable(struct qseecom_dev_handle *data)
+{
+ int ret = 0;
+ ret = qsee_vote_for_clock(data, CLK_DFAB);
+ if (ret) {
+ pr_err("Failed to vote for DFAB clock with err %d\n", ret);
+ goto perf_enable_exit;
+ }
+ ret = qsee_vote_for_clock(data, CLK_SFPB);
+ if (ret) {
+ qsee_disable_clock_vote(data, CLK_DFAB);
+ pr_err("Failed to vote for SFPB clock with err %d\n", ret);
+ goto perf_enable_exit;
+ }
+
+perf_enable_exit:
+ return ret;
+}
+
static int qseecom_scale_bus_bandwidth(struct qseecom_dev_handle *data,
void __user *argp)
{
@@ -631,10 +650,29 @@
pr_err("Invalid bandwidth mode (%d)\n", req_mode);
return ret;
}
- mutex_lock(&qsee_bw_mutex);
- ret = __qseecom_register_bus_bandwidth_needs(data, req_mode);
- mutex_unlock(&qsee_bw_mutex);
+ /*
+ * Register bus bandwidth needs if bus scaling feature is enabled;
+ * otherwise, qseecom enable/disable clocks for the client directly.
+ */
+ if (qseecom.support_bus_scaling) {
+ mutex_lock(&qsee_bw_mutex);
+ ret = __qseecom_register_bus_bandwidth_needs(data, req_mode);
+ mutex_unlock(&qsee_bw_mutex);
+ } else {
+ pr_debug("Bus scaling feature is NOT enabled\n");
+ pr_debug("request bandwidth mode %d for the client\n",
+ req_mode);
+ if (req_mode != INACTIVE) {
+ ret = qseecom_perf_enable(data);
+ if (ret)
+ pr_err("Failed to vote for clock with err %d\n",
+ ret);
+ } else {
+ qsee_disable_clock_vote(data, CLK_DFAB);
+ qsee_disable_clock_vote(data, CLK_SFPB);
+ }
+ }
return ret;
}
@@ -1294,15 +1332,9 @@
return ret;
}
} else {
- ret = qsee_vote_for_clock(data, CLK_DFAB);
+ ret = qseecom_perf_enable(data);
if (ret) {
- pr_err("Failed to vote for DFAB clock%d\n", ret);
- return ret;
- }
- ret = qsee_vote_for_clock(data, CLK_SFPB);
- if (ret) {
- qsee_disable_clock_vote(data, CLK_DFAB);
- pr_err("Failed to vote for SFPB clock%d\n", ret);
+ pr_err("Failed to vote for clocks with err %d\n", ret);
goto exit;
}
}
@@ -1370,6 +1402,7 @@
unsigned long flags;
struct qseecom_registered_app_list *ptr_app;
bool found_app = false;
+ int name_len = 0;
if (req->cmd_req_buf == NULL || req->resp_buf == NULL) {
pr_err("cmd buffer or response buffer is null\n");
@@ -1415,10 +1448,11 @@
spin_lock_irqsave(&qseecom.registered_app_list_lock, flags);
list_for_each_entry(ptr_app, &qseecom.registered_app_list_head,
list) {
+ name_len = min(strlen(data->client.app_name),
+ strlen(ptr_app->app_name));
if ((ptr_app->app_id == data->client.app_id) &&
(!memcmp((void *)ptr_app->app_name,
- (void *)data->client.app_name,
- strlen(data->client.app_name)))) {
+ (void *)data->client.app_name, name_len))) {
found_app = true;
break;
}
@@ -1870,7 +1904,6 @@
ret = __qseecom_enable_clk_scale_up(data);
if (ret) {
- kzfree(img_data);
ret = -EIO;
goto loadfw_err;
}
@@ -1880,7 +1913,6 @@
ret = scm_call(SCM_SVC_TZSCHEDULER, 1, &load_req,
sizeof(struct qseecom_load_app_ireq),
&resp, sizeof(resp));
- kzfree(img_data);
if (ret) {
pr_err("scm_call to load failed : ret %d\n", ret);
ret = -EIO;
@@ -1908,6 +1940,7 @@
}
loadfw_err:
+ kzfree(img_data);
__qseecom_disable_clk_scale_down(data);
if (qseecom.support_bus_scaling) {
mutex_lock(&qsee_bw_mutex);
@@ -2286,6 +2319,7 @@
int ret = 0;
struct qseecom_send_cmd_req req = {0, 0, 0, 0};
struct qseecom_dev_handle *data;
+ bool perf_enabled = false;
if (handle == NULL) {
pr_err("Handle is not initialized\n");
@@ -2309,11 +2343,35 @@
return ret;
}
}
+ /*
+ * On targets where crypto clock is handled by HLOS,
+ * if clk_access_cnt is zero and perf_enabled is false,
+ * then the crypto clock was not enabled before sending cmd
+ * to tz, qseecom will enable the clock to avoid service failure.
+ */
+ if (!qseecom.qsee.clk_access_cnt && !data->perf_enabled) {
+ pr_debug("ce clock is not enabled!\n");
+ ret = qseecom_perf_enable(data);
+ if (ret) {
+ pr_err("Failed to vote for clock with err %d\n",
+ ret);
+ atomic_dec(&data->ioctl_count);
+ mutex_unlock(&app_access_lock);
+ return -EINVAL;
+ }
+ perf_enabled = true;
+ }
+
ret = __qseecom_send_cmd(data, &req);
if (qseecom.support_bus_scaling)
__qseecom_add_bw_scale_down_timer(
QSEECOM_SEND_CMD_CRYPTO_TIMEOUT);
+ if (perf_enabled) {
+ qsee_disable_clock_vote(data, CLK_DFAB);
+ qsee_disable_clock_vote(data, CLK_SFPB);
+ }
+
atomic_dec(&data->ioctl_count);
mutex_unlock(&app_access_lock);
@@ -2342,16 +2400,10 @@
if (ret)
pr_err("Failed to scale bus (med) %d\n", ret);
} else {
- ret = qsee_vote_for_clock(handle->dev, CLK_DFAB);
+ ret = qseecom_perf_enable(handle->dev);
if (ret)
- pr_err("Failed to vote for DFAB clock%d\n",
- ret);
- ret = qsee_vote_for_clock(handle->dev, CLK_SFPB);
- if (ret) {
- pr_err("Failed to vote for SFPB clock%d\n",
- ret);
- qsee_disable_clock_vote(handle->dev, CLK_DFAB);
- }
+ pr_err("Failed to vote for clock with err %d\n",
+ ret);
}
} else {
if (!qseecom.support_bus_scaling) {
@@ -3418,6 +3470,7 @@
int ret = 0;
struct qseecom_dev_handle *data = file->private_data;
void __user *argp = (void __user *) arg;
+ bool perf_enabled = false;
if (!data) {
pr_err("Invalid/uninitialized device handle\n");
@@ -3491,11 +3544,33 @@
break;
}
}
+ /*
+ * On targets where crypto clock is handled by HLOS,
+ * if clk_access_cnt is zero and perf_enabled is false,
+ * then the crypto clock was not enabled before sending cmd
+ * to tz, qseecom will enable the clock to avoid service failure.
+ */
+ if (!qseecom.qsee.clk_access_cnt && !data->perf_enabled) {
+ pr_debug("ce clock is not enabled!\n");
+ ret = qseecom_perf_enable(data);
+ if (ret) {
+ pr_err("Failed to vote for clock with err %d\n",
+ ret);
+ mutex_unlock(&app_access_lock);
+ ret = -EINVAL;
+ break;
+ }
+ perf_enabled = true;
+ }
atomic_inc(&data->ioctl_count);
ret = qseecom_send_cmd(data, argp);
if (qseecom.support_bus_scaling)
__qseecom_add_bw_scale_down_timer(
QSEECOM_SEND_CMD_CRYPTO_TIMEOUT);
+ if (perf_enabled) {
+ qsee_disable_clock_vote(data, CLK_DFAB);
+ qsee_disable_clock_vote(data, CLK_SFPB);
+ }
atomic_dec(&data->ioctl_count);
wake_up_all(&data->abort_wq);
mutex_unlock(&app_access_lock);
@@ -3529,11 +3604,33 @@
break;
}
}
+ /*
+ * On targets where crypto clock is handled by HLOS,
+ * if clk_access_cnt is zero and perf_enabled is false,
+ * then the crypto clock was not enabled before sending cmd
+ * to tz, qseecom will enable the clock to avoid service failure.
+ */
+ if (!qseecom.qsee.clk_access_cnt && !data->perf_enabled) {
+ pr_debug("ce clock is not enabled!\n");
+ ret = qseecom_perf_enable(data);
+ if (ret) {
+ pr_err("Failed to vote for clock with err %d\n",
+ ret);
+ mutex_unlock(&app_access_lock);
+ ret = -EINVAL;
+ break;
+ }
+ perf_enabled = true;
+ }
atomic_inc(&data->ioctl_count);
ret = qseecom_send_modfd_cmd(data, argp);
if (qseecom.support_bus_scaling)
__qseecom_add_bw_scale_down_timer(
QSEECOM_SEND_CMD_CRYPTO_TIMEOUT);
+ if (perf_enabled) {
+ qsee_disable_clock_vote(data, CLK_DFAB);
+ qsee_disable_clock_vote(data, CLK_SFPB);
+ }
atomic_dec(&data->ioctl_count);
wake_up_all(&data->abort_wq);
mutex_unlock(&app_access_lock);
@@ -3663,12 +3760,9 @@
__qseecom_register_bus_bandwidth_needs(data, HIGH);
mutex_unlock(&qsee_bw_mutex);
} else {
- ret = qsee_vote_for_clock(data, CLK_DFAB);
+ ret = qseecom_perf_enable(data);
if (ret)
- pr_err("Fail to vote for DFAB clock%d\n", ret);
- ret = qsee_vote_for_clock(data, CLK_SFPB);
- if (ret)
- pr_err("Fail to vote for SFPB clock%d\n", ret);
+ pr_err("Fail to vote for clocks %d\n", ret);
}
atomic_dec(&data->ioctl_count);
break;
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 97de664..06d960f 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -69,6 +69,7 @@
#define PACKED_CMD_VER 0x01
#define PACKED_CMD_WR 0x02
#define PACKED_TRIGGER_MAX_ELEMENTS 5000
+#define MMC_BLK_MAX_RETRIES 5 /* max # of retries before aborting a command */
#define MMC_BLK_UPDATE_STOP_REASON(stats, reason) \
do { \
if (stats->enabled) \
@@ -2541,12 +2542,13 @@
}
goto cmd_abort;
case MMC_BLK_RETRY:
- if (retry++ < 5)
+ if (retry++ < MMC_BLK_MAX_RETRIES)
break;
/* Fall through */
case MMC_BLK_ABORT:
- if (!mmc_blk_reset(md, card->host, type))
- break;
+ if (!mmc_blk_reset(md, card->host, type) &&
+ (retry++ < (MMC_BLK_MAX_RETRIES + 1)))
+ break;
goto cmd_abort;
case MMC_BLK_DATA_ERR: {
int err;
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index c1f366e..3b439e8 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -761,9 +761,7 @@
EXT_CSD_PWR_CL_52_195 :
EXT_CSD_PWR_CL_DDR_52_195;
else if (host->ios.clock <= 200000000)
- index = (bus_width <= EXT_CSD_BUS_WIDTH_8) ?
- EXT_CSD_PWR_CL_200_195 :
- EXT_CSD_PWR_CL_DDR_200_195;
+ index = EXT_CSD_PWR_CL_200_195;
break;
case MMC_VDD_27_28:
case MMC_VDD_28_29:
@@ -781,9 +779,9 @@
EXT_CSD_PWR_CL_52_360 :
EXT_CSD_PWR_CL_DDR_52_360;
else if (host->ios.clock <= 200000000)
- index = (bus_width <= EXT_CSD_BUS_WIDTH_8) ?
- EXT_CSD_PWR_CL_200_360 :
- EXT_CSD_PWR_CL_DDR_200_360;
+ index = (bus_width == EXT_CSD_DDR_BUS_WIDTH_8) ?
+ EXT_CSD_PWR_CL_DDR_200_360 :
+ EXT_CSD_PWR_CL_200_360;
break;
default:
pr_warning("%s: Voltage range not supported "
diff --git a/drivers/net/ethernet/msm/msm_rmnet.c b/drivers/net/ethernet/msm/msm_rmnet.c
index 06f8cd4..7a0e1b5 100644
--- a/drivers/net/ethernet/msm/msm_rmnet.c
+++ b/drivers/net/ethernet/msm/msm_rmnet.c
@@ -3,7 +3,7 @@
* Virtual Ethernet Interface for MSM7K Networking
*
* Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2012, 2014, The Linux Foundation. All rights reserved.
* Author: Brian Swetland <swetland@google.com>
*
* This software is licensed under the terms of the GNU General Public
@@ -141,7 +141,8 @@
struct device_attribute *attr,
char *buf)
{
- return sprintf(buf, "%lu\n", (unsigned long) timeout_suspend_us);
+ return snprintf(buf, PAGE_SIZE, "%lu\n",
+ (unsigned long) timeout_suspend_us);
}
static DEVICE_ATTR(timeout_suspend, 0664, timeout_suspend_show, timeout_suspend_store);
@@ -196,7 +197,7 @@
char *buf)
{
struct rmnet_private *p = netdev_priv(to_net_dev(d));
- return sprintf(buf, "%lu\n", p->wakeups_xmit);
+ return snprintf(buf, PAGE_SIZE, "%lu\n", p->wakeups_xmit);
}
DEVICE_ATTR(wakeups_xmit, 0444, wakeups_xmit_show, NULL);
@@ -205,7 +206,7 @@
char *buf)
{
struct rmnet_private *p = netdev_priv(to_net_dev(d));
- return sprintf(buf, "%lu\n", p->wakeups_rcv);
+ return snprintf(buf, PAGE_SIZE, "%lu\n", p->wakeups_rcv);
}
DEVICE_ATTR(wakeups_rcv, 0444, wakeups_rcv_show, NULL);
@@ -229,7 +230,7 @@
{
struct rmnet_private *p = netdev_priv(to_net_dev(d));
p = netdev_priv(to_net_dev(d));
- return sprintf(buf, "%lu\n", timeout_us);
+ return snprintf(buf, PAGE_SIZE, "%lu\n", timeout_us);
}
DEVICE_ATTR(timeout, 0664, timeout_show, timeout_store);
diff --git a/drivers/net/ethernet/msm/msm_rmnet_sdio.c b/drivers/net/ethernet/msm/msm_rmnet_sdio.c
index 754cb83..695d6c69 100644
--- a/drivers/net/ethernet/msm/msm_rmnet_sdio.c
+++ b/drivers/net/ethernet/msm/msm_rmnet_sdio.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-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
@@ -109,7 +109,8 @@
struct device_attribute *attr,
char *buf)
{
- return sprintf(buf, "%lu\n", (unsigned long) timeout_suspend_us);
+ return snprintf(buf, PAGE_SIZE, "%lu\n",
+ (unsigned long) timeout_suspend_us);
}
static DEVICE_ATTR(timeout_suspend, 0664, timeout_suspend_show,
@@ -168,7 +169,7 @@
char *buf)
{
struct rmnet_private *p = netdev_priv(to_net_dev(d));
- return sprintf(buf, "%lu\n", p->wakeups_xmit);
+ return snprintf(buf, PAGE_SIZE, "%lu\n", p->wakeups_xmit);
}
DEVICE_ATTR(wakeups_xmit, 0444, wakeups_xmit_show, NULL);
@@ -177,7 +178,7 @@
char *buf)
{
struct rmnet_private *p = netdev_priv(to_net_dev(d));
- return sprintf(buf, "%lu\n", p->wakeups_rcv);
+ return snprintf(buf, PAGE_SIZE, "%lu\n", p->wakeups_rcv);
}
DEVICE_ATTR(wakeups_rcv, 0444, wakeups_rcv_show, NULL);
@@ -201,7 +202,7 @@
{
struct rmnet_private *p = netdev_priv(to_net_dev(d));
p = netdev_priv(to_net_dev(d));
- return sprintf(buf, "%lu\n", timeout_us);
+ return snprintf(buf, PAGE_SIZE, "%lu\n", timeout_us);
}
DEVICE_ATTR(timeout, 0664, timeout_show, timeout_store);
diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c
index 2d260be..ed6fa29 100644
--- a/drivers/net/wireless/wcnss/wcnss_wlan.c
+++ b/drivers/net/wireless/wcnss/wcnss_wlan.c
@@ -35,6 +35,7 @@
#include <linux/rwsem.h>
#include <linux/mfd/pm8xxx/misc.h>
#include <linux/qpnp/qpnp-adc.h>
+#include <linux/pm_qos.h>
#include <mach/board.h>
#include <mach/msm_smd.h>
@@ -51,6 +52,10 @@
#define VERSION "1.01"
#define WCNSS_PIL_DEVICE "wcnss"
+#define WCNSS_DISABLE_PC_LATENCY 100
+#define WCNSS_ENABLE_PC_LATENCY PM_QOS_DEFAULT_VALUE
+#define WCNSS_PM_QOS_TIMEOUT 15000
+
/* module params */
#define WCNSS_CONFIG_UNSPECIFIED (-1)
#define UINT32_MAX (0xFFFFFFFFU)
@@ -122,6 +127,12 @@
#define A2XB_TSTBUS_CTRL_OFFSET 0x14
#define A2XB_TSTBUS_OFFSET 0x18
#define A2XB_ERR_INFO_OFFSET 0x1c
+#define A2XB_FIFO_FILL_OFFSET 0x07
+#define A2XB_READ_FIFO_FILL_MASK 0x3F
+#define A2XB_CMD_FIFO_FILL_MASK 0x0F
+#define A2XB_WRITE_FIFO_FILL_MASK 0x1F
+#define A2XB_FIFO_EMPTY 0x2
+#define A2XB_FIFO_COUNTER 0xA
#define WCNSS_TSTBUS_CTRL_EN BIT(0)
#define WCNSS_TSTBUS_CTRL_AXIM (0x02 << 1)
@@ -170,7 +181,7 @@
#define WCNSS_DEF_WLAN_RX_BUFF_COUNT 1024
#define WCNSS_VBATT_THRESHOLD 3500000
-#define WCNSS_VBATT_GUARD 200
+#define WCNSS_VBATT_GUARD 20000
#define WCNSS_VBATT_HIGH 3700000
#define WCNSS_VBATT_LOW 3300000
@@ -204,6 +215,7 @@
#define WCNSS_BUILD_VER_REQ (WCNSS_CTRL_MSG_START + 9)
#define WCNSS_BUILD_VER_RSP (WCNSS_CTRL_MSG_START + 10)
#define WCNSS_PM_CONFIG_REQ (WCNSS_CTRL_MSG_START + 11)
+#define WCNSS_CBC_COMPLETE_IND (WCNSS_CTRL_MSG_START + 12)
/* max 20mhz channel count */
#define WCNSS_MAX_CH_NUM 45
@@ -396,6 +408,7 @@
void __iomem *alarms_tactl;
void __iomem *fiq_reg;
int nv_downloaded;
+ int is_cbc_done;
unsigned char *fw_cal_data;
unsigned char *user_cal_data;
int fw_cal_rcvd;
@@ -420,6 +433,9 @@
u16 unsafe_ch_list[WCNSS_MAX_CH_NUM];
void *wcnss_notif_hdle;
u8 is_shutdown;
+ struct pm_qos_request wcnss_pm_qos_request;
+ int pc_disabled;
+ struct delayed_work wcnss_pm_qos_del_req;
} *penv = NULL;
static ssize_t wcnss_wlan_macaddr_store(struct device *dev,
@@ -583,6 +599,30 @@
}
EXPORT_SYMBOL(wcnss_riva_log_debug_regs);
+void wcnss_pronto_is_a2xb_bus_stall(void *tst_addr, u32 fifo_mask, char *type)
+{
+ u32 iter = 0, reg = 0;
+ u32 axi_fifo_count = 0, axi_fifo_count_last = 0;
+
+ reg = readl_relaxed(tst_addr);
+ axi_fifo_count = (reg >> A2XB_FIFO_FILL_OFFSET) & fifo_mask;
+ while ((++iter < A2XB_FIFO_COUNTER) && axi_fifo_count) {
+ axi_fifo_count_last = axi_fifo_count;
+ reg = readl_relaxed(tst_addr);
+ axi_fifo_count = (reg >> A2XB_FIFO_FILL_OFFSET) & fifo_mask;
+ if (axi_fifo_count < axi_fifo_count_last)
+ break;
+ }
+
+ if (iter == A2XB_FIFO_COUNTER) {
+ pr_err("%s data FIFO testbus possibly stalled reg%08x\n",
+ type, reg);
+ } else {
+ pr_err("%s data FIFO tstbus not stalled reg%08x\n",
+ type, reg);
+ }
+}
+
/* Log pronto debug registers before sending reset interrupt */
void wcnss_pronto_log_debug_regs(void)
{
@@ -680,21 +720,36 @@
reg = reg | WCNSS_TSTBUS_CTRL_EN | WCNSS_TSTBUS_CTRL_RDFIFO;
writel_relaxed(reg, tst_ctrl_addr);
reg = readl_relaxed(tst_addr);
- pr_err("Read data FIFO testbus %08x\n", reg);
-
+ if (!(reg & A2XB_FIFO_EMPTY)) {
+ wcnss_pronto_is_a2xb_bus_stall(tst_addr,
+ A2XB_READ_FIFO_FILL_MASK, "Read");
+ } else {
+ pr_err("Read data FIFO testbus %08x\n", reg);
+ }
/* command FIFO */
reg = 0;
reg = reg | WCNSS_TSTBUS_CTRL_EN | WCNSS_TSTBUS_CTRL_CMDFIFO;
writel_relaxed(reg, tst_ctrl_addr);
reg = readl_relaxed(tst_addr);
- pr_err("Command FIFO testbus %08x\n", reg);
+ if (!(reg & A2XB_FIFO_EMPTY)) {
+ wcnss_pronto_is_a2xb_bus_stall(tst_addr,
+ A2XB_CMD_FIFO_FILL_MASK, "Cmd");
+ } else {
+ pr_err("Command FIFO testbus %08x\n", reg);
+ }
+
/* write data FIFO */
reg = 0;
reg = reg | WCNSS_TSTBUS_CTRL_EN | WCNSS_TSTBUS_CTRL_WRFIFO;
writel_relaxed(reg, tst_ctrl_addr);
reg = readl_relaxed(tst_addr);
- pr_err("Rrite data FIFO testbus %08x\n", reg);
+ if (!(reg & A2XB_FIFO_EMPTY)) {
+ wcnss_pronto_is_a2xb_bus_stall(tst_addr,
+ A2XB_WRITE_FIFO_FILL_MASK, "Write");
+ } else {
+ pr_err("Write data FIFO testbus %08x\n", reg);
+ }
/* AXIM SEL CFG0 */
reg = 0;
@@ -925,6 +980,46 @@
device_remove_file(dev, &dev_attr_wcnss_mac_addr);
}
}
+
+static void wcnss_pm_qos_add_request(void)
+{
+ pr_info("%s: add request", __func__);
+ pm_qos_add_request(&penv->wcnss_pm_qos_request, PM_QOS_CPU_DMA_LATENCY,
+ PM_QOS_DEFAULT_VALUE);
+}
+
+static void wcnss_pm_qos_remove_request(void)
+{
+ pr_info("%s: remove request", __func__);
+ pm_qos_remove_request(&penv->wcnss_pm_qos_request);
+}
+
+void wcnss_pm_qos_update_request(int val)
+{
+ pr_info("%s: update request %d", __func__, val);
+ pm_qos_update_request(&penv->wcnss_pm_qos_request, val);
+}
+
+void wcnss_disable_pc_remove_req(void)
+{
+ if (penv->pc_disabled) {
+ wcnss_pm_qos_update_request(WCNSS_ENABLE_PC_LATENCY);
+ wcnss_pm_qos_remove_request();
+ wcnss_allow_suspend();
+ penv->pc_disabled = 0;
+ }
+}
+
+void wcnss_disable_pc_add_req(void)
+{
+ if (!penv->pc_disabled) {
+ wcnss_pm_qos_add_request();
+ wcnss_prevent_suspend();
+ wcnss_pm_qos_update_request(WCNSS_DISABLE_PC_LATENCY);
+ penv->pc_disabled = 1;
+ }
+}
+
static void wcnss_smd_notify_event(void *data, unsigned int event)
{
int len = 0;
@@ -948,6 +1043,8 @@
WCNSS_CTRL_CHANNEL);
schedule_work(&penv->wcnssctrl_version_work);
schedule_work(&penv->wcnss_pm_config_work);
+ __cancel_delayed_work(&penv->wcnss_pm_qos_del_req);
+ schedule_delayed_work(&penv->wcnss_pm_qos_del_req, 0);
break;
@@ -955,6 +1052,7 @@
pr_debug("wcnss: closing WCNSS SMD channel :%s",
WCNSS_CTRL_CHANNEL);
penv->nv_downloaded = 0;
+ penv->is_cbc_done = 0;
break;
default:
@@ -1115,6 +1213,13 @@
.remove = __devexit_p(wcnss_ctrl_remove),
};
+void wcnss_get_monotonic_boottime(struct timespec *ts)
+{
+ get_monotonic_boottime(ts);
+}
+EXPORT_SYMBOL(wcnss_get_monotonic_boottime);
+
+
struct device *wcnss_wlan_get_device(void)
{
if (penv && penv->pdev && penv->smd_channel_ready)
@@ -1139,6 +1244,14 @@
}
EXPORT_SYMBOL(wcnss_get_wlan_config);
+int wcnss_is_hw_pronto_ver3(void)
+{
+ if (penv && penv->pdev)
+ return penv->wlan_config.is_pronto_v3;
+ return 0;
+}
+EXPORT_SYMBOL(wcnss_is_hw_pronto_ver3);
+
int wcnss_device_ready(void)
{
if (penv && penv->pdev && penv->nv_downloaded &&
@@ -1148,6 +1261,15 @@
}
EXPORT_SYMBOL(wcnss_device_ready);
+int wcnss_cbc_complete(void)
+{
+ if (penv && penv->pdev && penv->is_cbc_done &&
+ !wcnss_device_is_shutdown())
+ return 1;
+ return 0;
+}
+EXPORT_SYMBOL(wcnss_cbc_complete);
+
int wcnss_device_is_shutdown(void)
{
if (penv && penv->is_shutdown)
@@ -1194,6 +1316,11 @@
const struct dev_pm_ops *pm_ops)
{
if (penv && dev && (dev == &penv->pdev->dev) && pm_ops) {
+ if (penv->pm_ops == NULL) {
+ pr_err("%s: pm_ops is already unregistered.\n",
+ __func__);
+ return;
+ }
if (pm_ops->suspend != penv->pm_ops->suspend ||
pm_ops->resume != penv->pm_ops->resume)
pr_err("PM APIs dont match with registered APIs\n");
@@ -1778,6 +1905,10 @@
pr_debug("wcnss: received WCNSS_CALDATA_DNLD_RSP from ccpu %u\n",
fw_status);
break;
+ case WCNSS_CBC_COMPLETE_IND:
+ penv->is_cbc_done = 1;
+ pr_info("wcnss: received WCNSS_CBC_COMPLETE_IND from FW\n");
+ break;
case WCNSS_CALDATA_UPLD_REQ:
extract_cal_data(len);
@@ -1870,8 +2001,8 @@
ret = request_firmware(&nv, NVBIN_FILE, dev);
if (ret || !nv || !nv->data || !nv->size) {
- pr_err("wcnss: %s: request_firmware failed for %s\n",
- __func__, NVBIN_FILE);
+ pr_err("wcnss: %s: request_firmware failed for %s(ret = %d)\n",
+ __func__, NVBIN_FILE, ret);
goto out;
}
@@ -1971,6 +2102,11 @@
return;
}
+static void wcnss_pm_qos_enable_pc(struct work_struct *worker)
+{
+ wcnss_disable_pc_remove_req();
+ return;
+}
static void wcnss_caldata_dnld(const void *cal_data,
unsigned int cal_data_size, bool msg_to_follow)
@@ -2204,10 +2340,14 @@
unsigned long wcnss_phys_addr;
int size = 0;
struct resource *res;
+ int is_pronto_v3;
int pil_retry = 0;
int has_pronto_hw = of_property_read_bool(pdev->dev.of_node,
"qcom,has-pronto-hw");
+ is_pronto_v3 = of_property_read_bool(pdev->dev.of_node,
+ "qcom,is-pronto-v3");
+
if (of_property_read_u32(pdev->dev.of_node,
"qcom,wlan-rx-buff-count", &penv->wlan_rx_buff_count)) {
penv->wlan_rx_buff_count = WCNSS_DEF_WLAN_RX_BUFF_COUNT;
@@ -2230,6 +2370,7 @@
}
penv->wcnss_hw_type = (has_pronto_hw) ? WCNSS_PRONTO_HW : WCNSS_RIVA_HW;
penv->wlan_config.use_48mhz_xo = has_48mhz_xo;
+ penv->wlan_config.is_pronto_v3 = is_pronto_v3;
if (WCNSS_CONFIG_UNSPECIFIED == has_autodetect_xo && has_pronto_hw) {
has_autodetect_xo = of_property_read_bool(pdev->dev.of_node,
@@ -2285,8 +2426,11 @@
INIT_WORK(&penv->wcnssctrl_version_work, wcnss_send_version_req);
INIT_WORK(&penv->wcnss_pm_config_work, wcnss_send_pm_config);
INIT_WORK(&penv->wcnssctrl_nvbin_dnld_work, wcnss_nvbin_dnld_main);
+ INIT_DELAYED_WORK(&penv->wcnss_pm_qos_del_req, wcnss_pm_qos_enable_pc);
wake_lock_init(&penv->wcnss_wake_lock, WAKE_LOCK_SUSPEND, "wcnss");
+ /* Add pm_qos request to disable power collapse for DDR */
+ wcnss_disable_pc_add_req();
if (wcnss_hardware_type() == WCNSS_PRONTO_HW) {
size = 0x3000;
@@ -2410,6 +2554,7 @@
if (IS_ERR(penv->pil)) {
dev_err(&pdev->dev, "Peripheral Loader failed on WCNSS.\n");
ret = PTR_ERR(penv->pil);
+ wcnss_disable_pc_add_req();
wcnss_pronto_log_debug_regs();
}
} while (pil_retry++ < WCNSS_MAX_PIL_RETRY && IS_ERR(penv->pil));
@@ -2422,6 +2567,8 @@
penv->pil = NULL;
goto fail_pil;
}
+ /* Remove pm_qos request */
+ wcnss_disable_pc_remove_req();
return 0;
@@ -2474,6 +2621,7 @@
else
wcnss_gpios_config(penv->gpios_5wire, false);
fail_gpio_res:
+ wcnss_disable_pc_remove_req();
penv = NULL;
return ret;
}
@@ -2600,14 +2748,18 @@
static int wcnss_notif_cb(struct notifier_block *this, unsigned long code,
void *ss_handle)
{
- pr_debug("%s: wcnss notification event: %lu\n", __func__, code);
+ pr_info("%s: wcnss notification event: %lu\n", __func__, code);
- if (SUBSYS_POWERUP_FAILURE == code)
- wcnss_pronto_log_debug_regs();
- else if (SUBSYS_BEFORE_SHUTDOWN == code)
- penv->is_shutdown = 1;
- else if (SUBSYS_AFTER_POWERUP == code)
- penv->is_shutdown = 0;
+ if (code == SUBSYS_BEFORE_SHUTDOWN) {
+ penv->is_shutdown = 1;
+ wcnss_disable_pc_add_req();
+ schedule_delayed_work(&penv->wcnss_pm_qos_del_req,
+ msecs_to_jiffies(WCNSS_PM_QOS_TIMEOUT));
+ } else if (code == SUBSYS_POWERUP_FAILURE) {
+ wcnss_pronto_log_debug_regs();
+ wcnss_disable_pc_remove_req();
+ } else if (SUBSYS_AFTER_POWERUP == code)
+ penv->is_shutdown = 0;
return NOTIFY_DONE;
}
diff --git a/drivers/platform/msm/qpnp-power-on.c b/drivers/platform/msm/qpnp-power-on.c
index 1a3baf5..1d388f4 100644
--- a/drivers/platform/msm/qpnp-power-on.c
+++ b/drivers/platform/msm/qpnp-power-on.c
@@ -28,8 +28,9 @@
#define PMIC_VERSION_REG 0x0105
#define PMIC_VERSION_REV4_REG 0x0103
-#define PMIC8941_V1_REV4 0x01
-#define PMIC8941_V2_REV4 0x02
+#define PMIC8941_V1_REV4 0x01
+#define PMIC8941_V2_REV4 0x02
+#define PON_REV2_VALUE 0x00
/* Common PNP defines */
#define QPNP_PON_REVISION2(base) (base + 0x01)
@@ -66,8 +67,8 @@
#define QPNP_PON_S3_SRC_KPDPWR 0
#define QPNP_PON_S3_SRC_RESIN 1
-#define QPNP_PON_S3_SRC_KPDPWR_OR_RESIN 2
-#define QPNP_PON_S3_SRC_KPDPWR_AND_RESIN 3
+#define QPNP_PON_S3_SRC_KPDPWR_AND_RESIN 2
+#define QPNP_PON_S3_SRC_KPDPWR_OR_RESIN 3
#define QPNP_PON_S3_SRC_MASK 0x3
#define QPNP_PON_WARM_RESET_TFT BIT(4)
@@ -94,6 +95,12 @@
#define QPNP_PON_RESET_EN BIT(7)
#define QPNP_PON_POWER_OFF_MASK 0xF
+#define QPNP_PON_S3_SRC_KPDPWR 0
+#define QPNP_PON_S3_SRC_RESIN 1
+#define QPNP_PON_S3_SRC_KPDPWR_AND_RESIN 2
+#define QPNP_PON_S3_SRC_KPDPWR_OR_RESIN 3
+#define QPNP_PON_S3_SRC_MASK 0x3
+
/* Ranges */
#define QPNP_PON_S1_TIMER_MAX 10256
#define QPNP_PON_S2_TIMER_MAX 2000
@@ -105,7 +112,6 @@
#define QPNP_PON_MAX_DBC_US (USEC_PER_SEC * 2)
#define QPNP_KEY_STATUS_DELAY msecs_to_jiffies(250)
-#define QPNP_PON_REV_B 0x01
enum pon_type {
PON_KPDPWR,
@@ -228,7 +234,7 @@
return rc;
}
- if (reg == 0x00)
+ if (reg == PON_REV2_VALUE)
rst_en_reg = QPNP_PON_PS_HOLD_RST_CTL(pon->base);
else
rst_en_reg = QPNP_PON_PS_HOLD_RST_CTL2(pon->base);
@@ -837,14 +843,19 @@
}
}
- if (pon_ver == QPNP_PON_REV_B) {
+ /* If the value read from REVISION2 register is 0x00,
+ * then there is a single register to control s2 reset.
+ * Otherwise there are separate registers for s2 reset
+ * type and s2 reset enable
+ */
+ if (pon_ver == PON_REV2_VALUE) {
+ cfg->s2_cntl_addr = cfg->s2_cntl2_addr =
+ QPNP_PON_KPDPWR_S2_CNTL(pon->base);
+ } else {
cfg->s2_cntl_addr =
QPNP_PON_KPDPWR_S2_CNTL(pon->base);
cfg->s2_cntl2_addr =
QPNP_PON_KPDPWR_S2_CNTL2(pon->base);
- } else {
- cfg->s2_cntl_addr = cfg->s2_cntl2_addr =
- QPNP_PON_KPDPWR_S2_CNTL(pon->base);
}
break;
@@ -909,14 +920,14 @@
}
}
- if (pon_ver == QPNP_PON_REV_B) {
+ if (pon_ver == PON_REV2_VALUE) {
+ cfg->s2_cntl_addr = cfg->s2_cntl2_addr =
+ QPNP_PON_RESIN_S2_CNTL(pon->base);
+ } else {
cfg->s2_cntl_addr =
QPNP_PON_RESIN_S2_CNTL(pon->base);
cfg->s2_cntl2_addr =
QPNP_PON_RESIN_S2_CNTL2(pon->base);
- } else {
- cfg->s2_cntl_addr = cfg->s2_cntl2_addr =
- QPNP_PON_RESIN_S2_CNTL(pon->base);
}
break;
@@ -950,14 +961,14 @@
}
}
- if (pon_ver == QPNP_PON_REV_B) {
+ if (pon_ver == PON_REV2_VALUE) {
+ cfg->s2_cntl_addr = cfg->s2_cntl2_addr =
+ QPNP_PON_KPDPWR_RESIN_S2_CNTL(pon->base);
+ } else {
cfg->s2_cntl_addr =
QPNP_PON_KPDPWR_RESIN_S2_CNTL(pon->base);
cfg->s2_cntl2_addr =
QPNP_PON_KPDPWR_RESIN_S2_CNTL2(pon->base);
- } else {
- cfg->s2_cntl_addr = cfg->s2_cntl2_addr =
- QPNP_PON_KPDPWR_RESIN_S2_CNTL(pon->base);
}
break;
@@ -1245,6 +1256,9 @@
else /* default combination */
s3_src_reg = QPNP_PON_S3_SRC_KPDPWR_AND_RESIN;
+ /* S3 source is a write once register. If the register has
+ * been configured by bootloader then this operation will
+ * not be effective. */
rc = qpnp_pon_masked_write(pon, QPNP_PON_S3_SRC(pon->base),
QPNP_PON_S3_SRC_MASK, s3_src_reg);
if (rc) {
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 4688514..6f8f9a9 100644
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -153,6 +153,7 @@
POWER_SUPPLY_ATTR(input_current_max),
POWER_SUPPLY_ATTR(input_current_trim),
POWER_SUPPLY_ATTR(input_current_settled),
+ POWER_SUPPLY_ATTR(bypass_vchg_loop_debouncer),
POWER_SUPPLY_ATTR(current_now),
POWER_SUPPLY_ATTR(current_avg),
POWER_SUPPLY_ATTR(power_now),
diff --git a/drivers/power/qpnp-bms.c b/drivers/power/qpnp-bms.c
index e227ecd..537dc1d 100644
--- a/drivers/power/qpnp-bms.c
+++ b/drivers/power/qpnp-bms.c
@@ -428,6 +428,12 @@
pr_err("couldnt lock bms output rc = %d\n", rc);
return rc;
}
+ /*
+ * Sleep for at least 60 microseconds here to make sure there has
+ * been at least two cycles of the sleep clock so that the registers
+ * are correctly locked.
+ */
+ usleep_range(60, 2000);
return 0;
}
@@ -1078,7 +1084,7 @@
}
rc = read_cc_raw(chip, &raw->cc, CC);
- rc = read_cc_raw(chip, &raw->shdw_cc, SHDW_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);
goto param_err;
@@ -2571,7 +2577,12 @@
batt_temp = (int)result.physical;
mutex_lock(&chip->last_ocv_uv_mutex);
- read_soc_params_raw(chip, &raw, batt_temp);
+ rc = read_soc_params_raw(chip, &raw, batt_temp);
+ if (rc) {
+ pr_err("Unable to read params, rc: %d\n", rc);
+ soc = 0;
+ goto done;
+ }
calculate_soc_params(chip, &raw, ¶ms, batt_temp);
if (!is_battery_present(chip)) {
pr_debug("battery gone\n");
@@ -2585,6 +2596,7 @@
soc = calculate_raw_soc(chip, &raw,
¶ms, batt_temp);
}
+done:
mutex_unlock(&chip->last_ocv_uv_mutex);
}
}
@@ -2623,8 +2635,14 @@
batt_temp = (int)result.physical;
mutex_lock(&chip->last_ocv_uv_mutex);
- read_soc_params_raw(chip, &raw, batt_temp);
- soc = calculate_state_of_charge(chip, &raw, batt_temp);
+ rc = read_soc_params_raw(chip, &raw, batt_temp);
+ if (rc) {
+ pr_err("Unable to read params, rc: %d\n", rc);
+ soc = chip->calculated_soc;
+ } else {
+ soc = calculate_state_of_charge(chip,
+ &raw, batt_temp);
+ }
mutex_unlock(&chip->last_ocv_uv_mutex);
}
}
@@ -3077,8 +3095,10 @@
min_cycle = chip->fcc_learning_samples[0].chargecycles;
for (i = 1; i < chip->min_fcc_learning_samples; i++) {
if (min_cycle >
- chip->fcc_learning_samples[i].chargecycles)
+ chip->fcc_learning_samples[i].chargecycles) {
pos = i;
+ break;
+ }
}
} else {
/* find an empty location */
diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c
index 7963ed4..a30b5bb 100644
--- a/drivers/power/qpnp-charger.c
+++ b/drivers/power/qpnp-charger.c
@@ -97,6 +97,7 @@
#define CHGR_MISC_BOOT_DONE 0x42
#define CHGR_BUCK_PSTG_CTRL 0x73
#define CHGR_BUCK_COMPARATOR_OVRIDE_1 0xEB
+#define CHGR_BUCK_COMPARATOR_OVRIDE_2 0xEC
#define CHGR_BUCK_COMPARATOR_OVRIDE_3 0xED
#define CHG_OVR0 0xED
#define CHG_TRICKLE_CLAMP 0xE3
@@ -378,6 +379,7 @@
struct delayed_work aicl_check_work;
struct work_struct insertion_ocv_work;
struct work_struct ocp_clear_work;
+ struct qpnp_chg_regulator flash_wa_vreg;
struct qpnp_chg_regulator otg_vreg;
struct qpnp_chg_regulator boost_vreg;
struct qpnp_chg_regulator batfet_vreg;
@@ -393,9 +395,11 @@
struct work_struct reduce_power_stage_work;
bool power_stage_workaround_running;
bool power_stage_workaround_enable;
+ bool is_flash_wa_reg_enabled;
bool ext_ovp_ic_gpio_enabled;
unsigned int ext_ovp_isns_gpio;
unsigned int usb_trim_default;
+ u8 chg_temp_thresh_default;
};
static void
@@ -1709,6 +1713,7 @@
return IRQ_HANDLED;
if (chip->usb_present ^ usb_present) {
+ chip->aicl_settled = false;
chip->usb_present = usb_present;
if (!usb_present) {
/* when a valid charger inserted, and increase the
@@ -1744,7 +1749,6 @@
qpnp_chg_iusbmax_set(chip, QPNP_CHG_I_MAX_MIN_100);
qpnp_chg_iusb_trim_set(chip, chip->usb_trim_default);
chip->prev_usb_max_ma = -EINVAL;
- chip->aicl_settled = false;
} else {
/* when OVP clamped usbin, and then decrease
* the charger voltage to lower than the OVP
@@ -1783,6 +1787,47 @@
return IRQ_HANDLED;
}
+#define BUCK_VIN_LOOP_CMP_OVRD_MASK 0x30
+static int
+qpnp_chg_bypass_vchg_loop_debouncer(struct qpnp_chg_chip *chip, bool bypass)
+{
+ int rc;
+ u8 value = bypass ? 0x10 : 0;
+
+ pr_debug("bypass vchg_loop debouncer: %d\n", bypass);
+
+ rc = qpnp_chg_masked_write(chip, chip->buck_base + SEC_ACCESS,
+ 0xFF, 0xA5, 1);
+ if (rc) {
+ pr_err("failed to write SEC_ACCESS register, rc = %d\n", rc);
+ return rc;
+ }
+
+ rc = qpnp_chg_masked_write(chip,
+ chip->buck_base + CHGR_BUCK_COMPARATOR_OVRIDE_2,
+ BUCK_VIN_LOOP_CMP_OVRD_MASK, value, 1);
+ if (rc)
+ pr_err("failed to write BUCK_COMP_OVRIDE_2, rc = %d\n", rc);
+
+ return rc;
+}
+
+static int
+qpnp_chg_vchg_loop_debouncer_setting_get(struct qpnp_chg_chip *chip)
+{
+ int rc;
+ u8 value;
+
+ rc = qpnp_chg_read(chip, &value,
+ chip->buck_base + CHGR_BUCK_COMPARATOR_OVRIDE_2, 1);
+ if (rc) {
+ pr_err("failed to read BUCK_CMP_OVERIDE_2, rc = %d\n", rc);
+ return 0;
+ }
+
+ return value & BUCK_VIN_LOOP_CMP_OVRD_MASK;
+}
+
#define TEST_EN_SMBC_LOOP 0xE5
#define IBAT_REGULATION_DISABLE BIT(2)
static irqreturn_t
@@ -2119,6 +2164,7 @@
case POWER_SUPPLY_PROP_INPUT_CURRENT_MAX:
case POWER_SUPPLY_PROP_INPUT_CURRENT_TRIM:
case POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED:
+ case POWER_SUPPLY_PROP_VCHG_LOOP_DBC_BYPASS:
case POWER_SUPPLY_PROP_VOLTAGE_MIN:
case POWER_SUPPLY_PROP_COOL_TEMP:
case POWER_SUPPLY_PROP_WARM_TEMP:
@@ -2284,6 +2330,7 @@
POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,
POWER_SUPPLY_PROP_INPUT_CURRENT_TRIM,
POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED,
+ POWER_SUPPLY_PROP_VCHG_LOOP_DBC_BYPASS,
POWER_SUPPLY_PROP_VOLTAGE_MIN,
POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,
POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
@@ -2810,6 +2857,10 @@
case POWER_SUPPLY_PROP_ONLINE:
val->intval = get_prop_online(chip);
break;
+ case POWER_SUPPLY_PROP_VCHG_LOOP_DBC_BYPASS:
+ val->intval = qpnp_chg_vchg_loop_debouncer_setting_get(chip);
+ break;
+
default:
return -EINVAL;
}
@@ -3058,7 +3109,12 @@
{
int rc, ibat_max_ma;
u8 reg, chgr_sts, ibat_trim, i;
+ bool usb_present = qpnp_chg_is_usb_chg_plugged_in(chip);
+ if (!usb_present) {
+ pr_debug("Ignoring AICL settled, since USB is removed\n");
+ return 0;
+ }
chip->aicl_settled = true;
/*
@@ -3212,6 +3268,75 @@
}
}
+/*
+ * Increase the SMBB/SMBBP charger overtemp threshold to 150C while firing
+ * the flash (and/or torch for PM8x26) when the bharger is used as the
+ * power source.
+ */
+static int
+qpnp_chg_temp_threshold_set(struct qpnp_chg_chip *chip, u8 value)
+{
+ int rc;
+
+ rc = qpnp_chg_masked_write(chip, chip->chgr_base +
+ CHGR_CHG_TEMP_THRESH ,
+ 0xFF, value, 1);
+ if (rc)
+ pr_err("set CHG_TEMP_THRESH_Flash failed, value = %d, rc = %d\n",
+ value, rc);
+
+ return rc;
+}
+
+#define CHG_TEMP_THRESH_FOR_FLASH 0xFD
+#define CHG_TEMP_THRESH_DEFAULT 0x94
+static int
+qpnp_chg_regulator_flash_wa_enable(struct regulator_dev *rdev)
+{
+ struct qpnp_chg_chip *chip = rdev_get_drvdata(rdev);
+ int rc = 0;
+
+ if (chip->flags & BOOST_FLASH_WA) {
+ rc = qpnp_chg_temp_threshold_set(chip,
+ CHG_TEMP_THRESH_FOR_FLASH);
+ if (rc) {
+ pr_err("set chg temp threshold failed rc = %d\n", rc);
+ return rc;
+ }
+ }
+ chip->is_flash_wa_reg_enabled = true;
+
+ return rc;
+}
+
+static int
+qpnp_chg_regulator_flash_wa_disable(struct regulator_dev *rdev)
+{
+ struct qpnp_chg_chip *chip = rdev_get_drvdata(rdev);
+ int rc = 0;
+
+ if (chip->flags & BOOST_FLASH_WA) {
+ rc = qpnp_chg_temp_threshold_set(chip,
+ chip->chg_temp_thresh_default);
+ if (rc) {
+ pr_err("set chg temp threshold failed rc = %d\n", rc);
+ return rc;
+ }
+
+ }
+ chip->is_flash_wa_reg_enabled = false;
+
+ return rc;
+}
+
+static int
+qpnp_chg_regulator_flash_wa_is_enabled(struct regulator_dev *rdev)
+{
+ struct qpnp_chg_chip *chip = rdev_get_drvdata(rdev);
+
+ return chip->is_flash_wa_reg_enabled;
+}
+
/* OTG regulator operations */
static int
qpnp_chg_regulator_otg_enable(struct regulator_dev *rdev)
@@ -3458,6 +3583,12 @@
return BOOST_MIN_UV + (selector * BOOST_STEP_UV);
}
+static struct regulator_ops qpnp_chg_flash_wa_reg_ops = {
+ .enable = qpnp_chg_regulator_flash_wa_enable,
+ .disable = qpnp_chg_regulator_flash_wa_disable,
+ .is_enabled = qpnp_chg_regulator_flash_wa_is_enabled,
+};
+
static struct regulator_ops qpnp_chg_otg_reg_ops = {
.enable = qpnp_chg_regulator_otg_enable,
.disable = qpnp_chg_regulator_otg_disable,
@@ -4204,6 +4335,9 @@
case POWER_SUPPLY_PROP_VOLTAGE_MIN:
qpnp_chg_vinmin_set(chip, val->intval / 1000);
break;
+ case POWER_SUPPLY_PROP_VCHG_LOOP_DBC_BYPASS:
+ rc = qpnp_chg_bypass_vchg_loop_debouncer(chip, !!val->intval);
+ break;
default:
return -EINVAL;
}
@@ -4632,6 +4766,42 @@
rc = qpnp_chg_masked_write(chip, chip->chgr_base +
CHG_TRICKLE_CLAMP,
0xFF, 0x00, 1);
+
+ rc = qpnp_chg_read(chip, &chip->chg_temp_thresh_default,
+ chip->chgr_base + CHGR_CHG_TEMP_THRESH, 1);
+ if (rc) {
+ pr_debug("read CHG_TEMP_THRESH failed, rc = %d\n", rc);
+ chip->chg_temp_thresh_default =
+ CHG_TEMP_THRESH_DEFAULT;
+ }
+
+ init_data = of_get_regulator_init_data(chip->dev,
+ spmi_resource->of_node);
+ if (!init_data) {
+ pr_err("unable to get regulator init data for flash_wa\n");
+ return -ENOMEM;
+ }
+
+ if (init_data->constraints.name) {
+ rdesc = &(chip->flash_wa_vreg.rdesc);
+ rdesc->owner = THIS_MODULE;
+ rdesc->type = REGULATOR_VOLTAGE;
+ rdesc->ops = &qpnp_chg_flash_wa_reg_ops;
+ rdesc->name = init_data->constraints.name;
+
+ init_data->constraints.valid_ops_mask
+ |= REGULATOR_CHANGE_STATUS;
+
+ chip->flash_wa_vreg.rdev =
+ regulator_register(rdesc, chip->dev, init_data,
+ chip, spmi_resource->of_node);
+ if (IS_ERR(chip->flash_wa_vreg.rdev)) {
+ rc = PTR_ERR(chip->flash_wa_vreg.rdev);
+ chip->flash_wa_vreg.rdev = NULL;
+ pr_err("Flash wa failed, rc=%d\n", rc);
+ return rc;
+ }
+ }
break;
case SMBB_BUCK_SUBTYPE:
case SMBBP_BUCK_SUBTYPE:
diff --git a/drivers/rtc/alarm.c b/drivers/rtc/alarm.c
index 8531de9..da8a634 100644
--- a/drivers/rtc/alarm.c
+++ b/drivers/rtc/alarm.c
@@ -523,6 +523,7 @@
false);
spin_unlock_irqrestore(&alarm_slock, flags);
+ set_alarm_time_to_rtc(power_on_alarm);
return 0;
}
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 8b68f7b..65b99fc 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -82,23 +82,14 @@
hba->hba_ptr = NULL;
}
-/* rd_release_device_space():
- *
- *
- */
-static void rd_release_device_space(struct rd_dev *rd_dev)
+static u32 rd_release_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table *sg_table,
+ u32 sg_table_count)
{
- u32 i, j, page_count = 0, sg_per_table;
- struct rd_dev_sg_table *sg_table;
struct page *pg;
struct scatterlist *sg;
+ u32 i, j, page_count = 0, sg_per_table;
- if (!rd_dev->sg_table_array || !rd_dev->sg_table_count)
- return;
-
- sg_table = rd_dev->sg_table_array;
-
- for (i = 0; i < rd_dev->sg_table_count; i++) {
+ for (i = 0; i < sg_table_count; i++) {
sg = sg_table[i].sg_table;
sg_per_table = sg_table[i].rd_sg_count;
@@ -109,16 +100,28 @@
page_count++;
}
}
-
kfree(sg);
}
+ kfree(sg_table);
+ return page_count;
+}
+
+static void rd_release_device_space(struct rd_dev *rd_dev)
+{
+ u32 page_count;
+
+ if (!rd_dev->sg_table_array || !rd_dev->sg_table_count)
+ return;
+
+ page_count = rd_release_sgl_table(rd_dev, rd_dev->sg_table_array,
+ rd_dev->sg_table_count);
+
pr_debug("CORE_RD[%u] - Released device space for Ramdisk"
" Device ID: %u, pages %u in %u tables total bytes %lu\n",
rd_dev->rd_host->rd_host_id, rd_dev->rd_dev_id, page_count,
rd_dev->sg_table_count, (unsigned long)page_count * PAGE_SIZE);
- kfree(sg_table);
rd_dev->sg_table_array = NULL;
rd_dev->sg_table_count = 0;
}
@@ -128,33 +131,15 @@
*
*
*/
-static int rd_build_device_space(struct rd_dev *rd_dev)
+static int rd_allocate_sgl_table(struct rd_dev *rd_dev, struct rd_dev_sg_table *sg_table,
+ u32 total_sg_needed, unsigned char init_payload)
{
- u32 i = 0, j, page_offset = 0, sg_per_table, sg_tables, total_sg_needed;
+ u32 i = 0, j, page_offset = 0, sg_per_table;
u32 max_sg_per_table = (RD_MAX_ALLOCATION_SIZE /
sizeof(struct scatterlist));
- struct rd_dev_sg_table *sg_table;
struct page *pg;
struct scatterlist *sg;
-
- if (rd_dev->rd_page_count <= 0) {
- pr_err("Illegal page count: %u for Ramdisk device\n",
- rd_dev->rd_page_count);
- return -EINVAL;
- }
- total_sg_needed = rd_dev->rd_page_count;
-
- sg_tables = (total_sg_needed / max_sg_per_table) + 1;
-
- sg_table = kzalloc(sg_tables * sizeof(struct rd_dev_sg_table), GFP_KERNEL);
- if (!sg_table) {
- pr_err("Unable to allocate memory for Ramdisk"
- " scatterlist tables\n");
- return -ENOMEM;
- }
-
- rd_dev->sg_table_array = sg_table;
- rd_dev->sg_table_count = sg_tables;
+ unsigned char *p;
while (total_sg_needed) {
sg_per_table = (total_sg_needed > max_sg_per_table) ?
@@ -185,16 +170,59 @@
}
sg_assign_page(&sg[j], pg);
sg[j].length = PAGE_SIZE;
+
+ p = kmap(pg);
+ memset(p, init_payload, PAGE_SIZE);
+ kunmap(pg);
}
page_offset += sg_per_table;
total_sg_needed -= sg_per_table;
}
+ return 0;
+}
+
+static int rd_build_device_space(struct rd_dev *rd_dev)
+{
+ struct rd_dev_sg_table *sg_table;
+ u32 sg_tables, total_sg_needed;
+ u32 max_sg_per_table = (RD_MAX_ALLOCATION_SIZE /
+ sizeof(struct scatterlist));
+ int rc;
+
+ if (rd_dev->rd_page_count <= 0) {
+ pr_err("Illegal page count: %u for Ramdisk device\n",
+ rd_dev->rd_page_count);
+ return -EINVAL;
+ }
+
+ /* Don't need backing pages for NULLIO */
+ if (rd_dev->rd_flags & RDF_NULLIO)
+ return 0;
+
+ total_sg_needed = rd_dev->rd_page_count;
+
+ sg_tables = (total_sg_needed / max_sg_per_table) + 1;
+
+ sg_table = kzalloc(sg_tables * sizeof(struct rd_dev_sg_table), GFP_KERNEL);
+ if (!sg_table) {
+ pr_err("Unable to allocate memory for Ramdisk"
+ " scatterlist tables\n");
+ return -ENOMEM;
+ }
+
+ rd_dev->sg_table_array = sg_table;
+ rd_dev->sg_table_count = sg_tables;
+
+ rc = rd_allocate_sgl_table(rd_dev, sg_table, total_sg_needed, 0x00);
+ if (rc)
+ return rc;
+
pr_debug("CORE_RD[%u] - Built Ramdisk Device ID: %u space of"
- " %u pages in %u tables\n", rd_dev->rd_host->rd_host_id,
- rd_dev->rd_dev_id, rd_dev->rd_page_count,
- rd_dev->sg_table_count);
+ " %u pages in %u tables\n", rd_dev->rd_host->rd_host_id,
+ rd_dev->rd_dev_id, rd_dev->rd_page_count,
+ rd_dev->sg_table_count);
return 0;
}
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 84288a7..ad1ecff 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -1132,6 +1132,11 @@
unsigned int ret = 0;
struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
+ if (msm_uport->clk_state == MSM_HS_CLK_PORT_OFF) {
+ MSM_HS_ERR("%s:UART port is closed\n", __func__);
+ return -EPERM;
+ }
+
msm_hs_clock_vote(msm_uport);
data = msm_hs_read(uport, UART_DM_SR);
msm_hs_clock_unvote(msm_uport);
@@ -1715,6 +1720,10 @@
{
unsigned long flags;
struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
+ if (msm_uport->clk_state == MSM_HS_CLK_PORT_OFF) {
+ MSM_HS_ERR("%s:UART port is closed\n", __func__);
+ return ;
+ }
msm_hs_clock_vote(msm_uport);
spin_lock_irqsave(&uport->lock, flags);
@@ -2031,6 +2040,10 @@
struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
int data;
+ if (msm_uport->clk_state == MSM_HS_CLK_PORT_OFF) {
+ MSM_HS_ERR("%s:UART port is closed\n", __func__);
+ return ;
+ }
spin_lock_irqsave(&uport->lock, flags);
if (msm_uport->clk_state == MSM_HS_CLK_ON) {
msm_uport->clk_state = MSM_HS_CLK_REQUEST_OFF;
@@ -2060,6 +2073,11 @@
unsigned int data;
int ret = 0;
+ if (msm_uport->clk_state == MSM_HS_CLK_PORT_OFF) {
+ MSM_HS_ERR("%s:UART port is closed\n", __func__);
+ return ;
+ }
+
mutex_lock(&msm_uport->clk_mutex);
spin_lock_irqsave(&uport->lock, flags);
diff --git a/drivers/usb/gadget/f_mbim.c b/drivers/usb/gadget/f_mbim.c
index 88a7bde..e2f17aa 100644
--- a/drivers/usb/gadget/f_mbim.c
+++ b/drivers/usb/gadget/f_mbim.c
@@ -1673,6 +1673,7 @@
{
struct f_mbim *dev = fp->private_data;
struct ctrl_pkt *cpkt = NULL;
+ unsigned long flags;
int ret = 0;
pr_debug("Enter(%d)\n", count);
@@ -1710,10 +1711,10 @@
return -EIO;
}
- spin_lock(&dev->lock);
+ spin_lock_irqsave(&dev->lock, flags);
while (list_empty(&dev->cpkt_req_q)) {
pr_debug("Requests list is empty. Wait.\n");
- spin_unlock(&dev->lock);
+ spin_unlock_irqrestore(&dev->lock, flags);
ret = wait_event_interruptible(dev->read_wq,
!list_empty(&dev->cpkt_req_q));
if (ret < 0) {
@@ -1722,13 +1723,13 @@
return -ERESTARTSYS;
}
pr_debug("Received request packet\n");
- spin_lock(&dev->lock);
+ spin_lock_irqsave(&dev->lock, flags);
}
cpkt = list_first_entry(&dev->cpkt_req_q, struct ctrl_pkt,
list);
if (cpkt->len > count) {
- spin_unlock(&dev->lock);
+ spin_unlock_irqrestore(&dev->lock, flags);
mbim_unlock(&dev->read_excl);
pr_err("cpkt size too big:%d > buf size:%d\n",
cpkt->len, count);
@@ -1738,7 +1739,7 @@
pr_debug("cpkt size:%d\n", cpkt->len);
list_del(&cpkt->list);
- spin_unlock(&dev->lock);
+ spin_unlock_irqrestore(&dev->lock, flags);
mbim_unlock(&dev->read_excl);
ret = copy_to_user(buf, cpkt->buf, cpkt->len);
diff --git a/drivers/video/msm/mdss/Makefile b/drivers/video/msm/mdss/Makefile
index ae13322..4eb1033 100644
--- a/drivers/video/msm/mdss/Makefile
+++ b/drivers/video/msm/mdss/Makefile
@@ -20,7 +20,7 @@
dsi-v2-objs = dsi_v2.o dsi_host_v2.o dsi_io_v2.o
obj-$(CONFIG_FB_MSM_MDSS_MDP3) += dsi-v2.o
-mdss-dsi-objs := mdss_dsi.o mdss_dsi_host.o mdss_dsi_cmd.o
+mdss-dsi-objs := mdss_dsi.o mdss_dsi_host.o mdss_dsi_cmd.o mdss_dsi_status.o
mdss-dsi-objs += mdss_dsi_panel.o
mdss-dsi-objs += msm_mdss_io_8974.o
obj-$(CONFIG_FB_MSM_MDSS) += mdss-dsi.o
diff --git a/drivers/video/msm/mdss/dsi_host_v2.c b/drivers/video/msm/mdss/dsi_host_v2.c
index 454fd15..592f70e 100644
--- a/drivers/video/msm/mdss/dsi_host_v2.c
+++ b/drivers/video/msm/mdss/dsi_host_v2.c
@@ -1263,7 +1263,83 @@
return 0;
}
-int msm_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
+static int msm_dsi_read_status(struct mdss_dsi_ctrl_pdata *ctrl)
+{
+ struct dcs_cmd_req cmdreq;
+
+ memset(&cmdreq, 0, sizeof(cmdreq));
+ cmdreq.cmds = ctrl->status_cmds.cmds;
+ cmdreq.cmds_cnt = ctrl->status_cmds.cmd_cnt;
+ cmdreq.flags = CMD_REQ_COMMIT | CMD_CLK_CTRL | CMD_REQ_RX;
+ cmdreq.rlen = 1;
+ cmdreq.cb = NULL;
+ cmdreq.rbuf = ctrl->status_buf.data;
+
+ return mdss_dsi_cmdlist_put(ctrl, &cmdreq);
+}
+
+
+/**
+ * msm_dsi_reg_status_check() - Check dsi panel status through reg read
+ * @ctrl_pdata: pointer to the dsi controller structure
+ *
+ * This function can be used to check the panel status through reading the
+ * status register from the panel.
+ *
+ * Return: positive value if the panel is in good state, negative value or
+ * zero otherwise.
+ */
+int msm_dsi_reg_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
+{
+ int ret = 0;
+
+ if (ctrl_pdata == NULL) {
+ pr_err("%s: Invalid input data\n", __func__);
+ return 0;
+ }
+
+ pr_debug("%s: Checking Register status\n", __func__);
+
+ msm_dsi_clk_ctrl(&ctrl_pdata->panel_data, 1);
+
+ if (ctrl_pdata->status_cmds.link_state == DSI_HS_MODE)
+ dsi_set_tx_power_mode(0);
+
+ ret = msm_dsi_read_status(ctrl_pdata);
+
+ if (ctrl_pdata->status_cmds.link_state == DSI_HS_MODE)
+ dsi_set_tx_power_mode(1);
+
+ if (ret == 0) {
+ if (ctrl_pdata->status_buf.data[0] !=
+ ctrl_pdata->status_value) {
+ pr_err("%s: Read back value from panel is incorrect\n",
+ __func__);
+ ret = -EINVAL;
+ } else {
+ ret = 1;
+ }
+ } else {
+ pr_err("%s: Read status register returned error\n", __func__);
+ }
+
+ msm_dsi_clk_ctrl(&ctrl_pdata->panel_data, 0);
+ pr_debug("%s: Read register done with ret: %d\n", __func__, ret);
+
+ return ret;
+}
+
+/**
+ * msm_dsi_bta_status_check() - Check dsi panel status through bta check
+ * @ctrl_pdata: pointer to the dsi controller structure
+ *
+ * This function can be used to check status of the panel using bta check
+ * for the panel.
+ *
+ * Return: positive value if the panel is in good state, negative value or
+ * zero otherwise.
+ */
+static int msm_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
{
int ret = 0;
@@ -1478,9 +1554,19 @@
complete(&ctrl->mdp_comp);
dsi_buf_alloc(&ctrl->tx_buf, SZ_4K);
dsi_buf_alloc(&ctrl->rx_buf, SZ_4K);
+ dsi_buf_alloc(&ctrl->status_buf, SZ_4K);
ctrl->cmdlist_commit = msm_dsi_cmdlist_commit;
ctrl->panel_mode = ctrl->panel_data.panel_info.mipi.mode;
- ctrl->check_status = msm_dsi_bta_status_check;
+
+ if (ctrl->status_mode == ESD_REG)
+ ctrl->check_status = msm_dsi_reg_status_check;
+ else if (ctrl->status_mode == ESD_BTA)
+ ctrl->check_status = msm_dsi_bta_status_check;
+
+ if (ctrl->status_mode == ESD_MAX) {
+ pr_err("%s: Using default BTA for ESD check\n", __func__);
+ ctrl->check_status = msm_dsi_bta_status_check;
+ }
}
static int __devinit msm_dsi_probe(struct platform_device *pdev)
diff --git a/drivers/video/msm/mdss/mdp3_ppp.c b/drivers/video/msm/mdss/mdp3_ppp.c
index 462f1d8..0cb3c08 100644
--- a/drivers/video/msm/mdss/mdp3_ppp.c
+++ b/drivers/video/msm/mdss/mdp3_ppp.c
@@ -401,9 +401,18 @@
return 0;
}
-bool mdp3_optimal_bw(int req_cnt)
+bool mdp3_optimal_bw(struct blit_req_list *req)
{
- if (req_cnt == 1 && ppp_stat->req_q.count == 1)
+ int i, solid_fill = 0;
+
+ if (!req || (ppp_stat->req_q.count > 1))
+ return false;
+
+ for (i = 0; i < req->count; i++) {
+ if (req->req_list[i].flags & MDP_SOLID_FILL)
+ solid_fill++;
+ }
+ if ((req->count - solid_fill) <= 1)
return true;
return false;
}
@@ -1043,7 +1052,7 @@
}
if (!ppp_stat->bw_on) {
- ppp_stat->bw_optimal = mdp3_optimal_bw(req->count);
+ ppp_stat->bw_optimal = mdp3_optimal_bw(req);
mdp3_ppp_turnon(mfd, 1);
if (rc < 0) {
mutex_unlock(&ppp_stat->config_ppp_mutex);
@@ -1076,7 +1085,7 @@
if (ppp_stat->wait_for_pop)
complete(&ppp_stat->pop_q_comp);
mutex_unlock(&ppp_stat->req_mutex);
- if (req && (ppp_stat->bw_optimal != mdp3_optimal_bw(req->count))) {
+ if (req && (ppp_stat->bw_optimal != mdp3_optimal_bw(req))) {
ppp_stat->bw_optimal = !ppp_stat->bw_optimal;
mdp3_ppp_vote_update(mfd);
}
diff --git a/drivers/video/msm/mdss/mdss_dsi.c b/drivers/video/msm/mdss/mdss_dsi.c
index 50e4a01..ee8994a 100644
--- a/drivers/video/msm/mdss/mdss_dsi.c
+++ b/drivers/video/msm/mdss/mdss_dsi.c
@@ -1599,8 +1599,16 @@
}
ctrl_pdata->panel_data.event_handler = mdss_dsi_event_handler;
- ctrl_pdata->check_status = mdss_dsi_bta_status_check;
+ if (ctrl_pdata->status_mode == ESD_REG)
+ ctrl_pdata->check_status = mdss_dsi_reg_status_check;
+ else if (ctrl_pdata->status_mode == ESD_BTA)
+ ctrl_pdata->check_status = mdss_dsi_bta_status_check;
+
+ if (ctrl_pdata->status_mode == ESD_MAX) {
+ pr_err("%s: Using default BTA for ESD check\n", __func__);
+ ctrl_pdata->check_status = mdss_dsi_bta_status_check;
+ }
if (ctrl_pdata->bklt_ctrl == BL_PWM)
mdss_dsi_panel_pwm_cfg(ctrl_pdata);
diff --git a/drivers/video/msm/mdss/mdss_dsi.h b/drivers/video/msm/mdss/mdss_dsi.h
index 609b7ce..aeb79a9e 100644
--- a/drivers/video/msm/mdss/mdss_dsi.h
+++ b/drivers/video/msm/mdss/mdss_dsi.h
@@ -85,6 +85,12 @@
UNKNOWN_CTRL,
};
+enum dsi_panel_status_mode {
+ ESD_BTA,
+ ESD_REG,
+ ESD_MAX,
+};
+
enum dsi_ctrl_op_mode {
DSI_LP_MODE,
DSI_HS_MODE,
@@ -286,6 +292,8 @@
struct dsi_panel_cmds on_cmds;
struct dsi_panel_cmds off_cmds;
+ struct dsi_panel_cmds status_cmds;
+ u32 status_value;
struct dsi_panel_cmds video2cmd;
struct dsi_panel_cmds cmd2video;
@@ -305,6 +313,8 @@
struct dsi_buf tx_buf;
struct dsi_buf rx_buf;
+ struct dsi_buf status_buf;
+ int status_mode;
};
struct dsi_status_data {
@@ -363,6 +373,7 @@
int mdss_dsi_cmdlist_commit(struct mdss_dsi_ctrl_pdata *ctrl, int from_mdp);
void mdss_dsi_cmdlist_kickoff(int intf);
int mdss_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl);
+int mdss_dsi_reg_status_check(struct mdss_dsi_ctrl_pdata *ctrl);
bool __mdss_dsi_clk_enabled(struct mdss_dsi_ctrl_pdata *ctrl, u8 clk_type);
int mdss_dsi_panel_init(struct device_node *node,
diff --git a/drivers/video/msm/mdss/mdss_dsi_host.c b/drivers/video/msm/mdss/mdss_dsi_host.c
index d8a713e..0e48ee1 100644
--- a/drivers/video/msm/mdss/mdss_dsi_host.c
+++ b/drivers/video/msm/mdss/mdss_dsi_host.c
@@ -99,6 +99,7 @@
mutex_init(&ctrl->cmd_mutex);
mdss_dsi_buf_alloc(&ctrl->tx_buf, SZ_4K);
mdss_dsi_buf_alloc(&ctrl->rx_buf, SZ_4K);
+ mdss_dsi_buf_alloc(&ctrl->status_buf, SZ_4K);
ctrl->cmdlist_commit = mdss_dsi_cmdlist_commit;
@@ -612,6 +613,82 @@
pr_debug("%s: BTA done, status = %d\n", __func__, status);
}
+static int mdss_dsi_read_status(struct mdss_dsi_ctrl_pdata *ctrl)
+{
+ struct dcs_cmd_req cmdreq;
+
+ memset(&cmdreq, 0, sizeof(cmdreq));
+ cmdreq.cmds = ctrl->status_cmds.cmds;
+ cmdreq.cmds_cnt = ctrl->status_cmds.cmd_cnt;
+ cmdreq.flags = CMD_REQ_COMMIT | CMD_CLK_CTRL | CMD_REQ_RX;
+ cmdreq.rlen = 0;
+ cmdreq.cb = NULL;
+ cmdreq.rbuf = ctrl->status_buf.data;
+
+ return mdss_dsi_cmdlist_put(ctrl, &cmdreq);
+}
+
+
+/**
+ * mdss_dsi_reg_status_check() - Check dsi panel status through reg read
+ * @ctrl_pdata: pointer to the dsi controller structure
+ *
+ * This function can be used to check the panel status through reading the
+ * status register from the panel.
+ *
+ * Return: positive value if the panel is in good state, negative value or
+ * zero otherwise.
+ */
+int mdss_dsi_reg_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
+{
+ int ret = 0;
+
+ if (ctrl_pdata == NULL) {
+ pr_err("%s: Invalid input data\n", __func__);
+ return 0;
+ }
+
+ pr_debug("%s: Checking Register status\n", __func__);
+
+ mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 1);
+
+ if (ctrl_pdata->status_cmds.link_state == DSI_HS_MODE)
+ mdss_dsi_set_tx_power_mode(0, &ctrl_pdata->panel_data);
+
+ ret = mdss_dsi_read_status(ctrl_pdata);
+
+ if (ctrl_pdata->status_cmds.link_state == DSI_HS_MODE)
+ mdss_dsi_set_tx_power_mode(1, &ctrl_pdata->panel_data);
+
+ if (ret == 0) {
+ if (ctrl_pdata->status_buf.data[0] !=
+ ctrl_pdata->status_value) {
+ pr_err("%s: Read back value from panel is incorrect\n",
+ __func__);
+ ret = -EINVAL;
+ } else {
+ ret = 1;
+ }
+ } else {
+ pr_err("%s: Read status register returned error\n", __func__);
+ }
+
+ mdss_dsi_clk_ctrl(ctrl_pdata, DSI_ALL_CLKS, 0);
+ pr_debug("%s: Read register done with ret: %d\n", __func__, ret);
+
+ return ret;
+}
+
+/**
+ * mdss_dsi_bta_status_check() - Check dsi panel status through bta check
+ * @ctrl_pdata: pointer to the dsi controller structure
+ *
+ * This function can be used to check status of the panel using bta check
+ * for the panel.
+ *
+ * Return: positive value if the panel is in good state, negative value or
+ * zero otherwise.
+ */
int mdss_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl_pdata)
{
int ret = 0;
diff --git a/drivers/video/msm/mdss/mdss_dsi_panel.c b/drivers/video/msm/mdss/mdss_dsi_panel.c
index 4fa995f..6e2a7f5 100644
--- a/drivers/video/msm/mdss/mdss_dsi_panel.c
+++ b/drivers/video/msm/mdss/mdss_dsi_panel.c
@@ -41,6 +41,7 @@
{
int ret;
u32 duty;
+ u32 period_ns;
if (ctrl->pwm_bl == NULL) {
pr_err("%s: no PWM\n", __func__);
@@ -69,10 +70,23 @@
ctrl->pwm_enabled = 0;
}
- ret = pwm_config_us(ctrl->pwm_bl, duty, ctrl->pwm_period);
- if (ret) {
- pr_err("%s: pwm_config_us() failed err=%d.\n", __func__, ret);
- return;
+ if (ctrl->pwm_period >= USEC_PER_SEC) {
+ ret = pwm_config_us(ctrl->pwm_bl, duty, ctrl->pwm_period);
+ if (ret) {
+ pr_err("%s: pwm_config_us() failed err=%d.\n",
+ __func__, ret);
+ return;
+ }
+ } else {
+ period_ns = ctrl->pwm_period * NSEC_PER_USEC;
+ ret = pwm_config(ctrl->pwm_bl,
+ level * period_ns / ctrl->bklt_max,
+ period_ns);
+ if (ret) {
+ pr_err("%s: pwm_config() failed err=%d.\n",
+ __func__, ret);
+ return;
+ }
}
ret = pwm_enable(ctrl->pwm_bl);
@@ -822,6 +836,8 @@
"qcom,ulps-enabled");
pr_info("%s: ulps feature %s", __func__,
(pinfo->ulps_feature_enabled ? "enabled" : "disabled"));
+ pinfo->esd_check_enabled = of_property_read_bool(np,
+ "qcom,esd-check-enabled");
pinfo->mipi.dynamic_switch_enabled = of_property_read_bool(np,
"qcom,dynamic-mode-switch-enabled");
@@ -1130,6 +1146,23 @@
mdss_dsi_parse_dcs_cmds(np, &ctrl_pdata->off_cmds,
"qcom,mdss-dsi-off-command", "qcom,mdss-dsi-off-command-state");
+ mdss_dsi_parse_dcs_cmds(np, &ctrl_pdata->status_cmds,
+ "qcom,mdss-dsi-panel-status-command",
+ "qcom,mdss-dsi-panel-status-command-state");
+ rc = of_property_read_u32(np, "qcom,mdss-dsi-panel-status-value", &tmp);
+ ctrl_pdata->status_value = (!rc ? tmp : 0);
+
+
+ ctrl_pdata->status_mode = ESD_MAX;
+ rc = of_property_read_string(np,
+ "qcom,mdss-dsi-panel-status-check-mode", &data);
+ if (!rc) {
+ if (!strcmp(data, "bta_check"))
+ ctrl_pdata->status_mode = ESD_BTA;
+ else if (!strcmp(data, "reg_read"))
+ ctrl_pdata->status_mode = ESD_REG;
+ }
+
rc = mdss_dsi_parse_panel_features(np, ctrl_pdata);
if (rc) {
pr_err("%s: failed to parse panel features\n", __func__);
diff --git a/drivers/video/msm/mdss/mdss_dsi_status.c b/drivers/video/msm/mdss/mdss_dsi_status.c
index c68155a..02540bb 100644
--- a/drivers/video/msm/mdss/mdss_dsi_status.c
+++ b/drivers/video/msm/mdss/mdss_dsi_status.c
@@ -32,7 +32,7 @@
#define STATUS_CHECK_INTERVAL_MS 5000
#define STATUS_CHECK_INTERVAL_MIN_MS 200
-#define DSI_STATUS_CHECK_DISABLE 1
+#define DSI_STATUS_CHECK_DISABLE 0
static uint32_t interval = STATUS_CHECK_INTERVAL_MS;
static uint32_t dsi_status_disable = DSI_STATUS_CHECK_DISABLE;
@@ -81,6 +81,7 @@
struct dsi_status_data *pdata = container_of(self,
struct dsi_status_data, fb_notifier);
struct mdss_dsi_ctrl_pdata *ctrl_pdata = NULL;
+ struct mdss_panel_info *pinfo;
pdata->mfd = evdata->info->par;
ctrl_pdata = container_of(dev_get_platdata(&pdata->mfd->pdev->dev),
@@ -89,6 +90,14 @@
pr_err("%s: DSI ctrl not available\n", __func__);
return NOTIFY_BAD;
}
+
+ pinfo = &ctrl_pdata->panel_data.panel_info;
+
+ if (!(pinfo->esd_check_enabled)) {
+ pr_debug("ESD check is not enaled in panel dtsi\n");
+ return NOTIFY_DONE;
+ }
+
if (dsi_status_disable) {
pr_debug("%s: DSI status disabled\n", __func__);
return NOTIFY_DONE;
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
index 84ee426..bf91a29 100644
--- a/drivers/video/msm/mdss/mdss_fb.c
+++ b/drivers/video/msm/mdss/mdss_fb.c
@@ -572,7 +572,6 @@
mfd->mdp = *mdp_instance;
INIT_LIST_HEAD(&mfd->proc_list);
- mutex_init(&mfd->lock);
mutex_init(&mfd->bl_lock);
fbi_list[fbi_list_index++] = fbi;
@@ -885,6 +884,8 @@
struct mdss_panel_data *pdata;
int (*update_ad_input)(struct msm_fb_data_type *mfd);
u32 temp = bkl_lvl;
+ int ret = -EINVAL;
+ bool is_bl_changed = (bkl_lvl != mfd->bl_level);
if (((!mfd->panel_power_on && mfd->dcm_state != DCM_ENTER)
|| !mfd->bl_updated) && !IS_CALIB_MODE_BL(mfd)) {
@@ -897,6 +898,12 @@
pdata = dev_get_platdata(&mfd->pdev->dev);
if ((pdata) && (pdata->set_backlight)) {
+ if (mfd->mdp.ad_attenuate_bl) {
+ ret = (*mfd->mdp.ad_attenuate_bl)(bkl_lvl, &temp, mfd);
+ if (ret)
+ pr_err("Failed to attenuate BL\n");
+ }
+
mfd->bl_level_prev_scaled = mfd->bl_level_scaled;
if (!IS_CALIB_MODE_BL(mfd))
mdss_fb_scale_bl(mfd, &temp);
@@ -912,31 +919,42 @@
mfd->bl_level = bkl_lvl;
return;
}
+ pr_debug("backlight sent to panel :%d\n", temp);
pdata->set_backlight(pdata, temp);
mfd->bl_level = bkl_lvl;
mfd->bl_level_scaled = temp;
- if (mfd->mdp.update_ad_input) {
+ if (mfd->mdp.update_ad_input && is_bl_changed) {
update_ad_input = mfd->mdp.update_ad_input;
mutex_unlock(&mfd->bl_lock);
/* Will trigger ad_setup which will grab bl_lock */
update_ad_input(mfd);
- mdss_fb_bl_update_notify(mfd);
mutex_lock(&mfd->bl_lock);
}
+ mdss_fb_bl_update_notify(mfd);
}
}
void mdss_fb_update_backlight(struct msm_fb_data_type *mfd)
{
struct mdss_panel_data *pdata;
+ int ret = 0;
+ u32 temp;
mutex_lock(&mfd->bl_lock);
if (mfd->unset_bl_level && !mfd->bl_updated) {
pdata = dev_get_platdata(&mfd->pdev->dev);
if ((pdata) && (pdata->set_backlight)) {
mfd->bl_level = mfd->unset_bl_level;
- pdata->set_backlight(pdata, mfd->bl_level);
+ temp = mfd->bl_level;
+ if (mfd->mdp.ad_attenuate_bl) {
+ ret = (*mfd->mdp.ad_attenuate_bl)(temp,
+ &temp, mfd);
+ if (ret)
+ pr_err("Failed to attenuate BL\n");
+ }
+
+ pdata->set_backlight(pdata, temp);
mfd->bl_level_scaled = mfd->unset_bl_level;
mfd->bl_updated = 1;
}
diff --git a/drivers/video/msm/mdss/mdss_fb.h b/drivers/video/msm/mdss/mdss_fb.h
index 5ab3d41..1ab0fb7 100644
--- a/drivers/video/msm/mdss/mdss_fb.h
+++ b/drivers/video/msm/mdss/mdss_fb.h
@@ -123,6 +123,8 @@
int (*do_histogram)(struct msm_fb_data_type *mfd,
struct mdp_histogram *hist);
int (*update_ad_input)(struct msm_fb_data_type *mfd);
+ int (*ad_attenuate_bl)(u32 bl, u32 *bl_out,
+ struct msm_fb_data_type *mfd);
int (*panel_register_done)(struct mdss_panel_data *pdata);
u32 (*fb_stride)(u32 fb_index, u32 xres, int bpp);
int (*splash_init_fnc)(struct msm_fb_data_type *mfd);
@@ -193,7 +195,6 @@
u32 bl_level_scaled;
u32 bl_level_prev_scaled;
struct mutex bl_lock;
- struct mutex lock;
struct platform_device *pdev;
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
index 250b163..31e21f6 100644
--- a/drivers/video/msm/mdss/mdss_mdp.c
+++ b/drivers/video/msm/mdss/mdss_mdp.c
@@ -760,8 +760,6 @@
if (mdata->vsync_ena)
mdss_mdp_clk_update(MDSS_CLK_MDP_VSYNC, enable);
- mdss_bus_bandwidth_ctrl(enable);
-
if (!enable)
pm_runtime_put(&mdata->pdev->dev);
}
diff --git a/drivers/video/msm/mdss/mdss_mdp.h b/drivers/video/msm/mdss/mdss_mdp.h
index 8e83f51..149ce16 100644
--- a/drivers/video/msm/mdss/mdss_mdp.h
+++ b/drivers/video/msm/mdss/mdss_mdp.h
@@ -415,8 +415,7 @@
struct mdss_mdp_data back_buf;
struct mdss_mdp_data front_buf;
- struct list_head used_list;
- struct list_head cleanup_list;
+ struct list_head list;
struct mdp_overlay_pp_params pp_cfg;
struct mdss_pipe_pp_res pp_res;
@@ -443,6 +442,8 @@
struct mutex dfps_lock;
struct mdss_mdp_ctl *ctl;
struct mdss_mdp_wb *wb;
+
+ struct mutex list_lock;
struct list_head overlay_list;
struct list_head pipes_used;
struct list_head pipes_cleanup;
diff --git a/drivers/video/msm/mdss/mdss_mdp_ctl.c b/drivers/video/msm/mdss/mdss_mdp_ctl.c
index 8a0c9b1..f7d02b2 100644
--- a/drivers/video/msm/mdss/mdss_mdp_ctl.c
+++ b/drivers/video/msm/mdss/mdss_mdp_ctl.c
@@ -1536,7 +1536,11 @@
switch (pdata->panel_info.bpp) {
case 18:
- ctl->dst_format = MDSS_MDP_PANEL_FORMAT_RGB666;
+ if (ctl->intf_type == MDSS_INTF_DSI)
+ ctl->dst_format = MDSS_MDP_PANEL_FORMAT_RGB666 |
+ MDSS_MDP_PANEL_FORMAT_PACK_ALIGN_MSB;
+ else
+ ctl->dst_format = MDSS_MDP_PANEL_FORMAT_RGB666;
dither.flags = MDP_PP_OPS_ENABLE | MDP_PP_OPS_WRITE;
dither.g_y_depth = 2;
dither.r_cr_depth = 2;
diff --git a/drivers/video/msm/mdss/mdss_mdp_hwio.h b/drivers/video/msm/mdss/mdss_mdp_hwio.h
index ea41159..0b67a6d 100644
--- a/drivers/video/msm/mdss/mdss_mdp_hwio.h
+++ b/drivers/video/msm/mdss/mdss_mdp_hwio.h
@@ -379,6 +379,7 @@
#define MDSS_MDP_MAX_AD_AL 65535
#define MDSS_MDP_MAX_AD_STR 255
+#define MDSS_MDP_AD_BL_SCALE 4095
#define MDSS_MDP_REG_AD_BYPASS 0x000
#define MDSS_MDP_REG_AD_CTRL_0 0x004
@@ -519,7 +520,9 @@
#define MDSS_MDP_REG_INTF_FRAME_COUNT 0x0AC
#define MDSS_MDP_REG_INTF_LINE_COUNT 0x0B0
#define MDSS_MDP_PANEL_FORMAT_RGB888 0x213F
-#define MDSS_MDP_PANEL_FORMAT_RGB666 0x21AA
+#define MDSS_MDP_PANEL_FORMAT_RGB666 0x212A
+
+#define MDSS_MDP_PANEL_FORMAT_PACK_ALIGN_MSB BIT(7)
enum mdss_mdp_pingpong_index {
MDSS_MDP_PINGPONG0,
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c b/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
index 6808313..4c72d28 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
@@ -198,6 +198,8 @@
MDSS_XLOG(ctx->pp_num, ctx->koff_cnt, ctx->clk_enabled,
ctx->rdptr_enabled);
if (!ctx->clk_enabled) {
+ mdss_bus_bandwidth_ctrl(true);
+
ctx->clk_enabled = 1;
if (cancel_delayed_work_sync(&ctx->ulps_work))
pr_debug("deleted pending ulps work\n");
@@ -249,6 +251,7 @@
mdss_mdp_ctl_intf_event
(ctx->ctl, MDSS_EVENT_PANEL_CLK_CTRL, (void *)0);
mdss_iommu_ctrl(0);
+ mdss_bus_bandwidth_ctrl(false);
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
if (ctx->panel_on)
schedule_delayed_work(&ctx->ulps_work, ULPS_ENTER_TIME);
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
index 3413894..6642544 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
@@ -347,6 +347,8 @@
if (sctl)
mdss_mdp_irq_disable(MDSS_MDP_IRQ_INTF_UNDER_RUN,
sctl->intf_num);
+
+ mdss_bus_bandwidth_ctrl(false);
}
list_for_each_entry_safe(handle, tmp, &ctx->vsync_handlers, list)
@@ -740,6 +742,8 @@
mdss_mdp_irq_enable(MDSS_MDP_IRQ_INTF_UNDER_RUN,
sctl->intf_num);
+ mdss_bus_bandwidth_ctrl(true);
+
mdp_video_write(ctx, MDSS_MDP_REG_INTF_TIMING_ENGINE_EN, 1);
wmb();
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_writeback.c b/drivers/video/msm/mdss/mdss_mdp_intf_writeback.c
index 7bf03eb..55b831a 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_writeback.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_writeback.c
@@ -443,6 +443,7 @@
}
mdss_iommu_ctrl(0);
+ mdss_bus_bandwidth_ctrl(false);
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false); /* clock off */
ctx->comp_cnt--;
@@ -508,6 +509,7 @@
return ret;
}
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
+ mdss_bus_bandwidth_ctrl(true);
mdss_mdp_ctl_write(ctl, MDSS_MDP_REG_CTL_START, 1);
wmb();
diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
index 41a7d9d..f286de5 100644
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
@@ -40,6 +40,9 @@
#define CHECK_BOUNDS(offset, size, max_size) \
(((size) > (max_size)) || ((offset) > ((max_size) - (size))))
+#define IS_RIGHT_MIXER_OV(flags, dst_x, left_lm_w) \
+ ((flags & MDSS_MDP_RIGHT_MIXER) || (dst_x >= left_lm_w))
+
#define PP_CLK_CFG_OFF 0
#define PP_CLK_CFG_ON 1
@@ -58,6 +61,12 @@
static void __overlay_kickoff_requeue(struct msm_fb_data_type *mfd);
static void __vsync_retire_signal(struct msm_fb_data_type *mfd, int val);
+static inline u32 left_lm_w_from_mfd(struct msm_fb_data_type *mfd)
+{
+ struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
+ return ctl->mixer_left->width;
+}
+
static int mdss_mdp_overlay_sd_ctrl(struct msm_fb_data_type *mfd,
unsigned int enable)
{
@@ -96,17 +105,71 @@
return 0;
}
+/*
+ * This function is modified from mainline version. Source-split
+ * change is too large to port over onto certain code bases.
+ * Source-split patch added a new way to determine if layer
+ * is intended for right panel, by using x offset >= left LM
+ * This function corrects the x offset.
+ * Additionally, patches that fix other issues assumes that checks
+ * and corrections in this function are in place.
+ */
+static int mdss_mdp_ov_xres_check(struct msm_fb_data_type *mfd,
+ struct mdp_overlay *req)
+{
+ u32 xres = 0;
+ u32 left_lm_w = left_lm_w_from_mfd(mfd);
+ struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
+
+ if (IS_RIGHT_MIXER_OV(req->flags, req->dst_rect.x, left_lm_w)) {
+ if (req->dst_rect.x >= left_lm_w) {
+ /*
+ * this is a step towards removing a reliance on
+ * MDSS_MDP_RIGHT_MIXER flags. With the new src split
+ * code, some clients of non-src-split chipsets have
+ * stopped sending MDSS_MDP_RIGHT_MIXER flag and
+ * modified their xres relative to full panel
+ * dimensions. In such cases, we need to deduct left
+ * layer mixer width before we programm this HW.
+ */
+ req->dst_rect.x -= left_lm_w;
+ req->flags |= MDSS_MDP_RIGHT_MIXER;
+ }
+
+ if (ctl->mixer_right) {
+ xres += ctl->mixer_right->width;
+ } else {
+ pr_err("ov cannot be placed on right mixer\n");
+ return -EPERM;
+ }
+ } else {
+ if (ctl->mixer_left) {
+ xres = ctl->mixer_left->width;
+ } else {
+ pr_err("ov cannot be placed on left mixer\n");
+ return -EPERM;
+ }
+ }
+
+ if (CHECK_BOUNDS(req->dst_rect.x, req->dst_rect.w, xres)) {
+ pr_err("dst_xres is invalid. dst_x:%d, dst_w:%d, xres:%d\n",
+ req->dst_rect.x, req->dst_rect.w, xres);
+ return -EOVERFLOW;
+ }
+
+ return 0;
+}
+
int mdss_mdp_overlay_req_check(struct msm_fb_data_type *mfd,
struct mdp_overlay *req,
struct mdss_mdp_format_params *fmt)
{
- u32 xres, yres;
+ u32 yres;
u32 min_src_size, min_dst_size;
int content_secure;
struct mdss_data_type *mdata = mfd_to_mdata(mfd);
struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);
- xres = mfd->fbi->var.xres;
yres = mfd->fbi->var.yres;
content_secure = (req->flags & MDP_SECURE_OVERLAY_SESSION);
@@ -167,8 +230,7 @@
if (!(req->flags & MDSS_MDP_ROT_ONLY)) {
u32 src_w, src_h, dst_w, dst_h;
- if ((CHECK_BOUNDS(req->dst_rect.x, req->dst_rect.w, xres) ||
- CHECK_BOUNDS(req->dst_rect.y, req->dst_rect.h, yres))) {
+ if (CHECK_BOUNDS(req->dst_rect.y, req->dst_rect.h, yres)) {
pr_err("invalid destination rect=%d,%d,%d,%d\n",
req->dst_rect.x, req->dst_rect.y,
req->dst_rect.w, req->dst_rect.h);
@@ -229,7 +291,8 @@
}
}
- if (req->flags & MDP_DEINTERLACE) {
+ if ((req->flags & MDP_DEINTERLACE) &&
+ !req->scale.enable_pxl_ext) {
if (req->flags & MDP_SOURCE_ROTATED_90) {
if ((req->src_rect.w % 4) != 0) {
pr_err("interlaced rect not h/4\n");
@@ -288,6 +351,79 @@
return 0;
}
+static int __mdss_mdp_validate_pxl_extn(struct mdss_mdp_pipe *pipe)
+{
+ int plane;
+
+ for (plane = 0; plane < MAX_PLANES; plane++) {
+ u32 hor_req_pixels, hor_fetch_pixels;
+ u32 hor_ov_fetch, vert_ov_fetch;
+ u32 vert_req_pixels, vert_fetch_pixels;
+ u32 src_w = pipe->src.w >> pipe->horz_deci;
+ u32 src_h = pipe->src.h >> pipe->vert_deci;
+
+ /*
+ * plane 1 and 2 are for chroma and are same. While configuring
+ * HW, programming only one of the chroma components is
+ * sufficient.
+ */
+ if (plane == 2)
+ continue;
+
+ /*
+ * For chroma plane, width is half for the following sub sampled
+ * formats
+ */
+ if (plane == 1 &&
+ ((pipe->src_fmt->chroma_sample == MDSS_MDP_CHROMA_420) ||
+ (pipe->src_fmt->chroma_sample == MDSS_MDP_CHROMA_H2V1)))
+ src_w >>= 1;
+
+ if (plane == 1 &&
+ ((pipe->src_fmt->chroma_sample == MDSS_MDP_CHROMA_420) ||
+ (pipe->src_fmt->chroma_sample == MDSS_MDP_CHROMA_H1V2)))
+ src_h >>= 1;
+
+ hor_req_pixels = pipe->scale.roi_w[plane] +
+ pipe->scale.num_ext_pxls_left[plane] +
+ pipe->scale.num_ext_pxls_right[plane];
+
+ hor_fetch_pixels = src_w +
+ pipe->scale.left_ftch[plane] +
+ pipe->scale.left_rpt[plane] +
+ pipe->scale.right_ftch[plane] +
+ pipe->scale.right_rpt[plane];
+
+ hor_ov_fetch = src_w + pipe->scale.left_ftch[plane] +
+ pipe->scale.right_ftch[plane];
+
+ vert_req_pixels = pipe->scale.num_ext_pxls_top[plane] +
+ pipe->scale.num_ext_pxls_btm[plane];
+
+ vert_fetch_pixels = pipe->scale.top_ftch[plane] +
+ pipe->scale.top_rpt[plane] +
+ pipe->scale.btm_ftch[plane] +
+ pipe->scale.btm_rpt[plane];
+
+ vert_ov_fetch = src_h + pipe->scale.top_ftch[plane] +
+ pipe->scale.btm_ftch[plane];
+
+ if ((hor_req_pixels != hor_fetch_pixels) ||
+ (hor_ov_fetch > pipe->img_width) ||
+ (vert_req_pixels != vert_fetch_pixels) ||
+ (vert_ov_fetch > pipe->img_height)) {
+ pr_err("err: h_req:%d h_fetch:%d v_req:%d v_fetch:%d src_img:[%d,%d]\n",
+ hor_req_pixels, hor_fetch_pixels,
+ vert_req_pixels, vert_fetch_pixels,
+ pipe->img_width, pipe->img_height);
+ pipe->scale.enable_pxl_ext = 0;
+ return -EINVAL;
+ }
+ }
+
+ return 0;
+}
+
static int __mdss_mdp_overlay_setup_scaling(struct mdss_mdp_pipe *pipe)
{
u32 src;
@@ -295,8 +431,11 @@
src = pipe->src.w >> pipe->horz_deci;
- if (pipe->scale.enable_pxl_ext)
- return 0;
+ if (pipe->scale.enable_pxl_ext) {
+ rc = __mdss_mdp_validate_pxl_extn(pipe);
+ return rc;
+ }
+
memset(&pipe->scale, 0, sizeof(struct mdp_scale_data));
rc = mdss_mdp_calc_phase_step(src, pipe->dst.w,
&pipe->scale.phase_step_x[0]);
@@ -359,6 +498,7 @@
struct mdp_histogram_start_req hist;
int ret;
u32 bwc_enabled;
+ u32 left_lm_w = left_lm_w_from_mfd(mfd);
if (mdp5_data->ctl == NULL)
return -ENODEV;
@@ -374,7 +514,7 @@
return -EOVERFLOW;
}
- if (req->flags & MDSS_MDP_RIGHT_MIXER)
+ if (IS_RIGHT_MIXER_OV(req->flags, req->dst_rect.x, left_lm_w))
mixer_mux = MDSS_MDP_MIXER_MUX_RIGHT;
else
mixer_mux = MDSS_MDP_MIXER_MUX_LEFT;
@@ -392,6 +532,10 @@
return -EINVAL;
}
+ ret = mdss_mdp_ov_xres_check(mfd, req);
+ if (ret)
+ return ret;
+
ret = mdss_mdp_overlay_req_check(mfd, req, fmt);
if (ret)
return ret;
@@ -453,9 +597,9 @@
return ret;
}
- mutex_lock(&mfd->lock);
- list_add(&pipe->used_list, &mdp5_data->pipes_used);
- mutex_unlock(&mfd->lock);
+ mutex_lock(&mdp5_data->list_lock);
+ list_add(&pipe->list, &mdp5_data->pipes_used);
+ mutex_unlock(&mdp5_data->list_lock);
pipe->mixer = mixer;
pipe->mfd = mfd;
pipe->pid = current->tgid;
@@ -529,7 +673,8 @@
pipe->overfetch_disable = OVERFETCH_DISABLE_BOTTOM;
if (!(pipe->flags & MDSS_MDP_DUAL_PIPE) ||
- (pipe->flags & MDSS_MDP_RIGHT_MIXER))
+ IS_RIGHT_MIXER_OV(req->flags,
+ req->dst_rect.x, left_lm_w))
pipe->overfetch_disable |= OVERFETCH_DISABLE_RIGHT;
pr_debug("overfetch flags=%x\n", pipe->overfetch_disable);
} else {
@@ -595,17 +740,14 @@
* When scaling is enabled src crop and image
* width and height is modified by user
*/
- if ((pipe->flags & MDP_DEINTERLACE)) {
+ if ((pipe->flags & MDP_DEINTERLACE) && !pipe->scale.enable_pxl_ext) {
if (pipe->flags & MDP_SOURCE_ROTATED_90) {
pipe->src.x = DIV_ROUND_UP(pipe->src.x, 2);
pipe->src.x &= ~1;
- if (!pipe->scale.enable_pxl_ext) {
- pipe->src.w /= 2;
- pipe->img_width /= 2;
- }
+ pipe->src.w /= 2;
+ pipe->img_width /= 2;
} else {
- if (!pipe->scale.enable_pxl_ext)
- pipe->src.h /= 2;
+ pipe->src.h /= 2;
pipe->src.y = DIV_ROUND_UP(pipe->src.y, 2);
pipe->src.y &= ~1;
}
@@ -644,21 +786,21 @@
exit_fail:
mdss_mdp_pipe_unmap(pipe);
- mutex_lock(&mfd->lock);
+ mutex_lock(&mdp5_data->list_lock);
if (pipe->play_cnt == 0) {
pr_debug("failed for pipe %d\n", pipe->num);
- if (!list_empty(&pipe->used_list))
- list_del_init(&pipe->used_list);
+ if (!list_empty(&pipe->list))
+ list_del_init(&pipe->list);
mdss_mdp_pipe_destroy(pipe);
}
/* invalidate any overlays in this framebuffer after failure */
- list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
+ list_for_each_entry(pipe, &mdp5_data->pipes_used, list) {
pr_debug("freeing allocations for pipe %d\n", pipe->num);
mdss_mdp_smp_unreserve(pipe);
pipe->params_changed = 0;
}
- mutex_unlock(&mfd->lock);
+ mutex_unlock(&mdp5_data->list_lock);
return ret;
}
@@ -799,10 +941,9 @@
bool recovery_mode = false;
LIST_HEAD(destroy_pipes);
- mutex_lock(&mfd->lock);
- list_for_each_entry_safe(pipe, tmp, &mdp5_data->pipes_cleanup,
- cleanup_list) {
- list_move(&pipe->cleanup_list, &destroy_pipes);
+ mutex_lock(&mdp5_data->list_lock);
+ list_for_each_entry_safe(pipe, tmp, &mdp5_data->pipes_cleanup, list) {
+ list_move(&pipe->list, &destroy_pipes);
/* make sure pipe fetch has been halted before freeing buffer */
if (mdss_mdp_pipe_fetch_halt(pipe)) {
@@ -830,7 +971,7 @@
__mdss_mdp_overlay_free_list_purge(mfd);
- list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
+ list_for_each_entry(pipe, &mdp5_data->pipes_used, list) {
if (pipe->back_buf.num_planes) {
/* make back buffer active */
__mdss_mdp_overlay_free_list_add(mfd, &pipe->front_buf);
@@ -838,7 +979,7 @@
}
}
- list_for_each_entry_safe(pipe, tmp, &destroy_pipes, cleanup_list) {
+ list_for_each_entry_safe(pipe, tmp, &destroy_pipes, list) {
/*
* in case of secure UI, the buffer needs to be released as
* soon as session is closed.
@@ -850,7 +991,7 @@
mdss_mdp_overlay_free_buf(&pipe->back_buf);
mdss_mdp_pipe_destroy(pipe);
}
- mutex_unlock(&mfd->lock);
+ mutex_unlock(&mdp5_data->list_lock);
}
void mdss_mdp_handoff_cleanup_pipes(struct msm_fb_data_type *mfd,
@@ -883,8 +1024,7 @@
pipe = &pipes[i];
if (pipe->is_handed_off) {
pr_debug("Unmapping handed off pipe %d\n", pipe->num);
- list_add(&pipe->cleanup_list,
- &mdp5_data->pipes_cleanup);
+ list_add(&pipe->list, &mdp5_data->pipes_cleanup);
mdss_mdp_mixer_pipe_unstage(pipe);
pipe->is_handed_off = false;
}
@@ -1001,12 +1141,12 @@
* Setup pipe in solid fill before unstaging,
* to ensure no fetches are happening after dettach or reattach.
*/
- list_for_each_entry(pipe, &mdp5_data->pipes_cleanup, cleanup_list) {
+ list_for_each_entry(pipe, &mdp5_data->pipes_cleanup, list) {
mdss_mdp_pipe_queue_data(pipe, NULL);
mdss_mdp_mixer_pipe_unstage(pipe);
}
- list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
+ list_for_each_entry(pipe, &mdp5_data->pipes_used, list) {
struct mdss_mdp_data *buf;
/*
* When secure display is enabled, if there is a non secure
@@ -1105,12 +1245,12 @@
}
mutex_lock(&mdp5_data->ov_lock);
- mutex_lock(&mfd->lock);
+ mutex_lock(&mdp5_data->list_lock);
/*
* check if there is a secure display session
*/
- list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
+ list_for_each_entry(pipe, &mdp5_data->pipes_used, list) {
if (pipe->flags & MDP_SECURE_DISPLAY_OVERLAY_SESSION) {
sd_in_pipe = 1;
pr_debug("Secure pipe: %u : %08X\n",
@@ -1138,7 +1278,7 @@
* Setup pipe in solid fill before unstaging,
* to ensure no fetches are happening after dettach or reattach.
*/
- list_for_each_entry(pipe, &mdp5_data->pipes_cleanup, cleanup_list) {
+ list_for_each_entry(pipe, &mdp5_data->pipes_cleanup, list) {
mdss_mdp_pipe_queue_data(pipe, NULL);
mdss_mdp_mixer_pipe_unstage(pipe);
need_cleanup = true;
@@ -1148,6 +1288,7 @@
ret = __overlay_queue_pipes(mfd);
ATRACE_END("sspp_programming");
+ mutex_unlock(&mdp5_data->list_lock);
if (mfd->panel.type == WRITEBACK_PANEL) {
ATRACE_BEGIN("wb_kickoff");
ret = mdss_mdp_wb_kickoff(mfd);
@@ -1162,7 +1303,6 @@
atomic_set(&mfd->kickoff_pending, 0);
wake_up_all(&mfd->kickoff_wait_q);
}
- mutex_unlock(&mfd->lock);
if (IS_ERR_VALUE(ret))
goto commit_fail;
@@ -1176,13 +1316,11 @@
mutex_lock(&mdp5_data->ov_lock);
if (ret == 0) {
- mutex_lock(&mfd->lock);
if (!mdp5_data->sd_enabled && (sd_in_pipe == 1)) {
ret = mdss_mdp_overlay_sd_ctrl(mfd, 1);
if (ret == 0)
mdp5_data->sd_enabled = 1;
}
- mutex_unlock(&mfd->lock);
}
mdss_fb_update_notify_update(mfd);
@@ -1205,37 +1343,47 @@
int mdss_mdp_overlay_release(struct msm_fb_data_type *mfd, int ndx)
{
- struct mdss_mdp_pipe *pipe;
+ struct mdss_mdp_pipe *pipe, *tmp;
struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);
- u32 pipe_ndx, unset_ndx = 0;
- int i, destroy_pipe;
+ u32 unset_ndx = 0;
+ int destroy_pipe;
- for (i = 0; unset_ndx != ndx && i < MDSS_MDP_MAX_SSPP; i++) {
- pipe_ndx = BIT(i);
- if (pipe_ndx & ndx) {
- unset_ndx |= pipe_ndx;
- pipe = mdss_mdp_pipe_get(mdp5_data->mdata, pipe_ndx);
- if (IS_ERR_OR_NULL(pipe)) {
- pr_warn("unknown pipe ndx=%x\n", pipe_ndx);
+ mutex_lock(&mdp5_data->list_lock);
+ list_for_each_entry_safe(pipe, tmp, &mdp5_data->pipes_used, list) {
+ if (pipe->ndx & ndx) {
+ if (mdss_mdp_pipe_map(pipe)) {
+ pr_err("Unable to map used pipe%d ndx=%x\n",
+ pipe->num, pipe->ndx);
continue;
}
- mutex_lock(&mfd->lock);
+ unset_ndx |= pipe->ndx;
+
pipe->pid = 0;
destroy_pipe = pipe->play_cnt == 0;
- if (!list_empty(&pipe->used_list)) {
- list_del_init(&pipe->used_list);
- if (!destroy_pipe)
- list_add(&pipe->cleanup_list,
+ if (destroy_pipe)
+ list_del_init(&pipe->list);
+ else
+ list_move(&pipe->list,
&mdp5_data->pipes_cleanup);
- }
- mutex_unlock(&mfd->lock);
mdss_mdp_pipe_unmap(pipe);
if (destroy_pipe)
mdss_mdp_pipe_destroy(pipe);
+
+ if (unset_ndx == ndx)
+ break;
}
}
+
+ mutex_unlock(&mdp5_data->list_lock);
+
+ if (unset_ndx != ndx) {
+ pr_warn("Unable to unset pipe(s) ndx=0x%x unset=0x%x\n",
+ ndx, unset_ndx);
+ return -ENOENT;
+ }
+
return 0;
}
@@ -1303,8 +1451,8 @@
pr_debug("releasing all resources for fb%d pid=%d\n", mfd->index, pid);
mutex_lock(&mdp5_data->ov_lock);
- mutex_lock(&mfd->lock);
- list_for_each_entry(pipe, &mdp5_data->pipes_used, used_list) {
+ mutex_lock(&mdp5_data->list_lock);
+ list_for_each_entry(pipe, &mdp5_data->pipes_used, list) {
if (release_all || (pipe->pid == pid)) {
unset_ndx |= pipe->ndx;
cnt++;
@@ -1320,7 +1468,7 @@
pr_debug("release_all=%d mfd->ref_cnt=%d unset_ndx=0x%x cnt=%d\n",
release_all, mfd->ref_cnt, unset_ndx, cnt);
- mutex_unlock(&mfd->lock);
+ mutex_unlock(&mdp5_data->list_lock);
if (unset_ndx) {
pr_debug("%d pipes need cleanup (%x)\n", cnt, unset_ndx);
@@ -1537,7 +1685,7 @@
pr_warn("right fb pipe not needed\n");
return -EINVAL;
}
-
+ req.flags = req.flags | MDSS_MDP_RIGHT_MIXER;
req.src_rect.x = mixer->width;
req.src_rect.w = fbi->var.xres - mixer->width;
} else {
@@ -2123,6 +2271,11 @@
u32 copyback = 0;
u32 copy_from_kernel = 0;
+ if (mfd->panel_info->partial_update_enabled) {
+ pr_err("Partical update feature is enabled.");
+ return -EPERM;
+ }
+
ret = copy_from_user(&mdp_pp, argp, sizeof(mdp_pp));
if (ret)
return ret;
@@ -2236,6 +2389,11 @@
u32 pp_bus_handle;
static int req = -1;
+ if (mfd->panel_info->partial_update_enabled) {
+ pr_err("Partical update feature is enabled.");
+ return -EPERM;
+ }
+
switch (cmd) {
case MSMFB_HISTOGRAM_START:
if (!mfd->panel_power_on)
@@ -2393,6 +2551,7 @@
int ret = 0, left_cnt = 0, right_cnt = 0;
int i;
u32 new_reqs = 0;
+ u32 left_lm_w = left_lm_w_from_mfd(mfd);
ret = mutex_lock_interruptible(&mdp5_data->ov_lock);
if (ret)
@@ -2420,7 +2579,7 @@
if (pipe->play_cnt == 0)
new_reqs |= pipe->ndx;
- if (pipe->flags & MDSS_MDP_RIGHT_MIXER) {
+ if (IS_RIGHT_MIXER_OV(req->flags, req->dst_rect.x, left_lm_w)) {
if (right_cnt >= MDSS_MDP_MAX_STAGE) {
pr_err("too many pipes on right mixer\n");
ret = -EINVAL;
@@ -2782,9 +2941,9 @@
if (mixer)
mixer->cursor_enabled = 0;
- mutex_lock(&mfd->lock);
+ mutex_lock(&mdp5_data->list_lock);
need_cleanup = !list_empty(&mdp5_data->pipes_cleanup);
- mutex_unlock(&mfd->lock);
+ mutex_unlock(&mdp5_data->list_lock);
if (need_cleanup) {
pr_debug("cleaning up pipes on fb%d\n", mfd->index);
@@ -3122,6 +3281,7 @@
INIT_LIST_HEAD(&mdp5_data->pipes_used);
INIT_LIST_HEAD(&mdp5_data->pipes_cleanup);
INIT_LIST_HEAD(&mdp5_data->rot_proc_list);
+ mutex_init(&mdp5_data->list_lock);
mutex_init(&mdp5_data->ov_lock);
mutex_init(&mdp5_data->dfps_lock);
mdp5_data->hw_refresh = true;
diff --git a/drivers/video/msm/mdss/mdss_mdp_pipe.c b/drivers/video/msm/mdss/mdss_mdp_pipe.c
index ccd60a6..4819456 100644
--- a/drivers/video/msm/mdss/mdss_mdp_pipe.c
+++ b/drivers/video/msm/mdss/mdss_mdp_pipe.c
@@ -55,7 +55,7 @@
}
static u32 mdss_mdp_smp_mmb_reserve(struct mdss_mdp_pipe_smp_map *smp_map,
- size_t n)
+ size_t n, bool force_alloc)
{
u32 i, mmb;
u32 fixed_cnt = bitmap_weight(smp_map->fixed, SMP_MB_CNT);
@@ -73,7 +73,7 @@
* that calls for change in smp configuration (addition/removal
* of smp blocks), so that fallback solution happens.
*/
- if (i != 0 && n != i) {
+ if (i != 0 && n != i && !force_alloc) {
pr_debug("Can't change mmb config, num_blks: %d alloc: %d\n",
n, i);
return 0;
@@ -216,6 +216,7 @@
struct mdss_mdp_plane_sizes ps;
int i;
int rc = 0, rot_mode = 0, wb_mixer = 0;
+ bool force_alloc = 0;
u32 nlines, format, seg_w;
u16 width;
@@ -302,6 +303,14 @@
if (pipe->mixer->type == MDSS_MDP_MIXER_TYPE_WRITEBACK)
wb_mixer = 1;
+ /*
+ * Don't want to allow SMP changes for backend composition pipes
+ * inorder to preserve SMPs as much as possible.
+ * On the contrary for non backend composition pipes we should
+ * allow SMP allocations to prevent composition failures.
+ */
+ force_alloc = !(pipe->flags & MDP_BACKEND_COMPOSITION);
+
mutex_lock(&mdss_mdp_smp_lock);
for (i = (MAX_PLANES - 1); i >= ps.num_planes; i--) {
if (bitmap_weight(pipe->smp_map[i].allocated, SMP_MB_CNT)) {
@@ -331,7 +340,7 @@
pr_debug("reserving %d mmb for pnum=%d plane=%d\n",
num_blks, pipe->num, i);
reserved = mdss_mdp_smp_mmb_reserve(&pipe->smp_map[i],
- num_blks);
+ num_blks, force_alloc);
if (reserved < num_blks)
break;
}
diff --git a/drivers/video/msm/mdss/mdss_mdp_pp.c b/drivers/video/msm/mdss/mdss_mdp_pp.c
index ebda2ee..225862d 100644
--- a/drivers/video/msm/mdss/mdss_mdp_pp.c
+++ b/drivers/video/msm/mdss/mdss_mdp_pp.c
@@ -399,13 +399,27 @@
struct mdss_mdp_ctl *ctl, u32 num, u32 *opmode);
static int mdss_mdp_ad_setup(struct msm_fb_data_type *mfd);
static void pp_ad_cfg_lut(char __iomem *addr, u32 *data);
-static u32 pp_ad_attenuate_bl(u32 bl, struct mdss_ad_info *ad);
+static int pp_ad_attenuate_bl(u32 bl, u32 *bl_out,
+ struct msm_fb_data_type *mfd);
static int pp_num_to_side(struct mdss_mdp_ctl *ctl, u32 num);
static inline bool pp_sts_is_enabled(u32 sts, int side);
static inline void pp_sts_set_split_bits(u32 *sts, u32 bits);
static u32 last_sts, last_state;
+inline int linear_map(int in, int *out, int in_max, int out_max)
+{
+ if (in < 0 || !out || in_max <= 0 || out_max <= 0)
+ return -EINVAL;
+ *out = ((in * out_max) / in_max);
+ pr_debug("in = %d, out = %d, in_max = %d, out_max = %d\n",
+ in, *out, in_max, out_max);
+ if ((in > 0) && (*out == 0))
+ *out = 1;
+ return 0;
+
+}
+
int mdss_mdp_csc_setup_data(u32 block, u32 blk_idx, u32 tbl_idx,
struct mdp_csc_cfg *data)
{
@@ -814,19 +828,18 @@
* TODO: Allow pipe to be programmed whenever new CSC is
* applied (i.e. dirty bit)
*/
- if (pipe->play_cnt == 0)
- mdss_mdp_csc_setup_data(MDSS_MDP_BLOCK_SSPP,
- pipe->num, 1, &pipe->pp_cfg.csc_cfg);
+ mdss_mdp_csc_setup_data(MDSS_MDP_BLOCK_SSPP, pipe->num,
+ 1, &pipe->pp_cfg.csc_cfg);
} else {
- if (pipe->src_fmt->is_yuv)
+ if (pipe->src_fmt->is_yuv) {
opmode |= (0 << 19) | /* DST_DATA=RGB */
(1 << 18) | /* SRC_DATA=YCBCR */
(1 << 17); /* CSC_1_EN */
- /*
- * TODO: Needs to be part of dirty bit logic: if there is a
- * previously configured pipe need to re-configure CSC matrix
- */
- if (pipe->play_cnt == 0) {
+ /*
+ * TODO: Needs to be part of dirty bit logic: if there
+ * is a previously configured pipe need to re-configure
+ * CSC matrix
+ */
mdss_mdp_csc_setup(MDSS_MDP_BLOCK_SSPP, pipe->num, 1,
MDSS_MDP_CSC_YUV2RGB);
}
@@ -930,6 +943,7 @@
struct mdss_data_type *mdata;
u32 src_w, src_h;
u32 dcm_state = DCM_UNINIT;
+ u32 chroma_shift_x = 0, chroma_shift_y = 0;
pr_debug("pipe=%d, change pxl ext=%d\n", pipe->num,
pipe->scale.enable_pxl_ext);
@@ -985,7 +999,7 @@
(pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE) ||
(chroma_sample == MDSS_MDP_CHROMA_420) ||
(chroma_sample == MDSS_MDP_CHROMA_H1V2) ||
- pipe->scale.enable_pxl_ext) {
+ (pipe->scale.enable_pxl_ext && (src_h != pipe->dst.h))) {
pr_debug("scale y - src_h=%d dst_h=%d\n", src_h, pipe->dst.h);
if ((src_h / MAX_DOWNSCALE_RATIO) > pipe->dst.h) {
@@ -999,11 +1013,10 @@
init_phasey = pipe->scale.init_phase_y[0];
if (pipe->type == MDSS_MDP_PIPE_TYPE_VIG) {
- u32 chroma_shift = 0;
if (!pipe->vert_deci &&
((chroma_sample == MDSS_MDP_CHROMA_420) ||
(chroma_sample == MDSS_MDP_CHROMA_H1V2)))
- chroma_shift = 1; /* 2x upsample chroma */
+ chroma_shift_y = 1; /* 2x upsample chroma */
if (src_h <= pipe->dst.h)
scale_config |= /* G/Y, A */
@@ -1014,7 +1027,7 @@
(MDSS_MDP_SCALE_FILTER_PCMN << 10) |
(MDSS_MDP_SCALE_FILTER_PCMN << 18);
- if ((src_h >> chroma_shift) <= pipe->dst.h)
+ if ((src_h >> chroma_shift_y) <= pipe->dst.h)
scale_config |= /* CrCb */
(MDSS_MDP_SCALE_FILTER_BIL << 14);
else
@@ -1023,7 +1036,8 @@
writel_relaxed(init_phasey, pipe->base +
MDSS_MDP_REG_VIG_QSEED2_C12_INIT_PHASEY);
- writel_relaxed(phasey_step >> chroma_shift, pipe->base +
+ writel_relaxed(phasey_step >> chroma_shift_y,
+ pipe->base +
MDSS_MDP_REG_VIG_QSEED2_C12_PHASESTEPY);
} else {
if (src_h <= pipe->dst.h)
@@ -1041,7 +1055,7 @@
(pipe->pp_res.pp_sts.sharp_sts & PP_STS_ENABLE) ||
(chroma_sample == MDSS_MDP_CHROMA_420) ||
(chroma_sample == MDSS_MDP_CHROMA_H2V1) ||
- pipe->scale.enable_pxl_ext) {
+ (pipe->scale.enable_pxl_ext && (src_w != pipe->dst.w))) {
pr_debug("scale x - src_w=%d dst_w=%d\n", src_w, pipe->dst.w);
if ((src_w / MAX_DOWNSCALE_RATIO) > pipe->dst.w) {
@@ -1055,12 +1069,10 @@
phasex_step = pipe->scale.phase_step_x[0];
if (pipe->type == MDSS_MDP_PIPE_TYPE_VIG) {
- u32 chroma_shift = 0;
-
if (!pipe->horz_deci &&
((chroma_sample == MDSS_MDP_CHROMA_420) ||
(chroma_sample == MDSS_MDP_CHROMA_H2V1)))
- chroma_shift = 1; /* 2x upsample chroma */
+ chroma_shift_x = 1; /* 2x upsample chroma */
if (src_w <= pipe->dst.w)
scale_config |= /* G/Y, A */
@@ -1071,7 +1083,7 @@
(MDSS_MDP_SCALE_FILTER_PCMN << 8) |
(MDSS_MDP_SCALE_FILTER_PCMN << 16);
- if ((src_w >> chroma_shift) <= pipe->dst.w)
+ if ((src_w >> chroma_shift_x) <= pipe->dst.w)
scale_config |= /* CrCb */
(MDSS_MDP_SCALE_FILTER_BIL << 12);
else
@@ -1080,7 +1092,8 @@
writel_relaxed(init_phasex, pipe->base +
MDSS_MDP_REG_VIG_QSEED2_C12_INIT_PHASEX);
- writel_relaxed(phasex_step >> chroma_shift, pipe->base +
+ writel_relaxed(phasex_step >> chroma_shift_x,
+ pipe->base +
MDSS_MDP_REG_VIG_QSEED2_C12_PHASESTEPX);
} else {
if (src_w <= pipe->dst.w)
@@ -1140,10 +1153,48 @@
/*program pixel extn values for the SSPP*/
mdss_mdp_pipe_program_pixel_extn(pipe);
} else {
- writel_relaxed(phasex_step, pipe->base +
- MDSS_MDP_REG_SCALE_PHASE_STEP_X);
- writel_relaxed(phasey_step, pipe->base +
- MDSS_MDP_REG_SCALE_PHASE_STEP_Y);
+ if (pipe->type == MDSS_MDP_PIPE_TYPE_VIG) {
+ /*program x,y initial phase and phase step*/
+ writel_relaxed(0,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C03_INIT_PHASEX);
+ writel_relaxed(init_phasex,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C12_INIT_PHASEX);
+ writel_relaxed(phasex_step,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C03_PHASESTEPX);
+ writel_relaxed(phasex_step >> chroma_shift_x,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C12_PHASESTEPX);
+
+ writel_relaxed(0,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C03_INIT_PHASEY);
+ writel_relaxed(init_phasey,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C12_INIT_PHASEY);
+ writel_relaxed(phasey_step,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C03_PHASESTEPY);
+ writel_relaxed(phasey_step >> chroma_shift_y,
+ pipe->base +
+ MDSS_MDP_REG_VIG_QSEED2_C12_PHASESTEPY);
+ } else {
+
+ writel_relaxed(phasex_step,
+ pipe->base +
+ MDSS_MDP_REG_SCALE_PHASE_STEP_X);
+ writel_relaxed(phasey_step,
+ pipe->base +
+ MDSS_MDP_REG_SCALE_PHASE_STEP_Y);
+ writel_relaxed(0,
+ pipe->base +
+ MDSS_MDP_REG_SCALE_INIT_PHASE_X);
+ writel_relaxed(0,
+ pipe->base +
+ MDSS_MDP_REG_SCALE_INIT_PHASE_Y);
+ }
}
writel_relaxed(scale_config, pipe->base +
@@ -1605,18 +1656,18 @@
/* TODO: have some sort of reader/writer lock to prevent unclocked
* access while display power is toggled */
- if (!ctl->mfd->panel_power_on) {
+ mutex_lock(&ctl->lock);
+ if (!ctl->power_on) {
ret = -EPERM;
goto error;
}
- mutex_lock(&ctl->mfd->lock);
ret = mdss_mdp_pp_setup_locked(ctl);
- mutex_unlock(&ctl->mfd->lock);
error:
+ mutex_unlock(&ctl->lock);
+
return ret;
}
-/* call only when holding and mfd->lock */
int mdss_mdp_pp_setup_locked(struct mdss_mdp_ctl *ctl)
{
struct mdss_data_type *mdata = ctl->mdata;
@@ -1711,9 +1762,13 @@
if (ad->state & PP_AD_STATE_BL_LIN) {
bl = ad->bl_lin[bl >> ad->bl_bright_shift];
bl = bl << ad->bl_bright_shift;
- bl = pp_ad_attenuate_bl(bl, ad);
+ ret = pp_ad_attenuate_bl(bl, &bl, ad->mfd);
+ if (ret)
+ pr_err("Failed to attenuate BL\n");
}
- ad->bl_data = bl;
+ linear_map(bl, &ad->bl_data,
+ ad->bl_mfd->panel_info->bl_max,
+ MDSS_MDP_AD_BL_SCALE);
pp_ad_input_write(&mdata->ad_off[dspp_num], ad);
}
if ((PP_AD_STATE_VSYNC & ad->state) && ad->calc_itr)
@@ -3867,6 +3922,11 @@
return -ENODEV;
}
+ if (ad_mfd->panel_info->type == DTV_PANEL) {
+ pr_debug("AD not supported on external display\n");
+ return ret;
+ }
+
mixer_num = mdss_mdp_get_ctl_mixers(ad_mfd->index, mixer_id);
if (!mixer_num) {
pr_debug("no mixers connected, %d", mixer_num);
@@ -4011,11 +4071,7 @@
} else if (init_cfg->ops & MDP_PP_AD_CFG) {
memcpy(&ad->cfg, &init_cfg->params.cfg,
sizeof(struct mdss_ad_cfg));
- /*
- * TODO: specify panel independent range of input from cfg,
- * scale input backlight_scale to panel bl_max's range
- */
- ad->cfg.backlight_scale = bl_mfd->panel_info->bl_max;
+ ad->cfg.backlight_scale = MDSS_MDP_AD_BL_SCALE;
ad->sts |= PP_AD_STS_DIRTY_CFG;
}
@@ -4138,7 +4194,7 @@
if (!ret) {
if (wait) {
mutex_lock(&ad->lock);
- init_completion(&ad->comp);
+ INIT_COMPLETION(ad->comp);
mutex_unlock(&ad->lock);
}
if (wait) {
@@ -4277,10 +4333,7 @@
frame_end = 0xFFFF;
procs_start = 0x0;
procs_end = 0xFFFF;
- if (split_mode)
- tile_ctrl = 0x0;
- else
- tile_ctrl = 0x1;
+ tile_ctrl = 0x0;
}
@@ -4433,9 +4486,13 @@
if (ad->state & PP_AD_STATE_BL_LIN) {
bl = ad->bl_lin[bl >> ad->bl_bright_shift];
bl = bl << ad->bl_bright_shift;
- bl = pp_ad_attenuate_bl(bl, ad);
+ ret = pp_ad_attenuate_bl(bl, &bl, ad->mfd);
+ if (ret)
+ pr_err("Failed to attenuate BL\n");
}
- ad->bl_data = bl;
+ linear_map(bl, &ad->bl_data,
+ ad->bl_mfd->panel_info->bl_max,
+ MDSS_MDP_AD_BL_SCALE);
}
mutex_unlock(&bl_mfd->bl_lock);
ad->reg_sts |= PP_AD_STS_DIRTY_DATA;
@@ -4485,6 +4542,7 @@
if (bl_mfd != mfd)
bl_mfd->ext_ad_ctrl = mfd->index;
bl_mfd->mdp.update_ad_input = pp_update_ad_input;
+ bl_mfd->mdp.ad_attenuate_bl = pp_ad_attenuate_bl;
bl_mfd->ext_bl_ctrl = ad->cfg.bl_ctrl_mode;
mutex_unlock(&bl_mfd->bl_lock);
@@ -4514,6 +4572,7 @@
memset(&ad->cfg, 0, sizeof(struct mdss_ad_cfg));
mutex_lock(&bl_mfd->bl_lock);
bl_mfd->mdp.update_ad_input = NULL;
+ bl_mfd->mdp.ad_attenuate_bl = NULL;
bl_mfd->ext_bl_ctrl = 0;
bl_mfd->ext_ad_ctrl = -1;
mutex_unlock(&bl_mfd->bl_lock);
@@ -4631,9 +4690,9 @@
ctl->remove_vsync_handler(ctl, &ad->handle);
}
mutex_unlock(&ad->lock);
- mutex_lock(&mfd->lock);
+ mutex_lock(&ctl->lock);
ctl->flush_bits |= BIT(13 + ad->num);
- mutex_unlock(&mfd->lock);
+ mutex_unlock(&ctl->lock);
/* Trigger update notify to wake up those waiting for display updates */
mdss_fb_update_notify_update(bl_mfd);
@@ -4654,28 +4713,60 @@
addr + ((PP_AD_LUT_LEN - 1) * 2));
}
-static u32 pp_ad_attenuate_bl(u32 bl, struct mdss_ad_info *ad)
+static int pp_ad_attenuate_bl(u32 bl, u32 *bl_out,
+ struct msm_fb_data_type *mfd)
{
u32 shift = 0, ratio_temp = 0;
- u32 n, lut_interval, bl_att, out;
+ u32 n, lut_interval, bl_att;
+ int ret = -1;
+ struct mdss_ad_info *ad;
- ratio_temp = ad->cfg.backlight_max / (AD_BL_ATT_LUT_LEN - 1);
+ if (bl < 0) {
+ pr_err("Invalid backlight input\n");
+ return ret;
+ }
+
+ ret = mdss_mdp_get_ad(mfd, &ad);
+ if (ret || !ad || !ad->bl_mfd || !ad->bl_mfd->panel_info ||
+ !ad->bl_mfd->panel_info->bl_max || !ad->bl_att_lut) {
+ pr_err("Failed to get the ad.\n");
+ return ret;
+ }
+ pr_debug("bl_in = %d\n", bl);
+ /* map panel backlight range to AD backlight range */
+ linear_map(bl, &bl, ad->bl_mfd->panel_info->bl_max,
+ MDSS_MDP_AD_BL_SCALE);
+
+ pr_debug("Before attenuation = %d\n", bl);
+ ratio_temp = MDSS_MDP_AD_BL_SCALE / (AD_BL_ATT_LUT_LEN - 1);
while (ratio_temp > 0) {
ratio_temp = ratio_temp >> 1;
shift++;
}
n = bl >> shift;
- lut_interval = (ad->cfg.backlight_max + 1) / (AD_BL_ATT_LUT_LEN - 1);
+ if (n >= (AD_BL_ATT_LUT_LEN - 1)) {
+ pr_err("Invalid index for BL attenuation: %d.\n", n);
+ return ret;
+ }
+ lut_interval = (MDSS_MDP_AD_BL_SCALE + 1) / (AD_BL_ATT_LUT_LEN - 1);
bl_att = ad->bl_att_lut[n] + (bl - lut_interval * n) *
(ad->bl_att_lut[n + 1] - ad->bl_att_lut[n]) /
lut_interval;
+ pr_debug("n = %d, bl_att = %d\n", n, bl_att);
if (ad->init.alpha_base)
- out = (ad->init.alpha * bl_att +
+ *bl_out = (ad->init.alpha * bl_att +
(ad->init.alpha_base - ad->init.alpha) * bl) /
ad->init.alpha_base;
else
- out = bl;
- return out;
+ *bl_out = bl;
+
+ pr_debug("After attenuation = %d\n", *bl_out);
+ /* map AD backlight range back to panel backlight range */
+ linear_map(*bl_out, bl_out, MDSS_MDP_AD_BL_SCALE,
+ ad->bl_mfd->panel_info->bl_max);
+
+ pr_debug("bl_out = %d\n", *bl_out);
+ return 0;
}
int mdss_mdp_ad_addr_setup(struct mdss_data_type *mdata, u32 *ad_offsets)
@@ -4713,6 +4804,7 @@
mdata->ad_cfgs[i].last_str = 0xFFFFFFFF;
mdata->ad_cfgs[i].last_bl = 0;
mutex_init(&mdata->ad_cfgs[i].lock);
+ init_completion(&mdata->ad_cfgs[i].comp);
mdata->ad_cfgs[i].handle.vsync_handler = pp_ad_vsync_handler;
mdata->ad_cfgs[i].handle.cmd_post_flush = true;
INIT_WORK(&mdata->ad_cfgs[i].calc_work, pp_ad_calc_worker);
diff --git a/drivers/video/msm/mdss/mdss_panel.h b/drivers/video/msm/mdss/mdss_panel.h
index 084cba4..8713db4 100644
--- a/drivers/video/msm/mdss/mdss_panel.h
+++ b/drivers/video/msm/mdss/mdss_panel.h
@@ -328,6 +328,7 @@
u32 mode_gpio_state;
bool dynamic_fps;
bool ulps_feature_enabled;
+ bool esd_check_enabled;
char dfps_update;
int new_fps;
int panel_max_fps;
diff --git a/drivers/video/msm/mdss/mhl_sii8334.c b/drivers/video/msm/mdss/mhl_sii8334.c
index c5d5366..9f50f89 100644
--- a/drivers/video/msm/mdss/mhl_sii8334.c
+++ b/drivers/video/msm/mdss/mhl_sii8334.c
@@ -398,19 +398,22 @@
client = mhl_ctrl->i2c_handle;
- if (on) {
+ mutex_lock(&mhl_ctrl->sii_config_lock);
+ if (on && !mhl_ctrl->irq_req_done) {
rc = mhl_vreg_config(mhl_ctrl, 1);
if (rc) {
pr_err("%s: vreg init failed [%d]\n",
__func__, rc);
- return -ENODEV;
+ rc = -ENODEV;
+ goto vreg_config_error;
}
rc = mhl_gpio_config(mhl_ctrl, 1);
if (rc) {
pr_err("%s: gpio init failed [%d]\n",
__func__, rc);
- return -ENODEV;
+ rc = -ENODEV;
+ goto vreg_config_error;
}
rc = request_threaded_irq(mhl_ctrl->i2c_handle->irq, NULL,
@@ -419,17 +422,22 @@
if (rc) {
pr_err("%s: request_threaded_irq failed, status: %d\n",
__func__, rc);
- return -ENODEV;
+ rc = -ENODEV;
+ goto vreg_config_error;
} else {
mhl_ctrl->irq_req_done = true;
+ /* wait for i2c interrupt line to be activated */
+ msleep(100);
}
- } else {
+ } else if (!on && mhl_ctrl->irq_req_done) {
free_irq(mhl_ctrl->i2c_handle->irq, mhl_ctrl);
mhl_gpio_config(mhl_ctrl, 0);
mhl_vreg_config(mhl_ctrl, 0);
mhl_ctrl->irq_req_done = false;
}
+vreg_config_error:
+ mutex_unlock(&mhl_ctrl->sii_config_lock);
return rc;
}
@@ -471,15 +479,10 @@
flush_work(&mhl_ctrl->mhl_intr_work);
- if (!mhl_ctrl->irq_req_done) {
- rc = mhl_sii_config(mhl_ctrl, true);
- if (rc) {
- pr_err("%s: Failed to config vreg/gpio\n", __func__);
- return rc;
- }
-
- /* wait for i2c interrupt line to be activated */
- msleep(100);
+ rc = mhl_sii_config(mhl_ctrl, true);
+ if (rc) {
+ pr_err("%s: Failed to config vreg/gpio\n", __func__);
+ return rc;
}
if (!mhl_ctrl->disc_enabled) {
@@ -1532,22 +1535,29 @@
pr_debug("%s\n", __func__);
if (!enable) {
- regulator_disable(reg_8941_vdda);
- regulator_put(reg_8941_vdda);
- reg_8941_vdda = NULL;
+ if (reg_8941_vdda) {
+ regulator_disable(reg_8941_vdda);
+ regulator_put(reg_8941_vdda);
+ reg_8941_vdda = NULL;
+ }
- regulator_disable(reg_8941_smps3a);
- regulator_put(reg_8941_smps3a);
- reg_8941_smps3a = NULL;
+ if (reg_8941_smps3a) {
+ regulator_disable(reg_8941_smps3a);
+ regulator_put(reg_8941_smps3a);
+ reg_8941_smps3a = NULL;
+ }
- regulator_disable(reg_8941_l02);
- regulator_put(reg_8941_l02);
- reg_8941_l02 = NULL;
+ if (reg_8941_l02) {
+ regulator_disable(reg_8941_l02);
+ regulator_put(reg_8941_l02);
+ reg_8941_l02 = NULL;
+ }
- regulator_disable(reg_8941_l24);
- regulator_put(reg_8941_l24);
- reg_8941_l24 = NULL;
-
+ if (reg_8941_l24) {
+ regulator_disable(reg_8941_l24);
+ regulator_put(reg_8941_l24);
+ reg_8941_l24 = NULL;
+ }
return 0;
}
@@ -1858,6 +1868,7 @@
init_completion(&mhl_ctrl->rgnd_done);
+ mutex_init(&mhl_ctrl->sii_config_lock);
mhl_ctrl->mhl_psy.name = "ext-vbus";
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 117c5de85..d31a7e4 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -358,6 +358,7 @@
header-y += signalfd.h
header-y += snmp.h
header-y += socket.h
+header-y += sockev.h
header-y += sockios.h
header-y += som.h
header-y += sonet.h
diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h
index 74f6714..6c847e6 100644
--- a/include/linux/dma-attrs.h
+++ b/include/linux/dma-attrs.h
@@ -18,6 +18,7 @@
DMA_ATTR_NO_KERNEL_MAPPING,
DMA_ATTR_STRONGLY_ORDERED,
DMA_ATTR_SKIP_ZEROING,
+ DMA_ATTR_SKIP_CPU_SYNC,
DMA_ATTR_MAX,
};
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 51da65b..9dcdb62 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -49,6 +49,8 @@
FRA_TABLE, /* Extended table id */
FRA_FWMASK, /* mask for netfilter mark */
FRA_OIFNAME,
+ FRA_UID_START, /* UID range */
+ FRA_UID_END,
__FRA_MAX
};
diff --git a/include/linux/mhl_8334.h b/include/linux/mhl_8334.h
index 42ee81e..69cf36d 100644
--- a/include/linux/mhl_8334.h
+++ b/include/linux/mhl_8334.h
@@ -164,6 +164,11 @@
int wr_burst_pending;
struct completion req_write_done;
spinlock_t lock;
+ /*
+ * Lock between mhl_sii_config and
+ * mhl_sii_device_discovery functions
+ */
+ struct mutex sii_config_lock;
bool tx_powered_off;
uint8_t dwnstream_hpd;
bool mhl_det_discon;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index b626915..e13bc45 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -330,8 +330,7 @@
#define EXT_CSD_POWER_OFF_LONG_TIME 247 /* RO */
#define EXT_CSD_GENERIC_CMD6_TIME 248 /* RO */
#define EXT_CSD_CACHE_SIZE 249 /* RO, 4 bytes */
-#define EXT_CSD_PWR_CL_DDR_200_195 253 /* RO */
-#define EXT_CSD_PWR_CL_DDR_200_360 254 /* RO */
+#define EXT_CSD_PWR_CL_DDR_200_360 253 /* RO */
#define EXT_CSD_TAG_UNIT_SIZE 498 /* RO */
#define EXT_CSD_DATA_TAG_SUPPORT 499 /* RO */
#define EXT_CSD_MAX_PACKED_WRITES 500 /* RO */
diff --git a/include/linux/msm_ipa.h b/include/linux/msm_ipa.h
index 9368d8f..8b45fcc 100644
--- a/include/linux/msm_ipa.h
+++ b/include/linux/msm_ipa.h
@@ -51,7 +51,15 @@
#define IPA_IOCTL_GET_NAT_OFFSET 28
#define IPA_IOCTL_RM_ADD_DEPENDENCY 29
#define IPA_IOCTL_RM_DEL_DEPENDENCY 30
-#define IPA_IOCTL_MAX 31
+#define IPA_IOCTL_GENERATE_FLT_EQ 31
+#define IPA_IOCTL_QUERY_INTF_EXT_PROPS 32
+#define IPA_IOCTL_QUERY_EP_MAPPING 33
+#define IPA_IOCTL_QUERY_RT_TBL_INDEX 34
+#define IPA_IOCTL_WRITE_QMAPID 35
+#define IPA_IOCTL_MDFY_FLT_RULE 36
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD 37
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL 38
+#define IPA_IOCTL_MAX 39
/**
* max size of the header to be inserted
@@ -179,7 +187,38 @@
WLAN_AP_DISCONNECT,
WLAN_STA_CONNECT,
WLAN_STA_DISCONNECT,
- IPA_EVENT_MAX
+ IPA_WLAN_EVENT_MAX
+};
+
+/**
+ * enum ipa_wan_event - Events for wan client
+ *
+ * wan default route add/del
+ */
+enum ipa_wan_event {
+ WAN_UPSTREAM_ROUTE_ADD = IPA_WLAN_EVENT_MAX,
+ WAN_UPSTREAM_ROUTE_DEL,
+ IPA_WAN_EVENT_MAX
+};
+
+enum ipa_ecm_event {
+ ECM_CONNECT = IPA_WAN_EVENT_MAX,
+ ECM_DISCONNECT,
+ IPA_EVENT_MAX_NUM
+};
+
+#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)
+
+/**
+ * struct ipa_wan_msg - To hold information about wan client
+ * @name: name of the wan interface
+ *
+ * CnE need to pass the name of default wan iface when connected/disconnected.
+ */
+struct ipa_wan_msg {
+ char upstream_ifname[IPA_RESOURCE_NAME_MAX];
+ char tethered_ifname[IPA_RESOURCE_NAME_MAX];
+ enum ipa_ip_type ip;
};
/**
@@ -824,6 +863,14 @@
IPA_IOCTL_RM_DEL_DEPENDENCY, \
struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_ADD _IOWR(IPA_IOC_MAGIC, \
+ IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD, \
+ struct ipa_wan_msg *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_DEL _IOWR(IPA_IOC_MAGIC, \
+ IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL, \
+ struct ipa_wan_msg *)
+
/*
* unique magic number of the Tethering bridge ioctls
*/
diff --git a/include/linux/msm_vidc_dec.h b/include/linux/msm_vidc_dec.h
index b09fc2d..1c3337c 100644
--- a/include/linux/msm_vidc_dec.h
+++ b/include/linux/msm_vidc_dec.h
@@ -551,6 +551,7 @@
enum vdec_picture pic_type;
void *client_data;
void *input_frame_clientdata;
+ struct vdec_picsize picsize;
struct vdec_framesize framesize;
enum vdec_interlaced_format interlaced_format;
struct vdec_aspectratioinfo aspect_ratio_info;
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index a2092f5..a95eeb7 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -26,6 +26,7 @@
#define NETLINK_ECRYPTFS 19
#define NETLINK_RDMA 20
#define NETLINK_CRYPTO 21 /* Crypto layer */
+#define NETLINK_SOCKEV 22 /* Socket Administrative Events */
#define NETLINK_INET_DIAG NETLINK_SOCK_DIAG
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 0c89a42..351fd1c 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -107,6 +107,7 @@
POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,
POWER_SUPPLY_PROP_INPUT_CURRENT_TRIM,
POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED,
+ POWER_SUPPLY_PROP_VCHG_LOOP_DBC_BYPASS,
POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_CURRENT_AVG,
POWER_SUPPLY_PROP_POWER_NOW,
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 577592e..5529245 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -283,6 +283,8 @@
RTA_MP_ALGO, /* no longer used */
RTA_TABLE,
RTA_MARK,
+ RTA_MFC_STATS, /* not used - backported from the future */
+ RTA_UID,
__RTA_MAX
};
diff --git a/include/linux/sockev.h b/include/linux/sockev.h
new file mode 100644
index 0000000..9f2bf44
--- /dev/null
+++ b/include/linux/sockev.h
@@ -0,0 +1,32 @@
+#ifndef _SOCKEV_H_
+#define _SOCKEV_H_
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+#include <linux/socket.h>
+
+enum sknetlink_groups {
+ SKNLGRP_UNICAST,
+ SKNLGRP_SOCKEV,
+ __SKNLGRP_MAX
+};
+
+#define SOCKEV_STR_MAX 32
+
+/********************************************************************
+* Socket operation messages
+****/
+
+struct sknlsockevmsg {
+ __u8 event[SOCKEV_STR_MAX];
+ __u32 pid; /* (struct task_struct*)->pid */
+ __u16 skfamily; /* (struct socket*)->sk->sk_family */
+ __u8 skstate; /* (struct socket*)->sk->sk_state */
+ __u8 skprotocol; /* (struct socket*)->sk->sk_protocol */
+ __u16 sktype; /* (struct socket*)->sk->sk_type */
+ __u64 skflags; /* (struct socket*)->sk->sk_flags */
+};
+
+#endif /* _SOCKEV_H_ */
+
+
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index f760672..91c5f81 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1948,6 +1948,9 @@
#define V4L2_CID_MPEG_VIDC_VIDEO_B_FRAME_QP \
(V4L2_CID_MPEG_MSM_VIDC_BASE + 47)
+#define V4L2_CID_MPEG_VIDC_VIDEO_BUFFER_SIZE_LIMIT \
+ (V4L2_CID_MPEG_MSM_VIDC_BASE + 48)
+
/* Camera class control IDs */
#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)
#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1)
diff --git a/include/linux/wcnss_wlan.h b/include/linux/wcnss_wlan.h
index 8836e4a..56ba8ab 100644
--- a/include/linux/wcnss_wlan.h
+++ b/include/linux/wcnss_wlan.h
@@ -28,6 +28,8 @@
struct wcnss_wlan_config {
int use_48mhz_xo;
+ int is_pronto_v3;
+ void __iomem *msm_wcnss_base;
};
enum {
@@ -40,9 +42,11 @@
#define HAVE_WCNSS_SUSPEND_RESUME_NOTIFY 1
#define HAVE_WCNSS_RESET_INTR 1
#define HAVE_WCNSS_CAL_DOWNLOAD 1
+#define HAVE_CBC_DONE 1
#define HAVE_WCNSS_RX_BUFF_COUNT 1
#define WLAN_MAC_ADDR_SIZE (6)
+void wcnss_get_monotonic_boottime(struct timespec *ts);
struct device *wcnss_wlan_get_device(void);
struct resource *wcnss_wlan_get_memory_map(struct device *dev);
int wcnss_wlan_get_dxe_tx_irq(struct device *dev);
@@ -76,7 +80,9 @@
void wcnss_resume_notify(void);
void wcnss_riva_log_debug_regs(void);
void wcnss_pronto_log_debug_regs(void);
+int wcnss_is_hw_pronto_ver3(void);
int wcnss_device_ready(void);
+int wcnss_cbc_complete(void);
int wcnss_device_is_shutdown(void);
void wcnss_riva_dump_pmic_regs(void);
int wcnss_xo_auto_detect_enabled(void);
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index a15d1f1..b0b6b04 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -17,6 +17,8 @@
#include <linux/poll.h>
#include <linux/videodev2.h>
+#define VB2_MAX_FRAME 64
+
struct vb2_alloc_ctx;
struct vb2_fileio_data;
@@ -281,7 +283,7 @@
/* private: internal use only */
enum v4l2_memory memory;
- struct vb2_buffer *bufs[VIDEO_MAX_FRAME];
+ struct vb2_buffer *bufs[VB2_MAX_FRAME];
unsigned int num_buffers;
struct list_head queued_list;
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 075f1e3..52e77a3 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -23,6 +23,8 @@
struct fib_rule __rcu *ctarget;
char iifname[IFNAMSIZ];
char oifname[IFNAMSIZ];
+ uid_t uid_start;
+ uid_t uid_end;
struct rcu_head rcu;
struct net * fr_net;
};
@@ -79,7 +81,9 @@
[FRA_FWMARK] = { .type = NLA_U32 }, \
[FRA_FWMASK] = { .type = NLA_U32 }, \
[FRA_TABLE] = { .type = NLA_U32 }, \
- [FRA_GOTO] = { .type = NLA_U32 }
+ [FRA_GOTO] = { .type = NLA_U32 }, \
+ [FRA_UID_START] = { .type = NLA_U32 }, \
+ [FRA_UID_END] = { .type = NLA_U32 }
static inline void fib_rule_get(struct fib_rule *rule)
{
diff --git a/include/net/flow.h b/include/net/flow.h
index 6c469db..3fe9261 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -23,6 +23,7 @@
#define FLOWI_FLAG_PRECOW_METRICS 0x02
#define FLOWI_FLAG_CAN_SLEEP 0x04
__u32 flowic_secid;
+ uid_t flowic_uid;
};
union flowi_uli {
@@ -59,6 +60,7 @@
#define flowi4_proto __fl_common.flowic_proto
#define flowi4_flags __fl_common.flowic_flags
#define flowi4_secid __fl_common.flowic_secid
+#define flowi4_uid __fl_common.flowic_uid
/* (saddr,daddr) must be grouped, same order as in IP header */
__be32 saddr;
@@ -78,7 +80,8 @@
__u32 mark, __u8 tos, __u8 scope,
__u8 proto, __u8 flags,
__be32 daddr, __be32 saddr,
- __be16 dport, __be16 sport)
+ __be16 dport, __be16 sport,
+ uid_t uid)
{
fl4->flowi4_oif = oif;
fl4->flowi4_iif = 0;
@@ -88,6 +91,7 @@
fl4->flowi4_proto = proto;
fl4->flowi4_flags = flags;
fl4->flowi4_secid = 0;
+ fl4->flowi4_uid = uid;
fl4->daddr = daddr;
fl4->saddr = saddr;
fl4->fl4_dport = dport;
@@ -115,6 +119,7 @@
#define flowi6_proto __fl_common.flowic_proto
#define flowi6_flags __fl_common.flowic_flags
#define flowi6_secid __fl_common.flowic_secid
+#define flowi6_uid __fl_common.flowic_uid
struct in6_addr daddr;
struct in6_addr saddr;
__be32 flowlabel;
@@ -158,6 +163,7 @@
#define flowi_proto u.__fl_common.flowic_proto
#define flowi_flags u.__fl_common.flowic_flags
#define flowi_secid u.__fl_common.flowic_secid
+#define flowi_uid u.__fl_common.flowic_uid
} __attribute__((__aligned__(BITS_PER_LONG/8)));
static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)
diff --git a/include/net/ip.h b/include/net/ip.h
index b53d65f..53af759 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -166,6 +166,7 @@
/* -1 if not needed */
int bound_dev_if;
u8 tos;
+ uid_t uid;
};
#define IP_REPLY_ARG_NOSRCCHECK 1
diff --git a/include/net/route.h b/include/net/route.h
index b1c0d5b..7488c9e 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -60,6 +60,7 @@
int rt_iif;
int rt_oif;
__u32 rt_mark;
+ uid_t rt_uid;
/* Info on neighbour */
__be32 rt_gateway;
@@ -146,7 +147,7 @@
flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos,
RT_SCOPE_UNIVERSE, proto,
sk ? inet_sk_flowi_flags(sk) : 0,
- daddr, saddr, dport, sport);
+ daddr, saddr, dport, sport, sk ? sock_i_uid(sk) : 0);
if (sk)
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
return ip_route_output_flow(net, fl4, sk);
@@ -250,7 +251,8 @@
flow_flags |= FLOWI_FLAG_CAN_SLEEP;
flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
- protocol, flow_flags, dst, src, dport, sport);
+ protocol, flow_flags, dst, src, dport, sport,
+ sock_i_uid(sk));
}
static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
diff --git a/include/net/sock.h b/include/net/sock.h
index 83e98f6..9f78060 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2155,4 +2155,15 @@
extern __u32 sysctl_wmem_default;
extern __u32 sysctl_rmem_default;
+/* SOCKEV Notifier Events */
+#define SOCKEV_SOCKET 0x00
+#define SOCKEV_BIND 0x01
+#define SOCKEV_LISTEN 0x02
+#define SOCKEV_ACCEPT 0x03
+#define SOCKEV_CONNECT 0x04
+#define SOCKEV_SHUTDOWN 0x05
+
+int sockev_register_notify(struct notifier_block *nb);
+int sockev_unregister_notify(struct notifier_block *nb);
+
#endif /* _SOCK_H */
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 01f68c4..066c364 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -289,7 +289,7 @@
/*
* A queue for waiters to do rmdir() cgroup. A tasks will sleep when
- * cgroup->count == 0 && list_empty(&cgroup->children) && subsys has some
+ * list_empty(&cgroup->children) && subsys has some
* reference to css->refcnt. In general, this refcnt is expected to goes down
* to zero, soon.
*
@@ -3912,6 +3912,10 @@
struct cgroup_subsys *ss;
unsigned long flags;
bool failed = false;
+
+ if (atomic_read(&cgrp->count) != 0)
+ return false;
+
local_irq_save(flags);
for_each_subsys(cgrp->root, ss) {
struct cgroup_subsys_state *css = cgrp->subsys[ss->subsys_id];
@@ -3960,12 +3964,16 @@
{
struct cg_cgroup_link *link;
+ read_lock(&css_set_lock);
list_for_each_entry(link, &cgrp->css_sets, cgrp_link_list) {
struct css_set *cg = link->cg;
- if (atomic_read(&cg->refcount) > 0)
+ if (cg && (atomic_read(&cg->refcount) > 0)) {
+ read_unlock(&css_set_lock);
return 0;
+ }
}
+ read_unlock(&css_set_lock);
return 1;
}
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index faeb4b7..1e5bfd8 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1609,8 +1609,7 @@
smp_wmb();
raw_spin_lock_irqsave(&p->pi_lock, flags);
- src_cpu = task_cpu(p);
- cpu = src_cpu;
+ src_cpu = cpu = task_cpu(p);
if (!(p->state & state))
goto out;
@@ -1652,6 +1651,9 @@
p->sched_class->task_waking(p);
cpu = select_task_rq(p, SD_BALANCE_WAKE, wake_flags);
+
+ /* Refresh src_cpu as it could have changed since we last read it */
+ src_cpu = task_cpu(p);
if (src_cpu != cpu) {
wake_flags |= WF_MIGRATED;
set_task_cpu(p, cpu);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d4c0534..7eefa94 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -657,6 +657,8 @@
int migratetype = 0;
int batch_free = 0;
int to_free = count;
+ int free = 0;
+ int cma_free = 0;
int mt = 0;
spin_lock(&zone->lock);
@@ -687,17 +689,23 @@
do {
page = list_entry(list->prev, struct page, lru);
mt = get_pageblock_migratetype(page);
+ if (likely(mt != MIGRATE_ISOLATE))
+ mt = page_private(page);
+
/* must delete as __free_one_page list manipulates */
list_del(&page->lru);
/* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */
- __free_one_page(page, zone, 0, page_private(page));
- trace_mm_page_pcpu_drain(page, 0, page_private(page));
- if (is_migrate_cma(mt))
- __mod_zone_page_state(zone,
- NR_FREE_CMA_PAGES, 1);
+ __free_one_page(page, zone, 0, mt);
+ trace_mm_page_pcpu_drain(page, 0, mt);
+ if (likely(mt != MIGRATE_ISOLATE)) {
+ free++;
+ if (is_migrate_cma(mt))
+ cma_free++;
+ }
} while (--to_free && --batch_free && !list_empty(list));
}
- __mod_zone_page_state(zone, NR_FREE_PAGES, count);
+ __mod_zone_page_state(zone, NR_FREE_PAGES, free);
+ __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, cma_free);
spin_unlock(&zone->lock);
}
diff --git a/net/Kconfig b/net/Kconfig
index c8ee300..26c8cb8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -274,6 +274,15 @@
packet sniffing (libpcap/tcpdump). Note : Admin should enable
this feature changing /proc/sys/net/core/bpf_jit_enable
+config SOCKEV_NLMCAST
+ bool "Enable SOCKEV Netlink Multicast"
+ default n
+ ---help---
+ Default client for SOCKEV notifier events. Sends multicast netlink
+ messages whenever the socket event notifier is invoked. Enable if
+ user space entities need to be notified of socket events without
+ having to poll /proc
+
menu "Network testing"
config NET_PKTGEN
diff --git a/net/core/Makefile b/net/core/Makefile
index 674641b..b293e67 100644
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -21,3 +21,4 @@
obj-$(CONFIG_NET_DROP_MONITOR) += drop_monitor.o
obj-$(CONFIG_NETWORK_PHY_TIMESTAMPING) += timestamping.o
obj-$(CONFIG_NETPRIO_CGROUP) += netprio_cgroup.o
+obj-$(CONFIG_SOCKEV_NLMCAST) += sockev_nlmcast.o
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index c02e63c..91ede8b 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -17,6 +17,12 @@
#include <net/sock.h>
#include <net/fib_rules.h>
+#define INVALID_UID ((uid_t) -1)
+#define uid_valid(uid) ((uid) != -1)
+#define uid_lte(a, b) ((a) <= (b))
+#define uid_eq(a, b) ((a) == (b))
+#define uid_gte(a, b) ((a) >= (b))
+
int fib_default_rule_add(struct fib_rules_ops *ops,
u32 pref, u32 table, u32 flags)
{
@@ -31,6 +37,8 @@
r->pref = pref;
r->table = table;
r->flags = flags;
+ r->uid_start = INVALID_UID;
+ r->uid_end = INVALID_UID;
r->fr_net = hold_net(ops->fro_net);
/* The lock is not required here, the list in unreacheable
@@ -177,6 +185,23 @@
}
EXPORT_SYMBOL_GPL(fib_rules_unregister);
+static inline uid_t fib_nl_uid(struct nlattr *nla)
+{
+ return nla_get_u32(nla);
+}
+
+static int nla_put_uid(struct sk_buff *skb, int idx, uid_t uid)
+{
+ return nla_put_u32(skb, idx, uid);
+}
+
+static int fib_uid_range_match(struct flowi *fl, struct fib_rule *rule)
+{
+ return (!uid_valid(rule->uid_start) && !uid_valid(rule->uid_end)) ||
+ (uid_gte(fl->flowi_uid, rule->uid_start) &&
+ uid_lte(fl->flowi_uid, rule->uid_end));
+}
+
static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,
struct flowi *fl, int flags)
{
@@ -191,6 +216,9 @@
if ((rule->mark ^ fl->flowi_mark) & rule->mark_mask)
goto out;
+ if (!fib_uid_range_match(fl, rule))
+ goto out;
+
ret = ops->match(rule, fl, flags);
out:
return (rule->flags & FIB_RULE_INVERT) ? !ret : ret;
@@ -361,6 +389,19 @@
} else if (rule->action == FR_ACT_GOTO)
goto errout_free;
+ /* UID start and end must either both be valid or both unspecified. */
+ rule->uid_start = rule->uid_end = INVALID_UID;
+ if (tb[FRA_UID_START] || tb[FRA_UID_END]) {
+ if (tb[FRA_UID_START] && tb[FRA_UID_END]) {
+ rule->uid_start = fib_nl_uid(tb[FRA_UID_START]);
+ rule->uid_end = fib_nl_uid(tb[FRA_UID_END]);
+ }
+ if (!uid_valid(rule->uid_start) ||
+ !uid_valid(rule->uid_end) ||
+ !uid_lte(rule->uid_start, rule->uid_end))
+ goto errout_free;
+ }
+
err = ops->configure(rule, skb, frh, tb);
if (err < 0)
goto errout_free;
@@ -466,6 +507,14 @@
(rule->mark_mask != nla_get_u32(tb[FRA_FWMASK])))
continue;
+ if (tb[FRA_UID_START] &&
+ !uid_eq(rule->uid_start, fib_nl_uid(tb[FRA_UID_START])))
+ continue;
+
+ if (tb[FRA_UID_END] &&
+ !uid_eq(rule->uid_end, fib_nl_uid(tb[FRA_UID_END])))
+ continue;
+
if (!ops->compare(rule, frh, tb))
continue;
@@ -520,7 +569,9 @@
+ nla_total_size(4) /* FRA_PRIORITY */
+ nla_total_size(4) /* FRA_TABLE */
+ nla_total_size(4) /* FRA_FWMARK */
- + nla_total_size(4); /* FRA_FWMASK */
+ + nla_total_size(4) /* FRA_FWMASK */
+ + nla_total_size(4) /* FRA_UID_START */
+ + nla_total_size(4); /* FRA_UID_END */
if (ops->nlmsg_payload)
payload += ops->nlmsg_payload(rule);
@@ -578,6 +629,12 @@
if (rule->target)
NLA_PUT_U32(skb, FRA_GOTO, rule->target);
+ if (uid_valid(rule->uid_start))
+ nla_put_uid(skb, FRA_UID_START, rule->uid_start);
+
+ if (uid_valid(rule->uid_end))
+ nla_put_uid(skb, FRA_UID_END, rule->uid_end);
+
if (ops->fill(rule, skb, frh) < 0)
goto nla_put_failure;
diff --git a/net/core/sockev_nlmcast.c b/net/core/sockev_nlmcast.c
new file mode 100644
index 0000000..251e01a
--- /dev/null
+++ b/net/core/sockev_nlmcast.c
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ *
+ *
+ * Default SOCKEV client implementation
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/export.h>
+#include <linux/netlink.h>
+#include <linux/sockev.h>
+#include <net/sock.h>
+
+static int registration_status;
+static struct sock *socknlmsgsk;
+
+static void sockev_skmsg_recv(struct sk_buff *skb)
+{
+ pr_debug("%s(): Got unsolicited request\n", __func__);
+}
+
+static void _sockev_event(unsigned long event, __u8 *evstr, int buflen)
+{
+ switch (event) {
+ case SOCKEV_SOCKET:
+ strlcpy(evstr, "SOCKEV_SOCKET", buflen);
+ break;
+ case SOCKEV_BIND:
+ strlcpy(evstr, "SOCKEV_BIND", buflen);
+ break;
+ case SOCKEV_LISTEN:
+ strlcpy(evstr, "SOCKEV_LISTEN", buflen);
+ break;
+ case SOCKEV_ACCEPT:
+ strlcpy(evstr, "SOCKEV_ACCEPT", buflen);
+ break;
+ case SOCKEV_CONNECT:
+ strlcpy(evstr, "SOCKEV_CONNECT", buflen);
+ break;
+ case SOCKEV_SHUTDOWN:
+ strlcpy(evstr, "SOCKEV_SHUTDOWN", buflen);
+ break;
+ default:
+ strlcpy(evstr, "UNKOWN", buflen);
+ }
+}
+
+static int sockev_client_cb(struct notifier_block *nb,
+ unsigned long event, void *data)
+{
+
+ struct sk_buff *skb;
+ struct nlmsghdr *nlh;
+ struct sknlsockevmsg *smsg;
+ struct socket *sock;
+
+ sock = (struct socket *)data;
+ if (socknlmsgsk == 0)
+ goto done;
+ if ((socknlmsgsk == NULL) || (sock == NULL) || (sock->sk == NULL))
+ goto done;
+
+ skb = nlmsg_new(sizeof(struct sknlsockevmsg), GFP_KERNEL);
+ if (skb == NULL)
+ goto done;
+
+ nlh = nlmsg_put(skb, 0, 0, event, sizeof(struct sknlsockevmsg), 0);
+ if (nlh == NULL) {
+ kfree_skb(skb);
+ goto done;
+ }
+
+ NETLINK_CB(skb).dst_group = SKNLGRP_SOCKEV;
+
+ smsg = nlmsg_data(nlh);
+ smsg->pid = current->pid;
+ _sockev_event(event, smsg->event, sizeof(smsg->event));
+ smsg->skfamily = sock->sk->sk_family;
+ smsg->skstate = sock->sk->sk_state;
+ smsg->skprotocol = sock->sk->sk_protocol;
+ smsg->sktype = sock->sk->sk_type;
+ smsg->skflags = sock->sk->sk_flags;
+
+ nlmsg_notify(socknlmsgsk, skb, 0, SKNLGRP_SOCKEV, 0, GFP_KERNEL);
+done:
+ return 0;
+}
+
+static struct notifier_block sockev_notifier_client = {
+ .notifier_call = sockev_client_cb,
+ .next = 0,
+ .priority = 0
+};
+
+/* ***************** Startup/Shutdown *************************************** */
+
+static int __init sockev_client_init(void)
+{
+ int rc;
+ registration_status = 1;
+ rc = sockev_register_notify(&sockev_notifier_client);
+ if (rc != 0) {
+ registration_status = 0;
+ pr_err("%s(): Failed to register cb (%d)\n", __func__, rc);
+ }
+ socknlmsgsk = netlink_kernel_create(&init_net,
+ NETLINK_SOCKEV,
+ 0,
+ sockev_skmsg_recv,
+ NULL,
+ THIS_MODULE);
+ if (!socknlmsgsk) {
+ pr_err("%s(): Failed to initialize netlink socket\n", __func__);
+ if (registration_status)
+ sockev_unregister_notify(&sockev_notifier_client);
+ registration_status = 0;
+ }
+
+ return rc;
+}
+static void __exit sockev_client_exit(void)
+{
+ if (registration_status)
+ sockev_unregister_notify(&sockev_notifier_client);
+}
+module_init(sockev_client_init)
+module_exit(sockev_client_exit)
+MODULE_LICENSE("GPL v2");
+
+
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index cbe3a68..0a24199 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -481,6 +481,7 @@
[RTA_METRICS] = { .type = NLA_NESTED },
[RTA_MULTIPATH] = { .len = sizeof(struct rtnexthop) },
[RTA_FLOW] = { .type = NLA_U32 },
+ [RTA_UID] = { .type = NLA_U32 },
};
static int rtm_to_fib_config(struct net *net, struct sk_buff *skb,
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 19d66ce..b902d58 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -365,7 +365,8 @@
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
sk->sk_protocol, inet_sk_flowi_flags(sk),
(opt && opt->opt.srr) ? opt->opt.faddr : ireq->rmt_addr,
- ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport);
+ ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport,
+ sock_i_uid(sk));
security_req_classify_flow(req, flowi4_to_flowi(fl4));
rt = ip_route_output_flow(net, fl4, sk);
if (IS_ERR(rt))
@@ -398,7 +399,8 @@
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
sk->sk_protocol, inet_sk_flowi_flags(sk),
(opt && opt->opt.srr) ? opt->opt.faddr : ireq->rmt_addr,
- ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport);
+ ireq->loc_addr, ireq->rmt_port, inet_sk(sk)->inet_sport,
+ sock_i_uid(sk));
security_req_classify_flow(req, flowi4_to_flowi(fl4));
rt = ip_route_output_flow(net, fl4, sk);
if (IS_ERR(rt))
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 4910176..c8e10a5 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1505,7 +1505,8 @@
RT_SCOPE_UNIVERSE, sk->sk_protocol,
ip_reply_arg_flowi_flags(arg),
daddr, rt->rt_spec_dst,
- tcp_hdr(skb)->source, tcp_hdr(skb)->dest);
+ tcp_hdr(skb)->source, tcp_hdr(skb)->dest,
+ arg->uid);
security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
rt = ip_route_output_key(sock_net(sk), &fl4);
if (IS_ERR(rt))
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 5f2ee64..63b3dc7 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -772,7 +772,8 @@
flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
RT_SCOPE_UNIVERSE, sk->sk_protocol,
- inet_sk_flowi_flags(sk), faddr, saddr, 0, 0);
+ inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,
+ sock_i_uid(sk));
security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
rt = ip_route_output_flow(net, &fl4, sk);
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index bbd604c..b5b563d 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -567,7 +567,8 @@
RT_SCOPE_UNIVERSE,
inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP,
- daddr, saddr, 0, 0);
+ daddr, saddr, 0, 0,
+ sock_i_uid(sk));
if (!inet->hdrincl) {
err = raw_probe_proto_opt(&fl4, msg);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index d02a8da..3ab9d27 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -741,6 +741,7 @@
(rt1->rt_mark ^ rt2->rt_mark) |
(rt1->rt_key_tos ^ rt2->rt_key_tos) |
(rt1->rt_route_iif ^ rt2->rt_route_iif) |
+ (rt1->rt_uid ^ rt2->rt_uid) |
(rt1->rt_oif ^ rt2->rt_oif)) == 0;
}
@@ -1881,6 +1882,7 @@
fl4.flowi4_oif = rt->dst.dev->ifindex;
fl4.flowi4_iif = skb->dev->ifindex;
fl4.flowi4_mark = skb->mark;
+ fl4.flowi4_uid = skb->sk ? sock_i_uid(skb->sk) : 0;
rcu_read_lock();
if (fib_lookup(dev_net(rt->dst.dev), &fl4, &res) == 0)
@@ -2064,6 +2066,7 @@
rth->rt_iif = dev->ifindex;
rth->rt_oif = 0;
rth->rt_mark = skb->mark;
+ rth->rt_uid = 0;
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->rt_peer_genid = 0;
@@ -2193,6 +2196,7 @@
rth->rt_iif = in_dev->dev->ifindex;
rth->rt_oif = 0;
rth->rt_mark = skb->mark;
+ rth->rt_uid = 0;
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->rt_peer_genid = 0;
@@ -2376,6 +2380,7 @@
rth->rt_iif = dev->ifindex;
rth->rt_oif = 0;
rth->rt_mark = skb->mark;
+ rth->rt_uid = 0;
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->rt_peer_genid = 0;
@@ -2580,6 +2585,7 @@
rth->rt_iif = orig_oif ? : dev_out->ifindex;
rth->rt_oif = orig_oif;
rth->rt_mark = fl4->flowi4_mark;
+ rth->rt_uid = fl4->flowi4_uid;
rth->rt_gateway = fl4->daddr;
rth->rt_spec_dst= fl4->saddr;
rth->rt_peer_genid = 0;
@@ -2831,6 +2837,7 @@
rt_is_output_route(rth) &&
rth->rt_oif == flp4->flowi4_oif &&
rth->rt_mark == flp4->flowi4_mark &&
+ rth->rt_uid == flp4->flowi4_uid &&
!((rth->rt_key_tos ^ flp4->flowi4_tos) &
(IPTOS_RT_MASK | RTO_ONLINK)) &&
net_eq(dev_net(rth->dst.dev), net) &&
@@ -2912,6 +2919,7 @@
rt->rt_iif = ort->rt_iif;
rt->rt_oif = ort->rt_oif;
rt->rt_mark = ort->rt_mark;
+ rt->rt_uid = ort->rt_uid;
rt->rt_genid = rt_genid(net);
rt->rt_flags = ort->rt_flags;
@@ -3007,6 +3015,9 @@
if (rt->rt_mark)
NLA_PUT_BE32(skb, RTA_MARK, rt->rt_mark);
+ if (rt->rt_uid != (uid_t) -1)
+ NLA_PUT_BE32(skb, RTA_UID, rt->rt_uid);
+
error = rt->dst.error;
if (peer) {
inet_peer_refcheck(rt->peer);
@@ -3126,6 +3137,7 @@
.flowi4_tos = rtm->rtm_tos,
.flowi4_oif = tb[RTA_OIF] ? nla_get_u32(tb[RTA_OIF]) : 0,
.flowi4_mark = mark,
+ .flowi4_uid = tb[RTA_UID] ? nla_get_u32(tb[RTA_UID]) : current_uid(),
};
rt = ip_route_output_key(net, &fl4);
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index eab2a7f..7f4dba3 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -351,7 +351,8 @@
RT_SCOPE_UNIVERSE, IPPROTO_TCP,
inet_sk_flowi_flags(sk),
(opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
- ireq->loc_addr, th->source, th->dest);
+ ireq->loc_addr, th->source, th->dest,
+ sock_i_uid(sk));
security_req_classify_flow(req, flowi4_to_flowi(&fl4));
rt = ip_route_output_key(sock_net(sk), &fl4);
if (IS_ERR(rt)) {
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 7c9e1ab..72f2bb9 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -931,7 +931,8 @@
flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos,
RT_SCOPE_UNIVERSE, sk->sk_protocol,
inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP,
- faddr, saddr, dport, inet->inet_sport);
+ faddr, saddr, dport, inet->inet_sport,
+ sock_i_uid(sk));
security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
rt = ip_route_output_flow(net, fl4, sk);
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index a0b4c5d..e8ee427 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -86,6 +86,7 @@
xdst->u.rt.rt_iif = fl4->flowi4_iif;
xdst->u.rt.rt_oif = fl4->flowi4_oif;
xdst->u.rt.rt_mark = fl4->flowi4_mark;
+ xdst->u.rt.rt_uid = fl4->flowi4_uid;
xdst->u.dst.dev = dev;
dev_hold(dev);
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 22ebbb9..296886b 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -702,6 +702,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = inet->inet_dport;
fl6.fl6_sport = inet->inet_sport;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
final_p = fl6_update_dst(&fl6, np->opt, &final);
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 76832c8..ae4d713 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -160,6 +160,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = inet->inet_dport;
fl6.fl6_sport = inet->inet_sport;
+ fl6.flowi6_uid = sock_i_uid(sk);
if (!fl6.flowi6_oif && (addr_type&IPV6_ADDR_MULTICAST))
fl6.flowi6_oif = np->mcast_oif;
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 02dd203..21ee002 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -72,6 +72,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = inet_rsk(req)->rmt_port;
fl6.fl6_sport = inet_rsk(req)->loc_port;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_req_classify_flow(req, flowi6_to_flowi(&fl6));
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
@@ -223,6 +224,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_sport = inet->inet_sport;
fl6.fl6_dport = inet->inet_dport;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
final_p = fl6_update_dst(&fl6, np->opt, &final);
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 5bd6c0a..7559966 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -162,6 +162,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_icmp_type = user_icmph.icmp6_type;
fl6.fl6_icmp_code = user_icmph.icmp6_code;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 5bddea7..49ec3f8 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -761,6 +761,7 @@
memset(&fl6, 0, sizeof(fl6));
fl6.flowi6_mark = sk->sk_mark;
+ fl6.flowi6_uid = sock_i_uid(sk);
if (sin6) {
if (addr_len < SIN6_LEN_RFC2133)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 76e2afe..eabab4a 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2279,6 +2279,7 @@
[RTA_IIF] = { .type = NLA_U32 },
[RTA_PRIORITY] = { .type = NLA_U32 },
[RTA_METRICS] = { .type = NLA_NESTED },
+ [RTA_UID] = { .type = NLA_U32 },
};
static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -2591,6 +2592,11 @@
if (tb[RTA_OIF])
oif = nla_get_u32(tb[RTA_OIF]);
+ if (tb[RTA_UID])
+ fl6.flowi6_uid = nla_get_u32(tb[RTA_UID]);
+ else
+ fl6.flowi6_uid = (iif ? (uid_t) -1 : current_uid());
+
if (iif) {
struct net_device *dev;
int flags = 0;
diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c
index 8e951d8..83ee321 100644
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
@@ -244,6 +244,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = inet_rsk(req)->rmt_port;
fl6.fl6_sport = inet_sk(sk)->inet_sport;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_req_classify_flow(req, flowi6_to_flowi(&fl6));
dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 98256cf..806fafd 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -251,6 +251,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = usin->sin6_port;
fl6.fl6_sport = inet->inet_sport;
+ fl6.flowi6_uid = sock_i_uid(sk);
final_p = fl6_update_dst(&fl6, np->opt, &final);
@@ -404,6 +405,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = inet->inet_dport;
fl6.fl6_sport = inet->inet_sport;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_skb_classify_flow(skb, flowi6_to_flowi(&fl6));
dst = ip6_dst_lookup_flow(sk, &fl6, NULL, false);
@@ -496,6 +498,7 @@
fl6.flowi6_mark = sk->sk_mark;
fl6.fl6_dport = inet_rsk(req)->rmt_port;
fl6.fl6_sport = inet_rsk(req)->loc_port;
+ fl6.flowi6_uid = sock_i_uid(sk);
security_req_classify_flow(req, flowi6_to_flowi(&fl6));
opt = np->opt;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 37b0699..a20d55d 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1087,6 +1087,7 @@
fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
fl6.flowi6_mark = sk->sk_mark;
+ fl6.flowi6_uid = sock_i_uid(sk);
if (msg->msg_controllen) {
opt = &opt_space;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 562f6b7..d321483 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1354,7 +1354,8 @@
dst_pid = addr->nl_pid;
dst_group = ffs(addr->nl_groups);
err = -EPERM;
- if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND))
+ if ((dst_group || dst_pid) &&
+ !netlink_capable(sock, NL_NONROOT_SEND))
goto out;
} else {
dst_pid = nlk->dst_pid;
@@ -2129,6 +2130,7 @@
rcu_assign_pointer(nl_table[NETLINK_USERSOCK].listeners, listeners);
nl_table[NETLINK_USERSOCK].module = THIS_MODULE;
nl_table[NETLINK_USERSOCK].registered = 1;
+ nl_table[NETLINK_USERSOCK].nl_nonroot = NL_NONROOT_SEND;
netlink_table_ungrab();
}
diff --git a/net/socket.c b/net/socket.c
index 851edcd..3548af3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -105,6 +105,8 @@
#include <linux/sockios.h>
#include <linux/atalk.h>
+static BLOCKING_NOTIFIER_HEAD(sockev_notifier_list);
+
static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
unsigned long nr_segs, loff_t pos);
@@ -165,6 +167,14 @@
static DEFINE_PER_CPU(int, sockets_in_use);
/*
+ * Socket Event framework helpers
+ */
+static void sockev_notify(unsigned long event, struct socket *sk)
+{
+ blocking_notifier_call_chain(&sockev_notifier_list, event, sk);
+}
+
+/**
* Support routines.
* Move socket addresses back and forth across the kernel/user
* divide and look after the messy bits.
@@ -1343,6 +1353,9 @@
if (retval < 0)
goto out;
+ if (retval == 0)
+ sockev_notify(SOCKEV_SOCKET, sock);
+
retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
if (retval < 0)
goto out_release;
@@ -1460,6 +1473,8 @@
&address, addrlen);
}
fput_light(sock->file, fput_needed);
+ if (!err)
+ sockev_notify(SOCKEV_BIND, sock);
}
return err;
}
@@ -1487,6 +1502,8 @@
err = sock->ops->listen(sock, backlog);
fput_light(sock->file, fput_needed);
+ if (!err)
+ sockev_notify(SOCKEV_LISTEN, sock);
}
return err;
}
@@ -1566,7 +1583,8 @@
fd_install(newfd, newfile);
err = newfd;
-
+ if (!err)
+ sockev_notify(SOCKEV_ACCEPT, sock);
out_put:
fput_light(sock->file, fput_needed);
out:
@@ -1616,6 +1634,8 @@
err = sock->ops->connect(sock, (struct sockaddr *)&address, addrlen,
sock->file->f_flags);
+ if (!err)
+ sockev_notify(SOCKEV_CONNECT, sock);
out_put:
fput_light(sock->file, fput_needed);
out:
@@ -1876,6 +1896,7 @@
sock = sockfd_lookup_light(fd, &err, &fput_needed);
if (sock != NULL) {
+ sockev_notify(SOCKEV_SHUTDOWN, sock);
err = security_socket_shutdown(sock, how);
if (!err)
err = sock->ops->shutdown(sock, how);
@@ -3378,3 +3399,15 @@
return sock->ops->shutdown(sock, how);
}
EXPORT_SYMBOL(kernel_sock_shutdown);
+
+int sockev_register_notify(struct notifier_block *nb)
+{
+ return blocking_notifier_chain_register(&sockev_notifier_list, nb);
+}
+EXPORT_SYMBOL(sockev_register_notify);
+
+int sockev_unregister_notify(struct notifier_block *nb)
+{
+ return blocking_notifier_chain_unregister(&sockev_notifier_list, nb);
+}
+EXPORT_SYMBOL(sockev_unregister_notify);
diff --git a/net/wireless/db.txt b/net/wireless/db.txt
index 91591c7..5f8b5c2 100644
--- a/net/wireless/db.txt
+++ b/net/wireless/db.txt
@@ -434,8 +434,8 @@
country IL:
(2402 - 2482 @ 40), (N/A, 20)
- (5150 - 5250 @ 80), (N/A, 200 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (N/A, 200 mW), NO-OUTDOOR, DFS
+ (5150 - 5250 @ 80), (N/A, 20)
+ (5250 - 5330 @ 80), (N/A, 20), DFS
country IN:
(2402 - 2482 @ 40), (N/A, 20)
@@ -636,7 +636,7 @@
(5735 - 5835 @ 80), (N/A, 30)
country MX:
- (2402 - 2472 @ 40), (3, 27)
+ (2402 - 2482 @ 40), (3, 20)
(5170 - 5250 @ 80), (3, 17)
(5250 - 5330 @ 80), (3, 24), DFS
(5490 - 5730 @ 80), (3, 24), DFS
@@ -859,9 +859,10 @@
(2402 - 2482 @ 40), (N/A, 20)
country TW:
- (2402 - 2472 @ 40), (3, 27)
- (5270 - 5330 @ 40), (6, 17), DFS
- (5490 - 5730 @ 80), (6, 30), DFS
+ (2402 - 2472 @ 40), (3, 30)
+ (5270 - 5330 @ 40), (6, 17)
+ (5490 - 5590 @ 80), (6, 30), DFS
+ (5650 - 5730 @ 80), (6, 30), DFS
(5735 - 5815 @ 80), (6, 30)
country TH:
@@ -988,10 +989,9 @@
country ZA:
(2402 - 2482 @ 40), (N/A, 20)
- (5170 - 5250 @ 80), (3, 17)
- (5250 - 5330 @ 80), (3, 24), DFS
- (5490 - 5710 @ 80), (3, 24), DFS
- (5735 - 5835 @ 80), (3, 30)
+ (5170 - 5250 @ 80), (3, 20)
+ (5250 - 5330 @ 80), (3, 20), DFS
+ (5490 - 5710 @ 80), (3, 27), DFS
country ZW:
(2402 - 2482 @ 40), (N/A, 20)
diff --git a/sound/soc/codecs/wcd9306.c b/sound/soc/codecs/wcd9306.c
index 314c4f9..b35f7fb 100644
--- a/sound/soc/codecs/wcd9306.c
+++ b/sound/soc/codecs/wcd9306.c
@@ -1149,6 +1149,14 @@
40, digital_gain),
SOC_SINGLE_S8_TLV("IIR1 INP4 Volume", TAPAN_A_CDC_IIR1_GAIN_B4_CTL, -84,
40, digital_gain),
+ SOC_SINGLE_S8_TLV("IIR2 INP1 Volume", TAPAN_A_CDC_IIR2_GAIN_B1_CTL, -84,
+ 40, digital_gain),
+ SOC_SINGLE_S8_TLV("IIR2 INP2 Volume", TAPAN_A_CDC_IIR2_GAIN_B2_CTL, -84,
+ 40, digital_gain),
+ SOC_SINGLE_S8_TLV("IIR2 INP3 Volume", TAPAN_A_CDC_IIR2_GAIN_B3_CTL, -84,
+ 40, digital_gain),
+ SOC_SINGLE_S8_TLV("IIR2 INP4 Volume", TAPAN_A_CDC_IIR2_GAIN_B4_CTL, -84,
+ 40, digital_gain),
SOC_ENUM("TX1 HPF cut off", cf_dec1_enum),
SOC_ENUM("TX2 HPF cut off", cf_dec2_enum),
@@ -1318,7 +1326,7 @@
"ZERO", "EAR_HPH_L", "EAR_LINE_1",
};
-static const char * const iir1_inp1_text[] = {
+static const char * const iir_inp_text[] = {
"ZERO", "DEC1", "DEC2", "DEC3", "DEC4",
"RX1", "RX2", "RX3", "RX4", "RX5"
};
@@ -1422,7 +1430,28 @@
SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_ANC_B2_CTL, 0, 3, anc1_fb_mux_text);
static const struct soc_enum iir1_inp1_mux_enum =
- SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ1_B1_CTL, 0, 10, iir1_inp1_text);
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ1_B1_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir1_inp2_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ1_B2_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir1_inp3_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ1_B3_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir1_inp4_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ1_B4_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir2_inp1_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ2_B1_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir2_inp2_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ2_B2_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir2_inp3_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ2_B3_CTL, 0, 10, iir_inp_text);
+
+static const struct soc_enum iir2_inp4_mux_enum =
+ SOC_ENUM_SINGLE(TAPAN_A_CDC_CONN_EQ2_B4_CTL, 0, 10, iir_inp_text);
static const struct snd_kcontrol_new rx_mix1_inp1_mux =
SOC_DAPM_ENUM("RX1 MIX1 INP1 Mux", rx_mix1_inp1_chain_enum);
@@ -1601,6 +1630,27 @@
static const struct snd_kcontrol_new iir1_inp1_mux =
SOC_DAPM_ENUM("IIR1 INP1 Mux", iir1_inp1_mux_enum);
+static const struct snd_kcontrol_new iir1_inp2_mux =
+ SOC_DAPM_ENUM("IIR1 INP2 Mux", iir1_inp2_mux_enum);
+
+static const struct snd_kcontrol_new iir1_inp3_mux =
+ SOC_DAPM_ENUM("IIR1 INP3 Mux", iir1_inp3_mux_enum);
+
+static const struct snd_kcontrol_new iir1_inp4_mux =
+ SOC_DAPM_ENUM("IIR1 INP4 Mux", iir1_inp4_mux_enum);
+
+static const struct snd_kcontrol_new iir2_inp1_mux =
+ SOC_DAPM_ENUM("IIR2 INP1 Mux", iir2_inp1_mux_enum);
+
+static const struct snd_kcontrol_new iir2_inp2_mux =
+ SOC_DAPM_ENUM("IIR2 INP2 Mux", iir2_inp2_mux_enum);
+
+static const struct snd_kcontrol_new iir2_inp3_mux =
+ SOC_DAPM_ENUM("IIR2 INP3 Mux", iir2_inp3_mux_enum);
+
+static const struct snd_kcontrol_new iir2_inp4_mux =
+ SOC_DAPM_ENUM("IIR2 INP4 Mux", iir2_inp4_mux_enum);
+
static const struct snd_kcontrol_new anc1_mux =
SOC_DAPM_ENUM("ANC1 MUX Mux", anc1_mux_enum);
@@ -3119,12 +3169,14 @@
{"RX1 MIX1 INP1", "RX4", "SLIM RX4"},
{"RX1 MIX1 INP1", "RX5", "SLIM RX5"},
{"RX1 MIX1 INP1", "IIR1", "IIR1"},
+ {"RX1 MIX1 INP1", "IIR2", "IIR2"},
{"RX1 MIX1 INP2", "RX1", "SLIM RX1"},
{"RX1 MIX1 INP2", "RX2", "SLIM RX2"},
{"RX1 MIX1 INP2", "RX3", "SLIM RX3"},
{"RX1 MIX1 INP2", "RX4", "SLIM RX4"},
{"RX1 MIX1 INP2", "RX5", "SLIM RX5"},
{"RX1 MIX1 INP2", "IIR1", "IIR1"},
+ {"RX1 MIX1 INP2", "IIR2", "IIR2"},
{"RX1 MIX1 INP3", "RX1", "SLIM RX1"},
{"RX1 MIX1 INP3", "RX2", "SLIM RX2"},
{"RX1 MIX1 INP3", "RX3", "SLIM RX3"},
@@ -3136,30 +3188,39 @@
{"RX2 MIX1 INP1", "RX4", "SLIM RX4"},
{"RX2 MIX1 INP1", "RX5", "SLIM RX5"},
{"RX2 MIX1 INP1", "IIR1", "IIR1"},
+ {"RX2 MIX1 INP1", "IIR2", "IIR2"},
{"RX2 MIX1 INP2", "RX1", "SLIM RX1"},
{"RX2 MIX1 INP2", "RX2", "SLIM RX2"},
{"RX2 MIX1 INP2", "RX3", "SLIM RX3"},
{"RX2 MIX1 INP2", "RX4", "SLIM RX4"},
{"RX2 MIX1 INP2", "RX5", "SLIM RX5"},
{"RX2 MIX1 INP2", "IIR1", "IIR1"},
+ {"RX2 MIX1 INP2", "IIR2", "IIR2"},
{"RX3 MIX1 INP1", "RX1", "SLIM RX1"},
{"RX3 MIX1 INP1", "RX2", "SLIM RX2"},
{"RX3 MIX1 INP1", "RX3", "SLIM RX3"},
{"RX3 MIX1 INP1", "RX4", "SLIM RX4"},
{"RX3 MIX1 INP1", "RX5", "SLIM RX5"},
{"RX3 MIX1 INP1", "IIR1", "IIR1"},
+ {"RX3 MIX1 INP1", "IIR2", "IIR2"},
{"RX3 MIX1 INP2", "RX1", "SLIM RX1"},
{"RX3 MIX1 INP2", "RX2", "SLIM RX2"},
{"RX3 MIX1 INP2", "RX3", "SLIM RX3"},
{"RX3 MIX1 INP2", "RX4", "SLIM RX4"},
{"RX3 MIX1 INP2", "RX5", "SLIM RX5"},
{"RX3 MIX1 INP2", "IIR1", "IIR1"},
+ {"RX3 MIX1 INP2", "IIR2", "IIR2"},
{"RX1 MIX2 INP1", "IIR1", "IIR1"},
{"RX1 MIX2 INP2", "IIR1", "IIR1"},
{"RX2 MIX2 INP1", "IIR1", "IIR1"},
{"RX2 MIX2 INP2", "IIR1", "IIR1"},
+ {"RX1 MIX2 INP1", "IIR2", "IIR2"},
+ {"RX1 MIX2 INP2", "IIR2", "IIR2"},
+ {"RX2 MIX2 INP1", "IIR2", "IIR2"},
+ {"RX2 MIX2 INP2", "IIR2", "IIR2"},
+
/* Decimator Inputs */
{"DEC1 MUX", "ADC1", "ADC1"},
{"DEC1 MUX", "ADC2", "ADC2"},
@@ -3190,10 +3251,6 @@
{"LINEOUT1_PA_MIXER", "AUX_PGA_L Switch", "AUX_PGA_Left"},
{"LINEOUT2_PA_MIXER", "AUX_PGA_R Switch", "AUX_PGA_Right"},
- {"IIR1", NULL, "IIR1 INP1 MUX"},
- {"IIR1 INP1 MUX", "DEC1", "DEC1 MUX"},
- {"IIR1 INP1 MUX", "DEC2", "DEC2 MUX"},
-
{"MIC BIAS1 Internal1", NULL, "LDO_H"},
{"MIC BIAS1 Internal2", NULL, "LDO_H"},
{"MIC BIAS1 External", NULL, "LDO_H"},
@@ -3202,6 +3259,95 @@
{"MIC BIAS2 Internal3", NULL, "LDO_H"},
{"MIC BIAS2 External", NULL, "LDO_H"},
{DAPM_MICBIAS2_EXTERNAL_STANDALONE, NULL, "LDO_H Standalone"},
+
+ /*sidetone path enable*/
+ {"IIR1", NULL, "IIR1 INP1 MUX"},
+ {"IIR1 INP1 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR1 INP1 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR1 INP1 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR1 INP1 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR1 INP1 MUX", "RX1", "SLIM RX1"},
+ {"IIR1 INP1 MUX", "RX2", "SLIM RX2"},
+ {"IIR1 INP1 MUX", "RX3", "SLIM RX3"},
+ {"IIR1 INP1 MUX", "RX4", "SLIM RX4"},
+ {"IIR1 INP1 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR1", NULL, "IIR1 INP2 MUX"},
+ {"IIR1 INP2 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR1 INP2 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR1 INP2 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR1 INP2 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR1 INP2 MUX", "RX1", "SLIM RX1"},
+ {"IIR1 INP2 MUX", "RX2", "SLIM RX2"},
+ {"IIR1 INP2 MUX", "RX3", "SLIM RX3"},
+ {"IIR1 INP2 MUX", "RX4", "SLIM RX4"},
+ {"IIR1 INP2 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR1", NULL, "IIR1 INP3 MUX"},
+ {"IIR1 INP3 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR1 INP3 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR1 INP3 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR1 INP3 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR1 INP3 MUX", "RX1", "SLIM RX1"},
+ {"IIR1 INP3 MUX", "RX2", "SLIM RX2"},
+ {"IIR1 INP3 MUX", "RX3", "SLIM RX3"},
+ {"IIR1 INP3 MUX", "RX4", "SLIM RX4"},
+ {"IIR1 INP3 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR1", NULL, "IIR1 INP4 MUX"},
+ {"IIR1 INP4 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR1 INP4 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR1 INP4 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR1 INP4 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR1 INP4 MUX", "RX1", "SLIM RX1"},
+ {"IIR1 INP4 MUX", "RX2", "SLIM RX2"},
+ {"IIR1 INP4 MUX", "RX3", "SLIM RX3"},
+ {"IIR1 INP4 MUX", "RX4", "SLIM RX4"},
+ {"IIR1 INP4 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR2", NULL, "IIR2 INP1 MUX"},
+ {"IIR2 INP1 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR2 INP1 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR2 INP1 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR2 INP1 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR2 INP1 MUX", "RX1", "SLIM RX1"},
+ {"IIR2 INP1 MUX", "RX2", "SLIM RX2"},
+ {"IIR2 INP1 MUX", "RX3", "SLIM RX3"},
+ {"IIR2 INP1 MUX", "RX4", "SLIM RX4"},
+ {"IIR2 INP1 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR2", NULL, "IIR2 INP2 MUX"},
+ {"IIR2 INP2 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR2 INP2 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR2 INP2 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR2 INP2 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR2 INP2 MUX", "RX1", "SLIM RX1"},
+ {"IIR2 INP2 MUX", "RX2", "SLIM RX2"},
+ {"IIR2 INP2 MUX", "RX3", "SLIM RX3"},
+ {"IIR2 INP2 MUX", "RX4", "SLIM RX4"},
+ {"IIR2 INP2 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR2", NULL, "IIR2 INP3 MUX"},
+ {"IIR2 INP3 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR2 INP3 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR2 INP3 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR2 INP3 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR2 INP3 MUX", "RX1", "SLIM RX1"},
+ {"IIR2 INP3 MUX", "RX2", "SLIM RX2"},
+ {"IIR2 INP3 MUX", "RX3", "SLIM RX3"},
+ {"IIR2 INP3 MUX", "RX4", "SLIM RX4"},
+ {"IIR2 INP3 MUX", "RX5", "SLIM RX5"},
+
+ {"IIR2", NULL, "IIR2 INP4 MUX"},
+ {"IIR2 INP4 MUX", "DEC1", "DEC1 MUX"},
+ {"IIR2 INP4 MUX", "DEC2", "DEC2 MUX"},
+ {"IIR2 INP4 MUX", "DEC3", "DEC3 MUX"},
+ {"IIR2 INP4 MUX", "DEC4", "DEC4 MUX"},
+ {"IIR2 INP4 MUX", "RX1", "SLIM RX1"},
+ {"IIR2 INP4 MUX", "RX2", "SLIM RX2"},
+ {"IIR2 INP4 MUX", "RX3", "SLIM RX3"},
+ {"IIR2 INP4 MUX", "RX4", "SLIM RX4"},
+ {"IIR2 INP4 MUX", "RX5", "SLIM RX5"},
};
static const struct snd_soc_dapm_route wcd9302_map[] = {
@@ -4425,6 +4571,23 @@
return 0;
}
+static int tapan_codec_set_iir_gain(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_codec *codec = w->codec;
+ int value = 0;
+
+ switch (event) {
+ case SND_SOC_DAPM_POST_PMU:
+ value = snd_soc_read(codec, TAPAN_A_CDC_IIR1_GAIN_B1_CTL);
+ snd_soc_write(codec, TAPAN_A_CDC_IIR1_GAIN_B1_CTL, value);
+ break;
+ default:
+ pr_err("%s: event = %d not expected\n", __func__, event);
+ }
+ return 0;
+}
+
static const struct snd_soc_dapm_widget tapan_9306_dapm_widgets[] = {
/* RX4 MIX1 mux inputs */
SND_SOC_DAPM_MUX("RX4 MIX1 INP1", SND_SOC_NOPM, 0, 0,
@@ -4806,7 +4969,38 @@
&iir1_inp1_mux, tapan_codec_iir_mux_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
- SND_SOC_DAPM_PGA("IIR1", TAPAN_A_CDC_CLK_SD_CTL, 0, 0, NULL, 0),
+ SND_SOC_DAPM_PGA_E("IIR1", TAPAN_A_CDC_CLK_SD_CTL, 0, 0, NULL, 0,
+ tapan_codec_set_iir_gain, SND_SOC_DAPM_POST_PMU),
+
+ SND_SOC_DAPM_MUX_E("IIR1 INP2 MUX", TAPAN_A_CDC_IIR1_GAIN_B2_CTL, 0, 0,
+ &iir1_inp2_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_MUX_E("IIR1 INP3 MUX", TAPAN_A_CDC_IIR1_GAIN_B3_CTL, 0, 0,
+ &iir1_inp3_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_MUX_E("IIR1 INP4 MUX", TAPAN_A_CDC_IIR1_GAIN_B4_CTL, 0, 0,
+ &iir1_inp4_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_MUX_E("IIR2 INP1 MUX", TAPAN_A_CDC_IIR2_GAIN_B1_CTL, 0, 0,
+ &iir2_inp1_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_MUX_E("IIR2 INP2 MUX", TAPAN_A_CDC_IIR2_GAIN_B2_CTL, 0, 0,
+ &iir2_inp2_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_MUX_E("IIR2 INP3 MUX", TAPAN_A_CDC_IIR2_GAIN_B3_CTL, 0, 0,
+ &iir2_inp3_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_MUX_E("IIR2 INP4 MUX", TAPAN_A_CDC_IIR2_GAIN_B4_CTL, 0, 0,
+ &iir2_inp4_mux, tapan_codec_iir_mux_event,
+ SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+ SND_SOC_DAPM_PGA("IIR2", TAPAN_A_CDC_CLK_SD_CTL, 1, 0, NULL, 0),
/* AUX PGA */
SND_SOC_DAPM_ADC_E("AUX_PGA_Left", NULL, TAPAN_A_RX_AUX_SW_CTL, 7, 0,
@@ -5650,7 +5844,9 @@
mux_wait_us + WCD9XXX_USLEEP_RANGE_MARGIN_US);
break;
case PA_DISABLE:
- if (!mbhc->hph_pa_dac_state)
+ if (!mbhc->hph_pa_dac_state &&
+ (!(test_bit(MBHC_EVENT_PA_HPHL, &mbhc->event_state) ||
+ test_bit(MBHC_EVENT_PA_HPHR, &mbhc->event_state))))
wcd9xxx_enable_static_pa(mbhc, false);
wcd9xxx_restore_registers(codec, &tapan->reg_save_restore);
break;
diff --git a/sound/soc/codecs/wcd9320.c b/sound/soc/codecs/wcd9320.c
index e17925f..75a1a14 100644
--- a/sound/soc/codecs/wcd9320.c
+++ b/sound/soc/codecs/wcd9320.c
@@ -6777,7 +6777,9 @@
/* Clean up starts */
/* Turn off PA ramp generator */
snd_soc_write(codec, WCD9XXX_A_CDC_PA_RAMP_B1_CTL, 0x0);
- if (!mbhc->hph_pa_dac_state)
+ if (!mbhc->hph_pa_dac_state &&
+ (!(test_bit(MBHC_EVENT_PA_HPHL, &mbhc->event_state) ||
+ test_bit(MBHC_EVENT_PA_HPHR, &mbhc->event_state))))
wcd9xxx_enable_static_pa(mbhc, false);
wcd9xxx_restore_registers(codec, &taiko->reg_save_restore);
break;
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c
index a49866c..09721e1 100644
--- a/sound/soc/codecs/wcd9xxx-mbhc.c
+++ b/sound/soc/codecs/wcd9xxx-mbhc.c
@@ -2290,7 +2290,8 @@
* source to VDDIO
*/
if (mbhc->event_state &
- (1 << MBHC_EVENT_PA_HPHL | 1 << MBHC_EVENT_PA_HPHR))
+ (1 << MBHC_EVENT_PA_HPHL | 1 << MBHC_EVENT_PA_HPHR |
+ 1 << MBHC_EVENT_PRE_TX_1_3_ON))
__wcd9xxx_switch_micbias(mbhc, 1, false,
false);
wcd9xxx_start_hs_polling(mbhc);
diff --git a/sound/soc/msm/qdsp6v2/msm-lsm-client.c b/sound/soc/msm/qdsp6v2/msm-lsm-client.c
index ff82299..e7b0cf0 100644
--- a/sound/soc/msm/qdsp6v2/msm-lsm-client.c
+++ b/sound/soc/msm/qdsp6v2/msm-lsm-client.c
@@ -284,8 +284,32 @@
unsigned long flags;
struct snd_pcm_runtime *runtime = substream->runtime;
struct lsm_priv *prtd = runtime->private_data;
+ int ret = 0;
pr_debug("%s\n", __func__);
+ if (prtd->lsm_client->started) {
+ ret = q6lsm_stop(prtd->lsm_client, true);
+ if (ret)
+ pr_err("%s: session stop failed, err = %d\n",
+ __func__, ret);
+ else
+ pr_debug("%s: LSM client session stopped %d\n",
+ __func__, ret);
+
+ /*
+ * Go Ahead and try de-register sound model,
+ * even if stop failed
+ */
+ prtd->lsm_client->started = false;
+
+ ret = q6lsm_deregister_sound_model(prtd->lsm_client);
+ if (ret)
+ pr_err("%s: dereg_snd_model failed, err = %d\n",
+ __func__, ret);
+ else
+ pr_debug("%s: dereg_snd_model succesful\n",
+ __func__);
+ }
q6lsm_close(prtd->lsm_client);
q6lsm_client_free(prtd->lsm_client);
diff --git a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
index 1553d1c..e973d10 100644
--- a/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
@@ -3966,6 +3966,7 @@
{"CS-VOICE_UL1", NULL, "VOC_EXT_EC MUX"},
{"VOIP_UL", NULL, "VOC_EXT_EC MUX"},
{"VoLTE_UL", NULL, "VOC_EXT_EC MUX"},
+ {"VOICE2_UL", NULL, "VOC_EXT_EC MUX"},
{"AUDIO_REF_EC_UL1 MUX", "PRI_MI2S_TX" , "PRI_MI2S_TX"},
{"AUDIO_REF_EC_UL1 MUX", "SEC_MI2S_TX" , "SEC_MI2S_TX"},
diff --git a/sound/soc/msm/qdsp6v2/q6adm.c b/sound/soc/msm/qdsp6v2/q6adm.c
index 7b10815..4addcee 100644
--- a/sound/soc/msm/qdsp6v2/q6adm.c
+++ b/sound/soc/msm/qdsp6v2/q6adm.c
@@ -430,7 +430,8 @@
rc = -EINVAL;
goto adm_get_param_return;
}
- if (params_data) {
+ if ((params_data) && (adm_get_parameters[0] <
+ ARRAY_SIZE(adm_get_parameters))) {
for (i = 0; i < adm_get_parameters[0]; i++)
params_data[i] = adm_get_parameters[1+i];
}
@@ -627,7 +628,12 @@
data->payload_size))
break;
- if (data->payload_size > (4 * sizeof(uint32_t))) {
+ /* payload[3] is the param size, check if payload */
+ /* is big enough and has a valid param size */
+ if ((data->payload_size > (4 * sizeof(uint32_t))) &&
+ (payload[3] <= ADM_GET_PARAMETER_LENGTH) &&
+ (adm_get_parameters[0] <
+ ARRAY_SIZE(adm_get_parameters))) {
adm_get_parameters[0] = payload[3];
pr_debug("GET_PP PARAM:received parameter length: %x\n",
adm_get_parameters[0]);
diff --git a/sound/soc/msm/qdsp6v2/q6afe.c b/sound/soc/msm/qdsp6v2/q6afe.c
index fc82215..a7a5d1e 100644
--- a/sound/soc/msm/qdsp6v2/q6afe.c
+++ b/sound/soc/msm/qdsp6v2/q6afe.c
@@ -2899,8 +2899,9 @@
__func__, pcm_afe_instance[port_id & 0x1]);
port_id = VIRTUAL_ID_TO_PORTID(port_id);
pcm_afe_instance[port_id & 0x1]--;
- if (!(pcm_afe_instance[port_id & 0x1] == 0 &&
- proxy_afe_instance[port_id & 0x1] == 0))
+ if ((!(pcm_afe_instance[port_id & 0x1] == 0 &&
+ proxy_afe_instance[port_id & 0x1] == 0)) ||
+ afe_close_done[port_id & 0x1] == true)
return 0;
else
afe_close_done[port_id & 0x1] = true;
@@ -2912,8 +2913,9 @@
__func__, proxy_afe_instance[port_id & 0x1]);
port_id = VIRTUAL_ID_TO_PORTID(port_id);
proxy_afe_instance[port_id & 0x1]--;
- if (!(pcm_afe_instance[port_id & 0x1] == 0 &&
- proxy_afe_instance[port_id & 0x1] == 0))
+ if ((!(pcm_afe_instance[port_id & 0x1] == 0 &&
+ proxy_afe_instance[port_id & 0x1] == 0)) ||
+ afe_close_done[port_id & 0x1] == true)
return 0;
else
afe_close_done[port_id & 0x1] = true;
diff --git a/sound/soc/msm/qdsp6v2/q6voice.c b/sound/soc/msm/qdsp6v2/q6voice.c
index 1ca9b1a..475a0eb 100644
--- a/sound/soc/msm/qdsp6v2/q6voice.c
+++ b/sound/soc/msm/qdsp6v2/q6voice.c
@@ -655,6 +655,8 @@
/* send cmd to create mvm session and wait for response */
if (!mvm_handle) {
+ memset(mvm_session_cmd.mvm_session.name, 0,
+ sizeof(mvm_session_cmd.mvm_session.name));
if (!is_voip_session(v->session_id)) {
mvm_session_cmd.hdr.hdr_field = APR_HDR_FIELD(
APR_MSG_TYPE_SEQ_CMD,
@@ -675,23 +677,23 @@
if (is_volte_session(v->session_id)) {
strlcpy(mvm_session_cmd.mvm_session.name,
"default volte voice",
- sizeof(mvm_session_cmd.mvm_session.name));
+ strlen("default volte voice")+1);
} else if (is_voice2_session(v->session_id)) {
strlcpy(mvm_session_cmd.mvm_session.name,
VOICE2_SESSION_VSID_STR,
- sizeof(mvm_session_cmd.mvm_session.name));
+ strlen(VOICE2_SESSION_VSID_STR)+1);
} else if (is_qchat_session(v->session_id)) {
strlcpy(mvm_session_cmd.mvm_session.name,
QCHAT_SESSION_VSID_STR,
- sizeof(mvm_session_cmd.mvm_session.name));
+ strlen(QCHAT_SESSION_VSID_STR)+1);
} else if (is_vowlan_session(v->session_id)) {
strlcpy(mvm_session_cmd.mvm_session.name,
VOWLAN_SESSION_VSID_STR,
- sizeof(mvm_session_cmd.mvm_session.name));
+ strlen(VOWLAN_SESSION_VSID_STR)+1);
} else {
strlcpy(mvm_session_cmd.mvm_session.name,
"default modem voice",
- sizeof(mvm_session_cmd.mvm_session.name));
+ strlen("default modem voice")+1);
}
v->mvm_state = CMD_STATUS_FAIL;
@@ -727,7 +729,7 @@
VSS_IMVM_CMD_CREATE_FULL_CONTROL_SESSION;
strlcpy(mvm_session_cmd.mvm_session.name,
"default voip",
- sizeof(mvm_session_cmd.mvm_session.name));
+ strlen("default voip")+1);
v->mvm_state = CMD_STATUS_FAIL;
@@ -750,6 +752,8 @@
}
/* send cmd to create cvs session */
if (!cvs_handle) {
+ memset(cvs_session_cmd.cvs_session.name, 0,
+ sizeof(cvs_session_cmd.cvs_session.name));
if (!is_voip_session(v->session_id)) {
pr_debug("%s: creating CVS passive session\n",
__func__);
@@ -771,23 +775,23 @@
if (is_volte_session(v->session_id)) {
strlcpy(cvs_session_cmd.cvs_session.name,
"default volte voice",
- sizeof(cvs_session_cmd.cvs_session.name));
+ strlen("default volte voice")+1);
} else if (is_voice2_session(v->session_id)) {
strlcpy(cvs_session_cmd.cvs_session.name,
VOICE2_SESSION_VSID_STR,
- sizeof(cvs_session_cmd.cvs_session.name));
+ strlen(VOICE2_SESSION_VSID_STR)+1);
} else if (is_qchat_session(v->session_id)) {
strlcpy(cvs_session_cmd.cvs_session.name,
QCHAT_SESSION_VSID_STR,
- sizeof(cvs_session_cmd.cvs_session.name));
+ strlen(QCHAT_SESSION_VSID_STR)+1);
} else if (is_vowlan_session(v->session_id)) {
strlcpy(cvs_session_cmd.cvs_session.name,
VOWLAN_SESSION_VSID_STR,
- sizeof(cvs_session_cmd.cvs_session.name));
+ strlen(VOWLAN_SESSION_VSID_STR)+1);
} else {
strlcpy(cvs_session_cmd.cvs_session.name,
"default modem voice",
- sizeof(cvs_session_cmd.cvs_session.name));
+ strlen("default modem voice")+1);
}
v->cvs_state = CMD_STATUS_FAIL;
@@ -835,7 +839,7 @@
common.mvs_info.network_type;
strlcpy(cvs_full_ctl_cmd.cvs_session.name,
"default q6 voice",
- sizeof(cvs_full_ctl_cmd.cvs_session.name));
+ strlen("default q6 voice")+1);
v->cvs_state = CMD_STATUS_FAIL;