Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp53304imm; Wed, 5 Sep 2018 14:51:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYFeRhn17dgPq75S8k6oDg/6PJ2x77GcU9fTNQZy90PdPKrXhdHwwn5GaeLu1TH0ZzaRXfG X-Received: by 2002:a17:902:622:: with SMTP id 31-v6mr40999753plg.153.1536184299550; Wed, 05 Sep 2018 14:51:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536184299; cv=none; d=google.com; s=arc-20160816; b=DtX5TA4qNeIAL42lQztyeXZqStYqyfv9PKKv6k26IKptJPAFTMl304EaJsuTK6aJGD Ja/bm+C7w44TrA9QInbQHGBu/kxITdPrTayz3UCCL7r9yjPebq1vdMK0AU+MT4NMMWe/ q5MG6x9BK4E5Y93qqsIEjKPeMJi09O6oqVP+1bHt4UAfKVI7Lydnq7TVVQ4Jpvmgu77q B+BSHW5IPMV/DZI4klinW0DNNcq3L4MOTKRZcnqpH5N3C6KvLCiqpULQgFj1ekhD7z6t wXF0MPsiVZkD7iTbD9931koxqzuGZqUfB2VmAi+ATxWO0Q3DrxAu4XwXa1KBxDe0Q3FA IecQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=SgXc6uxF01q/mjlbRQxSLitpo236eGYQTP1YkZLUhLA=; b=JGg47le/nhedIGQBvg9X0G/iOW8Hs3e8WAz6WBvho833nEH5fY6S12EoS3AbMigFy/ 1km7FoxCHnQp3WFK7UilZuDkOnV9K3fDoqjFfmzS0f7XQmQoauhcrbtN6x82X04+bcXK m7t3mjYt/eFFiSiwMjl7VHdvYj+oWgRwBiTDb19AIdkNPUAiykcMFFZDO0MZ+Q+31aoB fGiC/AKrC5U6CnLU2basYJLG2yppuQJxRttvrBrC2eHkBJx3+t0rTeZ6OiwcyHKqiUXs eaNlIStlSlbhMHwYr9lQ7TGxpNbHLUD3YqASnIG30a9p2h5gIYAmM44MbSGGohVd8oPy YaUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vK6EHU3u; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6-v6si3308576pfu.143.2018.09.05.14.51.21; Wed, 05 Sep 2018 14:51:39 -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=@gmail.com header.s=20161025 header.b=vK6EHU3u; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727803AbeIFCVZ (ORCPT + 99 others); Wed, 5 Sep 2018 22:21:25 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:33051 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727069AbeIFCVX (ORCPT ); Wed, 5 Sep 2018 22:21:23 -0400 Received: by mail-lj1-f193.google.com with SMTP id s12-v6so7569747ljj.0; Wed, 05 Sep 2018 14:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SgXc6uxF01q/mjlbRQxSLitpo236eGYQTP1YkZLUhLA=; b=vK6EHU3uqB+1LgxUcigTmMpzlRGmaJ1pv5xEyGq75FYnPEgfH4iTgJK0Bv8LWAdnrS 63MPFZH6GTjO2GNOavyAMo+phhe4MulrwosZZtJ0uR6JE0eiKQl3M1OPkonGo9dHvBbw W9dQo3hJJYb1iOEmR3Lzwd3hSGc/M8jPWmszu0TNHXk6kRjXXfFwnMAI4LYyrEyTchKi ii9p4yrjW48aevJasWVF3/eneqo4nFEkxFqMnQ5HGqgGU7i2m1EhPxhQ2eSK/xOV5Yih 0PEdlPwSqLI+PoKUHoN+hgTX7NN1ECaOAx/xvaj/0ufvFiknMh+QypIt7z/eaHBUqwr4 jdJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SgXc6uxF01q/mjlbRQxSLitpo236eGYQTP1YkZLUhLA=; b=Acdf1tER29VS/jDJZ9MDDz9KGO/dU2o6Kub2vG6MSz4M6Eg3cBUJaaaffWQZgPD+AE 72MGu6IxWVG5SVoNELa86QJk3iWzoSVzr5eg16WrnVyD9EIoqWOS1LZFvsqkhOOeZIII a6UzEd7FpaMzA5mb8pvahvY6JzEP3DCjAqFlMx8rv6PseDkzvjr7Fh1NUbmxMxl29M/e nAPfkfG36D1iyDsG2/avXamGMcqmAX51O2wGA+W6qJ6VpbbxX6jS4dIijyLwwahR8Ga+ 35pJG5Wy7azU75CgkqBbzQ8CpCjJbVd5n2kKYjMR2eHKWviJey3NVKyk9iGCCi3MYatD /9rA== X-Gm-Message-State: APzg51ClqOTRD+XuV5f4MGfV9Mq0F6rvaetTylcb2mWGZ8pmpl7UcYuZ lPFYs5IcdCMZ6XimvK2xkmE= X-Received: by 2002:a2e:83d7:: with SMTP id s23-v6mr4217222ljh.82.1536184153574; Wed, 05 Sep 2018 14:49:13 -0700 (PDT) Received: from z50.lan (93-181-165-181.internetia.net.pl. [93.181.165.181]) by smtp.gmail.com with ESMTPSA id i2-v6sm491873lfa.78.2018.09.05.14.49.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 14:49:12 -0700 (PDT) From: Janusz Krzysztofik To: Linus Walleij Cc: Jonathan Corbet , Miguel Ojeda Sandonis , Peter Korsgaard , Peter Rosin , Ulf Hansson , Andrew Lunn , Florian Fainelli , "David S. Miller" , Dominik Brodowski , Greg Kroah-Hartman , Kishon Vijay Abraham I , Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Hartmut Knaack , Peter Meerwald-Stadler , Jiri Slaby , Willy Tarreau , Geert Uytterhoeven , Sebastien Bourdelin , Lukas Wunner , Rojhalat Ibrahim , Russell King , Tony Lindgren , Yegor Yefremov , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Janusz Krzysztofik , linux-doc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-mmc@vger.kernel.org, netdev@vger.kernel.org, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-serial@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 2/4] gpiolib: Identify arrays matching GPIO hardware Date: Wed, 5 Sep 2018 23:50:06 +0200 Message-Id: <20180905215008.1649-3-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180905215008.1649-1-jmkrzyszt@gmail.com> References: <20180902120144.6855-1-jmkrzyszt@gmail.com> <20180905215008.1649-1-jmkrzyszt@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Certain GPIO array lookup results may map directly to GPIO pins of a single GPIO chip in hardware order. If that condition is recognized and handled efficiently, significant performance gain of get/set array functions may be possible. While processing a request for an array of GPIO descriptors, identify those which represent corresponding pins of a single GPIO chip. Skip over pins which require open source or open drain special processing. Moreover, identify pins which require inversion. Pass a pointer to that information with the array to the caller so it can benefit from enhanced performance as soon as get/set array functions can accept and make efficient use of it. Cc: Jonathan Corbet Signed-off-by: Janusz Krzysztofik --- Documentation/driver-api/gpio/consumer.rst | 4 +- drivers/gpio/gpiolib.c | 72 +++++++++++++++++++++++++++++- drivers/gpio/gpiolib.h | 9 ++++ include/linux/gpio/consumer.h | 9 ++++ 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/Documentation/driver-api/gpio/consumer.rst b/Documentation/driver-api/gpio/consumer.rst index ed68042ddccf..7e0298b9a7b9 100644 --- a/Documentation/driver-api/gpio/consumer.rst +++ b/Documentation/driver-api/gpio/consumer.rst @@ -109,9 +109,11 @@ For a function using multiple GPIOs all of those can be obtained with one call:: enum gpiod_flags flags) This function returns a struct gpio_descs which contains an array of -descriptors:: +descriptors. It also contains a pointer to a gpiolib private structure which, +if passed back to get/set array functions, may speed up I/O proocessing:: struct gpio_descs { + struct gpio_array *info; unsigned int ndescs; struct gpio_desc *desc[]; } diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index b66b2191c5c5..141f39308a53 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -4174,7 +4174,9 @@ struct gpio_descs *__must_check gpiod_get_array(struct device *dev, { struct gpio_desc *desc; struct gpio_descs *descs; - int count; + struct gpio_array *array_info = NULL; + struct gpio_chip *chip; + int count, bitmap_size; count = gpiod_count(dev, con_id); if (count < 0) @@ -4190,9 +4192,77 @@ struct gpio_descs *__must_check gpiod_get_array(struct device *dev, gpiod_put_array(descs); return ERR_CAST(desc); } + descs->desc[descs->ndescs] = desc; + + chip = gpiod_to_chip(desc); + /* + * Select a chip of first array member + * whose index matches its pin hardware number + * as a candidate for fast bitmap processing. + */ + if (!array_info && gpio_chip_hwgpio(desc) == descs->ndescs) { + struct gpio_descs *array; + + bitmap_size = BITS_TO_LONGS(chip->ngpio > count ? + chip->ngpio : count); + + array = kzalloc(struct_size(descs, desc, count) + + struct_size(array_info, invert_mask, + 3 * bitmap_size), GFP_KERNEL); + if (!array) { + gpiod_put_array(descs); + return ERR_PTR(-ENOMEM); + } + + memcpy(array, descs, + struct_size(descs, desc, descs->ndescs + 1)); + kfree(descs); + + descs = array; + array_info = (void *)(descs->desc + count); + array_info->get_mask = array_info->invert_mask + + bitmap_size; + array_info->set_mask = array_info->get_mask + + bitmap_size; + + array_info->desc = descs->desc; + array_info->size = count; + array_info->chip = chip; + bitmap_set(array_info->get_mask, descs->ndescs, + count - descs->ndescs); + bitmap_set(array_info->set_mask, descs->ndescs, + count - descs->ndescs); + descs->info = array_info; + } + /* + * Unmark members which don't qualify for fast bitmap + * processing (different chip, not in hardware order) + */ + if (array_info && (chip != array_info->chip || + gpio_chip_hwgpio(desc) != descs->ndescs)) { + __clear_bit(descs->ndescs, array_info->get_mask); + __clear_bit(descs->ndescs, array_info->set_mask); + } else if (array_info) { + /* Exclude open drain or open source from fast output */ + if (gpiochip_line_is_open_drain(chip, descs->ndescs) || + gpiochip_line_is_open_source(chip, descs->ndescs)) + __clear_bit(descs->ndescs, + array_info->set_mask); + /* Identify 'fast' pins which require invertion */ + if (gpiod_is_active_low(desc)) + __set_bit(descs->ndescs, + array_info->invert_mask); + } + descs->ndescs++; } + if (array_info) + dev_dbg(dev, + "GPIO array info: chip=%s, size=%d, get_mask=%lx, set_mask=%lx, invert_mask=%lx\n", + array_info->chip->label, array_info->size, + *array_info->get_mask, *array_info->set_mask, + *array_info->invert_mask); return descs; } EXPORT_SYMBOL_GPL(gpiod_get_array); diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index 11e83d2eef89..b60905d558b1 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -183,6 +183,15 @@ static inline bool acpi_can_fallback_to_crs(struct acpi_device *adev, } #endif +struct gpio_array { + struct gpio_desc **desc; + unsigned int size; + struct gpio_chip *chip; + unsigned long *get_mask; + unsigned long *set_mask; + unsigned long invert_mask[]; +}; + struct gpio_desc *gpiochip_get_desc(struct gpio_chip *chip, u16 hwnum); int gpiod_get_array_value_complex(bool raw, bool can_sleep, unsigned int array_size, diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 2b0389f0bec4..0ffd71c0a77c 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -17,11 +17,20 @@ struct device; */ struct gpio_desc; +/** + * Opaque descriptor for a structure of GPIO array attributes. This structure + * is attached to struct gpiod_descs obtained from gpiod_get_array() and can be + * passed back to get/set array functions in order to activate fast processing + * path if applicable. + */ +struct gpio_array; + /** * Struct containing an array of descriptors that can be obtained using * gpiod_get_array(). */ struct gpio_descs { + struct gpio_array *info; unsigned int ndescs; struct gpio_desc *desc[]; }; -- 2.16.4