Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3816264ybi; Mon, 29 Jul 2019 13:11:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzrRhxpWsBxobo07WyqhxgzJEbskpOlpsjwjNObOGs1o47P4PnfiRcx2uQlR9YPtcX4wep8 X-Received: by 2002:a63:6a81:: with SMTP id f123mr27256415pgc.348.1564431067071; Mon, 29 Jul 2019 13:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564431067; cv=none; d=google.com; s=arc-20160816; b=hTPpFbELZA0/vvq/ccprd1iNKYFc/bm813h93RWeDuDXCnYrQ0Z7HW4k1htFny2+6F ru375iyFrYBwjB0QnBdI5+dUkfwhfw70X74F0+w3n3UuXIEzeV2SP9NT7aUF8UvqsTzK Pg/n75+FUCS05DytcyGd5mrGsWpdjvrin/IJ9/+gyZT8BDUgbTW7l/mSaNG3cnqRj9qg cB/E04HhIF+rb5PasYolY1zkYq+Q2olbFdZWsFs4kc52FRrMI8n8n3sUKyX1xetLWI5W /IeY/OO6S2LXVm1dV2Xw4vx9CiE4DdCSgEebhzm56FMn+gnT3z4C51n6AIZze8HOGlj0 iusg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Etpxn4sUqaazMn0ipxkFtxAFwttzRNH5XSJuxIb0ZHU=; b=RotVSmNTon6m+Wpnt//Rw6C9ESwohVWEMul2pWX4bWKxIqQVpvPK/yd/3pwrWX/wEt u21EP7ALfmG16m9+azQGSaj/wt6RCDpO8As448FAhhrNxvtxRLr+wbHKt+Qjg9MvCBsB MbfHBmJURY0W/8wS/fs5md60C1Er3+X6X+630gAQrJca0RQbYW8LbHwCMPGq4e0UbHDt +g2XejzGN2jgbhuFu0z7W5FDpsWizQX3IDouE9T4TB2kyuTKkHTrOVOAzOwfqkHuJOBc dYgxN5MF7Z3BPPd7fXb4BsU4EA2V0CNpWQ8CQCAKl19RZpWXM1m1Nt6LUjN65uZL+dwb EUUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i5nt17wj; 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 p4si27149875pgh.350.2019.07.29.13.10.52; Mon, 29 Jul 2019 13:11:07 -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; dkim=pass header.i=@kernel.org header.s=default header.b=i5nt17wj; 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 S1730397AbfG2UJi (ORCPT + 99 others); Mon, 29 Jul 2019 16:09:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:50472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730229AbfG2TgK (ORCPT ); Mon, 29 Jul 2019 15:36:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97CFC217D7; Mon, 29 Jul 2019 19:36:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564428969; bh=NL0Hfjz45MuNbtUhlnR1TsogGihB0wA2bwbfMTTx4fM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i5nt17wju2xrkPcHZNihmtcYT2HJ/Gdb2llreqBP+Y8kUcQekWsTaUAh0YpK/nZzT EHbBaD7WOlPKslewjVtU2gXuu2Xl3rUIIKtuSSEaAQbxd+PNk0is8VH68o5qJuOWGg 0yZoW3Zc55IH3l7993J90Az4zCIw3GeyJ1jqgzog= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Roese , Mika Westerberg , Andy Shevchenko , Yegor Yefremov , Giulio Benetti , Sasha Levin Subject: [PATCH 4.14 244/293] serial: mctrl_gpio: Check if GPIO property exisits before requesting it Date: Mon, 29 Jul 2019 21:22:15 +0200 Message-Id: <20190729190843.157174988@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190820.321094988@linuxfoundation.org> References: <20190729190820.321094988@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit d99482673f950817b30caf3fcdfb31179b050ce1 ] 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 Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- 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 d2da6aa7f27d..42e42e3e7a6e 100644 --- a/drivers/tty/serial/serial_mctrl_gpio.c +++ b/drivers/tty/serial/serial_mctrl_gpio.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "serial_mctrl_gpio.h" @@ -124,6 +125,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.20.1