From patchwork Tue Jan 23 16:36:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 125553 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1832628ljf; Tue, 23 Jan 2018 07:46:26 -0800 (PST) X-Google-Smtp-Source: AH8x224t/AoNzI+rRlwxX0pl0detzTofxbvl547oPEimMg8dxdE+SuUNmyH1qH/Gywg1kJoqJcWy X-Received: by 10.36.224.139 with SMTP id c133mr4305688ith.39.1516722386471; Tue, 23 Jan 2018 07:46:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516722386; cv=none; d=google.com; s=arc-20160816; b=ES6bs18F/X6Nbml6GO85u+BWjCQMX4LhdJ4Fb1gSFFBqJeo6QdwuWAyFExuAOQYAIx XZnPVhXNmkUaLRataueZpPTIxWObgIvJ9rId/pCDbH8MzQRczis9YFotN0aDfKR+fYRT ZH8Sr+uYP8zzXcnJ2vGQSfZR9G5dvA8FeN+6Vct1EEQpiJCakRWR0h7S2Grg55EoiClh EZugInX8HvGQskz6vJ9REMwJIegJBFG5hvejRPSwHas9gLJNvWPtwSwZylr6rGx+98bA S34r+YdJFifXBFtWEJoQkjWChTKSNLnIWm/WxjIFWJkIPKBKyCVzNkdS+UFCQDOt6rl3 rLfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=hrSGIrKw7wI1nvgtoHGHpySQrf7ZkusCzNlS+vUnvT8=; b=BTiFG3qPsxrDrDdkfm4UZlKC7Q7kfdplq7EXAVFSxyZhxzPnC6ZDqyu+F2SaFz5Mw+ oi2OBB5L3n9Wp+ljrKuNddz2RHYUS7Z5MrGBtbrbUDGMhO8cGSt6oBDhhc31xmKELLBH f4zMchhhx4taGYATvnsGTA7we1l1kLXDR5o0IcYAnar5ulxHmG2tQqcYDEie4fxxPkbm Dvk5b4QnAeJtpP0wY3Th/T+8d+sTxB8CgOa16QYjBI5GZeff1Uy34zHPaV9q/slrDhaP yw0FfdLNPYDAtZvItXLidzXaEkBPCLz8yazBBEkdtxex3OBQo6Hd7HEkW0vLNc0Mx0/o X3UA== 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 n126si8260643itd.147.2018.01.23.07.46.26; Tue, 23 Jan 2018 07:46:26 -0800 (PST) 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 S1752318AbeAWPpo (ORCPT + 28 others); Tue, 23 Jan 2018 10:45:44 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:4684 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752196AbeAWPpg (ORCPT ); Tue, 23 Jan 2018 10:45:36 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id D63ACF7953AD8; Tue, 23 Jan 2018 23:45:07 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.361.1; Tue, 23 Jan 2018 23:44:58 +0800 From: John Garry To: , , , , , , , , , , CC: , , , , , , , , , Zhichang Yuan , Gabriele Paoloni Subject: [PATCH v12 4/9] PCI: Apply the new generic I/O management on PCI IO hosts Date: Wed, 24 Jan 2018 00:36:20 +0800 Message-ID: <1516725385-24535-5-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516725385-24535-1-git-send-email-john.garry@huawei.com> References: <1516725385-24535-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhichang Yuan After introducing the new generic I/O space management in logic pio, the original PCI MMIO relevant helpers need to be updated based on the new interfaces. This patch adapts the corresponding code to match the changes introduced by logic pio. Signed-off-by: Zhichang Yuan Signed-off-by: Gabriele Paoloni Signed-off-by: Arnd Bergmann #earlier draft Acked-by: Bjorn Helgaas --- drivers/pci/pci.c | 95 +++++++++--------------------------------------- include/asm-generic/io.h | 2 +- 2 files changed, 18 insertions(+), 79 deletions(-) -- 1.9.1 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d60f0a3..54048fe 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -3368,17 +3369,6 @@ int pci_request_regions_exclusive(struct pci_dev *pdev, const char *res_name) } EXPORT_SYMBOL(pci_request_regions_exclusive); -#ifdef PCI_IOBASE -struct io_range { - struct list_head list; - phys_addr_t start; - resource_size_t size; -}; - -static LIST_HEAD(io_range_list); -static DEFINE_SPINLOCK(io_range_lock); -#endif - /* * Record the PCI IO range (expressed as CPU physical address + size). * Return a negative value if an error has occured, zero otherwise @@ -3386,51 +3376,28 @@ struct io_range { int pci_register_io_range(struct fwnode_handle *fwnode, phys_addr_t addr, resource_size_t size) { - int err = 0; - + int ret = 0; #ifdef PCI_IOBASE - struct io_range *range; - resource_size_t allocated_size = 0; - - /* check if the range hasn't been previously recorded */ - spin_lock(&io_range_lock); - list_for_each_entry(range, &io_range_list, list) { - if (addr >= range->start && addr + size <= range->start + size) { - /* range already registered, bail out */ - goto end_register; - } - allocated_size += range->size; - } + struct logic_pio_hwaddr *range; - /* range not registed yet, check for available space */ - if (allocated_size + size - 1 > IO_SPACE_LIMIT) { - /* if it's too big check if 64K space can be reserved */ - if (allocated_size + SZ_64K - 1 > IO_SPACE_LIMIT) { - err = -E2BIG; - goto end_register; - } - - size = SZ_64K; - pr_warn("Requested IO range too big, new size set to 64K\n"); - } + if (!size || addr + size < addr) + return -EINVAL; - /* add the range to the list */ range = kzalloc(sizeof(*range), GFP_ATOMIC); - if (!range) { - err = -ENOMEM; - goto end_register; - } + if (!range) + return -ENOMEM; - range->start = addr; + range->fwnode = fwnode; range->size = size; + range->hw_start = addr; + range->flags = PIO_CPU_MMIO; - list_add_tail(&range->list, &io_range_list); - -end_register: - spin_unlock(&io_range_lock); + ret = logic_pio_register_range(range); + if (ret) + kfree(range); #endif - return err; + return ret; } phys_addr_t pci_pio_to_address(unsigned long pio) @@ -3438,21 +3405,10 @@ phys_addr_t pci_pio_to_address(unsigned long pio) phys_addr_t address = (phys_addr_t)OF_BAD_ADDR; #ifdef PCI_IOBASE - struct io_range *range; - resource_size_t allocated_size = 0; - - if (pio > IO_SPACE_LIMIT) + if (pio >= MMIO_UPPER_LIMIT) return address; - spin_lock(&io_range_lock); - list_for_each_entry(range, &io_range_list, list) { - if (pio >= allocated_size && pio < allocated_size + range->size) { - address = range->start + pio - allocated_size; - break; - } - allocated_size += range->size; - } - spin_unlock(&io_range_lock); + address = logic_pio_to_hwaddr(pio); #endif return address; @@ -3461,25 +3417,8 @@ phys_addr_t pci_pio_to_address(unsigned long pio) unsigned long __weak pci_address_to_pio(phys_addr_t address) { #ifdef PCI_IOBASE - struct io_range *res; - resource_size_t offset = 0; - unsigned long addr = -1; - - spin_lock(&io_range_lock); - list_for_each_entry(res, &io_range_list, list) { - if (address >= res->start && address < res->start + res->size) { - addr = address - res->start + offset; - break; - } - offset += res->size; - } - spin_unlock(&io_range_lock); - - return addr; + return logic_pio_trans_cpuaddr(address); #else - if (address > IO_SPACE_LIMIT) - return (unsigned long)-1; - return (unsigned long) address; #endif } diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index b7996a79..5a59931 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -901,7 +901,7 @@ static inline void iounmap(void __iomem *addr) #define ioport_map ioport_map static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { - return PCI_IOBASE + (port & IO_SPACE_LIMIT); + return PCI_IOBASE + (port & MMIO_UPPER_LIMIT); } #endif