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

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

Merge "msm: ipa3: add WIGIG related definitions"

parents c5ad7968 6e8b7641

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

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

/* Copyright (c) 2012-2019, 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
@@ -1462,7 +1462,7 @@ static ssize_t ipa_read_msg(struct file *file, char __user *ubuf, 
	int cnt = 0;

	int i;



	for (i = 0; i < IPA_EVENT_MAX_NUM; i++) {

	for (i = 0; i < ARRAY_SIZE(ipa_event_name); i++) {

		nbytes = scnprintf(dbg_buff + cnt, IPA_MAX_MSG_LEN - cnt,

				"msg[%u:%27s] W:%u R:%u\n", i,

				ipa_event_name[i],

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

+1 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ static ssize_t ipa3_read_msg(struct file *file, char __user *ubuf, 
	int cnt = 0;

	int i;



	for (i = 0; i < IPA_EVENT_MAX_NUM; i++) {

	for (i = 0; i < ARRAY_SIZE(ipa3_event_name); i++) {

		nbytes = scnprintf(dbg_buff + cnt, IPA_MAX_MSG_LEN - cnt,

				"msg[%u:%27s] W:%u R:%u\n", i,

				ipa3_event_name[i],

include/uapi/linux/msm_ipa.h

+21 −4
Original line number Diff line number Diff line
@@ -307,12 +307,25 @@ enum ipa_client_type { 


	/* RESERVERD PROD                            = 74, */

	IPA_CLIENT_MHI_DPL_CONS                 = 75,

	/* RESERVED PROD                             76, */

	IPA_CLIENT_DUMMY_CONS1			= 77

	/* RESERVED PROD                             = 76, */

	IPA_CLIENT_DUMMY_CONS1			= 77,



	IPA_CLIENT_WIGIG_PROD			= 78,

	IPA_CLIENT_WIGIG1_CONS			= 79,



	/* RESERVERD PROD			     = 80, */

	IPA_CLIENT_WIGIG2_CONS			= 81,



	/* RESERVERD PROD			     = 82, */

	IPA_CLIENT_WIGIG3_CONS			= 83,



	/* RESERVERD PROD			     = 84, */

	IPA_CLIENT_WIGIG4_CONS			= 85,

};



#define IPA_CLIENT_DUMMY_CONS IPA_CLIENT_DUMMY_CONS1

#define IPA_CLIENT_MAX (IPA_CLIENT_DUMMY_CONS + 1)

#define IPA_CLIENT_WIGIG4_CONS IPA_CLIENT_WIGIG4_CONS

#define IPA_CLIENT_MAX (IPA_CLIENT_WIGIG4_CONS + 1)



#define IPA_CLIENT_IS_APPS_CONS(client) \

	((client) == IPA_CLIENT_APPS_LAN_CONS || \
@@ -548,7 +561,11 @@ enum ipa_gsb_event { 
#define IPA_GSB_EVENT_MAX IPA_GSB_EVENT_MAX

};



#define IPA_EVENT_MAX_NUM (IPA_GSB_EVENT_MAX)

#define WIGIG_CLIENT_CONNECT (IPA_GSB_EVENT_MAX)

#define WIGIG_FST_SWITCH (WIGIG_CLIENT_CONNECT + 1)

#define WIGIG_EVENT_MAX (WIGIG_FST_SWITCH + 1)



#define IPA_EVENT_MAX_NUM (WIGIG_EVENT_MAX)

#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)



/**