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

Commit d28d105e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dwc3-msm: Block doorbell to GSI from USB wrapper"

parents 9227b4e6 404c72d5

drivers/usb/dwc3/core.h

+1 −0
Original line number Diff line number Diff line
@@ -846,6 +846,7 @@ struct dwc3_scratchpad_array { 
#define DWC3_GSI_EVT_BUF_SETUP			11

#define DWC3_GSI_EVT_BUF_CLEANUP		12

#define DWC3_GSI_EVT_BUF_FREE			13

#define DWC3_CONTROLLER_NOTIFY_CLEAR_DB		14



#define MAX_INTR_STATS				10

drivers/usb/dwc3/dwc3-msm.c

+5 −0
Original line number Diff line number Diff line
@@ -2027,6 +2027,11 @@ static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned int event, 
	case DWC3_CONTROLLER_NOTIFY_DISABLE_UPDXFER:

		dwc3_msm_dbm_disable_updxfer(dwc, value);

		break;

	case DWC3_CONTROLLER_NOTIFY_CLEAR_DB:

		dev_dbg(mdwc->dev, "DWC3_CONTROLLER_NOTIFY_CLEAR_DB\n");

		dwc3_msm_write_reg_field(mdwc->base,

			GSI_GENERAL_CFG_REG, BLOCK_GSI_WR_GO_MASK, true);

		break;

	default:

		dev_dbg(mdwc->dev, "unknown dwc3 event\n");

		break;

drivers/usb/dwc3/gadget.c

+3 −0
Original line number Diff line number Diff line
@@ -3042,6 +3042,9 @@ static void dwc3_stop_active_transfers(struct dwc3 *dwc) 
		if (!(dep->flags & DWC3_EP_ENABLED))

			continue;



		if (dep->endpoint.ep_type == EP_TYPE_GSI && dep->direction)

			dwc3_notify_event(dwc,

					DWC3_CONTROLLER_NOTIFY_CLEAR_DB, 0);

		dwc3_remove_requests(dwc, dep);

	}

}