From patchwork Tue Apr 10 00:16:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin X-Patchwork-Id: 10332145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C8FE96053B for ; Tue, 10 Apr 2018 00:16:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B86EC288E2 for ; Tue, 10 Apr 2018 00:16:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACBFD28C6F; Tue, 10 Apr 2018 00:16:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49647288E2 for ; Tue, 10 Apr 2018 00:16:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751630AbeDJAQp (ORCPT ); Mon, 9 Apr 2018 20:16:45 -0400 Received: from sender-of-o52.zoho.com ([135.84.80.217]:21342 "EHLO sender-of-o52.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbeDJAQo (ORCPT ); Mon, 9 Apr 2018 20:16:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1523319384; s=somekey; d=ziemianowicz.com; i=marcin@ziemianowicz.com; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; l=4831; bh=SbQ38ZumlXOg+I94vNkqD5tlseah/jBPdVD1jJcJHfY=; b=e5cw6ZZCNg8W+NcKND0UIkT4U38YGYzTlB9LmcYZLOE5YQHVi6ne0Z8teKUPskqK jCaV/+Dcupv9G5mZMkS5ZGfiBEhZcq7ARf7STRmLdg8Kxy0eqsJ/uSOc7ZGOPJRDEAs yCSuUzrT4Umhy31YTJOLdzI191z78m80ytA4iqg0= Received: from hak8or (98.15.121.23 [98.15.121.23]) by mx.zohomail.com with SMTPS id 1523319384425385.75876733893267; Mon, 9 Apr 2018 17:16:24 -0700 (PDT) Date: Mon, 9 Apr 2018 20:16:21 -0400 From: Marcin Ziemianowicz To: Boris Brezillon , Nicolas Ferre , Alexandre Belloni , Greg Kroah-Hartman Cc: Michael Turquette , Stephen Boyd , Alan Stern , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v2 1/2] clk: at91: Added more information logging. Message-ID: <20180410001621.GA62230@hak8or> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-ZohoMailClient: External Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I noticed that when debugging some USB clocking issue that there weren't many ways to tell what the state of the USB clocking system was. This adds a few logging statements to see what the relevant code is trying to do. Signed-off-by: Marcin Ziemianowicz --- drivers/clk/at91/clk-pll.c | 6 +++++- drivers/clk/at91/clk-usb.c | 10 ++++++++-- drivers/usb/host/ohci-at91.c | 16 ++++++++++------ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c index 7d3223fc7161..534961766ae5 100644 --- a/drivers/clk/at91/clk-pll.c +++ b/drivers/clk/at91/clk-pll.c @@ -133,6 +133,7 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hw, { struct clk_pll *pll = to_clk_pll(hw); unsigned int pllr; + unsigned long recalcedrate; u16 mul; u8 div; @@ -144,7 +145,10 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hw, if (!div || !mul) return 0; - return (parent_rate / div) * (mul + 1); + recalcedrate = (parent_rate / div) * (mul + 1); + pr_debug("clk-pll: calculating new rate, (%lu hz / %u) * %u = %lu hz\n", + parent_rate, div, mul, recalcedrate); + return recalcedrate; } static long clk_pll_get_best_div_mul(struct clk_pll *pll, unsigned long rate, diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c index 791770a563fc..2fa877e99bac 100644 --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c @@ -48,11 +48,15 @@ static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw, struct at91sam9x5_clk_usb *usb = to_at91sam9x5_clk_usb(hw); unsigned int usbr; u8 usbdiv; + unsigned int calcdclock; regmap_read(usb->regmap, AT91_PMC_USB, &usbr); usbdiv = (usbr & AT91_PMC_OHCIUSBDIV) >> SAM9X5_USB_DIV_SHIFT; - return DIV_ROUND_CLOSEST(parent_rate, (usbdiv + 1)); + calcdclock = DIV_ROUND_CLOSEST(parent_rate, (usbdiv + 1)); + pr_debug("clk-usb: calculating new rate, %lu hz / %u = %u hz\n", + parent_rate, usbdiv + 1, calcdclock); + return calcdclock; } static int at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, @@ -98,7 +102,6 @@ static int at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, if (!best_diff) break; } - if (best_rate < 0) return best_rate; @@ -142,6 +145,9 @@ static int at91sam9x5_clk_usb_set_rate(struct clk_hw *hw, unsigned long rate, if (div > SAM9X5_USB_MAX_DIV + 1 || !div) return -EINVAL; + pr_debug("clk-usb: setting USB clock divider to %lu hz / %lu = %lu hz\n", + parent_rate, div, rate); + regmap_update_bits(usb->regmap, AT91_PMC_USB, AT91_PMC_OHCIUSBDIV, (div - 1) << SAM9X5_USB_DIV_SHIFT); diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 5ad9e9bdc8ee..c57a239918f9 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -70,11 +70,13 @@ static const struct ohci_driver_overrides ohci_at91_drv_overrides __initconst = /*-------------------------------------------------------------------------*/ -static void at91_start_clock(struct ohci_at91_priv *ohci_at91) +static void at91_start_clock(struct ohci_at91_priv *ohci_at91, + struct device *dev) { if (ohci_at91->clocked) return; + dev_dbg(dev, "Enabling hclk, iclk, and setting fclk to 48 Mhz\n"); clk_set_rate(ohci_at91->fclk, 48000000); clk_prepare_enable(ohci_at91->hclk); clk_prepare_enable(ohci_at91->iclk); @@ -82,11 +84,13 @@ static void at91_start_clock(struct ohci_at91_priv *ohci_at91) ohci_at91->clocked = true; } -static void at91_stop_clock(struct ohci_at91_priv *ohci_at91) +static void at91_stop_clock(struct ohci_at91_priv *ohci_at91, + struct device *dev) { if (!ohci_at91->clocked) return; + dev_dbg(dev, "Disabling hclk, iclk, and fclk\n"); clk_disable_unprepare(ohci_at91->fclk); clk_disable_unprepare(ohci_at91->iclk); clk_disable_unprepare(ohci_at91->hclk); @@ -104,7 +108,7 @@ static void at91_start_hc(struct platform_device *pdev) /* * Start the USB clocks. */ - at91_start_clock(ohci_at91); + at91_start_clock(ohci_at91, &pdev->dev); /* * The USB host controller must remain in reset. @@ -128,7 +132,7 @@ static void at91_stop_hc(struct platform_device *pdev) /* * Stop the USB clocks. */ - at91_stop_clock(ohci_at91); + at91_stop_clock(ohci_at91, &pdev->dev); } @@ -623,7 +627,7 @@ ohci_hcd_at91_drv_suspend(struct device *dev) /* flush the writes */ (void) ohci_readl (ohci, &ohci->regs->control); - at91_stop_clock(ohci_at91); + at91_stop_clock(ohci_at91, dev); } return ret; @@ -638,7 +642,7 @@ ohci_hcd_at91_drv_resume(struct device *dev) if (ohci_at91->wakeup) disable_irq_wake(hcd->irq); - at91_start_clock(ohci_at91); + at91_start_clock(ohci_at91, dev); ohci_resume(hcd, false);