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

Commit 2b54fa83 authored by Jack Pham's avatar Jack Pham
Browse files

usb: pd: fix compilation errors 



Fix compilation errors introduced during the snapshot from
msm-4.14 and subsequent cherry-picks.

 - Add missing linux/usb/usbpd.h header
 - Upstream moved extcon definitions to <linux/extcon-provider.h>
 - Fix missing space after '=' in Makefile, otherwise 'pd'
   subdirectory fails to be included
 - Fix a few places where break/return were incorrectly used
 - MSG_BATTERY_STATUS is not an extended message so handling
   should have been done in handle_data_snk_ready()

Change-Id: I248b17a8479572b53b2a792877460d6474bca113
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent aaf18e3a

drivers/usb/pd/policy_engine.c

+23 −22
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/workqueue.h>

#include <linux/extcon.h>

#include <linux/extcon-provider.h>

#include <linux/usb/class-dual-role.h>

#include <linux/usb/usbpd.h>

#include "usbpd.h"
@@ -1327,10 +1327,11 @@ int usbpd_send_svdm(struct usbpd *pd, u16 svid, u8 cmd, 
EXPORT_SYMBOL(usbpd_send_svdm);



static void handle_vdm_resp_ack(struct usbpd *pd, u32 *vdos, u8 num_vdos,

	u8 cmd)

	u16 vdm_hdr)

{

	int ret, i;

	u16 svid, *psvid;

	u8 cmd = SVDM_HDR_CMD(vdm_hdr);

	struct usbpd_svid_handler *handler;



	switch (cmd) {
@@ -1461,6 +1462,7 @@ static void handle_vdm_resp_ack(struct usbpd *pd, u32 *vdos, u8 num_vdos, 
}

static void handle_vdm_rx(struct usbpd *pd, struct rx_msg *rx_msg)

{

	int ret;

	u32 vdm_hdr =

	rx_msg->data_len >= sizeof(u32) ? ((u32 *)rx_msg->payload)[0] : 0;
@@ -1552,7 +1554,7 @@ static void handle_vdm_rx(struct usbpd *pd, struct rx_msg *rx_msg) 
			break;

		}



		handle_vdm_resp_ack(pd, vdos, num_vdos, cmd);

		handle_vdm_resp_ack(pd, vdos, num_vdos, vdm_hdr);

		break;



	case SVDM_CMD_TYPE_RESP_NAK:
@@ -2157,7 +2159,7 @@ static void handle_state_src_send_capabilities(struct usbpd *pd, 
	if (ret) {

		if (pd->pd_connected) {

			usbpd_set_state(pd, PE_SEND_SOFT_RESET);

			break;

			return;

		}



		/*
@@ -2353,7 +2355,7 @@ static void handle_state_src_ready(struct usbpd *pd, struct rx_msg *rx_msg) 
		   IS_CTRL(rx_msg, MSG_WAIT)) {

		usbpd_warn(&pd->dev, "Unexpected message\n");

		usbpd_set_state(pd, PE_SEND_SOFT_RESET);

		break;

		return;

	} else if (rx_msg && !IS_CTRL(rx_msg, MSG_NOT_SUPPORTED)) {

		usbpd_dbg(&pd->dev, "Unsupported message\n");

		ret = pd_send_msg(pd, pd->spec_rev == USBPD_REV_30 ?
@@ -2474,6 +2476,7 @@ static void handle_state_src_transition_to_default(struct usbpd *pd, 


static void enter_state_snk_startup(struct usbpd *pd)

{

	int ret;

	struct pd_phy_params phy_params = {

		.signal_cb		= phy_sig_received,

		.msg_rx_cb		= phy_msg_received,
@@ -2760,21 +2763,19 @@ static bool handle_ctrl_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg) 
		ret = pd_send_msg(pd, MSG_SOURCE_CAPABILITIES,

				default_src_caps,

				ARRAY_SIZE(default_src_caps), SOP_MSG);

		if (ret) {

		if (ret)

			usbpd_set_state(pd, PE_SEND_SOFT_RESET);

			return;

		}

		break;

	case MSG_DR_SWAP:

		if (pd->vdm_state == MODE_ENTERED) {

			usbpd_set_state(pd, PE_SNK_HARD_RESET);

			return;

			break;

		}



		ret = pd_send_msg(pd, MSG_ACCEPT, NULL, 0, SOP_MSG);

		if (ret) {

			usbpd_set_state(pd, PE_SEND_SOFT_RESET);

			return;

			break;

		}



		dr_swap(pd);
@@ -2784,7 +2785,7 @@ static bool handle_ctrl_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg) 
		ret = pd_send_msg(pd, MSG_ACCEPT, NULL, 0, SOP_MSG);

		if (ret) {

			usbpd_set_state(pd, PE_SEND_SOFT_RESET);

			return;

			break;

		}



		usbpd_set_state(pd, PE_PRS_SNK_SRC_TRANSITION_TO_OFF);
@@ -2829,6 +2830,8 @@ static bool handle_ctrl_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg) 


static bool handle_data_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg)

{

	u32 ado;



	switch (PD_MSG_HDR_TYPE(rx_msg->hdr)) {

	case MSG_SOURCE_CAPABILITIES:

		/* save the PDOs so userspace can further evaluate */
@@ -2845,8 +2848,6 @@ static bool handle_data_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg) 
		handle_vdm_rx(pd, rx_msg);

		break;

	case MSG_ALERT:

		u32 ado;



		if (rx_msg->data_len != sizeof(ado)) {

			usbpd_err(&pd->dev, "Invalid ado\n");

			break;
@@ -2862,6 +2863,15 @@ static bool handle_data_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg) 
		pd->send_get_status = true;

		kick_sm(pd, 150);

		break;

	case MSG_BATTERY_STATUS:

		if (rx_msg->data_len != sizeof(pd->battery_sts_dobj)) {

			usbpd_err(&pd->dev, "Invalid bat sts dobj\n");

			break;

		}

		memcpy(&pd->battery_sts_dobj, rx_msg->payload,

			sizeof(pd->battery_sts_dobj));

		complete(&pd->is_ready);

		break;

	default:

		return false;

	}
@@ -2908,15 +2918,6 @@ static bool handle_ext_snk_ready(struct usbpd *pd, struct rx_msg *rx_msg) 
			sizeof(pd->battery_cap_db));

		complete(&pd->is_ready);

		break;

	case MSG_BATTERY_STATUS:

		if (rx_msg->data_len != sizeof(pd->battery_sts_dobj)) {

			usbpd_err(&pd->dev, "Invalid bat sts dobj\n");

			break;

		}

		memcpy(&pd->battery_sts_dobj, rx_msg->payload,

			sizeof(pd->battery_sts_dobj));

		complete(&pd->is_ready);

		break;

	case MSG_GET_BATTERY_CAP:

		handle_get_battery_cap(pd, rx_msg);

		break;

include/linux/usb/usbpd.h

0 → 100644
+156 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 */



#ifndef __LINUX_USB_USBPD_H

#define __LINUX_USB_USBPD_H



#include <linux/list.h>



struct usbpd;



/* Standard IDs */

#define USBPD_SID			0xff00



/* Structured VDM Command Type */

enum usbpd_svdm_cmd_type {

	SVDM_CMD_TYPE_INITIATOR,

	SVDM_CMD_TYPE_RESP_ACK,

	SVDM_CMD_TYPE_RESP_NAK,

	SVDM_CMD_TYPE_RESP_BUSY,

};



/* Structured VDM Commands */

#define USBPD_SVDM_DISCOVER_IDENTITY	0x1

#define USBPD_SVDM_DISCOVER_SVIDS	0x2

#define USBPD_SVDM_DISCOVER_MODES	0x3

#define USBPD_SVDM_ENTER_MODE		0x4

#define USBPD_SVDM_EXIT_MODE		0x5

#define USBPD_SVDM_ATTENTION		0x6



/*

 * Implemented by client

 */

struct usbpd_svid_handler {

	u16 svid;



	/* Notified when VDM session established/reset; must be implemented */

	void (*connect)(struct usbpd_svid_handler *hdlr);

	void (*disconnect)(struct usbpd_svid_handler *hdlr);



	/* DP driver -> PE driver for requesting USB SS lanes */

	int (*request_usb_ss_lane)(struct usbpd *pd,

			struct usbpd_svid_handler *hdlr);



	/* Unstructured VDM */

	void (*vdm_received)(struct usbpd_svid_handler *hdlr, u32 vdm_hdr,

			const u32 *vdos, int num_vdos);



	/* Structured VDM */

	void (*svdm_received)(struct usbpd_svid_handler *hdlr, u8 cmd,

			enum usbpd_svdm_cmd_type cmd_type, const u32 *vdos,

			int num_vdos);



	/* client should leave these blank; private members used by PD driver */

	struct list_head entry;

	bool discovered;

};



enum plug_orientation {

	ORIENTATION_NONE,

	ORIENTATION_CC1,

	ORIENTATION_CC2,

};



#if IS_ENABLED(CONFIG_USB_PD_POLICY)

/*

 * Obtains an instance of usbpd from a DT phandle

 */

struct usbpd *devm_usbpd_get_by_phandle(struct device *dev,

		const char *phandle);



/*

 * Called by client to handle specific SVID messages.

 * Specify callback functions in the usbpd_svid_handler argument

 */

int usbpd_register_svid(struct usbpd *pd, struct usbpd_svid_handler *hdlr);



void usbpd_unregister_svid(struct usbpd *pd, struct usbpd_svid_handler *hdlr);



/*

 * Transmit a VDM message.

 */

int usbpd_send_vdm(struct usbpd *pd, u32 vdm_hdr, const u32 *vdos,

		int num_vdos);



/*

 * Transmit a Structured VDM message.

 */

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);



/*

 * Get current status of CC pin orientation.

 *

 * Return: ORIENTATION_CC1 or ORIENTATION_CC2 if attached,

 *         otherwise ORIENTATION_NONE if not attached

 */

enum plug_orientation usbpd_get_plug_orientation(struct usbpd *pd);

#else

static inline struct usbpd *devm_usbpd_get_by_phandle(struct device *dev,

		const char *phandle)

{

	return ERR_PTR(-ENODEV);

}



static inline int usbpd_register_svid(struct usbpd *pd,

		struct usbpd_svid_handler *hdlr)

{

	return -EINVAL;

}



static inline void usbpd_unregister_svid(struct usbpd *pd,

		struct usbpd_svid_handler *hdlr)

{

}



static inline int usbpd_send_vdm(struct usbpd *pd, u32 vdm_hdr, const u32 *vdos,

		int num_vdos)

{

	return -EINVAL;

}



static inline 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)

{

	return -EINVAL;

}



static inline enum plug_orientation usbpd_get_plug_orientation(struct usbpd *pd)

{

	return ORIENTATION_NONE;

}

#endif /* IS_ENABLED(CONFIG_USB_PD_POLICY) */



/*

 * Additional helpers for Enter/Exit Mode commands

 */



static inline int usbpd_enter_mode(struct usbpd *pd, u16 svid, int mode,

		const u32 *vdo)

{

	return usbpd_send_svdm(pd, svid, USBPD_SVDM_ENTER_MODE,

			SVDM_CMD_TYPE_INITIATOR, mode, vdo, vdo ? 1 : 0);

}



static inline int usbpd_exit_mode(struct usbpd *pd, u16 svid, int mode,

		const u32 *vdo)

{

	return usbpd_send_svdm(pd, svid, USBPD_SVDM_EXIT_MODE,

			SVDM_CMD_TYPE_INITIATOR, mode, vdo, vdo ? 1 : 0);

}



#endif /* __LINUX_USB_USBPD_H */

drivers/usb/Makefile

+1 −1

File changed.

Contains only whitespace changes.