Re: [PATCH V4 3/4] ARM: shmobile: koelsch: Add USBHS and internal PCI USB support

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

 

On Mon, Feb 24, 2014 at 3:00 AM,  <vladimir.barinov@xxxxxxxxxxxxxxxxxx> wrote:
> From: Vladimir Barinov <vladimir.barinov@xxxxxxxxxxxxxxxxxx>
>
> This adds the following to R-Car M2 Koelsch board:
> - USBHS PHY
> - USBHS device
> - internal PCI USB host devices
>
> Depending on state of ID pin from MAX3355E chip the usb0 is configured
> ether as host or gadget.
> In case of gadget the USBHS device is registered.
> In case of host the PCI USB is registered.
>
> The USB phy is bound to either USB host or USBHS device respectively, hence
> configured to ether channel 0 or 2.
>
> The USBHS can act as USB Host, and this can be easily configured.
> But the simplest test with storage stick connected to USBHS Host provides
> IP resets and system hangs. Even the PWEN pin is not handled and it is nessasary to
> provide VBUS using gpio. It is easy to see in RCAR H2/M2 documentation
> that the USBHS IP changed. F.e. the PWEN/EXTLP pins are no more presented in
> USBHS via DVSTCTR register. And others.
>
> Since the USBHS is not stable in Host mode lets connect fully tested PCI USB IP to usb0.
>
> Signed-off-by: Valentine Barshak <valentine.barshak@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Vladimir Barinov <vladimir.barinov@xxxxxxxxxxxxxxxxxx>
>
> Changes in V4:
> * folded USBHS and internal PCI USB related patches together
> * added handling of ID pin from MAX3355E chip
> * removed ifdefs

Thanks for removing the ifdefs and adding some initial implementation
for the MAX chip.

Please see my comments below.

> --- build.orig/arch/arm/mach-shmobile/board-koelsch.c   2014-02-23 21:47:44.510571967 +0400
> +++ build/arch/arm/mach-shmobile/board-koelsch.c        2014-02-23 21:47:59.358571662 +0400
> @@ -367,6 +370,177 @@
>         DEFINE_RES_IRQ(gic_spi(168)),
>  };
>
> +/* USBHS */
> +static const struct resource usbhs_resources[] __initconst = {
> +       DEFINE_RES_MEM(0xe6590000, 0x100),
> +       DEFINE_RES_IRQ(gic_spi(107)),
> +};
> +
> +struct usbhs_private {
> +       struct renesas_usbhs_platform_info info;
> +       struct usb_phy *phy;
> +};
> +
> +#define usbhs_get_priv(pdev) \
> +       container_of(renesas_usbhs_get_info(pdev), struct usbhs_private, info)
> +
> +static int usbhs_power_ctrl(struct platform_device *pdev,
> +                               void __iomem *base, int enable)
> +{
> +       struct usbhs_private *priv = usbhs_get_priv(pdev);
> +
> +       if (!priv->phy)
> +               return -ENODEV;
> +
> +       if (enable) {
> +               int retval = usb_phy_init(priv->phy);
> +
> +               if (!retval)
> +                       retval = usb_phy_set_suspend(priv->phy, 0);
> +               return retval;
> +       }
> +
> +       usb_phy_set_suspend(priv->phy, 1);
> +       usb_phy_shutdown(priv->phy);
> +       return 0;
> +}
> +
> +static int usbhs_hardware_init(struct platform_device *pdev)
> +{
> +       struct usbhs_private *priv = usbhs_get_priv(pdev);
> +       struct usb_phy *phy;
> +
> +       phy = usb_get_phy_dev(&pdev->dev, 0);
> +       if (IS_ERR(phy))
> +               return PTR_ERR(phy);
> +
> +       priv->phy = phy;
> +       return 0;
> +}
> +
> +static int usbhs_hardware_exit(struct platform_device *pdev)
> +{
> +       struct usbhs_private *priv = usbhs_get_priv(pdev);
> +
> +       if (!priv->phy)
> +               return 0;
> +
> +       usb_put_phy(priv->phy);
> +       priv->phy = NULL;
> +       return 0;
> +}
> +
> +static int usbhs_get_id(struct platform_device *pdev)
> +{
> +       return USBHS_GADGET;
> +}

Uhm, I sort of expected this place to be where you read out the ID pin
state from the MAX device.

> +static u32 koelsch_usbhs_pipe_type[] = {
> +       USB_ENDPOINT_XFER_CONTROL,
> +       USB_ENDPOINT_XFER_ISOC,
> +       USB_ENDPOINT_XFER_ISOC,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_INT,
> +       USB_ENDPOINT_XFER_INT,
> +       USB_ENDPOINT_XFER_INT,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +       USB_ENDPOINT_XFER_BULK,
> +};
> +
> +static struct usbhs_private usbhs_priv __initdata = {
> +       .info = {
> +               .platform_callback = {
> +                       .power_ctrl     = usbhs_power_ctrl,
> +                       .hardware_init  = usbhs_hardware_init,
> +                       .hardware_exit  = usbhs_hardware_exit,
> +                       .get_id         = usbhs_get_id,
> +               },
> +               .driver_param = {
> +                       .buswait_bwait  = 4,
> +                       .pipe_type = koelsch_usbhs_pipe_type,
> +                       .pipe_size = ARRAY_SIZE(koelsch_usbhs_pipe_type),
> +               },
> +       }
> +};
> +
> +static void __init koelsch_add_usb0_gadget(void)
> +{
> +       usb_bind_phy("renesas_usbhs", 0, "usb_phy_rcar_gen2");
> +       platform_device_register_resndata(&platform_bus,
> +                                         "renesas_usbhs", -1,
> +                                         usbhs_resources,
> +                                         ARRAY_SIZE(usbhs_resources),
> +                                         &usbhs_priv.info,
> +                                         sizeof(usbhs_priv.info));
> +}
> +
> +/* Internal PCI0 */
> +static const struct resource pci0_resources[] __initconst = {
> +       DEFINE_RES_MEM(0xee090000, 0x10000),    /* CFG */
> +       DEFINE_RES_MEM(0xee080000, 0x10000),    /* MEM */
> +       DEFINE_RES_IRQ(gic_spi(108)),
> +};
> +
> +static void __init koelsch_add_usb0_host(void)
> +{
> +       usb_bind_phy("0000:00:01.0", 0, "usb_phy_rcar_gen2");
> +       usb_bind_phy("0000:00:02.0", 0, "usb_phy_rcar_gen2");
> +       platform_device_register_simple("pci-rcar-gen2",
> +                                       0, pci0_resources,
> +                                       ARRAY_SIZE(pci0_resources));
> +}
> +
> +/* Internal PCI1 */
> +static const struct resource pci1_resources[] __initconst = {
> +       DEFINE_RES_MEM(0xee0d0000, 0x10000),    /* CFG */
> +       DEFINE_RES_MEM(0xee0c0000, 0x10000),    /* MEM */
> +       DEFINE_RES_IRQ(gic_spi(113)),
> +};
> +
> +static void __init koelsch_add_usb1_host(void)
> +{
> +       platform_device_register_simple("pci-rcar-gen2",
> +                                       1, pci1_resources,
> +                                       ARRAY_SIZE(pci1_resources));
> +}
> +
> +/* USBHS PHY */
> +static struct rcar_gen2_phy_platform_data usbhs_phy_pdata = {
> +       .chan2_pci = 1, /* Channel 2 is PCI USB host */
> +};
> +
> +static const struct resource usbhs_phy_resources[] __initconst = {
> +       DEFINE_RES_MEM(0xe6590100, 0x100),
> +};
> +
> +/* Add all available USB devices */
> +static void __init koelsch_add_usb_devices(void)
> +{
> +       /* MAX3355E ID pin */
> +       gpio_request_one(RCAR_GP_PIN(5, 31), GPIOF_IN, NULL);
> +       if (!gpio_get_value(RCAR_GP_PIN(5, 31))) {
> +               usbhs_phy_pdata.chan0_pci = 1; /* Channel 0 is PCI USB host */
> +               koelsch_add_usb0_host();
> +       } else {
> +               usbhs_phy_pdata.chan0_pci = 0; /* Channel 0 is USBHS */
> +               koelsch_add_usb0_gadget();
> +       }

I don't think we should perform this kind of check at boot-up. This
goes without saying, but normal USB supports hot-plug so we should
check the cable type when the cable insertion event happens. Please
see my comment above for USBHS-specific location.

I do however understand that according to your investigation you
cannot use USBHS in host mode. I believe further investigation is
needed in that area to determine what is the best way forward.
Regarding VBUS control, I believe it should be possible to drive the
USB0_VBUS as GPIO and manually control the power.

Would it be possible for you to break out USB PCI support for USB1 and
resend that so we can begin by merging that?

Thanks,

/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[Index of Archives]     [Linux SPI]     [Linux Kernel]     [Linux ARM (vger)]     [Linux ARM MSM]     [Linux Omap]     [Linux Arm]     [Linux Tegra]     [Fedora ARM]     [Linux for Samsung SOC]     [eCos]     [Linux Fastboot]     [Gcc Help]     [Git]     [DCCP]     [IETF Announce]     [Security]     [Linux MIPS]     [Yosemite Campsites]

  Powered by Linux