From patchwork Sun Jul 16 14:14:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 704023 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CF91C0015E for ; Sun, 16 Jul 2023 14:14:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230070AbjGPOOq (ORCPT ); Sun, 16 Jul 2023 10:14:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbjGPOOp (ORCPT ); Sun, 16 Jul 2023 10:14:45 -0400 Received: from h1.cmg1.smtp.forpsi.com (h1.cmg1.smtp.forpsi.com [81.2.195.162]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4A4910C8 for ; Sun, 16 Jul 2023 07:14:43 -0700 (PDT) Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id L2WGqBW0BPm6CL2WHqIO7k; Sun, 16 Jul 2023 16:14:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1689516882; bh=Kb0mBdIxKMCU55eZrjc378rG9a3QsYq/13BrO+TSaSM=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=WeKuOlaqZQka1kjz4bu7/HOp3zsNgGsDQF3S3y76u+WDe+sdPmhiqM4C3hItB92Nl P3456Pi+0z+FlfQ7CRzVD/SHEhC34QL8iJpgeJmKDsmE5ewU7DEwn7pYlrx7dH6nqb qNJSTSmPXsN62CS2BKBLB3hRdDfNCRm6O5NOpaD7Ekrcmw3JS0nzEUxG9MTp27qv1x tlHHSSDpsmrzkBLzHe505ys2UmSwMMcIaWA1bEUR5HJcvrQE6a9AktG/cC1Aqcz2zT ED7chGk1Auiw6U9Sr0vjrg5CCfd4U0K6ANLHGifnLzi5qIo/ObAfq5YoPJYDpOt7K9 UaHCIZE+TTIiA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1689516882; bh=Kb0mBdIxKMCU55eZrjc378rG9a3QsYq/13BrO+TSaSM=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=WeKuOlaqZQka1kjz4bu7/HOp3zsNgGsDQF3S3y76u+WDe+sdPmhiqM4C3hItB92Nl P3456Pi+0z+FlfQ7CRzVD/SHEhC34QL8iJpgeJmKDsmE5ewU7DEwn7pYlrx7dH6nqb qNJSTSmPXsN62CS2BKBLB3hRdDfNCRm6O5NOpaD7Ekrcmw3JS0nzEUxG9MTp27qv1x tlHHSSDpsmrzkBLzHe505ys2UmSwMMcIaWA1bEUR5HJcvrQE6a9AktG/cC1Aqcz2zT ED7chGk1Auiw6U9Sr0vjrg5CCfd4U0K6ANLHGifnLzi5qIo/ObAfq5YoPJYDpOt7K9 UaHCIZE+TTIiA== Date: Sun, 16 Jul 2023 16:14:40 +0200 From: Ladislav Michl To: Thomas Bogendoerfer , Thinh Nguyen , Greg Kroah-Hartman , Liang He Cc: linux-mips@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v4 1/6] usb: dwc3: dwc3-octeon: Convert to glue driver Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfOx5menqH+89737dpJMGT9P1M+k2b2qk5TezGOUNcK0wBcQiKAWuC9htjbLr9IXYQjK8nDEYWC7gtH/1cMY7AuGbpy0p0DUk8uY+EjrcMh6h4SdTv4yP BPLmMeJmGprRvlpR6eVd/AQNZ7TvwbeVFA9w1MoA7l/dLItaz+O3EYq5bd8M5dpHjVwlR2M5UMjudvZQh20q8oOaAz6sdm/iDLIRK81VgBjW0HGn+nbxs1np gVS7i8EOiWKQOUhQJT457FGsd8Um6ieK2VIDDEqzrspfbuNDX+A5wfuzPrK7lEGPrWHjXG14ojK47iG9fohn9aLbDueqZs26LSioGo7odCZ3iZxGZlQkuleT vjvffJpS Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Ladislav Michl DWC3 as implemented in Cavium SoC is using UCTL bridge unit between I/O interconnect and USB controller. Currently there is no bond with dwc3 core code, so if anything goes wrong in UCTL setup dwc3 is left in reset, which leads to bus error while trying to read any device register. Thus any failure in UCTL initialization ends with kernel panic. To avoid this move Octeon DWC3 glue code from arch/mips and make it proper glue driver which is used instead of dwc3-of-simple. Signed-off-by: Ladislav Michl Acked-by: Thomas Bogendoerfer Acked-by: Thinh Nguyen --- CHANGES: - v2: squashed move and glue conversion patch, fixed sparse warning and formatting issue. Set private data at the end of probe. Clear drvdata on remove. Added host mode only notice. Collected ack for move from arch/mips. - v3: more descriptive commit message, dropped unrelated changes - v4: rename dwc3_data to dwc3_octeon, collect Thinh's ack. arch/mips/cavium-octeon/Makefile | 1 - arch/mips/cavium-octeon/octeon-platform.c | 1 - drivers/usb/dwc3/Kconfig | 10 ++ drivers/usb/dwc3/Makefile | 1 + .../usb/dwc3/dwc3-octeon.c | 105 ++++++++++-------- drivers/usb/dwc3/dwc3-of-simple.c | 1 - 6 files changed, 68 insertions(+), 51 deletions(-) rename arch/mips/cavium-octeon/octeon-usb.c => drivers/usb/dwc3/dwc3-octeon.c (91%) diff --git a/arch/mips/cavium-octeon/Makefile b/arch/mips/cavium-octeon/Makefile index 7c02e542959a..2a5926578841 100644 --- a/arch/mips/cavium-octeon/Makefile +++ b/arch/mips/cavium-octeon/Makefile @@ -18,4 +18,3 @@ obj-y += crypto/ obj-$(CONFIG_MTD) += flash_setup.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_OCTEON_ILM) += oct_ilm.o -obj-$(CONFIG_USB) += octeon-usb.o diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index ce05c0dd3acd..235c77ce7b18 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c @@ -450,7 +450,6 @@ static const struct of_device_id octeon_ids[] __initconst = { { .compatible = "cavium,octeon-3860-bootbus", }, { .compatible = "cavium,mdio-mux", }, { .compatible = "gpio-leds", }, - { .compatible = "cavium,octeon-7130-usb-uctl", }, {}, }; diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index be954a9abbe0..98efcbb76c88 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -168,4 +168,14 @@ config USB_DWC3_AM62 The Designware Core USB3 IP is programmed to operate in in USB 2.0 mode only. Say 'Y' or 'M' here if you have one such device + +config USB_DWC3_OCTEON + tristate "Cavium Octeon Platforms" + depends on CAVIUM_OCTEON_SOC || COMPILE_TEST + default USB_DWC3 + help + Support Cavium Octeon platforms with DesignWare Core USB3 IP. + Only the host mode is currently supported. + Say 'Y' or 'M' here if you have one such device. + endif diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 9f66bd82b639..fe1493d4bbe5 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -54,3 +54,4 @@ obj-$(CONFIG_USB_DWC3_ST) += dwc3-st.o obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o obj-$(CONFIG_USB_DWC3_IMX8MP) += dwc3-imx8mp.o obj-$(CONFIG_USB_DWC3_XILINX) += dwc3-xilinx.o +obj-$(CONFIG_USB_DWC3_OCTEON) += dwc3-octeon.o diff --git a/arch/mips/cavium-octeon/octeon-usb.c b/drivers/usb/dwc3/dwc3-octeon.c similarity index 91% rename from arch/mips/cavium-octeon/octeon-usb.c rename to drivers/usb/dwc3/dwc3-octeon.c index 2add435ad038..7134cdfc0fb6 100644 --- a/arch/mips/cavium-octeon/octeon-usb.c +++ b/drivers/usb/dwc3/dwc3-octeon.c @@ -187,7 +187,10 @@ #define USBDRD_UCTL_ECC 0xf0 #define USBDRD_UCTL_SPARE1 0xf8 -static DEFINE_MUTEX(dwc3_octeon_clocks_mutex); +struct dwc3_octeon { + struct device *dev; + void __iomem *base; +}; #ifdef CONFIG_CAVIUM_OCTEON_SOC #include @@ -233,6 +236,11 @@ static inline uint64_t dwc3_octeon_readq(void __iomem *addr) static inline void dwc3_octeon_writeq(void __iomem *base, uint64_t val) { } static inline void dwc3_octeon_config_gpio(int index, int gpio) { } + +static uint64_t octeon_get_io_clock_rate(void) +{ + return 150000000; +} #endif static int dwc3_octeon_get_divider(void) @@ -494,58 +502,59 @@ static void __init dwc3_octeon_phy_reset(void __iomem *base) dwc3_octeon_writeq(uctl_ctl_reg, val); } -static int __init dwc3_octeon_device_init(void) +static int dwc3_octeon_probe(struct platform_device *pdev) { - const char compat_node_name[] = "cavium,octeon-7130-usb-uctl"; - struct platform_device *pdev; - struct device_node *node; - struct resource *res; - void __iomem *base; + struct device *dev = &pdev->dev; + struct device_node *node = dev->of_node; + struct dwc3_octeon *octeon; + int err; - /* - * There should only be three universal controllers, "uctl" - * in the device tree. Two USB and a SATA, which we ignore. - */ - node = NULL; - do { - node = of_find_node_by_name(node, "uctl"); - if (!node) - return -ENODEV; - - if (of_device_is_compatible(node, compat_node_name)) { - pdev = of_find_device_by_node(node); - if (!pdev) - return -ENODEV; - - /* - * The code below maps in the registers necessary for - * setting up the clocks and reseting PHYs. We must - * release the resources so the dwc3 subsystem doesn't - * know the difference. - */ - base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); - if (IS_ERR(base)) { - put_device(&pdev->dev); - return PTR_ERR(base); - } + octeon = devm_kzalloc(dev, sizeof(*octeon), GFP_KERNEL); + if (!octeon) + return -ENOMEM; - mutex_lock(&dwc3_octeon_clocks_mutex); - if (dwc3_octeon_clocks_start(&pdev->dev, base) == 0) - dev_info(&pdev->dev, "clocks initialized.\n"); - dwc3_octeon_set_endian_mode(base); - dwc3_octeon_phy_reset(base); - mutex_unlock(&dwc3_octeon_clocks_mutex); - devm_iounmap(&pdev->dev, base); - devm_release_mem_region(&pdev->dev, res->start, - resource_size(res)); - put_device(&pdev->dev); - } - } while (node != NULL); + octeon->dev = dev; + octeon->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(octeon->base)) + return PTR_ERR(octeon->base); - return 0; + err = dwc3_octeon_clocks_start(dev, octeon->base); + if (err) + return err; + + dwc3_octeon_set_endian_mode(octeon->base); + dwc3_octeon_phy_reset(octeon->base); + + platform_set_drvdata(pdev, octeon); + + return of_platform_populate(node, NULL, NULL, dev); +} + +static void dwc3_octeon_remove(struct platform_device *pdev) +{ + struct dwc3_octeon *octeon = platform_get_drvdata(pdev); + + of_platform_depopulate(octeon->dev); + platform_set_drvdata(pdev, NULL); } -device_initcall(dwc3_octeon_device_init); +static const struct of_device_id dwc3_octeon_of_match[] = { + { .compatible = "cavium,octeon-7130-usb-uctl" }, + { }, +}; +MODULE_DEVICE_TABLE(of, dwc3_octeon_of_match); + +static struct platform_driver dwc3_octeon_driver = { + .probe = dwc3_octeon_probe, + .remove_new = dwc3_octeon_remove, + .driver = { + .name = "dwc3-octeon", + .of_match_table = dwc3_octeon_of_match, + }, +}; +module_platform_driver(dwc3_octeon_driver); + +MODULE_ALIAS("platform:dwc3-octeon"); MODULE_AUTHOR("David Daney "); MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("USB driver for OCTEON III SoC"); +MODULE_DESCRIPTION("DesignWare USB3 OCTEON III Glue Layer"); diff --git a/drivers/usb/dwc3/dwc3-of-simple.c b/drivers/usb/dwc3/dwc3-of-simple.c index 7e6ad8fe61a5..d1539fc9eabd 100644 --- a/drivers/usb/dwc3/dwc3-of-simple.c +++ b/drivers/usb/dwc3/dwc3-of-simple.c @@ -170,7 +170,6 @@ static const struct dev_pm_ops dwc3_of_simple_dev_pm_ops = { static const struct of_device_id of_dwc3_simple_match[] = { { .compatible = "rockchip,rk3399-dwc3" }, - { .compatible = "cavium,octeon-7130-usb-uctl" }, { .compatible = "sprd,sc9860-dwc3" }, { .compatible = "allwinner,sun50i-h6-dwc3" }, { .compatible = "hisilicon,hi3670-dwc3" }, From patchwork Sun Jul 16 14:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 704022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A46E1C0015E for ; Sun, 16 Jul 2023 14:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230092AbjGPOP4 (ORCPT ); Sun, 16 Jul 2023 10:15:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjGPOPz (ORCPT ); Sun, 16 Jul 2023 10:15:55 -0400 Received: from h2.cmg1.smtp.forpsi.com (h2.cmg1.smtp.forpsi.com [81.2.195.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3679610C8 for ; Sun, 16 Jul 2023 07:15:53 -0700 (PDT) Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id L2XQqBWaFPm6CL2XRqIOCf; Sun, 16 Jul 2023 16:15:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1689516953; bh=3BnJF1XmIFzq3a8gbpm23EgkT/fWjHnjATPV1mDlvX4=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=wfLXsA97gvIvkiNe8vEdR9hFu03kZQD9v2QaAqGCG0NyeaTTKv4weTEbj7revCKkW La/ai6oT+rHguSZGWZHJfT2aomjGNbEAI/9ail3wp5/10NJyq2Ss63j2FkhzHdhBwy yL9CtnBLZzbfLlW7hhbv+6Yl6jyIT7sHagrUhmdqR4E3oHwsu+YZyYPCF0fsyPRAEC hLhSQWrFLSYP9PC4xv/+alq6v3FJt+eOfzLaLF3ty4f/Ai/1UfhXULC7wSGSfJltYe qBaC0H6eDKyzd1FGlpQo58isHxpT8yNw1dVdfkP5ocg6gYuoB9kpqetpHoleQY7E7u lnR0gILuvA9uQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1689516953; bh=3BnJF1XmIFzq3a8gbpm23EgkT/fWjHnjATPV1mDlvX4=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=wfLXsA97gvIvkiNe8vEdR9hFu03kZQD9v2QaAqGCG0NyeaTTKv4weTEbj7revCKkW La/ai6oT+rHguSZGWZHJfT2aomjGNbEAI/9ail3wp5/10NJyq2Ss63j2FkhzHdhBwy yL9CtnBLZzbfLlW7hhbv+6Yl6jyIT7sHagrUhmdqR4E3oHwsu+YZyYPCF0fsyPRAEC hLhSQWrFLSYP9PC4xv/+alq6v3FJt+eOfzLaLF3ty4f/Ai/1UfhXULC7wSGSfJltYe qBaC0H6eDKyzd1FGlpQo58isHxpT8yNw1dVdfkP5ocg6gYuoB9kpqetpHoleQY7E7u lnR0gILuvA9uQ== Date: Sun, 16 Jul 2023 16:15:52 +0200 From: Ladislav Michl To: Thomas Bogendoerfer , Thinh Nguyen , Greg Kroah-Hartman , Liang He Cc: linux-mips@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v4 3/6] usb: dwc3: dwc3-octeon: Avoid half-initialized controller state Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfFCEGxUdkkmm56OpnYW5hKVBJscVKG5jkOuXNyYVQ8Ii+tDt6lQutj7tiDNVtuQsgoDdiWzYOdochmbKJhBXfoHZqAOfWR0P0zg3WXQVIlw3lWiDzCnn mLJFeXCPzrIM6kAg8hNj/7w8/8ZjxsuX9HQu4fXYEoxZI+IUNMNr5BYJZ/hhdfVPJbOMImkdZQ5Q3HQ8R2mixAE8ph9cEt7hgi2jQwhD+l7Ya57I7G4uA8xW qdHHl9me0iyYUft6EKlxUhoSSCT6epIVDyoj3yrX3S7eCL24+yc0m+nr8yFHGUOsFGgAWshY6uUSJ8vTyYtJOi2SqMJ2sR6hpE/0ZHjxbWG+F0EM1/EJQizq Oc6dIulu Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Ladislav Michl Power gpio configuration is done from the middle of dwc3_octeon_clocks_start leaving hardware in half-initialized state if it fails. As that indicates dwc3_octeon_clocks_start does more than just initialize the clocks rename it appropriately and verify power gpio configuration in advance at the beginning of device probe. Signed-off-by: Ladislav Michl --- CHANGES: - v4: new patch drivers/usb/dwc3/dwc3-octeon.c | 90 ++++++++++++++++------------------ 1 file changed, 43 insertions(+), 47 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-octeon.c b/drivers/usb/dwc3/dwc3-octeon.c index 20440c4d2366..d6ad6fbb6c12 100644 --- a/drivers/usb/dwc3/dwc3-octeon.c +++ b/drivers/usb/dwc3/dwc3-octeon.c @@ -192,6 +192,8 @@ struct dwc3_octeon { void __iomem *base; }; +#define DWC3_GPIO_POWER_NONE (-1) + #ifdef CONFIG_CAVIUM_OCTEON_SOC #include static inline uint64_t dwc3_octeon_readq(void __iomem *addr) @@ -258,55 +260,15 @@ static int dwc3_octeon_get_divider(void) return div; } -static int dwc3_octeon_config_power(struct device *dev, void __iomem *base) -{ - uint32_t gpio_pwr[3]; - int gpio, len, power_active_low; - struct device_node *node = dev->of_node; - u64 val; - void __iomem *uctl_host_cfg_reg = base + USBDRD_UCTL_HOST_CFG; - - if (of_find_property(node, "power", &len) != NULL) { - if (len == 12) { - of_property_read_u32_array(node, "power", gpio_pwr, 3); - power_active_low = gpio_pwr[2] & 0x01; - gpio = gpio_pwr[1]; - } else if (len == 8) { - of_property_read_u32_array(node, "power", gpio_pwr, 2); - power_active_low = 0; - gpio = gpio_pwr[1]; - } else { - dev_err(dev, "invalid power configuration\n"); - return -EINVAL; - } - dwc3_octeon_config_gpio(((u64)base >> 24) & 1, gpio); - - /* Enable XHCI power control and set if active high or low. */ - val = dwc3_octeon_readq(uctl_host_cfg_reg); - val |= USBDRD_UCTL_HOST_PPC_EN; - if (power_active_low) - val &= ~USBDRD_UCTL_HOST_PPC_ACTIVE_HIGH_EN; - else - val |= USBDRD_UCTL_HOST_PPC_ACTIVE_HIGH_EN; - dwc3_octeon_writeq(uctl_host_cfg_reg, val); - } else { - /* Disable XHCI power control and set if active high. */ - val = dwc3_octeon_readq(uctl_host_cfg_reg); - val &= ~USBDRD_UCTL_HOST_PPC_EN; - val &= ~USBDRD_UCTL_HOST_PPC_ACTIVE_HIGH_EN; - dwc3_octeon_writeq(uctl_host_cfg_reg, val); - dev_info(dev, "power control disabled\n"); - } - return 0; -} - -static int dwc3_octeon_clocks_start(struct dwc3_octeon *octeon) +static int dwc3_octeon_setup(struct dwc3_octeon *octeon, + int power_gpio, int power_active_low) { int i, div, mpll_mul, ref_clk_fsel, ref_clk_sel = 2; u32 clock_rate; u64 val; struct device *dev = octeon->dev; void __iomem *uctl_ctl_reg = octeon->base + USBDRD_UCTL_CTL; + void __iomem *uctl_host_cfg_reg = octeon->base + USBDRD_UCTL_HOST_CFG; if (dev->of_node) { const char *ss_clock_type; @@ -454,8 +416,21 @@ static int dwc3_octeon_clocks_start(struct dwc3_octeon *octeon) udelay(10); /* Step 8c: Setup power control. */ - if (dwc3_octeon_config_power(dev, octeon->base)) - return -EINVAL; + val = dwc3_octeon_readq(uctl_host_cfg_reg); + val |= USBDRD_UCTL_HOST_PPC_EN; + if (power_gpio == DWC3_GPIO_POWER_NONE) { + val &= ~USBDRD_UCTL_HOST_PPC_EN; + } else { + val |= USBDRD_UCTL_HOST_PPC_EN; + dwc3_octeon_config_gpio(((__force u64)octeon->base >> 24) & 1, + power_gpio); + dev_dbg(dev, "power control is using gpio%d\n", power_gpio); + } + if (power_active_low) + val &= ~USBDRD_UCTL_HOST_PPC_ACTIVE_HIGH_EN; + else + val |= USBDRD_UCTL_HOST_PPC_ACTIVE_HIGH_EN; + dwc3_octeon_writeq(uctl_host_cfg_reg, val); /* Step 8d: Deassert UAHC reset signal. */ val = dwc3_octeon_readq(uctl_ctl_reg); @@ -508,7 +483,28 @@ static int dwc3_octeon_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *node = dev->of_node; struct dwc3_octeon *octeon; - int err; + int power_active_low, power_gpio; + int err, len; + + power_gpio = DWC3_GPIO_POWER_NONE; + power_active_low = 0; + if (of_find_property(node, "power", &len)) { + u32 gpio_pwr[3]; + + switch (len) { + case 8: + of_property_read_u32_array(node, "power", gpio_pwr, 2); + break; + case 12: + of_property_read_u32_array(node, "power", gpio_pwr, 3); + power_active_low = gpio_pwr[2] & 0x01; + break; + default: + dev_err(dev, "invalid power configuration\n"); + return -EINVAL; + } + power_gpio = gpio_pwr[1]; + } octeon = devm_kzalloc(dev, sizeof(*octeon), GFP_KERNEL); if (!octeon) @@ -519,7 +515,7 @@ static int dwc3_octeon_probe(struct platform_device *pdev) if (IS_ERR(octeon->base)) return PTR_ERR(octeon->base); - err = dwc3_octeon_clocks_start(octeon); + err = dwc3_octeon_setup(octeon, power_gpio, power_active_low); if (err) return err; From patchwork Sun Jul 16 14:17:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 704021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9A17C0015E for ; Sun, 16 Jul 2023 14:17:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbjGPORG (ORCPT ); Sun, 16 Jul 2023 10:17:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbjGPORG (ORCPT ); Sun, 16 Jul 2023 10:17:06 -0400 Received: from h2.cmg1.smtp.forpsi.com (h2.cmg1.smtp.forpsi.com [81.2.195.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10AEB10C8 for ; Sun, 16 Jul 2023 07:17:04 -0700 (PDT) Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id L2YZqBX8vPm6CL2YaqIOHG; Sun, 16 Jul 2023 16:17:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1689517024; bh=tAEGamY/x6EGfjLvIsf7epNT1w/7wqVxn/uag/blbPk=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=xam7mA7VVxtfFogRRn9btR6W7N/gdkOWh6wJRaqWo8xH6LnzctiIplI9D2kq69WAZ JClqX7AWV7mb6uIN8fHyZHix45IPK/sGN3VU1ed7OVduEClrK4QOCu4UFXEEh0TiJo PJwpAMyDSPZQM/2yHJ3Ban8U+bB1iXDqEIyrg9fxgIniEnAu5Mc6hGuEvlZVCM+bNg pJQzYQRBZyRHUF2+YQuwV1XZNjhNZRXeQxBZhMxWb6WCSJOdGW7V/mbfxGX552eyam Szb5hVQzlu/hUc0WXVtm41s+4fSN7TZMQfE/n1A2eewxCyyzdkWMU7WVrnZc6xt2a6 OB0MlKIxxnUIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1689517024; bh=tAEGamY/x6EGfjLvIsf7epNT1w/7wqVxn/uag/blbPk=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=xam7mA7VVxtfFogRRn9btR6W7N/gdkOWh6wJRaqWo8xH6LnzctiIplI9D2kq69WAZ JClqX7AWV7mb6uIN8fHyZHix45IPK/sGN3VU1ed7OVduEClrK4QOCu4UFXEEh0TiJo PJwpAMyDSPZQM/2yHJ3Ban8U+bB1iXDqEIyrg9fxgIniEnAu5Mc6hGuEvlZVCM+bNg pJQzYQRBZyRHUF2+YQuwV1XZNjhNZRXeQxBZhMxWb6WCSJOdGW7V/mbfxGX552eyam Szb5hVQzlu/hUc0WXVtm41s+4fSN7TZMQfE/n1A2eewxCyyzdkWMU7WVrnZc6xt2a6 OB0MlKIxxnUIw== Date: Sun, 16 Jul 2023 16:17:03 +0200 From: Ladislav Michl To: Thomas Bogendoerfer , Thinh Nguyen , Greg Kroah-Hartman , Liang He Cc: linux-mips@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v4 5/6] usb: dwc3: dwc3-octeon: Dump control register on clock init failure Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CMAE-Envelope: MS4wfAo5o2wh7hs80bRLFm25WvE7unc2GiynDReoXiJkqPFumTamm+xrR5EXWvMqfGyafLQAUILkDvJab18hYsXcZwoKXVYAbextDuGSiZKKXCW8TIw1ShRJ at8UW9BL2lSqOks2ujQM0chbQizmPBlDSQuXbrXIoDFmBrrYjriISeqHcQgeARYc65U8akUnK5yrA14ldkEVR9Q4ipRWO5fvbLHoBUEQlYH8IvkBYt4fieiY 3ROCqbrB3otWzLYBliI6P7gS741nofmYI3QmFfk+vblwjg1sq2rcDfV4VvmH2Ud5mjGUpe5WRAFOWBQ15qB9Cjz4T+APRpJTDdG6KPbTLKpM2uG7deQYzrkO FLe/Y36C Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Ladislav Michl It might be interesting to know control register value in case clock fails to enable. Signed-off-by: Ladislav Michl Reviewed-by: Philippe Mathieu-Daudé --- CHANGES: - v4: new patch drivers/usb/dwc3/dwc3-octeon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-octeon.c b/drivers/usb/dwc3/dwc3-octeon.c index 45726b39adab..9116df7def86 100644 --- a/drivers/usb/dwc3/dwc3-octeon.c +++ b/drivers/usb/dwc3/dwc3-octeon.c @@ -299,8 +299,8 @@ static int dwc3_octeon_setup(struct dwc3_octeon *octeon, val = dwc3_octeon_readq(uctl_ctl_reg); if ((div != FIELD_GET(USBDRD_UCTL_CTL_H_CLKDIV_SEL, val)) || (!(FIELD_GET(USBDRD_UCTL_CTL_H_CLK_EN, val)))) { - dev_err(dev, "dwc3 controller clock init failure.\n"); - return -EINVAL; + dev_err(dev, "clock init failure (UCTL_CTL=%016llx)\n", val); + return -EINVAL; } /* Step 4c: Deassert the controller clock divider reset. */