lkml.org 
[lkml]   [2005]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/22] USB: ohci, move ppc asic tweaks nearer pci
    From: David Brownell <david-b@pacbell.net>

    This should fix a suspend/resume issues that appear with OHCI on some
    PPC hardware. The PCI layer should doesn't have the hooks needed for
    such ASIC-specific hooks (in this case, software clock gating), so
    this moves the code to do that into hcd-pci.c ... where it can be
    done after the relevant PCI PM state transition (to/from D3).

    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/core/hcd-pci.c | 38 ++++++++++++++++++++++++++++++++++++--
    drivers/usb/host/ohci-pci.c | 36 ------------------------------------
    2 files changed, 36 insertions(+), 38 deletions(-)

    --- usb-2.6.orig/drivers/usb/core/hcd-pci.c
    +++ usb-2.6/drivers/usb/core/hcd-pci.c
    @@ -20,9 +20,17 @@
    #include <linux/kernel.h>
    #include <linux/module.h>
    #include <linux/pci.h>
    +#include <linux/usb.h>
    +
    #include <asm/io.h>
    #include <asm/irq.h>
    -#include <linux/usb.h>
    +
    +#ifdef CONFIG_PPC_PMAC
    +#include <asm/machdep.h>
    +#include <asm/pmac_feature.h>
    +#include <asm/pci-bridge.h>
    +#include <asm/prom.h>
    +#endif

    #include "usb.h"
    #include "hcd.h"
    @@ -277,8 +285,22 @@ int usb_hcd_pci_suspend (struct pci_dev
    }

    done:
    - if (retval == 0)
    + if (retval == 0) {
    dev->dev.power.power_state = PMSG_SUSPEND;
    +
    +#ifdef CONFIG_PPC_PMAC
    + /* Disable ASIC clocks for USB */
    + if (_machine == _MACH_Pmac) {
    + struct device_node *of_node;
    +
    + of_node = pci_device_to_OF_node (dev);
    + if (of_node)
    + pmac_call_feature(PMAC_FTR_USB_ENABLE,
    + of_node, 0, 0);
    + }
    +#endif
    + }
    +
    return retval;
    }
    EXPORT_SYMBOL (usb_hcd_pci_suspend);
    @@ -301,6 +323,18 @@ int usb_hcd_pci_resume (struct pci_dev *
    return 0;
    }

    +#ifdef CONFIG_PPC_PMAC
    + /* Reenable ASIC clocks for USB */
    + if (_machine == _MACH_Pmac) {
    + struct device_node *of_node;
    +
    + of_node = pci_device_to_OF_node (dev);
    + if (of_node)
    + pmac_call_feature (PMAC_FTR_USB_ENABLE,
    + of_node, 0, 1);
    + }
    +#endif
    +
    /* NOTE: chip docs cover clean "real suspend" cases (what Linux
    * calls "standby", "suspend to RAM", and so on). There are also
    * dirty cases when swsusp fakes a suspend in "shutdown" mode.
    --- usb-2.6.orig/drivers/usb/host/ohci-pci.c
    +++ usb-2.6/drivers/usb/host/ohci-pci.c
    @@ -14,15 +14,6 @@
    * This file is licenced under the GPL.
    */

    -#include <linux/jiffies.h>
    -
    -#ifdef CONFIG_PPC_PMAC
    -#include <asm/machdep.h>
    -#include <asm/pmac_feature.h>
    -#include <asm/pci-bridge.h>
    -#include <asm/prom.h>
    -#endif
    -
    #ifndef CONFIG_PCI
    #error "This file is PCI bus glue. CONFIG_PCI must be defined."
    #endif
    @@ -115,39 +106,12 @@ ohci_pci_start (struct usb_hcd *hcd)
    static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message)
    {
    /* root hub was already suspended */
    -
    - /* FIXME these PMAC things get called in the wrong places. ASIC
    - * clocks should be turned off AFTER entering D3, and on BEFORE
    - * trying to enter D0. Evidently the PCI layer doesn't currently
    - * provide the right sort of platform hooks for this ...
    - */
    -#ifdef CONFIG_PPC_PMAC
    - if (_machine == _MACH_Pmac) {
    - struct device_node *of_node;
    -
    - /* Disable USB PAD & cell clock */
    - of_node = pci_device_to_OF_node (to_pci_dev(hcd->self.controller));
    - if (of_node)
    - pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0);
    - }
    -#endif /* CONFIG_PPC_PMAC */
    return 0;
    }


    static int ohci_pci_resume (struct usb_hcd *hcd)
    {
    -#ifdef CONFIG_PPC_PMAC
    - if (_machine == _MACH_Pmac) {
    - struct device_node *of_node;
    -
    - /* Re-enable USB PAD & cell clock */
    - of_node = pci_device_to_OF_node (to_pci_dev(hcd->self.controller));
    - if (of_node)
    - pmac_call_feature (PMAC_FTR_USB_ENABLE, of_node, 0, 1);
    - }
    -#endif /* CONFIG_PPC_PMAC */
    -
    usb_hcd_resume_root_hub(hcd);
    return 0;
    }
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-11-24 00:49    [W:0.027 / U:94.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site