From patchwork Sun Dec 4 23:59:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 13064043 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 A8E9EC4708D for ; Sun, 4 Dec 2022 23:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230439AbiLDX7f (ORCPT ); Sun, 4 Dec 2022 18:59:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230254AbiLDX7e (ORCPT ); Sun, 4 Dec 2022 18:59:34 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF924DF7D; Sun, 4 Dec 2022 15:59:33 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so13211175pje.5; Sun, 04 Dec 2022 15:59:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=gwAN8x9L4qNxV85BxY4GhMGOx/8SzHAhEgmFjx4Yf/8=; b=AFeOI5zSc+VGjp6mFQ+kNOTNIrstPA+Qp6T5aON32yMPoKInxglA4O9x8PAvR3F3PB 4ZmyV0w3xLEDD+Q3mwHy9nc7OXKh63tKpNXfKntGx3lsfbFVTD4ExvqUeO1Bzu2YiE8q 10KOPQoIKiW2EPP8yhOo0GSwXkkKiu8S0v7qFC/UyWIfLyl+yzD8PcPf1Kdu5Ss7cU9Z utkIDU9hxkecSVftxnRNutbFIn2bzEc/ppQVWYAlpgBgDtGcU2y3xl6I82D9GSkmRFl3 S2Hh40r1/su7zC7g/YwT6h+kX9GNbsRBweL6gnHrkjpThg4gqIk6bL6XUieLvxDboqkw R+iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gwAN8x9L4qNxV85BxY4GhMGOx/8SzHAhEgmFjx4Yf/8=; b=FN++zKSyjKKyImFg1t/wlz8fsFQ6u9x0iDa3Tjp6BoxFzJG7CF0+xZXFfHoNDVYhK7 jsSo0iVfuNBXU/FhyQsEH4oIE4YedzSjiy6lrJThmbHerQ4O9W0ZBuJ1wJMwRmSOa96a S5O+Od2Gi55bq1maugiDQx/RVnJ9ovngiEA0R72+YMgINUJ0Ei3VAyun3KvB+gKF0sAy MNITarAdexP9TEetqguXdDWZuW2eT3I6e04EwMWjdVUK6hZsWm0R5Ak7R68u6u84a8of vhoCHGdr6w1l1v7BA/8Cly+ZYNY5qbbx4oRShYnv4LpQ7XM8GBA8gmbVt1xR0gTIgxeG bQrA== X-Gm-Message-State: ANoB5pkHWMKbvXXLUCgwP34BtLBFuF5vCH/53eunIRgz5bZ5KntPUDen 1YvFSNkTdZbDt2xx6Il2cPA= X-Google-Smtp-Source: AA0mqf4IpXraLE56ol47TcW7xmGPEMG2N5z5q2/oJ2HjOwssbRIqD7Fw6iMCmCYVnbGcAolieL+fqg== X-Received: by 2002:a17:902:9897:b0:186:a98c:4ab8 with SMTP id s23-20020a170902989700b00186a98c4ab8mr62957137plp.118.1670198372964; Sun, 04 Dec 2022 15:59:32 -0800 (PST) Received: from google.com ([2620:15c:9d:2:ea63:b7ba:2a89:fec]) by smtp.gmail.com with ESMTPSA id n6-20020a654cc6000000b004468cb97c01sm7232776pgt.56.2022.12.04.15.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 15:59:32 -0800 (PST) Date: Sun, 4 Dec 2022 15:59:29 -0800 From: Dmitry Torokhov To: Arnd Bergmann , soc@kernel.org Cc: Qiang Zhao , Li Yang , Greg Kroah-Hartman , Linus Walleij , Andy Shevchenko , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v2] soc: fsl: qe: request pins non-exclusively Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Commit 84582f9ed090 ("soc: fsl: qe: Avoid using gpio_to_desc()") changed qe_pin_request() to request and hold GPIO corresponding to a given pin. Unfortunately this does not work, as fhci-hcd requests these GPIOs first, befor calling qe_pin_request() (see drivers/usb/host/fhci-hcd.c::of_fhci_probe()). To fix it change qe_pin_request() to request GPIOs non-exclusively, and free them once the code determines GPIO controller and offset for each GPIO/pin. Also reaching deep into gpiolib implementation is not the best idea. We should either export gpio_chip_hwgpio() or keep converting to the global gpio numbers space until we fix the driver to implement proper pin control. Fixes: 84582f9ed090 ("soc: fsl: qe: Avoid using gpio_to_desc()") Signed-off-by: Dmitry Torokhov Reviewed-by: Andy Shevchenko --- v2: - rebased on top of soc/driver. This will conflict with c9eb6e546a23 soc: fsl: qe: Switch to use fwnode instead of of_node found in next, the resolution is trivial: accept fwnode_device_is_compatible() line found in next. - fixed leak of gpiod when gc is not found - dropped Linus' reviewed-by as the patch changed drivers/soc/fsl/qe/gpio.c | 51 +++++++++++++++++-------------------- drivers/usb/host/fhci-hcd.c | 2 +- include/soc/fsl/qe/qe.h | 5 ++-- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c index af9193e7e49b..1440922341d8 100644 --- a/drivers/soc/fsl/qe/gpio.c +++ b/drivers/soc/fsl/qe/gpio.c @@ -13,19 +13,12 @@ #include #include #include -#include +#include /* for of_mm_gpio_chip */ #include #include #include #include #include -/* - * FIXME: this is legacy code that is accessing gpiolib internals in order - * to implement a custom pin controller. The proper solution is to create - * a real combined pin control and GPIO driver in drivers/pinctrl. However - * this hack is here for legacy code reasons. - */ -#include "../../../gpio/gpiolib.h" struct qe_gpio_chip { struct of_mm_gpio_chip mm_gc; @@ -147,65 +140,70 @@ struct qe_pin { * something like qe_pio_controller. Someday. */ struct qe_gpio_chip *controller; - struct gpio_desc *gpiod; int num; }; /** * qe_pin_request - Request a QE pin - * @np: device node to get a pin from - * @index: index of a pin in the device tree + * @dev: device to get the pin from + * @index: index of the pin in the device tree * Context: non-atomic * * This function return qe_pin so that you could use it with the rest of * the QE Pin Multiplexing API. */ -struct qe_pin *qe_pin_request(struct device_node *np, int index) +struct qe_pin *qe_pin_request(struct device *dev, int index) { struct qe_pin *qe_pin; struct gpio_chip *gc; struct gpio_desc *gpiod; + int gpio_num; int err; qe_pin = kzalloc(sizeof(*qe_pin), GFP_KERNEL); if (!qe_pin) { - pr_debug("%s: can't allocate memory\n", __func__); + dev_dbg(dev, "%s: can't allocate memory\n", __func__); return ERR_PTR(-ENOMEM); } - gpiod = fwnode_gpiod_get_index(of_fwnode_handle(np), NULL, index, GPIOD_ASIS, "qe"); - if (IS_ERR(gpiod)) { - err = PTR_ERR(gpiod); - goto err0; - } - if (!gpiod) { - err = -EINVAL; + /* + * Request gpio as nonexclusive as it was likely reserved by the + * caller, and we are not planning on controlling it, we only need + * the descriptor to the to the gpio chip structure. + */ + gpiod = gpiod_get_index(dev, NULL, index, + GPIOD_ASIS | GPIOD_FLAGS_BIT_NONEXCLUSIVE); + err = PTR_ERR_OR_ZERO(gpiod); + if (err) goto err0; - } + gc = gpiod_to_chip(gpiod); + gpio_num = desc_to_gpio(gpiod); + /* We no longer need this descriptor */ + gpiod_put(gpiod); + if (WARN_ON(!gc)) { err = -ENODEV; goto err0; } - qe_pin->gpiod = gpiod; + qe_pin->controller = gpiochip_get_data(gc); /* * FIXME: this gets the local offset on the gpio_chip so that the driver * can manipulate pin control settings through its custom API. The real * solution is to create a real pin control driver for this. */ - qe_pin->num = gpio_chip_hwgpio(gpiod); + qe_pin->num = gpio_num - gc->base; if (!of_device_is_compatible(gc->of_node, "fsl,mpc8323-qe-pario-bank")) { - pr_debug("%s: tried to get a non-qe pin\n", __func__); - gpiod_put(gpiod); + dev_dbg(dev, "%s: tried to get a non-qe pin\n", __func__); err = -EINVAL; goto err0; } return qe_pin; err0: kfree(qe_pin); - pr_debug("%s failed with status %d\n", __func__, err); + dev_dbg(dev, "%s failed with status %d\n", __func__, err); return ERR_PTR(err); } EXPORT_SYMBOL(qe_pin_request); @@ -220,7 +218,6 @@ EXPORT_SYMBOL(qe_pin_request); */ void qe_pin_free(struct qe_pin *qe_pin) { - gpiod_put(qe_pin->gpiod); kfree(qe_pin); } EXPORT_SYMBOL(qe_pin_free); diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 95a44462bed0..1f666804fa91 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -651,7 +651,7 @@ static int of_fhci_probe(struct platform_device *ofdev) } for (j = 0; j < NUM_PINS; j++) { - fhci->pins[j] = qe_pin_request(node, j); + fhci->pins[j] = qe_pin_request(dev, j); if (IS_ERR(fhci->pins[j])) { ret = PTR_ERR(fhci->pins[j]); dev_err(dev, "can't get pin %d: %d\n", j, ret); diff --git a/include/soc/fsl/qe/qe.h b/include/soc/fsl/qe/qe.h index b02e9fe69146..eb5079904cc8 100644 --- a/include/soc/fsl/qe/qe.h +++ b/include/soc/fsl/qe/qe.h @@ -172,14 +172,15 @@ static inline int par_io_data_set(u8 port, u8 pin, u8 val) { return -ENOSYS; } /* * Pin multiplexing functions. */ +struct device; struct qe_pin; #ifdef CONFIG_QE_GPIO -extern struct qe_pin *qe_pin_request(struct device_node *np, int index); +extern struct qe_pin *qe_pin_request(struct device *dev, int index); extern void qe_pin_free(struct qe_pin *qe_pin); extern void qe_pin_set_gpio(struct qe_pin *qe_pin); extern void qe_pin_set_dedicated(struct qe_pin *pin); #else -static inline struct qe_pin *qe_pin_request(struct device_node *np, int index) +static inline struct qe_pin *qe_pin_request(struct device *dev, int index) { return ERR_PTR(-ENOSYS); }