Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3874759ybi; Mon, 3 Jun 2019 01:35:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqxei0pBc78IQaDOGeIcUOkxCUeJaOb6zgTYBb6aKwhFk7EctWStSNUeB7jUPBjZvraKW8ZD X-Received: by 2002:a17:902:3103:: with SMTP id w3mr26845478plb.187.1559550943523; Mon, 03 Jun 2019 01:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559550943; cv=none; d=google.com; s=arc-20160816; b=LCpHTdTmWjgxDVHyR6Et5hShrBb7awnGVREcTK7aOza5g1fQqyKMjuwBVT4IW6hoar cLPFkchYB46omKWelZPpZDdHhTvmEnefZCyMw5ag1O8RgzsIz6dbHzPv5YZwud5066gI MNfnqirWciIRHHuNMfeGBjkAy5b30qcsl/Tl7yii0oPXDYI2fweX/yPlJ5qQtQ0ybTBF Ch2iegBM2/sMJFKhVsmR+b9+5OFmewmXpZS1nmlDmCGOWGMnxSPcUGpbkq41L6txkd9h 2KbY7bTHaE4CEnOerFu8TZAuv2Of54ct2IIl6wyxH1KSAtMW5QWPcs0jLxbN1ogroX98 V6sQ== 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=TsIM1jVDGiSh61KuDCDA4FUsfvzxkoabvCmKq71T4UY=; b=dvqX+bcMgq5SSvDaiqwN0ugfpIHMYdqzFegdd3OMuC6hUDQ46cTOIQdj4DfFntLtZD OfhWZKP7BN2RHSwvKOXKMqdP/U0xqc2bzahdYdQYRLrJ31crOS6WVpIcbCeaUHoV8OC6 KJnlUB4/0d0aX8w/O2RysTU9GFct4sceeRTdGjtRn+8yDmJvpcIa6BAgQ6/4nY7+CW0/ 4tmxXYsRkuod+K+OMlVpwJmpNOtL0wDy2+tuWCMblen4t9n9EdRi5JRZXBhyQvPcFfdY OFPhWni6KUmsxTCEXbZN/1oGVSD8TeECMfLYiiq+xn5IHDUv5IstT7hEil12qAr/RtVR 768A== 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 y186si10612370pfy.212.2019.06.03.01.35.27; Mon, 03 Jun 2019 01:35:43 -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 S1727745AbfFCIdp (ORCPT + 99 others); Mon, 3 Jun 2019 04:33:45 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:14466 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727255AbfFCIdm (ORCPT ); Mon, 3 Jun 2019 04:33:42 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id B58E65023B; Mon, 3 Jun 2019 10:33:39 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id lSgL1cpt3KJ8; Mon, 3 Jun 2019 10:33:35 +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 , Johan Hovold Subject: [PATCH 1/2 v4] serial: mctrl_gpio: Check if GPIO property exisits before requesting it Date: Mon, 3 Jun 2019 10:33:31 +0200 Message-Id: <20190603083332.12480-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 Cc: Mika Westerberg Cc: Andy Shevchenko Cc: Yegor Yefremov Cc: Greg Kroah-Hartman Cc: Giulio Benetti Cc: Johan Hovold --- 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/tty/serial/serial_mctrl_gpio.c b/drivers/tty/serial/serial_mctrl_gpio.c index 39ed56214cd3..6367f389cdfc 100644 --- a/drivers/tty/serial/serial_mctrl_gpio.c +++ b/drivers/tty/serial/serial_mctrl_gpio.c @@ -116,6 +116,16 @@ 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; + + /* Check if GPIO property exists and continue if not */ + gpio_str = kasprintf(GFP_KERNEL, "%s-gpios", + mctrl_gpios_desc[i].name); + if (!device_property_present(dev, gpio_str)) { + kfree(gpio_str); + continue; + } + kfree(gpio_str); if (mctrl_gpios_desc[i].dir_out) flags = GPIOD_OUT_LOW; -- 2.21.0