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

Commit 34145b60 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: svc: clean up CPortFlags handling 



Clean up CPortFlags handling and explicitly disable CSD when E2EFC is
enabled (CSD_n is ignored when E2EFC is set).

Note that the bootrom requires E2EFC, CSD, and CSV to all be disabled.

Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent cb033188

drivers/staging/greybus/svc.c

+5 −12
Original line number Diff line number Diff line
@@ -291,21 +291,14 @@ int gb_svc_connection_create(struct gb_svc *svc, 
	request.cport1_id = cpu_to_le16(cport1_id);

	request.intf2_id = intf2_id;

	request.cport2_id = cpu_to_le16(cport2_id);

	/*

	 * XXX: fix connections paramaters to TC0 and all CPort flags

	 * for now.

	 */

	request.tc = 0;

	request.tc = 0;		/* TC0 */



	/*

	 * We need to skip setting E2EFC and other flags to the connection

	 * create request, for all cports, on an interface that need to boot

	 * over unipro, i.e. interfaces required to download firmware.

	 */

	/* The ES2/ES3 bootrom requires E2EFC, CSD and CSV to be disabled. */

	request.flags = CPORT_FLAGS_CSV_N;

	if (boot_over_unipro)

		request.flags = CPORT_FLAGS_CSV_N | CPORT_FLAGS_CSD_N;

		request.flags |= CPORT_FLAGS_CSD_N;

	else

		request.flags = CPORT_FLAGS_CSV_N | CPORT_FLAGS_E2EFC;

		request.flags |= CPORT_FLAGS_CSD_N | CPORT_FLAGS_E2EFC;



	return gb_operation_sync(svc->connection, GB_SVC_TYPE_CONN_CREATE,

				 &request, sizeof(request), NULL, 0);