From patchwork Mon Aug 24 19:13:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 7066491 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ACADFC05AC for ; Mon, 24 Aug 2015 19:18:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5E7820219 for ; Mon, 24 Aug 2015 19:18:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B58B720396 for ; Mon, 24 Aug 2015 19:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753989AbbHXTNs (ORCPT ); Mon, 24 Aug 2015 15:13:48 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:36676 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbbHXTNq (ORCPT ); Mon, 24 Aug 2015 15:13:46 -0400 Received: by pacgr6 with SMTP id gr6so2634612pac.3; Mon, 24 Aug 2015 12:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=vYtd7mRSTqQLr2bVgu5HF8AszegLR0X9aMUp0einpiQ=; b=iUJwLwLxZevuMJOCmWlsDW5zPrj8v49JyatuxfuW8rrvgnomqvaPczN/m01ke4KdNt IXvVJ+MEl3kB3yAcXRYC8vEnxLGm/HCqZOIsnhh1c5Id1BKdtFisYIgEo2aJHLpD5E9W nCPfCl2WJ+nDYmWhIKPNJMJ6cBUUaIrLQ0CaFYidV/OABc2hNwgbN58Kmc8FIsK8iseo r6qS6c9YGk076wFi0Mf05aJLoYintav9Cs7VRkQdHwKMKnbnzk+TBmPNIvnfw422S+Mk XHPpjifW3j9mtT70iP8mTqZ+M45R4AGNg8ct72dH2ZkYFiAYxpZLTNVCEbmH8qSLSeUN PHTA== X-Received: by 10.66.147.131 with SMTP id tk3mr48958786pab.104.1440443625845; Mon, 24 Aug 2015 12:13:45 -0700 (PDT) Received: from mcgrof@gmail.com ([2601:646:200:bc5b:ca60:ff:feda:57a7]) by smtp.gmail.com with ESMTPSA id nv8sm16409797pdb.92.2015.08.24.12.13.42 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 24 Aug 2015 12:13:44 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Mon, 24 Aug 2015 12:13:42 -0700 From: "Luis R. Rodriguez" To: mingo@kernel.org Cc: bp@suse.de, bhelgaas@google.com, tomi.valkeinen@ti.com, airlied@linux.ie, linux-fbdev@vger.kernel.org, luto@amacapital.net, vinod.koul@intel.com, dan.j.williams@intel.com, toshi.kani@hp.com, benh@kernel.crashing.org, mst@redhat.com, akpm@linux-foundation.org, daniel.vetter@ffwll.ch, konrad.wilk@oracle.com, x86@kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xensource.com, "Luis R. Rodriguez" , Antonino Daplas , Dave Airlie , Davidlohr Bueso , "H. Peter Anvin" , Jean-Christophe Plagniol-Villard , Juergen Gross , Mel Gorman , Suresh Siddha , Thomas Gleixner , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Vlastimil Babka Subject: [PATCH v4 01/11] PCI: Add pci_ioremap_wc_bar() Date: Mon, 24 Aug 2015 12:13:23 -0700 Message-Id: <1440443613-13696-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440443613-13696-1-git-send-email-mcgrof@do-not-panic.com> References: <1440443613-13696-1-git-send-email-mcgrof@do-not-panic.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" This lets drivers take advantage of PAT when available. It should help with the transition of converting video drivers over to ioremap_wc() to help with the goal of eventually using _PAGE_CACHE_UC over _PAGE_CACHE_UC_MINUS on x86 on ioremap_nocache(), see: de33c442ed2a ("x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()") Signed-off-by: Luis R. Rodriguez Acked-by: Arnd Bergmann Cc: Andrew Morton Cc: Andy Lutomirski Cc: Antonino Daplas Cc: benh@kernel.crashing.org Cc: Bjorn Helgaas Cc: Daniel Vetter Cc: Dave Airlie Cc: Davidlohr Bueso Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Jean-Christophe Plagniol-Villard Cc: Juergen Gross Cc: linux-fbdev@vger.kernel.org Cc: linux-pci@vger.kernel.org Cc: Mel Gorman Cc: mst@redhat.com Cc: Suresh Siddha Cc: Thomas Gleixner Cc: Tomi Valkeinen Cc: Toshi Kani Cc: Ville Syrjälä Cc: Vlastimil Babka Link: http://lkml.kernel.org/r/1435195342-26879-2-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Borislav Petkov --- drivers/pci/pci.c | 14 ++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8037c27beb05..33867b8a4bc9 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -138,6 +138,20 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) return ioremap_nocache(res->start, resource_size(res)); } EXPORT_SYMBOL_GPL(pci_ioremap_bar); + +void __iomem *pci_ioremap_wc_bar(struct pci_dev *pdev, int bar) +{ + /* + * Make sure the BAR is actually a memory resource, not an IO resource + */ + if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) { + WARN_ON(1); + return NULL; + } + return ioremap_wc(pci_resource_start(pdev, bar), + pci_resource_len(pdev, bar)); +} +EXPORT_SYMBOL_GPL(pci_ioremap_wc_bar); #endif diff --git a/include/linux/pci.h b/include/linux/pci.h index 88bee285b93d..2b2d7d44c21a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1701,6 +1701,7 @@ static inline void pci_mmcfg_late_init(void) { } int pci_ext_cfg_avail(void); void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar); +void __iomem *pci_ioremap_wc_bar(struct pci_dev *pdev, int bar); #ifdef CONFIG_PCI_IOV int pci_iov_virtfn_bus(struct pci_dev *dev, int id);