Re: [PATCH v5 01/11] usb: chipidea: usb OTG fsm initialization.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Mar 30, 2014 at 08:20:03PM +0800, Li Jun wrote:
> This patch adds OTG fsm related initialization when do otg init,
> add a seperate file for OTG fsm related utilities.
> 
> Signed-off-by: Li Jun <b47624@xxxxxxxxxxxxx>
> ---
>  drivers/usb/chipidea/Makefile  |    1 +
>  drivers/usb/chipidea/ci.h      |   16 +++++++++++
>  drivers/usb/chipidea/otg.c     |    3 +-
>  drivers/usb/chipidea/otg_fsm.c |   60 ++++++++++++++++++++++++++++++++++++++++
>  drivers/usb/chipidea/otg_fsm.h |   29 +++++++++++++++++++
>  5 files changed, 108 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
> index 480bd4d..2f099c7 100644
> --- a/drivers/usb/chipidea/Makefile
> +++ b/drivers/usb/chipidea/Makefile
> @@ -6,6 +6,7 @@ ci_hdrc-y				:= core.o otg.o
>  ci_hdrc-$(CONFIG_USB_CHIPIDEA_UDC)	+= udc.o
>  ci_hdrc-$(CONFIG_USB_CHIPIDEA_HOST)	+= host.o
>  ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
> +ci_hdrc-$(CONFIG_USB_OTG_FSM)		+= otg_fsm.o
>  
>  # Glue/Bridge layers go here
>  
> diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> index 7ae8cb6..0bd16f6 100644
> --- a/drivers/usb/chipidea/ci.h
> +++ b/drivers/usb/chipidea/ci.h
> @@ -17,6 +17,7 @@
>  #include <linux/irqreturn.h>
>  #include <linux/usb.h>
>  #include <linux/usb/gadget.h>
> +#include <linux/usb/otg-fsm.h>
>  
>  /******************************************************************************
>   * DEFINE
> @@ -174,6 +175,7 @@ struct ci_hdrc {
>  	struct ci_role_driver		*roles[CI_ROLE_END];
>  	enum ci_role			role;
>  	bool				is_otg;
> +	struct otg_fsm			fsm;
>  	struct work_struct		work;
>  	struct workqueue_struct		*wq;
>  
> @@ -319,6 +321,20 @@ static inline u32 hw_test_and_write(struct ci_hdrc *ci, enum ci_hw_regs reg,
>  	return (val & mask) >> __ffs(mask);
>  }
>  
> +/**
> + * ci_otg_is_fsm_mode: runtime check if otg controller
> + * is in otg fsm mode.
> + */
> +static inline bool ci_otg_is_fsm_mode(struct ci_hdrc *ci)
> +{
> +#ifdef CONFIG_USB_OTG_FSM
> +	return ci->is_otg && ci->roles[CI_ROLE_HOST] &&
> +					ci->roles[CI_ROLE_GADGET];
> +#else
> +	return false;
> +#endif
> +}
> +
>  u32 hw_read_intr_enable(struct ci_hdrc *ci);
>  
>  u32 hw_read_intr_status(struct ci_hdrc *ci);
> diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c
> index c694340..b278cd9 100644
> --- a/drivers/usb/chipidea/otg.c
> +++ b/drivers/usb/chipidea/otg.c
> @@ -22,6 +22,7 @@
>  #include "ci.h"
>  #include "bits.h"
>  #include "otg.h"
> +#include "otg_fsm.h"
>  
>  /**
>   * hw_read_otgsc returns otgsc register bits value.
> @@ -116,7 +117,7 @@ int ci_hdrc_otg_init(struct ci_hdrc *ci)
>  		return -ENODEV;
>  	}
>  
> -	return 0;
> +	return ci_hdrc_otg_fsm_init(ci);


How about below change:

+	if (ci_otg_is_fsm_mode(ci))
+		return ci_hdrc_otg_fsm_init(ci);

In that case, the user doesn't need to look into ci_hdrc_otg_fsm_init.

>  }
>  
>  /**
> diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
> new file mode 100644
> index 0000000..35748a9
> --- /dev/null
> +++ b/drivers/usb/chipidea/otg_fsm.c
> @@ -0,0 +1,60 @@
> +/*
> + * otg_fsm.c - ChipIdea USB IP core OTG FSM driver
> + *
> + * Copyright (C) 2014 Freescale Semiconductor, Inc.
> + *
> + * Author: Jun Li
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +/*
> + * This file mainly handles OTG fsm, it includes OTG fsm operations
> + * for HNP and SRP.
> + */
> +
> +#include <linux/usb/otg.h>
> +#include <linux/usb/gadget.h>
> +#include <linux/usb/chipidea.h>
> +
> +#include "ci.h"
> +#include "bits.h"
> +#include "otg.h"
> +#include "otg_fsm.h"
> +
> +int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
> +{
> +	if (!ci_otg_is_fsm_mode(ci))
> +		return 0;

The above code doesn't need if checking ci_otg_is_fsm_mode before.

> +
> +	ci->transceiver->otg = devm_kzalloc(ci->dev,
> +			sizeof(struct usb_otg), GFP_KERNEL);
> +	if (!ci->transceiver->otg) {
> +		dev_err(ci->dev,
> +		"Failed to allocate usb_otg structure for ci hdrc otg!\n");
> +		return -ENOMEM;
> +	}
> +
> +	ci->fsm.power_up = 1;
> +	ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID);
> +	ci->fsm.otg = ci->transceiver->otg;
> +	ci->fsm.otg->phy = ci->transceiver;
> +	ci->fsm.otg->gadget = &ci->gadget;
> +	ci->transceiver->state = OTG_STATE_UNDEFINED;
> +
> +	mutex_init(&ci->fsm.lock);
> +
> +	/* Enable A vbus valid irq */
> +	hw_write_otgsc(ci, OTGSC_AVVIE, OTGSC_AVVIE);
> +
> +	if (ci->fsm.id) {
> +		ci->fsm.b_ssend_srp =
> +			hw_read_otgsc(ci, OTGSC_BSV) ? 0 : 1;
> +		ci->fsm.b_sess_vld =
> +			hw_read_otgsc(ci, OTGSC_BSV) ? 1 : 0;
> +	}
> +
> +	return 0;
> +}
> diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h
> new file mode 100644
> index 0000000..bf20a85
> --- /dev/null
> +++ b/drivers/usb/chipidea/otg_fsm.h
> @@ -0,0 +1,29 @@
> +/*
> + * Copyright (C) 2014 Freescale Semiconductor, Inc.
> + *
> + * Author: Jun Li
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
> +#define __DRIVERS_USB_CHIPIDEA_OTG_FSM_H
> +
> +#include <linux/usb/otg-fsm.h>
> +
> +#ifdef CONFIG_USB_OTG_FSM
> +
> +int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci);
> +
> +#else
> +
> +static inline int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
> +{
> +	return 0;
> +}
> +
> +#endif
> +
> +#endif /* __DRIVERS_USB_CHIPIDEA_OTG_FSM_H */
> -- 
> 1.7.9.5
> 
> 

-- 

Best Regards,
Peter Chen

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux