Commit e244a46a authored by Maximilian Luz's avatar Maximilian Luz Committed by Hans de Goede
Browse files

platform/surface: aggregator: Reserve more event- and target-categories 



With the introduction of the Surface Laptop Studio, more event- and
target categories have been added. Therefore, increase the number of
reserved events and extend the enum of know target categories to
accommodate this.

Signed-off-by: default avatarMaximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/20220614194117.4118897-1-luzmaximilian@gmail.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 31a1e4a5

drivers/platform/surface/aggregator/trace.h

+45 −35
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_HID); 
TRACE_DEFINE_ENUM(SSAM_SSH_TC_TCH);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_BKL);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_TAM);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_ACC);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_ACC0);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_UFI);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_USC);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_PEN);
@@ -85,6 +85,11 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_AUD); 
TRACE_DEFINE_ENUM(SSAM_SSH_TC_SMC);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_KPD);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_REG);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_SPT);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_SYS);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_ACC1);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_SHB);

TRACE_DEFINE_ENUM(SSAM_SSH_TC_POS);



#define SSAM_PTR_UID_LEN		9

#define SSAM_U8_FIELD_NOT_APPLICABLE	((u16)-1)
@@ -254,7 +259,7 @@ static inline u32 ssam_trace_get_request_tc(const struct ssh_packet *p) 
		{ SSAM_SSH_TC_TCH,			"TCH"  },	\

		{ SSAM_SSH_TC_BKL,			"BKL"  },	\

		{ SSAM_SSH_TC_TAM,			"TAM"  },	\

		{ SSAM_SSH_TC_ACC,			"ACC" },	\

		{ SSAM_SSH_TC_ACC0,			"ACC0" },	\

		{ SSAM_SSH_TC_UFI,			"UFI"  },	\

		{ SSAM_SSH_TC_USC,			"USC"  },	\

		{ SSAM_SSH_TC_PEN,			"PEN"  },	\
@@ -262,7 +267,12 @@ static inline u32 ssam_trace_get_request_tc(const struct ssh_packet *p) 
		{ SSAM_SSH_TC_AUD,			"AUD"  },	\

		{ SSAM_SSH_TC_SMC,			"SMC"  },	\

		{ SSAM_SSH_TC_KPD,			"KPD"  },	\

		{ SSAM_SSH_TC_REG,			"REG" }		\

		{ SSAM_SSH_TC_REG,			"REG"  },	\

		{ SSAM_SSH_TC_SPT,			"SPT"  },	\

		{ SSAM_SSH_TC_SYS,			"SYS"  },	\

		{ SSAM_SSH_TC_ACC1,			"ACC1" },	\

		{ SSAM_SSH_TC_SHB,			"SMB"  },	\

		{ SSAM_SSH_TC_POS,			"POS"  }	\

	)



DECLARE_EVENT_CLASS(ssam_frame_class,

include/linux/surface_aggregator/serial_hub.h

+40 −35
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static inline u16 ssh_crc(const u8 *buf, size_t len) 
 * exception of zero, which is not an event ID. Thus, this is also the

 * absolute maximum number of event handlers that can be registered.

 */

#define SSH_NUM_EVENTS		34

#define SSH_NUM_EVENTS		38



/*

 * SSH_NUM_TARGETS - The number of communication targets used in the protocol.
@@ -317,7 +317,7 @@ enum ssam_ssh_tc { 
	SSAM_SSH_TC_TCH  = 0x16,

	SSAM_SSH_TC_BKL  = 0x17,

	SSAM_SSH_TC_TAM  = 0x18,

	SSAM_SSH_TC_ACC = 0x19,

	SSAM_SSH_TC_ACC0 = 0x19,

	SSAM_SSH_TC_UFI  = 0x1a,

	SSAM_SSH_TC_USC  = 0x1b,

	SSAM_SSH_TC_PEN  = 0x1c,
@@ -326,6 +326,11 @@ enum ssam_ssh_tc { 
	SSAM_SSH_TC_SMC  = 0x1f,

	SSAM_SSH_TC_KPD  = 0x20,

	SSAM_SSH_TC_REG  = 0x21,  /* Extended event registry. */

	SSAM_SSH_TC_SPT  = 0x22,

	SSAM_SSH_TC_SYS  = 0x23,

	SSAM_SSH_TC_ACC1 = 0x24,

	SSAM_SSH_TC_SHB  = 0x25,

	SSAM_SSH_TC_POS  = 0x26,  /* For obtaining Laptop Studio screen position. */

};