Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 540dc815 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge fd4cdfac on remote branch 

Change-Id: Ic8e4cf75e7c170cb726e5d2f0c426c75ab6e8639
parents 07722d8e fd4cdfac

drivers/bus/mhi/core/mhi_boot.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl) 
	enum mhi_ee ee;

	const u32 delayus = 5000;

	u32 retry = (mhi_cntrl->timeout_ms * 1000) / delayus;

	const u32 rddm_timeout_us = 200000;

	const u32 rddm_timeout_us = 350000;

	int rddm_retry = rddm_timeout_us / delayus; /* time to enter rddm */

	void __iomem *base = mhi_cntrl->bhie;

drivers/char/diag/diag_masks.c

+1 −1
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ static int diag_cmd_set_msg_mask(unsigned char *src_buf, int src_len, 
			mask_size = MAX_SSID_PER_RANGE;

			mask->range_tools = MAX_SSID_PER_RANGE;

			mask->ssid_last_tools =

				mask->ssid_first + mask->range_tools;

				mask->ssid_first + mask->range_tools - 1;

		}

		if (ssid_range.ssid_last > mask->ssid_last_tools) {

			pr_debug("diag: Msg SSID range mismatch\n");

drivers/char/diag/diagchar_core.c

+3 −1
Original line number Diff line number Diff line
@@ -3986,7 +3986,6 @@ static ssize_t diagchar_read(struct file *file, char __user *buf, size_t count, 
		goto exit;

	}



exit:

	if (driver->data_ready[index] & DCI_DATA_TYPE) {

		data_type = driver->data_ready[index] & DCI_DATA_TYPE;

		mutex_unlock(&driver->diagchar_mutex);
@@ -4056,7 +4055,9 @@ static ssize_t diagchar_read(struct file *file, char __user *buf, size_t count, 
		mutex_unlock(&driver->dci_mutex);

		goto end;

	}

exit:

	mutex_unlock(&driver->diagchar_mutex);

	goto ret_end;

end:

	/*

	 * Flush any read that is currently pending on DCI data and
@@ -4067,6 +4068,7 @@ static ssize_t diagchar_read(struct file *file, char __user *buf, size_t count, 
		diag_ws_on_copy_complete(DIAG_WS_DCI);

		flush_workqueue(driver->diag_dci_wq);

	}

ret_end:

	return ret;

}

drivers/char/diag/diagfwd.c

+11 −0
Original line number Diff line number Diff line
@@ -1824,6 +1824,12 @@ void diag_process_non_hdlc_pkt(unsigned char *buf, int len, int pid) 
	if (partial_pkt->remaining == 0) {

		actual_pkt = (struct diag_pkt_frame_t *)(partial_pkt->data);

		data_ptr = partial_pkt->data + header_len;

		if ((header_len + actual_pkt->length + 1) >

				partial_pkt->capacity) {

			mutex_unlock(&driver->hdlc_recovery_mutex);

			return;

		}



		if (*(uint8_t *)(data_ptr + actual_pkt->length) !=

						CONTROL_CHAR) {

			mutex_unlock(&driver->hdlc_recovery_mutex);
@@ -1875,6 +1881,11 @@ void diag_process_non_hdlc_pkt(unsigned char *buf, int len, int pid) 
			mutex_unlock(&driver->hdlc_recovery_mutex);

			break;

		}

		if ((header_len + actual_pkt->length + 1) >

				partial_pkt->capacity) {

			mutex_unlock(&driver->hdlc_recovery_mutex);

			break;

		}

		data_ptr = buf + header_len;

		if (*(uint8_t *)(data_ptr + actual_pkt->length) !=

						CONTROL_CHAR) {

drivers/clk/qcom/debugcc-sdm429w.c

+0 −6
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static const char *const gcc_debug_mux_parent_names[] = { 
	"gcc_gp1_clk",

	"gcc_gp2_clk",

	"gcc_gp3_clk",

	"gcc_im_sleep_clk",

	"gcc_lpass_mport_axi_clk",

	"gcc_lpass_q6_axi_clk",

	"gcc_lpass_sway_clk",
@@ -153,7 +152,6 @@ static const char *const gcc_debug_mux_parent_names[] = { 
	"gcc_oxili_ahb_clk",

	"gcc_oxili_aon_clk",

	"gcc_oxili_gfx3d_clk",

	"gcc_pcnoc_mpu_cfg_ahb_clk",

	"gcc_pdm2_clk",

	"gcc_pdm_ahb_clk",

	"gcc_pdm_xo4_clk",
@@ -183,7 +181,6 @@ static const char *const gcc_debug_mux_parent_names[] = { 
	"gcc_venus0_core0_vcodec0_clk",

	"gcc_venus0_vcodec0_clk",

	"gcc_xo_clk",

	"gcc_xo_div4_clk",

	"gcc_gfx_tbu_clk",

	"gcc_gfx_tcu_clk",

	"gcc_gtcu_ahb_clk",
@@ -271,7 +268,6 @@ static int gcc_debug_mux_sels[] = { 
	0x10,		/* gcc_gp1_clk */

	0x11,		/* gcc_gp2_clk */

	0x12,		/* gcc_gp3_clk */

	0x14B,		/* gcc_im_sleep_clk */

	0x162,		/* gcc_lpass_mport_axi_clk */

	0x160,		/* gcc_lpass_q6_axi_clk */

	0x163,		/* gcc_lpass_sway_clk */
@@ -287,7 +283,6 @@ static int gcc_debug_mux_sels[] = { 
	0x1EB,		/* gcc_oxili_ahb_clk */

	0xEE,		/* gcc_oxili_aon_clk */

	0x1EA,		/* gcc_oxili_gfx3d_clk */

	0xC9,		/* gcc_pcnoc_mpu_cfg_ahb_clk */

	0xD2,		/* gcc_pdm2_clk */

	0xD0,		/* gcc_pdm_ahb_clk */

	0xD1,		/* gcc_pdm_xo4_clk */
@@ -317,7 +312,6 @@ static int gcc_debug_mux_sels[] = { 
	0x1B8,		/* gcc_venus0_core0_vcodec0_clk */

	0x1F1,		/* gcc_venus0_vcodec0_clk */

	0x149,		/* gcc_xo_clk */

	0x14A,		/* gcc_xo_div4_clk */

	0x52,		/* gcc_gfx_tbu_clk */

	0x53,		/* gcc_gfx_tcu_clk */

	0x58,		/* gcc_gtcu_ahb_clk */