| Message ID | 1429647634-17169-2-git-send-email-mcgrof@do-not-panic.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 21, 2015 at 01:20:31PM -0700, Luis R. Rodriguez wrote: > From: "Luis R. Rodriguez" <mcgrof@suse.com> > > This lets drivers take advantage of PAT when available. This > 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() (de33c442e titled "x86 PAT: fix performance > drop for glx, use UC minus for ioremap(), ioremap_nocache() and > pci_mmap_page_range()") > > Cc: Toshi Kani <toshi.kani@hp.com> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Suresh Siddha <sbsiddha@gmail.com> > Cc: Ingo Molnar <mingo@elte.hu> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Juergen Gross <jgross@suse.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Andy Lutomirski <luto@amacapital.net> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Antonino Daplas <adaplas@gmail.com> > Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Ville Syrjälä <syrjala@sci.fi> > Cc: Mel Gorman <mgorman@suse.de> > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: Borislav Petkov <bp@suse.de> > Cc: Davidlohr Bueso <dbueso@suse.de> > Cc: linux-fbdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> I don't have any objection to this, and I can apply the follow-on patches as well, given the appropriate acks and prerequisite patches (ioremap_wc() implementation). > --- > 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 687af72..fd14f10 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 > > #define PCI_FIND_CAP_TTL 48 > diff --git a/include/linux/pci.h b/include/linux/pci.h > index bc50bb0..490ca41 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1667,6 +1667,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); > -- > 2.3.2.209.gd67f9d5.dirty > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 20, 2015 at 2:02 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: > On Tue, Apr 21, 2015 at 01:20:31PM -0700, Luis R. Rodriguez wrote: >> From: "Luis R. Rodriguez" <mcgrof@suse.com> >> >> This lets drivers take advantage of PAT when available. This >> 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() (de33c442e titled "x86 PAT: fix performance >> drop for glx, use UC minus for ioremap(), ioremap_nocache() and >> pci_mmap_page_range()") >> >> Cc: Toshi Kani <toshi.kani@hp.com> >> Cc: Bjorn Helgaas <bhelgaas@google.com> >> Cc: Suresh Siddha <sbsiddha@gmail.com> >> Cc: Ingo Molnar <mingo@elte.hu> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Juergen Gross <jgross@suse.com> >> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> >> Cc: Andy Lutomirski <luto@amacapital.net> >> Cc: Dave Airlie <airlied@redhat.com> >> Cc: Antonino Daplas <adaplas@gmail.com> >> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> >> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> >> Cc: Ville Syrjälä <syrjala@sci.fi> >> Cc: Mel Gorman <mgorman@suse.de> >> Cc: Vlastimil Babka <vbabka@suse.cz> >> Cc: Borislav Petkov <bp@suse.de> >> Cc: Davidlohr Bueso <dbueso@suse.de> >> Cc: linux-fbdev@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> > > I don't have any objection to this, and I can apply the follow-on patches > as well, given the appropriate acks and prerequisite patches (ioremap_wc() > implementation). OK great, ioremap_wc() has been upstream for a long time. So I'll wait for Tomi's review of the fbdev changes. Once I get those I can resend in a series bundled together with the other pending pci / fbdev changes we just discussed to make things clear. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 687af72..fd14f10 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 #define PCI_FIND_CAP_TTL 48 diff --git a/include/linux/pci.h b/include/linux/pci.h index bc50bb0..490ca41 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1667,6 +1667,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);