From patchwork Sun Jul 28 20:22:09 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: 11063061 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 8503814E5 for ; Sun, 28 Jul 2019 20:23:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A60C2871F for ; Sun, 28 Jul 2019 20:23:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B6242874C; Sun, 28 Jul 2019 20:23:16 +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 0FB472871F for ; Sun, 28 Jul 2019 20:23:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726151AbfG1UXP (ORCPT ); Sun, 28 Jul 2019 16:23:15 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:44648 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726129AbfG1UXP (ORCPT ); Sun, 28 Jul 2019 16:23:15 -0400 Received: by mail-lj1-f196.google.com with SMTP id k18so56449988ljc.11; Sun, 28 Jul 2019 13:23:13 -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=svIZnH3LFn3SCsAf3hZ7NcuCk5uSXQPw/o877w6XO80=; b=eMFeppMRMFt/PfqKwzpNzERlfcQ6h72DB+BzrL7nDe/URd0PolGXPL7GsJsqo0oSn+ sz+gQydnhVQrz2cNHgS2qik1VK+L/rOdiFur9neMpbqu69bReubr2DswQM8AOogAr2T1 7Qnfe/MayCrHf0kNX0D/TTsbs7Fbb+pHhhxDoV2vSk+NNTo8FR/HydTN+uP/RlkNkK7C IDjAd78vxUlcsmfE+LFhQILeexPWpY9jwCh3uS3JwfyTs282vDVNWbiGSofPRMtr71kQ b1k4YooMbgTm3iNsZvUwffVXpGhoYFGowd9OPF38kUc1e0KBXVvioemkKIepzg1jk3Z8 Fqww== X-Gm-Message-State: APjAAAVMYcINoOHqR3MnhlFczLSn7nvati9HvN+WFRYoCoRxgEjWpV+Y TuWN3OUfOrkEablHAIR/ZMYsIUmQwnw= X-Google-Smtp-Source: APXvYqwiuHhdBpv2paJX0RbGJe6B84YT/HQ+J9VmSQk0WANqERsY6PXq3IkxDXDz0lW7cj/3nr+4EA== X-Received: by 2002:a2e:2993:: with SMTP id p19mr54104888ljp.202.1564345393166; Sun, 28 Jul 2019 13:23:13 -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 z17sm12395917ljc.37.2019.07.28.13.23.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jul 2019 13:23:12 -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 1/5] PCI: Convert pci_resource_to_user to a weak function Date: Sun, 28 Jul 2019 23:22:09 +0300 Message-Id: <20190728202213.15550-2-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190728202213.15550-1-efremov@linux.com> References: <20190728202213.15550-1-efremov@linux.com> MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@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 | 18 +++--------------- 2 files changed, 11 insertions(+), 15 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..1a19d0151b0a 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 */ - +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); /* * The world is not perfect and supplies us with broken PCI devices. From patchwork Sun Jul 28 20:22:11 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: 11063067 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 1CC3E14E5 for ; Sun, 28 Jul 2019 20:23:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 135052874C for ; Sun, 28 Jul 2019 20:23:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0631A2871F; Sun, 28 Jul 2019 20:23:47 +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 E8BEF2871F for ; Sun, 28 Jul 2019 20:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726220AbfG1UXq (ORCPT ); Sun, 28 Jul 2019 16:23:46 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:37032 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726129AbfG1UXq (ORCPT ); Sun, 28 Jul 2019 16:23:46 -0400 Received: by mail-lj1-f193.google.com with SMTP id z28so2220094ljn.4; Sun, 28 Jul 2019 13:23:44 -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=fF/FQdQ9xKIHaxOeRyQg02ZFBRSbODaQ0vz5FilulUrA04s8L0pObp5WwiLfAwzmhq 91ZSO71QJe/4d8GJVBb5IcJJGb9MgG6J1sBlfIe/bojjAe3bLfPj4dYgRrVjxHVUNDLn kRmKXTGEESa3e9iRtUl1fKYDMztcaVxLDN3q2jYPfNotx4u2wtPqqU/NCdLMEKbNEndZ 0FulmPzMw9mjYa9Oaym710dXqle0l7vuRHYW10OHDPu9OE40IFKow0bHU7CK6IAy5X1g aDJuER9EgKKgcTAK4C+T/7GmwA96QZb2uEnZeITdQgFTzfaQVkmPwZ/6t9jLtWcnN0JF +2XA== X-Gm-Message-State: APjAAAWuDOoKqDCQBMYZ3UpAxvhBmaJcOHbyUnrbKUuf3fyXp97ZTo32 4bEQNF2A4d+kv7JOXHxDv0M= X-Google-Smtp-Source: APXvYqyV1b8TXU6HxTOLiYBaGSCR3P+vLbqv4kmmZNGnZWYQLhF2jZROOmBKr1QIOxMTOl4u9lCHeQ== X-Received: by 2002:a2e:9dd7:: with SMTP id x23mr57267840ljj.160.1564345423752; Sun, 28 Jul 2019 13:23:43 -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 z17sm12395917ljc.37.2019.07.28.13.23.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jul 2019 13:23:43 -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 3/5] mips/PCI: Remove HAVE_ARCH_PCI_RESOURCE_TO_USER Date: Sun, 28 Jul 2019 23:22:11 +0300 Message-Id: <20190728202213.15550-4-efremov@linux.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190728202213.15550-1-efremov@linux.com> References: <20190728202213.15550-1-efremov@linux.com> MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@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.