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

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

Merge "msm: sps: Add IPC logging for SPS driver"

parents cb41ca99 a2a0b33e

drivers/platform/msm/sps/bam.c

+362 −205

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/sps/sps.c

+384 −294

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/sps/sps_bam.c

+169 −126

File changed.

Preview size limit exceeded, changes collapsed.

drivers/platform/msm/sps/sps_bam.h

+9 −1
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 


#define BAM_HANDLE_INVALID         0



#define to_sps_bam_dev(x) \

	container_of((x), struct sps_bam, base)



enum bam_irq {

	BAM_DEV_IRQ_RDY_TO_SLEEP = 0x00000001,

	BAM_DEV_IRQ_HRESP_ERROR = 0x00000002,
@@ -215,9 +218,14 @@ struct sps_bam { 
	u32 irq_from_disabled_pipe;

	u32 event_trigger_failures;



	void *ipc_log0;

	void *ipc_log1;

	void *ipc_log2;

	void *ipc_log3;

	void *ipc_log4;



	/* Desc cache pointers */

	u8 *desc_cache_pointers[BAM_MAX_PIPES];



};



/**

drivers/platform/msm/sps/sps_core.h

+1 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2011,2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011, 2013, 2015, 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
@@ -39,11 +39,6 @@ 
#define SPS_STATE_ENABLE      SPS_STATE_DEF(3)

#define SPS_STATE_DISABLE     SPS_STATE_DEF(4)



/* Connection mapping control struct */

struct sps_rm {

	struct list_head connections_q;

	struct mutex lock;

};



/**

 * Find the BAM device from the handle