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

Commit 1fa631c2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: ensure non-zero session or sequence ID values"

parents ac699e7b 4dfd3f42

drivers/bus/mhi/core/mhi_boot.c

+7 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */



#include <linux/debugfs.h>

#include <linux/delay.h>
@@ -319,6 +319,9 @@ static int mhi_fw_load_amss(struct mhi_controller *mhi_cntrl, 
			mhi_buf->len);



	mhi_cntrl->sequence_id = prandom_u32() & BHIE_TXVECSTATUS_SEQNUM_BMSK;

	if (unlikely(!mhi_cntrl->sequence_id))

		mhi_cntrl->sequence_id = 1;



	mhi_write_reg_field(mhi_cntrl, base, BHIE_TXVECDB_OFFS,

			    BHIE_TXVECDB_SEQNUM_BMSK, BHIE_TXVECDB_SEQNUM_SHFT,

			    mhi_cntrl->sequence_id);
@@ -381,6 +384,9 @@ static int mhi_fw_load_sbl(struct mhi_controller *mhi_cntrl, 
		      lower_32_bits(dma_addr));

	mhi_cntrl->write_reg(mhi_cntrl, base, BHI_IMGSIZE, size);

	mhi_cntrl->session_id = prandom_u32() & BHI_TXDB_SEQNUM_BMSK;

	if (unlikely(!mhi_cntrl->session_id))

		mhi_cntrl->session_id = 1;



	mhi_cntrl->write_reg(mhi_cntrl, base, BHI_IMGTXDB,

			mhi_cntrl->session_id);

	read_unlock_bh(pm_lock);