On Mon, Sep 24, 2012 at 02:44:19PM +0000, Liu Shengzhou-B36685 wrote: > > > -----Original Message----- > > From: Greg KH [mailto:greg@xxxxxxxxx] > > Sent: 2012年9月22日 22:49 > > To: Kumar Gala > > Cc: Liu Shengzhou-B36685; linuxppc-dev@xxxxxxxxxxxxxxxx; linux- > > usb@xxxxxxxxxxxxxxx > > Subject: Re: [PATCH v3] powerpc/usb: fix bug of CPU hang when missing > > USB PHY clock > > > > On Sat, Sep 22, 2012 at 09:39:15AM -0500, Kumar Gala wrote: > > > > > > On Sep 21, 2012, at 11:43 AM, Greg KH wrote: > > > > > > > On Tue, Sep 18, 2012 at 04:52:39PM +0800, Shengzhou Liu wrote: > > > >> when missing USB PHY clock, kernel booting up will hang during USB > > > >> initialization. We should check USBGP[PHY_CLK_VALID] bit to avoid > > > >> CPU hanging in this case. > > > >> > > > >> Signed-off-by: Shengzhou Liu <Shengzhou.Liu@xxxxxxxxxxxxx> > > > >> --- > > > >> v3 change: no check for UTMI PHY. > > > >> v2 change: use spin_event_timeout() instead. > > > >> > > > >> drivers/usb/host/ehci-fsl.c | 57 +++++++++++++++++++++++++++++-- > > ----------- > > > >> drivers/usb/host/ehci-fsl.h | 1 + > > > >> include/linux/fsl_devices.h | 1 + > > > >> 3 files changed, 41 insertions(+), 18 deletions(-) > > > > > > > > This is already applied, right? > > > > > > > > greg k-h > > > > > > It appears that v2 of the patch is applied to your usb-next branch. > > > > > > in drivers/usb/host/ehci-fsl.c > > > > > > V2: > > > @@ -262,23 +266,34 @@ static void ehci_fsl_setup_phy(struct usb_hcd > > *hcd, > > > case FSL_USB2_PHY_NONE: > > > break; > > > } > > > + > > > + if ((pdata->controller_ver) && ((phy_mode == > > FSL_USB2_PHY_ULPI) || > > > + (phy_mode == FSL_USB2_PHY_UTMI))) { > > > > > > V3: > > > > > > @@ -262,23 +266,33 @@ static void ehci_fsl_setup_phy(struct usb_hcd > > *hcd, > > > > > > case FSL_USB2_PHY_NONE: > > > break; > > > } > > > > > > + > > > + if (pdata->controller_ver && (phy_mode == FSL_USB2_PHY_ULPI)) { > > > + /* check PHY_CLK_VALID to get phy clk valid */ > > > > Ok, can someone please make the incremental patch that I need to apply > > here and send it to me? > > > > thanks, > > > > greg k-h > > Hi greg, > > I have sent the below incremental patch to you, please squash it into the previous patch v2, which had been applied in your usb-next branch. > http://patchwork.ozlabs.org/patch/186443/ Given that this is a git tree, "squashing" patches does not work at all. I'll just apply it as-is. thanks, greg k-h -- 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
