[PATCH] x86_64: Calgary IOMMU - Calgary specific bits
This patch hooks Calgary into the build, the x86-64 IOMMU initialization paths, and introduces the Calgary specific bits. The implementation draws inspiration from both PPC (which has support for the same chip but requires firmware support which we don't have on x86-64) and gart. Calgary is different from gart in that it support a translation table per PHB, as opposed to the single gart aperture. Changes from previous version: * Addition of boot-time disablement for bus-level translation/isolation (e.g, enable userspace DMA for things like X) * Usage of newer IOMMU abstraction functions Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jon Mason
Linus Torvalds
parent
0dc243ae10
commit
e465058d55
|
|
@ -205,6 +205,27 @@ IOMMU
|
|||
pages Prereserve that many 128K pages for the software IO bounce buffering.
|
||||
force Force all IO through the software TLB.
|
||||
|
||||
calgary=[64k,128k,256k,512k,1M,2M,4M,8M]
|
||||
calgary=[translate_empty_slots]
|
||||
calgary=[disable=<PCI bus number>]
|
||||
|
||||
64k,...,8M - Set the size of each PCI slot's translation table
|
||||
when using the Calgary IOMMU. This is the size of the translation
|
||||
table itself in main memory. The smallest table, 64k, covers an IO
|
||||
space of 32MB; the largest, 8MB table, can cover an IO space of
|
||||
4GB. Normally the kernel will make the right choice by itself.
|
||||
|
||||
translate_empty_slots - Enable translation even on slots that have
|
||||
no devices attached to them, in case a device will be hotplugged
|
||||
in the future.
|
||||
|
||||
disable=<PCI bus number> - Disable translation on a given PHB. For
|
||||
example, the built-in graphics adapter resides on the first bridge
|
||||
(PCI bus number 0); if translation (isolation) is enabled on this
|
||||
bridge, X servers that access the hardware directly from user
|
||||
space might stop working. Use this option if you have devices that
|
||||
are accessed from userspace directly on some PCI host bridge.
|
||||
|
||||
Debugging
|
||||
|
||||
oops=panic Always panic on oopses. Default is to just kill the process,
|
||||
|
|
|
|||
|
|
@ -405,6 +405,25 @@ config IOMMU
|
|||
device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified
|
||||
too.
|
||||
|
||||
config CALGARY_IOMMU
|
||||
bool "IBM Calgary IOMMU support"
|
||||
default y
|
||||
select SWIOTLB
|
||||
depends on PCI && EXPERIMENTAL
|
||||
help
|
||||
Support for hardware IOMMUs in IBM's xSeries x366 and x460
|
||||
systems. Needed to run systems with more than 3GB of memory
|
||||
properly with 32-bit PCI devices that do not support DAC
|
||||
(Double Address Cycle). Calgary also supports bus level
|
||||
isolation, where all DMAs pass through the IOMMU. This
|
||||
prevents them from going anywhere except their intended
|
||||
destination. This catches hard-to-find kernel bugs and
|
||||
mis-behaving drivers and devices that do not use the DMA-API
|
||||
properly to set up their DMA buffers. The IOMMU can be
|
||||
turned off at boot time with the iommu=off parameter.
|
||||
Normally the kernel will make the right choice by itself.
|
||||
If unsure, say Y.
|
||||
|
||||
# need this always selected by IOMMU for the VIA workaround
|
||||
config SWIOTLB
|
||||
bool
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
|
|||
obj-$(CONFIG_CPU_FREQ) += cpufreq/
|
||||
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
||||
obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
|
||||
obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o
|
||||
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
|
||||
obj-$(CONFIG_KPROBES) += kprobes.o
|
||||
obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -9,6 +9,7 @@
|
|||
#include <linux/module.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/proto.h>
|
||||
#include <asm/calgary.h>
|
||||
|
||||
int iommu_merge __read_mostly = 0;
|
||||
EXPORT_SYMBOL(iommu_merge);
|
||||
|
|
@ -291,6 +292,10 @@ void __init pci_iommu_alloc(void)
|
|||
iommu_hole_init();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CALGARY_IOMMU
|
||||
detect_calgary();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SWIOTLB
|
||||
pci_swiotlb_init();
|
||||
#endif
|
||||
|
|
@ -298,6 +303,10 @@ void __init pci_iommu_alloc(void)
|
|||
|
||||
static int __init pci_iommu_init(void)
|
||||
{
|
||||
#ifdef CONFIG_CALGARY_IOMMU
|
||||
calgary_iommu_init();
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_IOMMU
|
||||
gart_iommu_init();
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,202 @@
|
|||
/*
|
||||
* Derived from arch/powerpc/platforms/pseries/iommu.c
|
||||
*
|
||||
* Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation
|
||||
* Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/bootmem.h>
|
||||
#include <asm/tce.h>
|
||||
#include <asm/calgary.h>
|
||||
#include <asm/proto.h>
|
||||
|
||||
/* flush a tce at 'tceaddr' to main memory */
|
||||
static inline void flush_tce(void* tceaddr)
|
||||
{
|
||||
/* a single tce can't cross a cache line */
|
||||
if (cpu_has_clflush)
|
||||
asm volatile("clflush (%0)" :: "r" (tceaddr));
|
||||
else
|
||||
asm volatile("wbinvd":::"memory");
|
||||
}
|
||||
|
||||
void tce_build(struct iommu_table *tbl, unsigned long index,
|
||||
unsigned int npages, unsigned long uaddr, int direction)
|
||||
{
|
||||
u64* tp;
|
||||
u64 t;
|
||||
u64 rpn;
|
||||
|
||||
t = (1 << TCE_READ_SHIFT);
|
||||
if (direction != DMA_TO_DEVICE)
|
||||
t |= (1 << TCE_WRITE_SHIFT);
|
||||
|
||||
tp = ((u64*)tbl->it_base) + index;
|
||||
|
||||
while (npages--) {
|
||||
rpn = (virt_to_bus((void*)uaddr)) >> PAGE_SHIFT;
|
||||
t &= ~TCE_RPN_MASK;
|
||||
t |= (rpn << TCE_RPN_SHIFT);
|
||||
|
||||
*tp = cpu_to_be64(t);
|
||||
flush_tce(tp);
|
||||
|
||||
uaddr += PAGE_SIZE;
|
||||
tp++;
|
||||
}
|
||||
}
|
||||
|
||||
void tce_free(struct iommu_table *tbl, long index, unsigned int npages)
|
||||
{
|
||||
u64* tp;
|
||||
|
||||
tp = ((u64*)tbl->it_base) + index;
|
||||
|
||||
while (npages--) {
|
||||
*tp = cpu_to_be64(0);
|
||||
flush_tce(tp);
|
||||
tp++;
|
||||
}
|
||||
}
|
||||
|
||||
static inline unsigned int table_size_to_number_of_entries(unsigned char size)
|
||||
{
|
||||
/*
|
||||
* size is the order of the table, 0-7
|
||||
* smallest table is 8K entries, so shift result by 13 to
|
||||
* multiply by 8K
|
||||
*/
|
||||
return (1 << size) << 13;
|
||||
}
|
||||
|
||||
static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl)
|
||||
{
|
||||
unsigned int bitmapsz;
|
||||
unsigned int tce_table_index;
|
||||
unsigned long bmppages;
|
||||
int ret;
|
||||
|
||||
tbl->it_busno = dev->bus->number;
|
||||
|
||||
/* set the tce table size - measured in entries */
|
||||
tbl->it_size = table_size_to_number_of_entries(specified_table_size);
|
||||
|
||||
tce_table_index = bus_to_phb(tbl->it_busno);
|
||||
tbl->it_base = (unsigned long)tce_table_kva[tce_table_index];
|
||||
if (!tbl->it_base) {
|
||||
printk(KERN_ERR "Calgary: iommu_table_setparms: "
|
||||
"no table allocated?!\n");
|
||||
ret = -ENOMEM;
|
||||
goto done;
|
||||
}
|
||||
|
||||
/*
|
||||
* number of bytes needed for the bitmap size in number of
|
||||
* entries; we need one bit per entry
|
||||
*/
|
||||
bitmapsz = tbl->it_size / BITS_PER_BYTE;
|
||||
bmppages = __get_free_pages(GFP_KERNEL, get_order(bitmapsz));
|
||||
if (!bmppages) {
|
||||
printk(KERN_ERR "Calgary: cannot allocate bitmap\n");
|
||||
ret = -ENOMEM;
|
||||
goto done;
|
||||
}
|
||||
|
||||
tbl->it_map = (unsigned long*)bmppages;
|
||||
|
||||
memset(tbl->it_map, 0, bitmapsz);
|
||||
|
||||
tbl->it_hint = 0;
|
||||
|
||||
spin_lock_init(&tbl->it_lock);
|
||||
|
||||
return 0;
|
||||
|
||||
done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int build_tce_table(struct pci_dev *dev, void __iomem *bbar)
|
||||
{
|
||||
struct iommu_table *tbl;
|
||||
int ret;
|
||||
|
||||
if (dev->sysdata) {
|
||||
printk(KERN_ERR "Calgary: dev %p has sysdata %p\n",
|
||||
dev, dev->sysdata);
|
||||
BUG();
|
||||
}
|
||||
|
||||
tbl = kzalloc(sizeof(struct iommu_table), GFP_KERNEL);
|
||||
if (!tbl) {
|
||||
printk(KERN_ERR "Calgary: error allocating iommu_table\n");
|
||||
ret = -ENOMEM;
|
||||
goto done;
|
||||
}
|
||||
|
||||
ret = tce_table_setparms(dev, tbl);
|
||||
if (ret)
|
||||
goto free_tbl;
|
||||
|
||||
tce_free(tbl, 0, tbl->it_size);
|
||||
|
||||
tbl->bbar = bbar;
|
||||
|
||||
/*
|
||||
* NUMA is already using the bus's sysdata pointer, so we use
|
||||
* the bus's pci_dev's sysdata instead.
|
||||
*/
|
||||
dev->sysdata = tbl;
|
||||
|
||||
return 0;
|
||||
|
||||
free_tbl:
|
||||
kfree(tbl);
|
||||
done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
void* alloc_tce_table(void)
|
||||
{
|
||||
unsigned int size;
|
||||
|
||||
size = table_size_to_number_of_entries(specified_table_size);
|
||||
size *= TCE_ENTRY_SIZE;
|
||||
|
||||
return __alloc_bootmem_low(size, size, 0);
|
||||
}
|
||||
|
||||
void free_tce_table(void *tbl)
|
||||
{
|
||||
unsigned int size;
|
||||
|
||||
if (!tbl)
|
||||
return;
|
||||
|
||||
size = table_size_to_number_of_entries(specified_table_size);
|
||||
size *= TCE_ENTRY_SIZE;
|
||||
|
||||
free_bootmem(__pa(tbl), size);
|
||||
}
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
/*
|
||||
* Derived from include/asm-powerpc/iommu.h
|
||||
*
|
||||
* Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation
|
||||
* Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef _ASM_X86_64_CALGARY_H
|
||||
#define _ASM_X86_64_CALGARY_H
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <asm/types.h>
|
||||
|
||||
struct iommu_table {
|
||||
unsigned long it_base; /* mapped address of tce table */
|
||||
unsigned long it_hint; /* Hint for next alloc */
|
||||
unsigned long *it_map; /* A simple allocation bitmap for now */
|
||||
spinlock_t it_lock; /* Protects it_map */
|
||||
unsigned int it_size; /* Size of iommu table in entries */
|
||||
unsigned char it_busno; /* Bus number this table belongs to */
|
||||
void __iomem *bbar;
|
||||
u64 tar_val;
|
||||
struct timer_list watchdog_timer;
|
||||
};
|
||||
|
||||
#define TCE_TABLE_SIZE_UNSPECIFIED ~0
|
||||
#define TCE_TABLE_SIZE_64K 0
|
||||
#define TCE_TABLE_SIZE_128K 1
|
||||
#define TCE_TABLE_SIZE_256K 2
|
||||
#define TCE_TABLE_SIZE_512K 3
|
||||
#define TCE_TABLE_SIZE_1M 4
|
||||
#define TCE_TABLE_SIZE_2M 5
|
||||
#define TCE_TABLE_SIZE_4M 6
|
||||
#define TCE_TABLE_SIZE_8M 7
|
||||
|
||||
#ifdef CONFIG_CALGARY_IOMMU
|
||||
extern int calgary_iommu_init(void);
|
||||
extern void detect_calgary(void);
|
||||
#else
|
||||
static inline int calgary_iommu_init(void) { return 1; }
|
||||
static inline void detect_calgary(void) { return; }
|
||||
#endif
|
||||
|
||||
static inline unsigned int bus_to_phb(unsigned char busno)
|
||||
{
|
||||
return ((busno % 15 == 0) ? 0 : busno / 2 + 1);
|
||||
}
|
||||
|
||||
#endif /* _ASM_X86_64_CALGARY_H */
|
||||
|
|
@ -52,7 +52,7 @@ extern int iommu_setup(char *opt);
|
|||
*/
|
||||
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
|
||||
|
||||
#ifdef CONFIG_IOMMU
|
||||
#if defined(CONFIG_IOMMU) || defined(CONFIG_CALGARY_IOMMU)
|
||||
|
||||
/*
|
||||
* x86-64 always supports DAC, but sometimes it is useful to force
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
|
||||
* Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation
|
||||
*
|
||||
* This file is derived from asm-powerpc/tce.h.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef _ASM_X86_64_TCE_H
|
||||
#define _ASM_X86_64_TCE_H
|
||||
|
||||
extern void* tce_table_kva[];
|
||||
extern unsigned int specified_table_size;
|
||||
struct iommu_table;
|
||||
|
||||
#define TCE_ENTRY_SIZE 8 /* in bytes */
|
||||
|
||||
#define TCE_READ_SHIFT 0
|
||||
#define TCE_WRITE_SHIFT 1
|
||||
#define TCE_HUBID_SHIFT 2 /* unused */
|
||||
#define TCE_RSVD_SHIFT 8 /* unused */
|
||||
#define TCE_RPN_SHIFT 12
|
||||
#define TCE_UNUSED_SHIFT 48 /* unused */
|
||||
|
||||
#define TCE_RPN_MASK 0x0000fffffffff000ULL
|
||||
|
||||
extern void tce_build(struct iommu_table *tbl, unsigned long index,
|
||||
unsigned int npages, unsigned long uaddr, int direction);
|
||||
extern void tce_free(struct iommu_table *tbl, long index, unsigned int npages);
|
||||
extern void* alloc_tce_table(void);
|
||||
extern void free_tce_table(void *tbl);
|
||||
extern int build_tce_table(struct pci_dev *dev, void __iomem *bbar);
|
||||
|
||||
#endif /* _ASM_X86_64_TCE_H */
|
||||
Loading…
Reference in New Issue