Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3494240ybi; Tue, 18 Jun 2019 01:33:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxO3fQF2I73kTnneB8sCLih+HbrrAtww6VIQeza24wiet603Xa6UFCJcidM4PfAhexPwX95 X-Received: by 2002:a17:902:aa83:: with SMTP id d3mr88681308plr.74.1560846794674; Tue, 18 Jun 2019 01:33:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560846794; cv=none; d=google.com; s=arc-20160816; b=SdnWPqGFYzDqBbec10axrv1rsI3fSLRg/L4kZdIQqs3zrblXvMkXKPHXUXbeyV8W7o YUwtORkWBIh+IHxVJ6FsVpUNIuV/VSX95xY/DrsHayt0E9s2DvItDurzHNVXvBEOm89f izSNBCqa8++klLE7pr2bX8q5MeyxJVDiA+yExNYqLiU03/6b/FFvLh1pi0jdx0WhIyyE vtC43o/pUYdPmAWdFcBxyKIo2+lueqTIpOuU6yJIVgKn/W514JjtRrR5+MY2hCmazdPr ByY0xq+vSbkBgYNFkKx6dCrDbItdVOHUDvxOBpUTYTavWLTuGF103b0afKLkar+0UUPV +f+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=+ZMJbLr9ZGpQIoi5Ln19kYM02Sq+0ncEtdMl/S9znZE=; b=TseyYmxnW9ywrEHut3RK4PO5d4vIWx5KL0iXnNILCrAVbY4gbX9040dSHdHGLiWGYV tdnLArpuArZy6NwvKxcudPRUEGojG7AJ7/reyVTF+GX9Zy+6tfaGPv2vFEzDdvu2WZ8e Dfq69OfAxUqUbld5EKN1hbEBAqMMrfTL7eY9a+7hEnpaPUg5GXAGaJZY1p0uk+ZE+M6p vIms2BUZH+ML2lN26sA3+em8SCy9bDLSp+PiPzaD4RG0ll1FXBm2CeGBviWa9r9Nn3cC NnJytmnOk8utv7L6luGx3m4WAKCoiBYfNYNFE0y1L5vh9KCHq7cxw0m2zgk94Y0tUhQ6 xNSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t8si13015958pgh.235.2019.06.18.01.32.58; Tue, 18 Jun 2019 01:33:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729002AbfFRIcI (ORCPT + 99 others); Tue, 18 Jun 2019 04:32:08 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:21018 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726091AbfFRIcH (ORCPT ); Tue, 18 Jun 2019 04:32:07 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 6503C51319; Tue, 18 Jun 2019 10:32:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id CGbYZOAwNtNM; Tue, 18 Jun 2019 10:32:01 +0200 (CEST) From: Stefan Roese To: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Mika Westerberg , Andy Shevchenko , Yegor Yefremov , Greg Kroah-Hartman , Giulio Benetti Subject: [PATCH 1/3 v8] serial: mctrl_gpio: Check if GPIO property exisits before requesting it Date: Tue, 18 Jun 2019 10:31:58 +0200 Message-Id: <20190618083200.30234-1-sr@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds a check for the GPIOs property existence, before the GPIO is requested. This fixes an issue seen when the 8250 mctrl_gpio support is added (2nd patch in this patch series) on x86 platforms using ACPI. Here Mika's comments from 2016-08-09: " I noticed that with v4.8-rc1 serial console of some of our Broxton systems does not work properly anymore. I'm able to see output but input does not work. I bisected it down to commit 4ef03d328769eddbfeca1f1c958fdb181a69c341 ("tty/serial/8250: use mctrl_gpio helpers"). The reason why it fails is that in ACPI we do not have names for GPIOs (except when _DSD is used) so we use the "idx" to index into _CRS GPIO resources. Now mctrl_gpio_init_noauto() goes through a list of GPIOs calling devm_gpiod_get_index_optional() passing "idx" of 0 for each. The UART device in Broxton has following (simplified) ACPI description: Device (URT4) { ... Name (_CRS, ResourceTemplate () { GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly, "\\_SB.GPO0", 0x00, ResourceConsumer) { 0x003A } GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly, "\\_SB.GPO0", 0x00, ResourceConsumer) { 0x003D } }) In this case it finds the first GPIO (0x003A which happens to be RX pin for that UART), turns it into GPIO which then breaks input for the UART device. This also breaks systems with bluetooth connected to UART (those typically have some GPIOs in their _CRS). Any ideas how to fix this? We cannot just drop the _CRS index lookup fallback because that would break many existing machines out there so maybe we can limit this to only DT enabled machines. Or alternatively probe if the property first exists before trying to acquire the GPIOs (using device_property_present()). " This patch implements the fix suggested by Mika in his statement above. Signed-off-by: Stefan Roese Reviewed-by: Mika Westerberg Reviewed-by: Andy Shevchenko Tested-by: Yegor Yefremov Cc: Mika Westerberg Cc: Andy Shevchenko Cc: Yegor Yefremov Cc: Greg Kroah-Hartman Cc: Giulio Benetti --- v8: - Rebased on top of "tty-next" v7: - Include to fix compile breakage on OMAP v6: - No change v5: - Simplified the code a bit (Andy) - Added gpio_str == NULL handling (Andy) v4: - Add missing free() calls (Johan) - Added Mika's reviewed by tag - Added Johan to Cc v3: - No change v2: - Include the problem description and analysis from Mika into the commit text, as suggested by Greg. drivers/tty/serial/serial_mctrl_gpio.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/tty/serial/serial_mctrl_gpio.c b/drivers/tty/serial/serial_mctrl_gpio.c index 39ed56214cd3..2b400189be91 100644 --- a/drivers/tty/serial/serial_mctrl_gpio.c +++ b/drivers/tty/serial/serial_mctrl_gpio.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "serial_mctrl_gpio.h" @@ -116,6 +117,19 @@ struct mctrl_gpios *mctrl_gpio_init_noauto(struct device *dev, unsigned int idx) for (i = 0; i < UART_GPIO_MAX; i++) { enum gpiod_flags flags; + char *gpio_str; + bool present; + + /* Check if GPIO property exists and continue if not */ + gpio_str = kasprintf(GFP_KERNEL, "%s-gpios", + mctrl_gpios_desc[i].name); + if (!gpio_str) + continue; + + present = device_property_present(dev, gpio_str); + kfree(gpio_str); + if (!present) + continue; if (mctrl_gpios_desc[i].dir_out) flags = GPIOD_OUT_LOW; -- 2.22.0