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

Commit aac0f92b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix variables used uninitialized"

parents 7c75be09 4bcf8177

drivers/platform/msm/ipa/ipa_v2/ipa_client.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, 2018, 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
@@ -97,8 +97,8 @@ int ipa_disable_data_path(u32 clnt_hdl) 


static int ipa2_smmu_map_peer_bam(unsigned long dev)

{

	phys_addr_t base;

	u32 size;

	phys_addr_t base = 0;

	u32 size = 0;

	struct iommu_domain *smmu_domain;

	struct ipa_smmu_cb_ctx *cb = ipa2_get_smmu_ctx();

drivers/platform/msm/ipa/ipa_v2/ipa_mhi.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2018, 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
@@ -58,7 +58,7 @@ 
bool ipa2_mhi_sps_channel_empty(enum ipa_client_type client)

{

	u32 pipe_idx;

	bool pending;

	bool pending = 0;



	pipe_idx = ipa2_get_ep_mapping(client);

	if (sps_pipe_pending_desc(ipa_ctx->bam_handle,

drivers/platform/msm/ipa/ipa_v3/ipa.c

+3 −3
Original line number Diff line number Diff line
@@ -4537,7 +4537,7 @@ static void ipa3_post_init_wq(struct work_struct *work) 
static int ipa3_manual_load_ipa_fws(void)

{

	int result;

	const struct firmware *fw;

	const struct firmware *fw = NULL;



	IPADBG("Manual FW loading process initiated\n");
@@ -5742,7 +5742,7 @@ static int ipa_smmu_uc_cb_probe(struct device *dev) 
	int bypass = 1;

	int fast = 1;

	int ret;

	u32 iova_ap_mapping[2];

	u32 iova_ap_mapping[2] = {0};



	IPADBG("UC CB PROBE sub pdev=%p\n", dev);
@@ -5853,7 +5853,7 @@ static int ipa_smmu_ap_cb_probe(struct device *dev) 
	int atomic_ctx = 1;

	int fast = 1;

	int bypass = 1;

	u32 iova_ap_mapping[2];

	u32 iova_ap_mapping[2] = {0};

	u32 add_map_size;

	const u32 *add_map;

	void *smem_addr;

drivers/platform/msm/ipa/ipa_v3/ipa_client.c

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ int ipa3_disable_data_path(u32 clnt_hdl) 


static int ipa3_smmu_map_peer_bam(unsigned long dev)

{

	phys_addr_t base;

	u32 size;

	phys_addr_t base = 0;

	u32 size = 0;

	struct iommu_domain *smmu_domain;

	struct ipa_smmu_cb_ctx *cb = ipa3_get_smmu_ctx();

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+3 −3
Original line number Diff line number Diff line
@@ -6382,7 +6382,7 @@ void ipa3_set_resorce_groups_min_max_limits(void) 


static void ipa3_gsi_poll_after_suspend(struct ipa3_ep_context *ep)

{

	bool empty;

	bool empty = 0;



	IPADBG("switch ch %ld to poll\n", ep->gsi_chan_hdl);

	gsi_config_channel_mode(ep->gsi_chan_hdl, GSI_CHAN_MODE_POLL);
@@ -6894,8 +6894,8 @@ int ipa3_load_fws(const struct firmware *firmware, phys_addr_t gsi_mem_base) 
{

	const struct elf32_hdr *ehdr;

	const struct elf32_phdr *phdr;

	unsigned long gsi_iram_ofst;

	unsigned long gsi_iram_size;

	unsigned long gsi_iram_ofst = 0;

	unsigned long gsi_iram_size = 0;

	phys_addr_t ipa_reg_mem_base;

	u32 ipa_reg_ofst;

	int rc;