From patchwork Mon Jul 29 10:13:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis Efremov (Oracle)" X-Patchwork-Id: 11063579 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-2.web.codeaurora.org (Postfix) with ESMTP id 1DAA714DB for ; Mon, 29 Jul 2019 10:14:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C0FC200E7 for ; Mon, 29 Jul 2019 10:14:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0DBE286A0; Mon, 29 Jul 2019 10:14:34 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 A34B4200E7 for ; Mon, 29 Jul 2019 10:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728232AbfG2KOa (ORCPT ); Mon, 29 Jul 2019 06:14:30 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:40279 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbfG2KO3 (ORCPT ); Mon, 29 Jul 2019 06:14:29 -0400 Received: by mail-lj1-f195.google.com with SMTP id m8so24414991lji.7; Mon, 29 Jul 2019 03:14:28 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=Dpd4bG4LMHeAuXOdMrtoCn/QAeMyQrruUgZF75ZQCJ8=; b=c0Xr6FBvqIjyFCA2ShVizzaXbeN6VyAsj6EDFRce79o0RGbnq3hVIq24Tn6tn7I8KZ tq82w8i2dJM5GMDWN9ddNqsZi1FtS9DPP7O7QAsAAAxY6drZds9mYvfue6xodrz4DCd0 z9/qv4GdQF5+GSi8fF/iAf+es1FftfqRMZw6rQGKTmmz69g3hMnNtWKV3tPO6ieWDE1h Lj0fFgDBuiwiR5GLaNYIb08yXvObIcXUKFDmhpvttuImnrF/wL+k8uTU9oJvlmTz1Fac d7zRFJYgpyWZIM1sjnVWlb/gzvFsQWMe7QPCkkEXOFzAWhpQoYok+6GJ5ViptsPchAup ECXw== X-Gm-Message-State: APjAAAWDoICcx9nqpALoUh4bO93OI3OFr6paG0o+cISlcg5tJ9jb2cnY jiTCdlFiNb8QPpPuD1hIAwI= X-Google-Smtp-Source: APXvYqwEk2DknbB7kclA3P32EP96BIIMax8pcdBk+oaWSWKN8ffIkF+Ld5QCSkXWovB+komF1DZEFA== X-Received: by 2002:a2e:b4c9:: with SMTP id r9mr57348496ljm.196.1564395267211; Mon, 29 Jul 2019 03:14:27 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-48-208.ip.moscow.rt.ru. [188.32.48.208]) by smtp.googlemail.com with ESMTPSA id y12sm11814834lfy.36.2019.07.29.03.14.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 03:14:26 -0700 (PDT) From: Denis Efremov To: Bjorn Helgaas Cc: Denis Efremov , "David S. Miller" , "Benjamin Herrenschmidt" , Paul Mackerras , Michael Ellerman , Ralf Baechle , Paul Burton , James Hogan , Michal Simek , linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] PCI: Convert pci_resource_to_user to a weak function Date: Mon, 29 Jul 2019 13:13:57 +0300 Message-Id: <20190729101401.28068-2-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729101401.28068-1-efremov@linux.com> References: <20190729101401.28068-1-efremov@linux.com> MIME-Version: 1.0 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 The patch turns pci_resource_to_user() to a weak function. Thus, architecture-specific versions will automatically override the generic one. This allows to remove the HAVE_ARCH_PCI_RESOURCE_TO_USER macro and avoid the conditional compilation for this single function. Signed-off-by: Denis Efremov --- drivers/pci/pci.c | 8 ++++++++ include/linux/pci.h | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 29ed5ec1ac27..f9dc7563a8b9 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5932,6 +5932,14 @@ resource_size_t __weak pcibios_default_alignment(void) return 0; } +void __weak pci_resource_to_user(const struct pci_dev *dev, int bar, + const struct resource *rsrc, resource_size_t *start, + resource_size_t *end) +{ + *start = rsrc->start; + *end = rsrc->end; +} + #define RESOURCE_ALIGNMENT_PARAM_SIZE COMMAND_LINE_SIZE static char resource_alignment_param[RESOURCE_ALIGNMENT_PARAM_SIZE] = {0}; static DEFINE_SPINLOCK(resource_alignment_lock); diff --git a/include/linux/pci.h b/include/linux/pci.h index 9e700d9f9f28..dbdfdab1027b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1870,25 +1870,13 @@ static inline const char *pci_name(const struct pci_dev *pdev) return dev_name(&pdev->dev); } - /* * Some archs don't want to expose struct resource to userland as-is * in sysfs and /proc */ -#ifdef HAVE_ARCH_PCI_RESOURCE_TO_USER void pci_resource_to_user(const struct pci_dev *dev, int bar, const struct resource *rsrc, resource_size_t *start, resource_size_t *end); -#else -static inline void pci_resource_to_user(const struct pci_dev *dev, int bar, - const struct resource *rsrc, resource_size_t *start, - resource_size_t *end) -{ - *start = rsrc->start; - *end = rsrc->end; -} -#endif /* HAVE_ARCH_PCI_RESOURCE_TO_USER */ - /* * The world is not perfect and supplies us with broken PCI devices. From patchwork Mon Jul 29 10:13:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis Efremov (Oracle)" X-Patchwork-Id: 11063581 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-2.web.codeaurora.org (Postfix) with ESMTP id 67EC8746 for ; Mon, 29 Jul 2019 10:14:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 582AC200E7 for ; Mon, 29 Jul 2019 10:14:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C835286A0; Mon, 29 Jul 2019 10:14:37 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 EE8C5200E7 for ; Mon, 29 Jul 2019 10:14:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728152AbfG2KOg (ORCPT ); Mon, 29 Jul 2019 06:14:36 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:36328 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbfG2KOg (ORCPT ); Mon, 29 Jul 2019 06:14:36 -0400 Received: by mail-lf1-f66.google.com with SMTP id q26so41681835lfc.3; Mon, 29 Jul 2019 03:14:34 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=TmxcCXhXwRYGEoMeDwlU1eEbMiMpwlUebLffY1+PjIY=; b=HWioYTFXekM3wEsxeMggM8LTqCjOmuGnAlfVYr28d1I9tseRen9NBlQZMwslqqYUGN wsYfLEy86WLXT2bccXqyh8ai35sVjLJ4JQNoOWg1NTcnFE9vEqJO01TjF4GgHQOh6Tw+ ENNIO2resVRih8TY5U86Bi17JU5mtp2y9zsmykvCjcYzmIujDBANYYO/E3pCEOYlLG/r goa9eK+4Zh2mGLeDkep0PWEMbp3upTERBNWZCHDa0pQb90ER9qjywTWcOL1QAx/xurk2 DLX5JX47sL5nYia1hDUDte4ruqH/hvbKDBc+M8ICDlTuZxBXwu5q1PKh1/L7s+6/0S3S MBqA== X-Gm-Message-State: APjAAAV0GtM4fJVBJuZcOC7kMlaQUcKGPlIxdM7zxAue0TXeS8OeYvxA BwbeQEeVmb1GUzTJXP/cjUo= X-Google-Smtp-Source: APXvYqw0Cu+Xf6R15+Xv9Wzlg3NjXnpW+b+moVSWt5i+0ri2j5GzuRv5Gxey0YhFLKx3hSjrMGvJKA== X-Received: by 2002:ac2:4d1c:: with SMTP id r28mr49442744lfi.159.1564395274249; Mon, 29 Jul 2019 03:14:34 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-48-208.ip.moscow.rt.ru. [188.32.48.208]) by smtp.googlemail.com with ESMTPSA id y12sm11814834lfy.36.2019.07.29.03.14.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 03:14:33 -0700 (PDT) From: Denis Efremov To: Bjorn Helgaas Cc: Denis Efremov , Michal Simek , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] microblaze/PCI: Remove HAVE_ARCH_PCI_RESOURCE_TO_USER Date: Mon, 29 Jul 2019 13:13:58 +0300 Message-Id: <20190729101401.28068-3-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729101401.28068-1-efremov@linux.com> References: <20190729101401.28068-1-efremov@linux.com> MIME-Version: 1.0 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 The function pci_resource_to_user() was turned to a weak one. Thus, microblase-specific version will automatically override the generic one and the HAVE_ARCH_PCI_RESOURCE_TO_USER macro should be removed. Signed-off-by: Denis Efremov --- arch/microblaze/include/asm/pci.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 21ddba9188b2..7c4dc5d85f53 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -66,8 +66,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, unsigned long size, pgprot_t prot); -#define HAVE_ARCH_PCI_RESOURCE_TO_USER - /* This part of code was originally in xilinx-pci.h */ #ifdef CONFIG_PCI_XILINX extern void __init xilinx_pci_init(void); From patchwork Mon Jul 29 10:13:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis Efremov (Oracle)" X-Patchwork-Id: 11063591 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-2.web.codeaurora.org (Postfix) with ESMTP id BE10214DB for ; Mon, 29 Jul 2019 10:14:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B00BB200E7 for ; Mon, 29 Jul 2019 10:14:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3EBB286A0; Mon, 29 Jul 2019 10:14:58 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 0634E2855C for ; Mon, 29 Jul 2019 10:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728277AbfG2KOj (ORCPT ); Mon, 29 Jul 2019 06:14:39 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:34429 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbfG2KOj (ORCPT ); Mon, 29 Jul 2019 06:14:39 -0400 Received: by mail-lf1-f67.google.com with SMTP id b29so34404212lfq.1; Mon, 29 Jul 2019 03:14:37 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=mhScrfvzfJHOaoJ1E3ndJMrRVW60NNkjG9R46Biny8M=; b=PQD+V2vmqKcBSfcY8EVrs38RSYxD5piYNtIZwlBCZHv/BVlbTXFrhOlTryU8OJA19O Lwvwgnoiz0Jv4+HJiarR+WD0ASmjg9lKsTDFhOdpGOjgGIzKUWu7SeIJTyoN2FEE6T8R YgL8hqxOomX67cljEdplzU1doZ209G4kbTek/zv8dQT//s/Ukm1wAF7R/v6v1eUqI/5g QivOwT0GWD9LjLSvXSXCXUNy1m/uqVP7Yzg0kkXVYeD/hmgCvDfRWBcGOzWg38BrCEv1 nhO0UrKIPTjfsTrqmEBOX4FRjIOqawAbNZdJ4Nsb6CN52f012OE9VW7yU5Ny/maxUdGg OpeQ== X-Gm-Message-State: APjAAAVsW1981ZuhwbG0x+E423ie5fKBMoYGqmA/Ep+YVVgWJJ4RXlIm 3yh3P3Kqr7dG5Y/IKiZiuVw= X-Google-Smtp-Source: APXvYqyFV/z2+4qtK/3ETW+F11Zp0K4FKj2kFJkLCRVUOtY6mp6T14WvUEmJPMKi1FbaBLxNl25GSw== X-Received: by 2002:a19:f806:: with SMTP id a6mr37949567lff.102.1564395276889; Mon, 29 Jul 2019 03:14:36 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-48-208.ip.moscow.rt.ru. [188.32.48.208]) by smtp.googlemail.com with ESMTPSA id y12sm11814834lfy.36.2019.07.29.03.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 03:14:36 -0700 (PDT) From: Denis Efremov To: Bjorn Helgaas Cc: Denis Efremov , Ralf Baechle , Paul Burton , James Hogan , linux-mips@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] mips/PCI: Remove HAVE_ARCH_PCI_RESOURCE_TO_USER Date: Mon, 29 Jul 2019 13:13:59 +0300 Message-Id: <20190729101401.28068-4-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729101401.28068-1-efremov@linux.com> References: <20190729101401.28068-1-efremov@linux.com> MIME-Version: 1.0 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 The function pci_resource_to_user() was turned to a weak one. Thus, mips-specific version will automatically override the generic one and the HAVE_ARCH_PCI_RESOURCE_TO_USER macro should be removed. Signed-off-by: Denis Efremov --- arch/mips/include/asm/pci.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 436099883022..6f48649201c5 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h @@ -108,7 +108,6 @@ extern unsigned long PCIBIOS_MIN_MEM; #define HAVE_PCI_MMAP #define ARCH_GENERIC_PCI_MMAP_RESOURCE -#define HAVE_ARCH_PCI_RESOURCE_TO_USER /* * Dynamic DMA mapping stuff. From patchwork Mon Jul 29 10:14:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis Efremov (Oracle)" X-Patchwork-Id: 11063583 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-2.web.codeaurora.org (Postfix) with ESMTP id 0F4C114DB for ; Mon, 29 Jul 2019 10:14:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0085F200E7 for ; Mon, 29 Jul 2019 10:14:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8F6E286A0; Mon, 29 Jul 2019 10:14:43 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 A19A1200E7 for ; Mon, 29 Jul 2019 10:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728304AbfG2KOl (ORCPT ); Mon, 29 Jul 2019 06:14:41 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:40629 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728260AbfG2KOk (ORCPT ); Mon, 29 Jul 2019 06:14:40 -0400 Received: by mail-lf1-f65.google.com with SMTP id b17so41668809lff.7; Mon, 29 Jul 2019 03:14:39 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=BsIPSvfzLwnhnLKtcEHLG5y6k186GA8GW/6JbbfPnA4=; b=Bs6UPJ5AGBfzGCDu1yTlLyiAGy/axf7R5AP8BquIYDJcIDHfPQbNs/uxxXOtgdqbrT +x4q2VfquCtIdRSMCV14uxsQAqELm2Erq/3evaRSL659fACwYgGrjEb2m0f3V5qHjxsA 554SEssPzLAnrI/ZnRBvOiJ7KMl+GJS5UKoM8hUiC84MxbRkiEehEdbJ/7mAJwvmPxj9 2yzdv9if5oTGUUdVDKdt8mGyek6cOPJ3a+fdLPViRpnFA3+WGBVEEQIdUti/uzOIMijx gKdnym3hmSPhbbE6fuekglwfmvEqHi4HAPUrltBn9JYEe8y/VH85uevVtvrWndfgFs3S gsVQ== X-Gm-Message-State: APjAAAVO4XS41fsfxEqFx6QDMyvU3qizS2GaFpA5fDXOaG+B0W6PkbrB 5j9RYEhs0IiXdV70ZZfEfmk= X-Google-Smtp-Source: APXvYqxAitsCCS/HFPR7uHO4tOhzGp6jjCagTQ9NCr3/Ull+T3hU8+UpiyoxWae7OFM9Qe0aQhN3uA== X-Received: by 2002:ac2:5492:: with SMTP id t18mr53096046lfk.41.1564395278677; Mon, 29 Jul 2019 03:14:38 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-48-208.ip.moscow.rt.ru. [188.32.48.208]) by smtp.googlemail.com with ESMTPSA id y12sm11814834lfy.36.2019.07.29.03.14.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 03:14:38 -0700 (PDT) From: Denis Efremov To: Bjorn Helgaas Cc: Denis Efremov , "Benjamin Herrenschmidt" , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] powerpc/PCI: Remove HAVE_ARCH_PCI_RESOURCE_TO_USER Date: Mon, 29 Jul 2019 13:14:00 +0300 Message-Id: <20190729101401.28068-5-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729101401.28068-1-efremov@linux.com> References: <20190729101401.28068-1-efremov@linux.com> MIME-Version: 1.0 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 The function pci_resource_to_user() was turned to a weak one. Thus, powerpc-specific version will automatically override the generic one and the HAVE_ARCH_PCI_RESOURCE_TO_USER macro should be removed. Signed-off-by: Denis Efremov --- arch/powerpc/include/asm/pci.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 2372d35533ad..327567b8f7d6 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -112,8 +112,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, unsigned long size, pgprot_t prot); -#define HAVE_ARCH_PCI_RESOURCE_TO_USER - extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose); extern void pcibios_setup_bus_devices(struct pci_bus *bus); extern void pcibios_setup_bus_self(struct pci_bus *bus); From patchwork Mon Jul 29 10:14:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis Efremov (Oracle)" X-Patchwork-Id: 11063585 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-2.web.codeaurora.org (Postfix) with ESMTP id 0886F14DB for ; Mon, 29 Jul 2019 10:14:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED569200E7 for ; Mon, 29 Jul 2019 10:14:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1279286A0; Mon, 29 Jul 2019 10:14:50 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 988D9200E7 for ; Mon, 29 Jul 2019 10:14:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728306AbfG2KOn (ORCPT ); Mon, 29 Jul 2019 06:14:43 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:33050 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbfG2KOm (ORCPT ); Mon, 29 Jul 2019 06:14:42 -0400 Received: by mail-lf1-f65.google.com with SMTP id x3so41743056lfc.0; Mon, 29 Jul 2019 03:14:40 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=yupETfqZ2IUSTjDe+bKCoxhzbaEilz49jRRnCpaPaiM=; b=cRhDn/dJ6vQDUryu5X8N4NmMOZdsdiaQJJSOI/HSMQ2CX8DX+npSOXrkzcyT+yeduk BX9OsM326pWxtYV9N5xneJlNZWuGBbtS9C7zTWbpfDro8iDGV2NZnRXDeNIl/HkSlsx7 nFUMZmAgYT88R4HnXSfB4n4thoS7iBnCLTb9W4Zmk31c65Hufury6qIeIiTdPDsmFJJX YM/QOX9ocrGiShaXWfqCqAtBMZJRYP5EqrBiGTbnSilFKBbiQPOg9AgOQuEaVvSGTYfn +JgzdV04AfMZiX4jburVDZ8ufLr9d4fcfghppzFi4LqfSd/13CQZlA11l40hSZz0xGy3 FOww== X-Gm-Message-State: APjAAAWjr0L52nQY77Gc+/PbX7azTCDr1dVFEGH1zxEH/vt0gBHMZOpa vRuMrnfghdHDdugfyATMSs4= X-Google-Smtp-Source: APXvYqyzEX7/b64Ts0QNiQTVUqAu+v61liDsTlqZmJcWAS2uOGiIQr2pUT55zRUw5B/wxq4tvZCIVg== X-Received: by 2002:ac2:48a5:: with SMTP id u5mr52810601lfg.62.1564395279979; Mon, 29 Jul 2019 03:14:39 -0700 (PDT) Received: from localhost.localdomain (broadband-188-32-48-208.ip.moscow.rt.ru. [188.32.48.208]) by smtp.googlemail.com with ESMTPSA id y12sm11814834lfy.36.2019.07.29.03.14.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 03:14:39 -0700 (PDT) From: Denis Efremov To: Bjorn Helgaas Cc: Denis Efremov , "David S. Miller" , sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] sparc/PCI: Remove HAVE_ARCH_PCI_RESOURCE_TO_USER Date: Mon, 29 Jul 2019 13:14:01 +0300 Message-Id: <20190729101401.28068-6-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729101401.28068-1-efremov@linux.com> References: <20190729101401.28068-1-efremov@linux.com> MIME-Version: 1.0 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 The function pci_resource_to_user() was turned to a weak one. Thus, sparc-specific version will automatically override the generic one and the HAVE_ARCH_PCI_RESOURCE_TO_USER macro should be removed. Signed-off-by: Denis Efremov --- arch/sparc/include/asm/pci.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/sparc/include/asm/pci.h b/arch/sparc/include/asm/pci.h index cfec79bb1831..4deddf430e5d 100644 --- a/arch/sparc/include/asm/pci.h +++ b/arch/sparc/include/asm/pci.h @@ -38,8 +38,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) #define arch_can_pci_mmap_io() 1 #define HAVE_ARCH_PCI_GET_UNMAPPED_AREA #define get_pci_unmapped_area get_fb_unmapped_area - -#define HAVE_ARCH_PCI_RESOURCE_TO_USER #endif /* CONFIG_SPARC64 */ #if defined(CONFIG_SPARC64) || defined(CONFIG_LEON_PCI)