From patchwork Tue Apr 3 14:39:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10321313 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1DD7560318 for ; Tue, 3 Apr 2018 14:39:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F20FF287FF for ; Tue, 3 Apr 2018 14:39:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E589C28860; Tue, 3 Apr 2018 14:39:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23BEB287FF for ; Tue, 3 Apr 2018 14:39:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401AbeDCOjQ (ORCPT ); Tue, 3 Apr 2018 10:39:16 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34807 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbeDCOjN (ORCPT ); Tue, 3 Apr 2018 10:39:13 -0400 Received: by mail-wm0-f68.google.com with SMTP id w2so12001091wmw.1; Tue, 03 Apr 2018 07:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=UT2oxbRcErkd0xBrVara8z/Q5LoSOy1yk3AIZvDOQFM=; b=TLluZjEFdoMk+im2Q7azB/zWQqtJa+7wq2prF3XLvyWi7H8mSakI4OryY0lin7YtMT 3fPtAqkbDbZXTL1UBotvickAl2hQR0VBJCrSTY98JKAEFxYPQ1odxuj360iW/LOZGBAr YnSutbWEU6/Zp0qCt2V5xOdgrOfQQUjtvJILaNe333IBVpgmmvbh6OdNwvz4yVnDU39C USrij+PSB6nL0sHfMK1FVATKEgWPd1515aNiO6XfRRBCWE5CDd00VrAhc9cGJAQTtEaD h11oPPkzkLXZyquopiDyV1fxv4KnJWH28BRgNZJffiussjbOh0HU81cQOclJ1IMLAf+q 3ayQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UT2oxbRcErkd0xBrVara8z/Q5LoSOy1yk3AIZvDOQFM=; b=UE8njKhlbh6Blwp4caRcs0nyfe2mlGdKCBVb/GYZI5Rg9QKwHHttnO4ZFCK+l5z/35 55F73DqjMlSOfV7b5DcCE4FFEptezUgCxumpV596ij+Q1i0hjECNYTgcyuEzZRRUmRS0 dSLJiFnVrQY1x0DG1KGxFdY6BuQBCu6P1odcN/qiPAiNkjJLrow3kLvCIRMYjv+ZFI4K kI4abAmWAWs5qxoRuwTU7MPMaxGd3pr3Tbuf39ac9jrkEF0xMGB2FTGQGsdIsots4Bf0 lVTTIh2gq7B5Wjr/hBmsk4gGxzhAS30XCF/NEd6GJMJ2pN6XPo4ZIXAiQtSvu0XANB0V yNfA== X-Gm-Message-State: AElRT7FqGTpOBnEc9M4CPFSSsKrxZkNLoNcZ6XB8r5rDuWFpJ+TrqkH0 k84BxlVnbbEOjyMO48+YmOk= X-Google-Smtp-Source: AIpwx4/FvHOD75B6mAh+J53ls6CvHj464IMtw3pgazYjybKigfiHeIIvX36ZUaPoEtmD7N3zLsFqSQ== X-Received: by 10.28.45.9 with SMTP id t9mr4059971wmt.161.1522766351629; Tue, 03 Apr 2018 07:39:11 -0700 (PDT) Received: from localhost (p200300E41F193100D36CEB00B2C8378E.dip0.t-ipconnect.de. [2003:e4:1f19:3100:d36c:eb00:b2c8:378e]) by smtp.gmail.com with ESMTPSA id q81sm1105074wmg.8.2018.04.03.07.39.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Apr 2018 07:39:10 -0700 (PDT) Date: Tue, 3 Apr 2018 16:39:09 +0200 From: Thierry Reding To: John Garry Cc: mika.westerberg@linux.intel.com, rafael@kernel.org, lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, robh+dt@kernel.org, bhelgaas@google.com, arnd@arndb.de, mark.rutland@arm.com, olof@lixom.net, dann.frazier@canonical.com, andy.shevchenko@gmail.com, robh@kernel.org, andriy.shevchenko@linux.intel.com, joe@perches.com, benh@kernel.crashing.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linuxarm@huawei.com, minyard@acm.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, rdunlap@infradead.org, gregkh@linuxfoundation.org, akpm@linux-foundation.org, frowand.list@gmail.com, agraf@suse.de, linux-tegra@vger.kernel.org Subject: Re: [PATCH v17 01/10] LIB: Introduce a generic PIO mapping method Message-ID: <20180403143909.GA21171@ulmo> References: <1521051359-34473-1-git-send-email-john.garry@huawei.com> <1521051359-34473-2-git-send-email-john.garry@huawei.com> <20180403140410.GE27789@ulmo> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180403140410.GE27789@ulmo> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Apr 03, 2018 at 04:04:10PM +0200, Thierry Reding wrote: > On Thu, Mar 15, 2018 at 02:15:50AM +0800, John Garry wrote: > > From: Zhichang Yuan > > > > In commit 41f8bba7f555 ("of/pci: Add pci_register_io_range() and > > pci_pio_to_address()"), a new I/O space management was supported. With > > that driver, the I/O ranges configured for PCI/PCIe hosts on some > > architectures can be mapped to logical PIO, converted easily between > > CPU address and the corresponding logicial PIO. Based on this, PCI > > I/O devices can be accessed in a memory read/write way through the > > unified in/out accessors. > > > > But on some archs/platforms, there are bus hosts which access I/O > > peripherals with host-local I/O port addresses rather than memory > > addresses after memory-mapped. > > > > To support those devices, a more generic I/O mapping method is introduced > > here. Through this patch, both the CPU addresses and the host-local port > > can be mapped into the logical PIO space with different logical/fake PIOs. > > After this, all the I/O accesses to either PCI MMIO devices or host-local > > I/O peripherals can be unified into the existing I/O accessors defined in > > asm-generic/io.h and be redirected to the right device-specific hooks > > based on the input logical PIO. > > > > Signed-off-by: Zhichang Yuan > > Signed-off-by: Gabriele Paoloni > > Signed-off-by: John Garry > > Reviewed-by: Andy Shevchenko > > Tested-by: dann frazier > > --- > > include/asm-generic/io.h | 2 + > > include/linux/logic_pio.h | 124 ++++++++++++++++++++ > > lib/Kconfig | 15 +++ > > lib/Makefile | 2 + > > lib/logic_pio.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++ > > 5 files changed, 425 insertions(+) > > create mode 100644 include/linux/logic_pio.h > > create mode 100644 lib/logic_pio.c > > > [...] > > diff --git a/lib/logic_pio.c b/lib/logic_pio.c > > new file mode 100644 > > index 0000000..8394c2d > > --- /dev/null > > +++ b/lib/logic_pio.c > > @@ -0,0 +1,282 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2017 Hisilicon Limited, All Rights Reserved. > > + * Author: Gabriele Paoloni > > + * Author: Zhichang Yuan > > + * > > + */ > > + > > +#define pr_fmt(fmt) "LOGIC PIO: " fmt > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +/* The unique hardware address list. */ > > +static LIST_HEAD(io_range_list); > > +static DEFINE_MUTEX(io_range_mutex); > > + > > +/* Consider a kernel general helper for this */ > > +#define in_range(b, first, len) ((b) >= (first) && (b) < (first) + (len)) > > + > > +/** > > + * logic_pio_register_range - register logical PIO range for a host > > + * @new_range: pointer to the io range to be registered. > > + * > > + * returns 0 on success, the error code in case of failure > > + * > > + * Register a new io range node in the io range list. > > + */ > > +int logic_pio_register_range(struct logic_pio_hwaddr *new_range) > > +{ > > + struct logic_pio_hwaddr *range; > > + resource_size_t start = new_range->hw_start; > > + resource_size_t end = new_range->hw_start + new_range->size; > > + resource_size_t mmio_sz = 0; > > + resource_size_t iio_sz = MMIO_UPPER_LIMIT; > > + int ret = 0; > > + > > + if (!new_range || !new_range->fwnode || !new_range->size) > > + return -EINVAL; > > + > > + mutex_lock(&io_range_mutex); > > + list_for_each_entry_rcu(range, &io_range_list, list) { > > + if (range->fwnode == new_range->fwnode) { > > + /* range already there */ > > + ret = -EFAULT; > > + goto end_register; > > + } > > This is the -EFAULT that propagates to pci-tegra.c's ->probe() and fails > to bind the driver. > > I'm not exactly sure what's causing the duplicate here because it's > rather difficult to get at something useful from just the ->fwnode, but > I'm fairly sure that the reason this breaks is because the Tegra driver > will defer probe due to some regulators that aren't available on the > first try. Given the above code and the rest of this file, I can't see a > way to "fix" the driver and remove the I/O range on failure. > > This is doubly bad because this doesn't only leak the ranges on probe > deferral, but also on driver unload, and we just added support for > building the Tegra driver as a loadable module, so these are actually > cases that can happen in regular uses of the driver. > > I have no idea on how to fix this. Anyone know of a quick fix to restore > PCI for Tegra other than reverting all of these changes? > > I suppose an API could be added to unregister the range, but the calling > sequence is rather obfuscated, so removing the range will look totally > asymmetric, I'm afraid. > > Here's the call stack: > > tegra_pcie_probe() > tegra_pcie_parse_dt() > of_pci_range_to_resource() > pci_register_io_range() > logic_pio_register_range() > > So the range here is registered as part of a resource parsing function, > which is supposed to not have any side-effects. There's no equivalent of > that parsing routine (i.e. no "unparse" function that would undo the > effects of parsing). > > Perhaps a cleaner way would be to decouple the parsing from the actual > request step that has the side-effect. > > Going back in history a little, it looks like even before this commit > the I/O range registration was triggered by the parsing code and even > the range leak was there, except that it caused pci_register_io_range() > to return 0 rather than -EFAULT. Perhaps the quickest fix for this would > be to do the same in the new code and restore drivers that accidentally > depend on this behaviour. I can confirm that the following fixes the issue for me, though I don't think it's a very clean fix given that the range will remain requested forever, even if the driver is gone. But since that's already been the case for quite a while, probably something that can be fixed separately. Cc'ing linux-tegra for visibility. Thierry --- >8 --- diff --git a/lib/logic_pio.c b/lib/logic_pio.c index 29cedeadb397..4664b87e1c5f 100644 --- a/lib/logic_pio.c +++ b/lib/logic_pio.c @@ -46,7 +46,6 @@ int logic_pio_register_range(struct logic_pio_hwaddr *new_range) list_for_each_entry_rcu(range, &io_range_list, list) { if (range->fwnode == new_range->fwnode) { /* range already there */ - ret = -EFAULT; goto end_register; } if (range->flags == LOGIC_PIO_CPU_MMIO &&