Merge "msm: kgsl: Correct the refcount on current process PID"
diff --git a/arch/arm64/boot/dts/qcom/sdm670-camera-sensor-mtp.dtsi b/arch/arm64/boot/dts/qcom/sdm670-camera-sensor-mtp.dtsi
index f71fbd3..19dca08 100644
--- a/arch/arm64/boot/dts/qcom/sdm670-camera-sensor-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm670-camera-sensor-mtp.dtsi
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, 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
@@ -409,4 +409,48 @@
clock-cntl-level = "turbo";
clock-rates = <24000000>;
};
+
+ qcom,cam-sensor@3 {
+ cell-index = <0>;
+ compatible = "qcom,cam-sensor";
+ reg = <0x0>;
+ csiphy-sd-index = <0>;
+ sensor-position-roll = <270>;
+ sensor-position-pitch = <0>;
+ sensor-position-yaw = <180>;
+ led-flash-src = <&led_flash_rear>;
+ actuator-src = <&actuator_rear>;
+ ois-src = <&ois_rear>;
+ eeprom-src = <&eeprom_rear>;
+ cam_vio-supply = <&camera_vio_ldo>;
+ cam_vana-supply = <&camera_vana_ldo>;
+ cam_vdig-supply = <&camera_ldo>;
+ cam_clk-supply = <&titan_top_gdsc>;
+ regulator-names = "cam_vio", "cam_vana", "cam_vdig",
+ "cam_clk";
+ rgltr-cntrl-support;
+ rgltr-min-voltage = <1800000 2850000 1352000 0>;
+ rgltr-max-voltage = <1800000 2850000 1352000 0>;
+ rgltr-load-current = <0 80000 105000 0>;
+ gpio-no-mux = <0>;
+ pinctrl-names = "cam_default", "cam_suspend";
+ pinctrl-0 = <&cam_sensor_mclk0_active
+ &cam_sensor_rear_active>;
+ pinctrl-1 = <&cam_sensor_mclk0_suspend
+ &cam_sensor_rear_suspend>;
+ gpios = <&tlmm 13 0>,
+ <&tlmm 30 0>;
+ gpio-reset = <1>;
+ gpio-req-tbl-num = <0 1>;
+ gpio-req-tbl-flags = <1 0>;
+ gpio-req-tbl-label = "CAMIF_MCLK0",
+ "CAM_RESET0";
+ sensor-mode = <0>;
+ cci-master = <0>;
+ status = "ok";
+ clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
+ clock-names = "cam_clk";
+ clock-cntl-level = "turbo";
+ clock-rates = <24000000>;
+ };
};
diff --git a/arch/arm64/configs/sdm845-perf_defconfig b/arch/arm64/configs/sdm845-perf_defconfig
index 269c0c7..230ad65 100755
--- a/arch/arm64/configs/sdm845-perf_defconfig
+++ b/arch/arm64/configs/sdm845-perf_defconfig
@@ -301,9 +301,6 @@
CONFIG_WIL6210=m
# CONFIG_WIL6210_TRACING is not set
CONFIG_WCNSS_MEM_PRE_ALLOC=y
-CONFIG_CNSS=y
-CONFIG_CNSS_SDIO=y
-CONFIG_CLD_HL_SDIO_CORE=y
CONFIG_CLD_LL_CORE=y
CONFIG_CNSS_GENL=y
CONFIG_INPUT_EVDEV=y
@@ -578,7 +575,6 @@
CONFIG_QMP_DEBUGFS_CLIENT=y
CONFIG_MEM_SHARE_QMI_SERVICE=y
CONFIG_QSEE_IPC_IRQ_BRIDGE=y
-CONFIG_CNSS_CRYPTO=y
CONFIG_QCOM_BIMC_BWMON=y
CONFIG_ARM_MEMLAT_MON=y
CONFIG_QCOMCCI_HWMON=y
diff --git a/arch/arm64/configs/sdm845_defconfig b/arch/arm64/configs/sdm845_defconfig
index ad23d97..e518a58 100644
--- a/arch/arm64/configs/sdm845_defconfig
+++ b/arch/arm64/configs/sdm845_defconfig
@@ -306,9 +306,6 @@
CONFIG_USB_USBNET=y
CONFIG_WIL6210=m
CONFIG_WCNSS_MEM_PRE_ALLOC=y
-CONFIG_CNSS=y
-CONFIG_CNSS_SDIO=y
-CONFIG_CLD_HL_SDIO_CORE=y
CONFIG_CLD_LL_CORE=y
CONFIG_CNSS_GENL=y
CONFIG_INPUT_EVDEV=y
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 882d3fe..51fb970 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -2755,8 +2755,13 @@
mutex_unlock(&fl->fl_map_mutex);
if (err)
goto bail;
+ VERIFY(err, map != NULL);
+ if (err) {
+ err = -EINVAL;
+ goto bail;
+ }
VERIFY(err, !fastrpc_munmap_on_dsp(fl, map->raddr,
- map->phys, map->size, map->flags));
+ map->phys, map->size, map->flags));
if (err)
goto bail;
mutex_lock(&fl->fl_map_mutex);
diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index c9366c5..2bb4ffb 100644
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2019, Linux Foundation. All rights reserved.
+/* Copyright (c) 2009-2020, 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
@@ -890,6 +890,7 @@
u32 val = 0;
u32 ulpi_val = 0;
+ mutex_lock(&motg->lock);
msm_otg_dbg_log_event(&motg->phy, "USB RESET", phy->otg->state,
get_pm_runtime_counter(phy->dev));
/*
@@ -898,10 +899,13 @@
* USB BAM reset on other cases e.g. USB cable disconnections.
* If hardware reported error then it must be reset for recovery.
*/
- if (motg->err_event_seen)
+ if (motg->err_event_seen) {
dev_info(phy->dev, "performing USB h/w reset for recovery\n");
- else if (pdata->disable_reset_on_disconnect && motg->reset_counter)
+ } else if (pdata->disable_reset_on_disconnect &&
+ motg->reset_counter) {
+ mutex_unlock(&motg->lock);
return 0;
+ }
motg->reset_counter++;
@@ -916,6 +920,7 @@
enable_irq(motg->phy_irq);
enable_irq(motg->irq);
+ mutex_unlock(&motg->lock);
return ret;
}
@@ -926,6 +931,7 @@
ret = msm_otg_link_reset(motg);
if (ret) {
dev_err(phy->dev, "link reset failed\n");
+ mutex_unlock(&motg->lock);
return ret;
}
@@ -982,6 +988,7 @@
if (phy->otg->state == OTG_STATE_UNDEFINED && motg->rm_pulldown)
msm_chg_block_on(motg);
+ mutex_unlock(&motg->lock);
return 0;
}
@@ -4171,6 +4178,7 @@
motg->pdev = pdev;
motg->dbg_idx = 0;
motg->dbg_lock = __RW_LOCK_UNLOCKED(lck);
+ mutex_init(&motg->lock);
if (motg->pdata->bus_scale_table) {
motg->bus_perf_client =
diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index f010249..a22d2e4 100644
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -2,7 +2,7 @@
*
* Copyright (C) 2008 Google, Inc.
* Author: Brian Swetland <swetland@google.com>
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, 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
@@ -188,6 +188,7 @@
struct usb_phy phy;
struct msm_otg_platform_data *pdata;
struct platform_device *pdev;
+ struct mutex lock;
int irq;
int async_irq;
int phy_irq;