Merge "usb: pd: Correctly handle SVDM versions" (c1fcceff) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/usb/pd/policy_engine.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -1377,10 +1377,12 @@ int usbpd_send_svdm(struct usbpd *pd, u16 svid, u8 cmd,
		enum usbpd_svdm_cmd_type cmd_type, int obj_pos,
		const u32 *vdos, int num_vdos)
		{
		u32 svdm_hdr = SVDM_HDR(svid, 0, obj_pos, cmd_type, cmd);
		u32 svdm_hdr = SVDM_HDR(svid, pd->spec_rev == USBPD_REV_30 ? 1 : 0,
		obj_pos, cmd_type, cmd);

		usbpd_dbg(&pd->dev, "VDM tx: svid:%x cmd:%x cmd_type:%x svdm_hdr:%x\n",
		svid, cmd, cmd_type, svdm_hdr);
		usbpd_dbg(&pd->dev, "VDM tx: svid:%04x ver:%d obj_pos:%d cmd:%x cmd_type:%x svdm_hdr:%x\n",
		svid, pd->spec_rev == USBPD_REV_30 ? 1 : 0, obj_pos,
		cmd, cmd_type, svdm_hdr);

		return usbpd_send_vdm(pd, svdm_hdr, vdos, num_vdos);
		}
		@@ -1547,7 +1549,7 @@ static void handle_vdm_rx(struct usbpd pd, struct rx_msg rx_msg)
		ktime_t recvd_time = ktime_get();

		usbpd_dbg(&pd->dev,
		"VDM rx: svid:%x cmd:%x cmd_type:%x vdm_hdr:%x has_dp: %s\n",
		"VDM rx: svid:%04x cmd:%x cmd_type:%x vdm_hdr:%x has_dp: %s\n",
		svid, cmd, cmd_type, vdm_hdr,
		pd->has_dp ? "true" : "false");

		@@ -1574,11 +1576,9 @@ static void handle_vdm_rx(struct usbpd pd, struct rx_msg rx_msg)
		return;
		}

		if (SVDM_HDR_VER(vdm_hdr) > 1) {
		usbpd_dbg(&pd->dev, "Discarding SVDM with incorrect version:%d\n",
		if (SVDM_HDR_VER(vdm_hdr) > 1)
		usbpd_dbg(&pd->dev, "Received SVDM with unsupported version:%d\n",
		SVDM_HDR_VER(vdm_hdr));
		return;
		}

		if (cmd_type != SVDM_CMD_TYPE_INITIATOR &&
		pd->current_state != PE_SRC_STARTUP_WAIT_FOR_VDM_RESP)