Commit f84d9fa8 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc updates from David Miller:
 "Besides some cleanups the major thing here is supporting relaxed
  ordering PCIe transactions on newer sparc64 machines, from Chris
  Hyser"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fixing ident and beautifying code
  sparc64: Enable setting "relaxed ordering" in IOMMU mappings
  sparc64: Enable PCI IOMMU version 2 API
  sparc: migrate exception table users off module.h and onto extable.h
parents 82fa407d 98e98eb6
...@@ -1744,6 +1744,7 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle, ...@@ -1744,6 +1744,7 @@ unsigned long sun4v_vintr_set_target(unsigned long dev_handle,
#define HV_PCI_MAP_ATTR_READ 0x01 #define HV_PCI_MAP_ATTR_READ 0x01
#define HV_PCI_MAP_ATTR_WRITE 0x02 #define HV_PCI_MAP_ATTR_WRITE 0x02
#define HV_PCI_MAP_ATTR_RELAXED_ORDER 0x04
#define HV_PCI_DEVICE_BUILD(b,d,f) \ #define HV_PCI_DEVICE_BUILD(b,d,f) \
((((b) & 0xff) << 16) | \ ((((b) & 0xff) << 16) | \
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/kprobes.h> #include <linux/kprobes.h>
#include <linux/module.h> #include <linux/extable.h>
#include <linux/kdebug.h> #include <linux/kdebug.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/context_tracking.h> #include <linux/context_tracking.h>
......
...@@ -30,8 +30,19 @@ ...@@ -30,8 +30,19 @@
#define DRIVER_NAME "pci_sun4v" #define DRIVER_NAME "pci_sun4v"
#define PFX DRIVER_NAME ": " #define PFX DRIVER_NAME ": "
static unsigned long vpci_major = 1; static unsigned long vpci_major;
static unsigned long vpci_minor = 1; static unsigned long vpci_minor;
struct vpci_version {
unsigned long major;
unsigned long minor;
};
/* Ordered from largest major to lowest */
static struct vpci_version vpci_versions[] = {
{ .major = 2, .minor = 0 },
{ .major = 1, .minor = 1 },
};
#define PGLIST_NENTS (PAGE_SIZE / sizeof(u64)) #define PGLIST_NENTS (PAGE_SIZE / sizeof(u64))
...@@ -67,6 +78,10 @@ static long iommu_batch_flush(struct iommu_batch *p) ...@@ -67,6 +78,10 @@ static long iommu_batch_flush(struct iommu_batch *p)
u64 *pglist = p->pglist; u64 *pglist = p->pglist;
unsigned long npages = p->npages; unsigned long npages = p->npages;
/* VPCI maj=1, min=[0,1] only supports read and write */
if (vpci_major < 2)
prot &= (HV_PCI_MAP_ATTR_READ | HV_PCI_MAP_ATTR_WRITE);
while (npages != 0) { while (npages != 0) {
long num; long num;
...@@ -133,6 +148,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size, ...@@ -133,6 +148,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
unsigned long attrs) unsigned long attrs)
{ {
unsigned long flags, order, first_page, npages, n; unsigned long flags, order, first_page, npages, n;
unsigned long prot = 0;
struct iommu *iommu; struct iommu *iommu;
struct page *page; struct page *page;
void *ret; void *ret;
...@@ -146,6 +162,9 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size, ...@@ -146,6 +162,9 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
npages = size >> IO_PAGE_SHIFT; npages = size >> IO_PAGE_SHIFT;
if (attrs & DMA_ATTR_WEAK_ORDERING)
prot = HV_PCI_MAP_ATTR_RELAXED_ORDER;
nid = dev->archdata.numa_node; nid = dev->archdata.numa_node;
page = alloc_pages_node(nid, gfp, order); page = alloc_pages_node(nid, gfp, order);
if (unlikely(!page)) if (unlikely(!page))
...@@ -169,7 +188,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size, ...@@ -169,7 +188,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
local_irq_save(flags); local_irq_save(flags);
iommu_batch_start(dev, iommu_batch_start(dev,
(HV_PCI_MAP_ATTR_READ | (HV_PCI_MAP_ATTR_READ | prot |
HV_PCI_MAP_ATTR_WRITE), HV_PCI_MAP_ATTR_WRITE),
entry); entry);
...@@ -266,6 +285,9 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page, ...@@ -266,6 +285,9 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
if (direction != DMA_TO_DEVICE) if (direction != DMA_TO_DEVICE)
prot |= HV_PCI_MAP_ATTR_WRITE; prot |= HV_PCI_MAP_ATTR_WRITE;
if (attrs & DMA_ATTR_WEAK_ORDERING)
prot |= HV_PCI_MAP_ATTR_RELAXED_ORDER;
local_irq_save(flags); local_irq_save(flags);
iommu_batch_start(dev, prot, entry); iommu_batch_start(dev, prot, entry);
...@@ -344,6 +366,9 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist, ...@@ -344,6 +366,9 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,
if (direction != DMA_TO_DEVICE) if (direction != DMA_TO_DEVICE)
prot |= HV_PCI_MAP_ATTR_WRITE; prot |= HV_PCI_MAP_ATTR_WRITE;
if (attrs & DMA_ATTR_WEAK_ORDERING)
prot |= HV_PCI_MAP_ATTR_RELAXED_ORDER;
outs = s = segstart = &sglist[0]; outs = s = segstart = &sglist[0];
outcount = 1; outcount = 1;
incount = nelems; incount = nelems;
...@@ -907,21 +932,26 @@ static int pci_sun4v_probe(struct platform_device *op) ...@@ -907,21 +932,26 @@ static int pci_sun4v_probe(struct platform_device *op)
struct device_node *dp; struct device_node *dp;
struct iommu *iommu; struct iommu *iommu;
u32 devhandle; u32 devhandle;
int i, err; int i, err = -ENODEV;
dp = op->dev.of_node; dp = op->dev.of_node;
if (!hvapi_negotiated++) { if (!hvapi_negotiated++) {
err = sun4v_hvapi_register(HV_GRP_PCI, for (i = 0; i < ARRAY_SIZE(vpci_versions); i++) {
vpci_major, vpci_major = vpci_versions[i].major;
vpci_minor = vpci_versions[i].minor;
err = sun4v_hvapi_register(HV_GRP_PCI, vpci_major,
&vpci_minor); &vpci_minor);
if (!err)
break;
}
if (err) { if (err) {
printk(KERN_ERR PFX "Could not register hvapi, " pr_err(PFX "Could not register hvapi, err=%d\n", err);
"err=%d\n", err);
return err; return err;
} }
printk(KERN_INFO PFX "Registered hvapi major[%lu] minor[%lu]\n", pr_info(PFX "Registered hvapi major[%lu] minor[%lu]\n",
vpci_major, vpci_minor); vpci_major, vpci_minor);
dma_ops = &sun4v_dma_ops; dma_ops = &sun4v_dma_ops;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* I like traps on v9, :)))) * I like traps on v9, :))))
*/ */
#include <linux/module.h> #include <linux/extable.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/kernel.h> #include <linux/kernel.h>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/module.h> #include <linux/extable.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/pstate.h> #include <asm/pstate.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/module.h> #include <linux/extable.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz) * Copyright (C) 1997-1999 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
*/ */
#include <linux/module.h> #include <linux/extable.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/string.h> #include <linux/string.h>
......
...@@ -16,8 +16,7 @@ static struct linux_prom_ranges promlib_obio_ranges[PROMREG_MAX]; ...@@ -16,8 +16,7 @@ static struct linux_prom_ranges promlib_obio_ranges[PROMREG_MAX];
static int num_obio_ranges; static int num_obio_ranges;
/* Adjust register values based upon the ranges parameters. */ /* Adjust register values based upon the ranges parameters. */
static void static void prom_adjust_regs(struct linux_prom_registers *regp, int nregs,
prom_adjust_regs(struct linux_prom_registers *regp, int nregs,
struct linux_prom_ranges *rangep, int nranges) struct linux_prom_ranges *rangep, int nranges)
{ {
int regc, rngc; int regc, rngc;
...@@ -34,33 +33,30 @@ prom_adjust_regs(struct linux_prom_registers *regp, int nregs, ...@@ -34,33 +33,30 @@ prom_adjust_regs(struct linux_prom_registers *regp, int nregs,
} }
} }
static void static void prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1,
prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1,
struct linux_prom_ranges *ranges2, int nranges2) struct linux_prom_ranges *ranges2, int nranges2)
{ {
int rng1c, rng2c; int rng1c, rng2c;
for(rng1c=0; rng1c < nranges1; rng1c++) { for (rng1c = 0; rng1c < nranges1; rng1c++) {
for(rng2c=0; rng2c < nranges2; rng2c++) for (rng2c = 0; rng2c < nranges2; rng2c++)
if(ranges1[rng1c].ot_parent_space == ranges2[rng2c].ot_child_space && if (ranges1[rng1c].ot_parent_space == ranges2[rng2c].ot_child_space &&
ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base && ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base &&
ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U) ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U)
break; break;
if(rng2c == nranges2) /* oops */ if (rng2c == nranges2) /* oops */
prom_printf("adjust_ranges: Could not find matching bus type...\n"); prom_printf("adjust_ranges: Could not find matching bus type...\n");
else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size) else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size)
ranges1[rng1c].or_size = ranges1[rng1c].or_size = ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base;
ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base;
ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_parent_space; ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_parent_space;
ranges1[rng1c].ot_parent_base += ranges2[rng2c].ot_parent_base; ranges1[rng1c].ot_parent_base += ranges2[rng2c].ot_parent_base;
} }
} }
/* Apply probed obio ranges to registers passed, if no ranges return. */ /* Apply probed obio ranges to registers passed, if no ranges return. */
void void prom_apply_obio_ranges(struct linux_prom_registers *regs, int nregs)
prom_apply_obio_ranges(struct linux_prom_registers *regs, int nregs)
{ {
if(num_obio_ranges) if (num_obio_ranges)
prom_adjust_regs(regs, nregs, promlib_obio_ranges, num_obio_ranges); prom_adjust_regs(regs, nregs, promlib_obio_ranges, num_obio_ranges);
} }
EXPORT_SYMBOL(prom_apply_obio_ranges); EXPORT_SYMBOL(prom_apply_obio_ranges);
...@@ -76,15 +72,15 @@ void __init prom_ranges_init(void) ...@@ -76,15 +72,15 @@ void __init prom_ranges_init(void)
node = prom_getchild(prom_root_node); node = prom_getchild(prom_root_node);
obio_node = prom_searchsiblings(node, "obio"); obio_node = prom_searchsiblings(node, "obio");
if(obio_node) { if (obio_node) {
success = prom_getproperty(obio_node, "ranges", success = prom_getproperty(obio_node, "ranges",
(char *) promlib_obio_ranges, (char *) promlib_obio_ranges,
sizeof(promlib_obio_ranges)); sizeof(promlib_obio_ranges));
if(success != -1) if (success != -1)
num_obio_ranges = (success/sizeof(struct linux_prom_ranges)); num_obio_ranges = (success / sizeof(struct linux_prom_ranges));
} }
if(num_obio_ranges) if (num_obio_ranges)
prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges); prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges);
} }
...@@ -97,19 +93,19 @@ void prom_apply_generic_ranges(phandle node, phandle parent, ...@@ -97,19 +93,19 @@ void prom_apply_generic_ranges(phandle node, phandle parent,
success = prom_getproperty(node, "ranges", success = prom_getproperty(node, "ranges",
(char *) ranges, (char *) ranges,
sizeof (ranges)); sizeof(ranges));
if (success != -1) { if (success != -1) {
num_ranges = (success/sizeof(struct linux_prom_ranges)); num_ranges = (success / sizeof(struct linux_prom_ranges));
if (parent) { if (parent) {
struct linux_prom_ranges parent_ranges[PROMREG_MAX]; struct linux_prom_ranges parent_ranges[PROMREG_MAX];
int num_parent_ranges; int num_parent_ranges;
success = prom_getproperty(parent, "ranges", success = prom_getproperty(parent, "ranges",
(char *) parent_ranges, (char *) parent_ranges,
sizeof (parent_ranges)); sizeof(parent_ranges));
if (success != -1) { if (success != -1) {
num_parent_ranges = (success/sizeof(struct linux_prom_ranges)); num_parent_ranges = (success / sizeof(struct linux_prom_ranges));
prom_adjust_ranges (ranges, num_ranges, parent_ranges, num_parent_ranges); prom_adjust_ranges(ranges, num_ranges, parent_ranges, num_parent_ranges);
} }
} }
prom_adjust_regs(regs, nregs, ranges, num_ranges); prom_adjust_regs(regs, nregs, ranges, num_ranges);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment