Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp7054193ybi; Thu, 13 Jun 2019 08:48:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqyK5+RVZedPEm+34CrKixjoWWPSK7ctX25G2XIaoQlRnqfEe2zUPwtGe9uy6jYzwYIA6Whq X-Received: by 2002:a63:e24c:: with SMTP id y12mr31181390pgj.276.1560440902102; Thu, 13 Jun 2019 08:48:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560440902; cv=none; d=google.com; s=arc-20160816; b=ROt6Qb6Ge1GzkXYxQvmwEX31SD+6ulY9QTPXigB7CdylaToD/c/ECGgr6uo7hhxEew 97ymJCjEsMtyyYyr1qaGeGJ9niyNC3AIEX+uOmCGRPpM+4w+eBhsD+Vrt00H8n3LQiGm VRB51jm6WhiwQgw+p0OI/U5xI+PI3j033lYcR1ePlQDsCZ/GTueSoNU6RW9bPPeoQbIZ gR88gQ+1mZk5SgBNmVTc4vmTUeiwr056Fd8DsZE7TNVbaDjYCOIUDA6yjeUtQOv2jZFY 1lwR+QT6p0vfF6LC8/ZeDcL3zesa6GnPjbZZX3tvJdAtGxA7mXFmKI1Pkc+T5tYWOe1L ANAQ== 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=gFK8ZxVDYuSLdr1twSNE4ypazaLS/9WvrtMox2MVnCQ=; b=SqgHp/q/1HuGWkS0rOUqNJUCI22NwZ1i7HmGUdQt1PtW9qTb6A77ewjQ0Ja0rWlnWb G44pznJuDVgTWwbXrl2ln+gfKRiguSyr9LX35uGBvxtzc+voYuOA/S0tXpfXjY/6WSrS Pj2OjYXWaqgVdftwdD9brJB1UWwvyS88fKosr5WwiTYftr/ddi8b1EUIWDPVe/a0FQuH WbYbmo+Dt8iZHDVtMP6WUKsSx1TyOY9hwm8vB2aJi6/CwzuKqzzpxCVcziytM00gii5G QcDSkst34TKDShjPVm+J4hy6msdXYyQECwipq8mMboYmv2FPXjdaWinlZnWizBp+P0cx Gmpw== 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 d132si3672774pfd.102.2019.06.13.08.48.07; Thu, 13 Jun 2019 08:48:22 -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 S2389396AbfFMPqD (ORCPT + 99 others); Thu, 13 Jun 2019 11:46:03 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:14330 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389355AbfFMPqA (ORCPT ); Thu, 13 Jun 2019 11:46:00 -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 E58784FF25; Thu, 13 Jun 2019 17:45:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id 0S43kVFKKsZG; Thu, 13 Jun 2019 17:45:45 +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 v6] serial: mctrl_gpio: Check if GPIO property exisits before requesting it Date: Thu, 13 Jun 2019 17:45:40 +0200 Message-Id: <20190613154542.32438-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 --- 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/tty/serial/serial_mctrl_gpio.c b/drivers/tty/serial/serial_mctrl_gpio.c index 39ed56214cd3..65348887a749 100644 --- a/drivers/tty/serial/serial_mctrl_gpio.c +++ b/drivers/tty/serial/serial_mctrl_gpio.c @@ -116,6 +116,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