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

Commit 64d72675 authored by Jack Pham's avatar Jack Pham
Browse files

usb: pd: Avoid calling SVID disconnect if not previously connected 



Only call an SVID handler's disconnect function only if it was
previously connected, i.e. when the state machine had proceeded
received a successful DISCOVER_SVIDs response. This helps to
avoid excessive notification to SVID clients.

While at it, require that .connect and .disconnect callbacks
are supplied during registration. This helps to eliminate NULL
checks each time they are called.

Change-Id: I030153a6b2106a6504ed51b5cb00a27f842e2488
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 9d735f22

drivers/usb/pd/policy_engine.c

+19 −6
Original line number Diff line number Diff line
@@ -942,6 +942,13 @@ int usbpd_register_svid(struct usbpd *pd, struct usbpd_svid_handler *hdlr) 
		return -EINVAL;

	}



	/* require connect/disconnect callbacks be implemented */

	if (!hdlr->connect || !hdlr->disconnect) {

		usbpd_err(&pd->dev, "SVID 0x%04x connect/disconnect must be non-NULL\n",

				hdlr->svid);

		return -EINVAL;

	}



	usbpd_dbg(&pd->dev, "registered handler for SVID 0x%04x\n", hdlr->svid);



	list_add_tail(&hdlr->entry, &pd->svid_handlers);
@@ -952,8 +959,8 @@ int usbpd_register_svid(struct usbpd *pd, struct usbpd_svid_handler *hdlr) 


		for (i = 0; i < pd->num_svids; i++) {

			if (pd->discovered_svids[i] == hdlr->svid) {

				if (hdlr->connect)

				hdlr->connect(hdlr);

				hdlr->discovered = true;

				break;

			}

		}
@@ -1165,8 +1172,10 @@ static void handle_vdm_rx(struct usbpd *pd, struct rx_msg *rx_msg) 
				svid = pd->discovered_svids[i];

				if (svid) {

					handler = find_svid_handler(pd, svid);

					if (handler && handler->connect)

					if (handler) {

						handler->connect(handler);

						handler->discovered = true;

					}

				}

			}
@@ -1271,10 +1280,14 @@ static void reset_vdm_state(struct usbpd *pd) 
{

	struct usbpd_svid_handler *handler;



	pd->vdm_state = VDM_NONE;

	list_for_each_entry(handler, &pd->svid_handlers, entry)

		if (handler->disconnect)

	list_for_each_entry(handler, &pd->svid_handlers, entry) {

		if (handler->discovered) {

			handler->disconnect(handler);

			handler->discovered = false;

		}

	}



	pd->vdm_state = VDM_NONE;

	kfree(pd->vdm_tx_retry);

	pd->vdm_tx_retry = NULL;

	kfree(pd->discovered_svids);

include/linux/usb/usbpd.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum usbpd_svdm_cmd_type { 
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);
@@ -54,7 +55,9 @@ struct usbpd_svid_handler { 
			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 {