Merge "usb: pd: Support vdm messages for XR smartviewer" (112f5c9e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/sxr1130-svr.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -528,3 +528,7 @@
		regulator-min-microvolt = <5700000>;
		regulator-max-microvolt = <5700000>;
		};

		&pm660_pdphy {
		qcom,sxr1130-sxr-dp-sink;
		};

drivers/usb/pd/policy_engine.c

+85 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2018, Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2020, 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
		@@ -42,6 +42,13 @@ static bool rev3_sink_only;
		module_param(rev3_sink_only, bool, 0644);
		MODULE_PARM_DESC(rev3_sink_only, "Enable power delivery rev3.0 sink only mode");

		#define XR1_DISCOVER_VDO 0x1085
		#define XR1_DEFAULT_VDO 0x0
		#define XR1_PIN_E_VDO 0x0082
		#define DP_USBPD_EVT_STATUS_XR1 0x10
		#define DP_USBPD_EVT_CONFIGURE_XR1 0x11
		static bool sxr_dp_mode;

		enum usbpd_state {
		PE_UNKNOWN,
		PE_ERROR_RECOVERY,
		@@ -394,6 +401,9 @@ struct rx_msg {
		#define IS_EXT(m, t) ((m) && PD_MSG_HDR_IS_EXTENDED((m)->hdr) && \
		(PD_MSG_HDR_TYPE((m)->hdr) == (t)))

		#define SXR_SEND_SVDM(pd, cmd, num, tx_vdos, pos) usbpd_send_svdm(pd, 0xFF01, \
		cmd, SVDM_CMD_TYPE_RESP_ACK, \
		num, tx_vdos, pos)
		struct usbpd {
		struct device dev;
		struct workqueue_struct *wq;
		@@ -488,6 +498,7 @@ struct usbpd {
		u8 get_battery_status_db;
		bool send_get_battery_status;
		u32 battery_sts_dobj;
		bool is_sxr_dp_sink;
		};

		static LIST_HEAD(_usbpd); /* useful for debugging */
		@@ -1698,7 +1709,47 @@ static void handle_vdm_rx(struct usbpd pd, struct rx_msg rx_msg)
		}

		if (handler && handler->svdm_received) {
		handler->svdm_received(handler, cmd, cmd_type, vdos, num_vdos);
		if (pd->is_sxr_dp_sink) {
		u32 tx_vdos[1];

		switch (cmd) {
		/CMD 3, Type 1, PayLoad 43 /
		case USBPD_SVDM_DISCOVER_MODES:
		usbpd_dbg(&pd->dev,
		"USBPD_SVDM_DISCOVER_MODES\n");
		tx_vdos[0] = XR1_DISCOVER_VDO;
		usbpd_dbg(&pd->dev, "sending RESP_ACK\n");
		SXR_SEND_SVDM(pd, cmd, 0x0, tx_vdos, 0x1);
		break;
		/CMD 4, Type 1, PayLoad 44 /
		case USBPD_SVDM_ENTER_MODE:
		usbpd_dbg(&pd->dev, "USBPD_SVDM_ENTER_MODE\n");
		tx_vdos[0] = XR1_DEFAULT_VDO;
		usbpd_dbg(&pd->dev, "sending RESP_ACK\n");
		SXR_SEND_SVDM(pd, cmd, 0x1, tx_vdos, 0x0);
		break;
		/CMD 10, Type 1, PayLoad 50 /
		case DP_USBPD_EVT_STATUS_XR1:
		tx_vdos[0] = XR1_PIN_E_VDO; // Pin assign E
		usbpd_dbg(&pd->dev,
		"DP_USBPD_EVT_STATUS_XR1\n");
		SXR_SEND_SVDM(pd, cmd, 0x1, tx_vdos, 0x1);
		break;
		/CMD 11, Type 1, PayLoad 51 /
		case DP_USBPD_EVT_CONFIGURE_XR1:
		usbpd_dbg(&pd->dev,
		"DP_USBPD_EVT_CONFIGURE_XR1\n");
		tx_vdos[0] = XR1_DEFAULT_VDO;
		usbpd_dbg(&pd->dev,
		"DP_USBPD_EVT_STATUS_XR1\n");
		SXR_SEND_SVDM(pd, cmd, 0x1, tx_vdos, 0x0);
		break;
		default:
		usbpd_dbg(&pd->dev, "default mode:%d\n", cmd);
		}
		} else
		handler->svdm_received(handler, cmd, cmd_type, vdos,
		num_vdos);
		return;
		}

		@@ -1717,9 +1768,21 @@ static void handle_vdm_rx(struct usbpd pd, struct rx_msg rx_msg)
		usbpd_send_svdm(pd, USBPD_SID, cmd,
		SVDM_CMD_TYPE_RESP_ACK, 0, tx_vdos, 3);
		} else if (cmd != USBPD_SVDM_ATTENTION) {
		usbpd_send_svdm(pd, svid, cmd, SVDM_CMD_TYPE_RESP_NAK,
		if (pd->is_sxr_dp_sink) {
		u32 tx_vdos_pd[3] = {
		ID_HDR_VID,
		0xFF01,
		0x0,
		};
		usbpd_send_svdm(pd, USBPD_SID, cmd,
		SVDM_CMD_TYPE_RESP_ACK, 0,
		tx_vdos_pd, 3);
		} else {
		usbpd_send_svdm(pd, svid, cmd,
		SVDM_CMD_TYPE_RESP_NAK,
		SVDM_HDR_OBJ_POS(vdm_hdr), NULL, 0);
		}
		}
		break;

		case SVDM_CMD_TYPE_RESP_ACK:
		@@ -4117,6 +4180,15 @@ struct usbpd usbpd_create(struct device parent)
		goto put_psy;
		}

		/*
		* Need to set is_sxr_dp_sink to TRUE only when device tree node is
		* present, and sim_vid_display string is present in
		* boot_command_line string.
		*/
		if (sxr_dp_mode)
		pd->is_sxr_dp_sink = device_property_present(parent,
		"qcom,sxr1130-sxr-dp-sink");

		pd->vconn_is_external = device_property_present(parent,
		"qcom,vconn-uses-external-source");

		@@ -4236,6 +4308,15 @@ EXPORT_SYMBOL(usbpd_destroy);

		static int __init usbpd_init(void)
		{
		char *cmdline;

		cmdline = strnstr(boot_command_line,
		"msm_drm.dsi_display0=dsi_sim_vid_display",
		strlen(boot_command_line));
		sxr_dp_mode = false;
		if (cmdline)
		sxr_dp_mode = true;

		usbpd_ipc_log = ipc_log_context_create(NUM_LOG_PAGES, "usb_pd", 0);
		return class_register(&usbpd_class);
		}