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

Commit 8d5ef88e authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge fc53db74 on remote branch 

Change-Id: I3a12c74de4c2c6ed71129e1f57fe6a0435b435ce
parents 5f3db528 fc53db74

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ CHECK = sparse 


# Use the wrapper for the compiler.  This wrapper scans for new

# warnings and causes the build to stop upon encountering them

CC		= $(PYTHON) $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)

CC		= $(PYTHON2) $(srctree)/scripts/gcc-wrapper.py $(REAL_CC)



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

arch/arm64/configs/vendor/bengal_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ CONFIG_IIO=y 
CONFIG_QCOM_SPMI_ADC5=y

CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_PWM_QCOM=y

CONFIG_ARM_GIC_V3_ACL=y

CONFIG_QCOM_MPM=y

CONFIG_PHY_XGENE=y

drivers/char/adsprpc.c

+20 −11
Original line number Diff line number Diff line
@@ -144,6 +144,13 @@ 
#define INIT_MEMLEN_MAX  (8*1024*1024)

#define MAX_CACHE_BUF_SIZE (8*1024*1024)



/* FastRPC remote subsystem state*/

enum fastrpc_remote_subsys_state {

	SUBSYSTEM_RESTARTING = 0,

	SUBSYSTEM_DOWN,

	SUBSYSTEM_UP,

};



#define PERF_END (void)0



#define PERF(enb, cnt, ff) \
@@ -349,7 +356,7 @@ struct fastrpc_channel_ctx { 
	uint64_t ssrcount;

	void *handle;

	uint64_t prevssrcount;

	int issubsystemup;

	int subsystemstate;

	int vmid;

	struct secure_vm rhvm;

	int ramdumpenabled;
@@ -2936,7 +2943,7 @@ static int fastrpc_get_info_from_dsp(struct fastrpc_file *fl, 
	case ADSP_DOMAIN_ID:

	case SDSP_DOMAIN_ID:

	case CDSP_DOMAIN_ID:

		if (me->channel[domain].issubsystemup)

		if (me->channel[domain].subsystemstate == SUBSYSTEM_UP)

			dsp_support = 1;

		break;

	case MDSP_DOMAIN_ID:
@@ -3060,7 +3067,8 @@ static int fastrpc_release_current_dsp_process(struct fastrpc_file *fl) 
	VERIFY(err, fl->apps->channel[cid].rpdev != NULL);

	if (err)

		goto bail;

	VERIFY(err, fl->apps->channel[cid].issubsystemup == 1);

	VERIFY(err, fl->apps->channel[cid].subsystemstate !=

			SUBSYSTEM_RESTARTING);

	if (err) {

		wait_for_completion(&fl->shutdown);

		goto bail;
@@ -3926,8 +3934,8 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer, 
		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

			"\n%s %s %s\n", title, " CHANNEL INFO ", title);

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

			"%-7s|%-10s|%-14s|%-9s|%-13s\n",

			"subsys", "sesscount", "issubsystemup",

			"%-7s|%-10s|%-15s|%-9s|%-13s\n",

			"subsys", "sesscount", "subsystemstate",

			"ssrcount", "session_used");

		len += scnprintf(fileinfo + len, DEBUGFS_SIZE - len,

			"-%s%s%s%s-\n", single_line, single_line,
@@ -3941,8 +3949,8 @@ static ssize_t fastrpc_debugfs_read(struct file *filp, char __user *buffer, 
				DEBUGFS_SIZE - len, "|%-10u",

				chan->sesscount);

			len += scnprintf(fileinfo + len,

				DEBUGFS_SIZE - len, "|%-14d",

				chan->issubsystemup);

				DEBUGFS_SIZE - len, "|%-15d",

				chan->subsystemstate);

			len += scnprintf(fileinfo + len,

				DEBUGFS_SIZE - len, "|%-9u",

				chan->ssrcount);
@@ -4163,7 +4171,7 @@ static int fastrpc_channel_open(struct fastrpc_file *fl) 
	mutex_lock(&me->channel[cid].smd_mutex);

	if (me->channel[cid].ssrcount !=

				 me->channel[cid].prevssrcount) {

		if (!me->channel[cid].issubsystemup) {

		if (me->channel[cid].subsystemstate != SUBSYSTEM_UP) {

			err = -ENOTCONN;

			mutex_unlock(&me->channel[cid].smd_mutex);

			goto bail;
@@ -4778,7 +4786,7 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
			__func__, gcinfo[cid].subsys);

		mutex_lock(&me->channel[cid].smd_mutex);

		ctx->ssrcount++;

		ctx->issubsystemup = 0;

		ctx->subsystemstate = SUBSYSTEM_RESTARTING;

		mutex_unlock(&me->channel[cid].smd_mutex);

	} else if (code == SUBSYS_AFTER_SHUTDOWN) {

		pr_info("adsprpc: %s: %s subsystem is down\n",
@@ -4790,6 +4798,7 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
			complete(&fl->shutdown);

		}

		spin_unlock(&me->hlock);

		ctx->subsystemstate = SUBSYSTEM_DOWN;

	} else if (code == SUBSYS_RAMDUMP_NOTIFICATION) {

		if (cid == RH_CID) {

			if (me->ramdump_handle)
@@ -4808,7 +4817,7 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
	} else if (code == SUBSYS_AFTER_POWERUP) {

		pr_info("adsprpc: %s: %s subsystem is up\n",

			__func__, gcinfo[cid].subsys);

		ctx->issubsystemup = 1;

		ctx->subsystemstate = SUBSYSTEM_UP;

	}

	return NOTIFY_DONE;

}
@@ -5481,7 +5490,7 @@ static int __init fastrpc_device_init(void) 
			me->channel[i].dev = dev;

		me->channel[i].ssrcount = 0;

		me->channel[i].prevssrcount = 0;

		me->channel[i].issubsystemup = 1;

		me->channel[i].subsystemstate = SUBSYSTEM_UP;

		me->channel[i].ramdumpenabled = 0;

		me->channel[i].rh_dump_dev = NULL;

		me->channel[i].nb.notifier_call = fastrpc_restart_notifier_cb;

drivers/clk/qcom/gcc-scuba.c

+19 −0
Original line number Diff line number Diff line
@@ -2246,6 +2246,19 @@ static struct clk_regmap_div gcc_disp_gpll0_clk_src = { 
	},

};



static struct clk_regmap_div gcc_pwm0_xo512_div_clk_src = {

	.reg = 0x20030,

	.shift = 0,

	.width = 9,

	.clkr.hw.init = &(const struct clk_init_data) {

		.name = "gcc_pwm0_xo512_div_clk_src",

		.parent_names =

			(const char *[]){ "bi_tcxo" },

		.num_parents = 1,

		.ops = &clk_regmap_div_ops,

	},

};



static struct clk_branch gcc_disp_gpll0_div_clk_src = {

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {
@@ -2522,6 +2535,11 @@ static struct clk_branch gcc_pwm0_xo512_clk = { 
		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_pwm0_xo512_clk",

			.parent_names = (const char *[]){

				"gcc_pwm0_xo512_div_clk_src",

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,

			.ops = &clk_branch2_ops,

		},

	},
@@ -3178,6 +3196,7 @@ static struct clk_regmap *gcc_scuba_clocks[] = { 
	[GCC_GPU_CFG_AHB_CLK] = &gcc_gpu_cfg_ahb_clk.clkr,

	[GCC_GPU_GPLL0_CLK_SRC] = &gcc_gpu_gpll0_clk_src.clkr,

	[GCC_GPU_GPLL0_DIV_CLK_SRC] = &gcc_gpu_gpll0_div_clk_src.clkr,

	[GCC_PWM0_XO512_DIV_CLK_SRC] = &gcc_pwm0_xo512_div_clk_src.clkr,

	[GCC_GPU_IREF_CLK] = &gcc_gpu_iref_clk.clkr,

	[GCC_GPU_MEMNOC_GFX_CLK] = &gcc_gpu_memnoc_gfx_clk.clkr,

	[GCC_GPU_SNOC_DVM_GFX_CLK] = &gcc_gpu_snoc_dvm_gfx_clk.clkr,

drivers/crypto/msm/qcedev.c

+3 −0
Original line number Diff line number Diff line
@@ -2283,8 +2283,11 @@ static int qcedev_remove(struct platform_device *pdev) 
	podev = platform_get_drvdata(pdev);

	if (!podev)

		return 0;



	qcedev_ce_high_bw_req(podev, true);

	if (podev->qce)

		qce_close(podev->qce);

	qcedev_ce_high_bw_req(podev, false);



	if (podev->platform_support.bus_scale_table != NULL)

		msm_bus_scale_unregister_client(podev->bus_scale_handle);