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

Commit 88a25e02 authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Felipe Balbi
Browse files

usb: renesas_usbhs: Add access control for INTSTS1 and INTENB1 register 



INTSTS1 and INTENB1 register of renesas_usbhs can access only Host mode.
This adds process of accessing INTSTS1 and INTENB1 only when renesas_usbhs
is Host mode.

Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 1c14905e

drivers/usb/renesas_usbhs/mod.c

+34 −27
Original line number Diff line number Diff line
@@ -218,10 +218,12 @@ static int usbhs_status_get_each_irq(struct usbhs_priv *priv, 
	/********************  spin lock ********************/

	usbhs_lock(priv, flags);

	state->intsts0 = usbhs_read(priv, INTSTS0);

	state->intsts1 = usbhs_read(priv, INTSTS1);



	intenb0 = usbhs_read(priv, INTENB0);



	if (usbhs_mod_is_host(priv)) {

		state->intsts1 = usbhs_read(priv, INTSTS1);

		intenb1 = usbhs_read(priv, INTENB1);

	}



	/* mask */

	if (mod) {
@@ -275,6 +277,7 @@ static irqreturn_t usbhs_interrupt(int irq, void *data) 
	 *	   - Function :: VALID bit should 0

	 */

	usbhs_write(priv, INTSTS0, ~irq_state.intsts0 & INTSTS0_MAGIC);

	if (usbhs_mod_is_host(priv))

		usbhs_write(priv, INTSTS1, ~irq_state.intsts1 & INTSTS1_MAGIC);



	usbhs_write(priv, BRDYSTS, ~irq_state.brdysts);
@@ -303,6 +306,7 @@ static irqreturn_t usbhs_interrupt(int irq, void *data) 
	if (irq_state.intsts0 & BRDY)

		usbhs_mod_call(priv, irq_ready, priv, &irq_state);



	if (usbhs_mod_is_host(priv)) {

		/* INTSTS1 */

		if (irq_state.intsts1 & ATTCH)

			usbhs_mod_call(priv, irq_attch, priv, &irq_state);
@@ -315,7 +319,7 @@ static irqreturn_t usbhs_interrupt(int irq, void *data) 


		if (irq_state.intsts1 & SACK)

			usbhs_mod_call(priv, irq_sack, priv, &irq_state);



	}

	return IRQ_HANDLED;

}
@@ -334,6 +338,7 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod) 
	 *  - update INTSTS0

	 */

	usbhs_write(priv, INTENB0, 0);

	if (usbhs_mod_is_host(priv))

		usbhs_write(priv, INTENB1, 0);



	usbhs_write(priv, BEMPENB, 0);
@@ -368,6 +373,7 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod) 
			intenb0 |= BRDYE;

		}



		if (usbhs_mod_is_host(priv)) {

			/*

			 * INTSTS1

			 */
@@ -383,10 +389,11 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod) 
			if (mod->irq_sack)

				intenb1 |= SACKE;

		}

	}



	if (intenb0)

		usbhs_write(priv, INTENB0, intenb0);



	if (intenb1)

	if (usbhs_mod_is_host(priv) && intenb1)

		usbhs_write(priv, INTENB1, intenb1);

}