Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98523d46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (30 commits)
  sparc64: Update defconfig.
  sparc: Wire up sys_rt_tgsigqueueinfo().
  openprom: Squelch useless GCC warning.
  sparc: replace uses of CPU_MASK_ALL_PTR
  sparc64: Add proper dynamic ftrace support.
  sparc: Simplify code using is_power_of_2() routine.
  sparc: move of_device common code to of_device_common
  sparc: remove dma-mapping_{32|64}.h
  sparc: use dma_map_page instead of dma_map_single
  sparc: add sync_single_for_device and sync_sg_for_device to struct dma_ops
  sparc: move the duplication in dma-mapping_{32|64}.h to dma-mapping.h
  p9100: use standard fields for framebuffer physical address and length
  leo: use standard fields for framebuffer physical address and length
  cg6: use standard fields for framebuffer physical address and length
  cg3: use standard fields for framebuffer physical address and length
  cg14: use standard fields for framebuffer physical address and length
  bw2: use standard fields for framebuffer physical address and length
  sparc64: fix and optimize irq distribution
  sparc64: Use new dynamic per-cpu allocator.
  sparc64: Only allocate per-cpu areas for possible cpus.
  ...
parents 8d6cea51 aaa7e2f7

arch/sparc/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ config SPARC64 
	select HAVE_KPROBES

	select HAVE_LMB

	select HAVE_SYSCALL_WRAPPERS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE_MCOUNT_RECORD

	select USE_GENERIC_SMP_HELPERS if SMP

	select RTC_DRV_CMOS

	select RTC_DRV_BQ4802
@@ -93,6 +95,9 @@ config AUDIT_ARCH 
config HAVE_SETUP_PER_CPU_AREA

	def_bool y if SPARC64



config HAVE_DYNAMIC_PER_CPU_AREA

	def_bool y if SPARC64



config GENERIC_HARDIRQS_NO__DO_IRQ

	bool

	def_bool y if SPARC64

arch/sparc/configs/sparc64_defconfig

+45 −18
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc2

# Fri Apr 17 02:03:07 2009

# Linux kernel version: 2.6.30

# Tue Jun 16 04:59:36 2009

#

CONFIG_64BIT=y

CONFIG_SPARC=y
@@ -19,6 +19,7 @@ CONFIG_LOCKDEP_SUPPORT=y 
CONFIG_HAVE_LATENCYTOP_SUPPORT=y

CONFIG_AUDIT_ARCH=y

CONFIG_HAVE_SETUP_PER_CPU_AREA=y

CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_MMU=y

CONFIG_ARCH_NO_VIRT_TO_BUS=y
@@ -82,7 +83,6 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -95,16 +95,21 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y



#

# Performance Counters

#

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_COMPAT_BRK is not set

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

CONFIG_PROFILING=y

CONFIG_TRACEPOINTS=y

# CONFIG_MARKERS is not set

CONFIG_MARKERS=y

CONFIG_OPROFILE=m

CONFIG_HAVE_OPROFILE=y

CONFIG_KPROBES=y
@@ -202,6 +207,7 @@ CONFIG_NR_QUICK=1 
CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=8192

CONFIG_SCHED_SMT=y

CONFIG_SCHED_MC=y

# CONFIG_PREEMPT_NONE is not set
@@ -321,6 +327,7 @@ CONFIG_VLAN_8021Q=m 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -340,7 +347,11 @@ CONFIG_WIRELESS=y 
CONFIG_WIRELESS_OLD_REGULATORY=y

# CONFIG_WIRELESS_EXT is not set

# CONFIG_LIB80211 is not set

# CONFIG_MAC80211 is not set



#

# CFG80211 needs to be enabled for MAC80211

#

CONFIG_MAC80211_DEFAULT_PS_VALUE=0

# CONFIG_WIMAX is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set
@@ -364,6 +375,7 @@ CONFIG_EXTRA_FIRMWARE="" 
CONFIG_CONNECTOR=m

# CONFIG_MTD is not set

CONFIG_OF_DEVICE=y

CONFIG_OF_MDIO=m

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_FD is not set
@@ -399,6 +411,7 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_CB710_CORE is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=y
@@ -477,10 +490,6 @@ CONFIG_BLK_DEV_SR=m 
CONFIG_BLK_DEV_SR_VENDOR=y

CONFIG_CHR_DEV_SG=m

# CONFIG_CHR_DEV_SCH is not set



#

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs

#

CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

# CONFIG_SCSI_LOGGING is not set
@@ -499,6 +508,7 @@ CONFIG_SCSI_FC_ATTRS=y 
CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_CXGB3_ISCSI is not set

# CONFIG_SCSI_BNX2_ISCSI is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set
@@ -507,6 +517,7 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_AIC7XXX_OLD is not set

# CONFIG_SCSI_AIC79XX is not set

# CONFIG_SCSI_AIC94XX is not set

# CONFIG_SCSI_MVSAS is not set

# CONFIG_SCSI_ARCMSR is not set

# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set
@@ -521,7 +532,6 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_MVSAS is not set

# CONFIG_SCSI_STEX is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -569,7 +579,6 @@ CONFIG_DM_ZERO=m 
# CONFIG_IEEE1394 is not set

# CONFIG_I2O is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -635,6 +644,7 @@ CONFIG_NET_PCI=y 
# CONFIG_SMSC9420 is not set

# CONFIG_SUNDANCE is not set

# CONFIG_TLAN is not set

# CONFIG_KS8842 is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_SC92031 is not set

# CONFIG_ATL2 is not set
@@ -1127,6 +1137,11 @@ CONFIG_SND_VERBOSE_PROCFS=y 
# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

CONFIG_SND_VMASTER=y

CONFIG_SND_RAWMIDI_SEQ=m

# CONFIG_SND_OPL3_LIB_SEQ is not set

# CONFIG_SND_OPL4_LIB_SEQ is not set

# CONFIG_SND_SBAWE_SEQ is not set

# CONFIG_SND_EMU10K1_SEQ is not set

CONFIG_SND_MPU401_UART=m

CONFIG_SND_AC97_CODEC=m

CONFIG_SND_DRIVERS=y
@@ -1153,6 +1168,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_OXYGEN is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CTXFI is not set

# CONFIG_SND_DARLA20 is not set

# CONFIG_SND_GINA20 is not set

# CONFIG_SND_LAYLA20 is not set
@@ -1183,6 +1199,7 @@ CONFIG_SND_ALI5451=m 
# CONFIG_SND_INTEL8X0 is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_LX6464ES is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set
@@ -1229,6 +1246,7 @@ CONFIG_HID_BELKIN=y 
CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

CONFIG_HID_DRAGONRISE=y

# CONFIG_DRAGONRISE_FF is not set

CONFIG_HID_EZKEY=y

CONFIG_HID_KYE=y
@@ -1246,9 +1264,14 @@ CONFIG_HID_PETALYNX=y 
CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

# CONFIG_GREENASIA_FF is not set

CONFIG_HID_SMARTJOYPLUS=y

# CONFIG_SMARTJOYPLUS_FF is not set

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

# CONFIG_THRUSTMASTER_FF is not set

CONFIG_HID_ZEROPLUS=y

# CONFIG_ZEROPLUS_FF is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y
@@ -1462,6 +1485,7 @@ CONFIG_FILE_LOCKING=y 
# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FSNOTIFY=y

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -1636,25 +1660,28 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y 
# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_RING_BUFFER=y

CONFIG_EVENT_TRACING=y

CONFIG_CONTEXT_SWITCH_TRACER=y

CONFIG_TRACING=y

CONFIG_GENERIC_TRACER=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

# CONFIG_PROFILE_ALL_BRANCHES is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_RING_BUFFER_BENCHMARK is not set

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

arch/sparc/include/asm/cpudata_64.h

+1 −196
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
#ifndef _SPARC64_CPUDATA_H

#define _SPARC64_CPUDATA_H



#include <asm/hypervisor.h>

#include <asm/asi.h>



#ifndef __ASSEMBLY__



#include <linux/percpu.h>
@@ -38,202 +35,10 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data); 
#define cpu_data(__cpu)		per_cpu(__cpu_data, (__cpu))

#define local_cpu_data()	__get_cpu_var(__cpu_data)



/* Trap handling code needs to get at a few critical values upon

 * trap entry and to process TSB misses.  These cannot be in the

 * per_cpu() area as we really need to lock them into the TLB and

 * thus make them part of the main kernel image.  As a result we

 * try to make this as small as possible.

 *

 * This is padded out and aligned to 64-bytes to avoid false sharing

 * on SMP.

 */



/* If you modify the size of this structure, please update

 * TRAP_BLOCK_SZ_SHIFT below.

 */

struct thread_info;

struct trap_per_cpu {

/* D-cache line 1: Basic thread information, cpu and device mondo queues */

	struct thread_info	*thread;

	unsigned long		pgd_paddr;

	unsigned long		cpu_mondo_pa;

	unsigned long		dev_mondo_pa;



/* D-cache line 2: Error Mondo Queue and kernel buffer pointers */

	unsigned long		resum_mondo_pa;

	unsigned long		resum_kernel_buf_pa;

	unsigned long		nonresum_mondo_pa;

	unsigned long		nonresum_kernel_buf_pa;



/* Dcache lines 3, 4, 5, and 6: Hypervisor Fault Status */

	struct hv_fault_status	fault_info;



/* Dcache line 7: Physical addresses of CPU send mondo block and CPU list.  */

	unsigned long		cpu_mondo_block_pa;

	unsigned long		cpu_list_pa;

	unsigned long		tsb_huge;

	unsigned long		tsb_huge_temp;



/* Dcache line 8: IRQ work list, and keep trap_block a power-of-2 in size.  */

	unsigned long		irq_worklist_pa;

	unsigned int		cpu_mondo_qmask;

	unsigned int		dev_mondo_qmask;

	unsigned int		resum_qmask;

	unsigned int		nonresum_qmask;

	void			*hdesc;

} __attribute__((aligned(64)));

extern struct trap_per_cpu trap_block[NR_CPUS];

extern void init_cur_cpu_trap(struct thread_info *);

extern void setup_tba(void);

extern int ncpus_probed;

extern const struct seq_operations cpuinfo_op;



extern unsigned long real_hard_smp_processor_id(void);



struct cpuid_patch_entry {

	unsigned int	addr;

	unsigned int	cheetah_safari[4];

	unsigned int	cheetah_jbus[4];

	unsigned int	starfire[4];

	unsigned int	sun4v[4];

};

extern struct cpuid_patch_entry __cpuid_patch, __cpuid_patch_end;



struct sun4v_1insn_patch_entry {

	unsigned int	addr;

	unsigned int	insn;

};

extern struct sun4v_1insn_patch_entry __sun4v_1insn_patch,

	__sun4v_1insn_patch_end;



struct sun4v_2insn_patch_entry {

	unsigned int	addr;

	unsigned int	insns[2];

};

extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch,

	__sun4v_2insn_patch_end;



#endif /* !(__ASSEMBLY__) */



#define TRAP_PER_CPU_THREAD		0x00

#define TRAP_PER_CPU_PGD_PADDR		0x08

#define TRAP_PER_CPU_CPU_MONDO_PA	0x10

#define TRAP_PER_CPU_DEV_MONDO_PA	0x18

#define TRAP_PER_CPU_RESUM_MONDO_PA	0x20

#define TRAP_PER_CPU_RESUM_KBUF_PA	0x28

#define TRAP_PER_CPU_NONRESUM_MONDO_PA	0x30

#define TRAP_PER_CPU_NONRESUM_KBUF_PA	0x38

#define TRAP_PER_CPU_FAULT_INFO		0x40

#define TRAP_PER_CPU_CPU_MONDO_BLOCK_PA	0xc0

#define TRAP_PER_CPU_CPU_LIST_PA	0xc8

#define TRAP_PER_CPU_TSB_HUGE		0xd0

#define TRAP_PER_CPU_TSB_HUGE_TEMP	0xd8

#define TRAP_PER_CPU_IRQ_WORKLIST_PA	0xe0

#define TRAP_PER_CPU_CPU_MONDO_QMASK	0xe8

#define TRAP_PER_CPU_DEV_MONDO_QMASK	0xec

#define TRAP_PER_CPU_RESUM_QMASK	0xf0

#define TRAP_PER_CPU_NONRESUM_QMASK	0xf4



#define TRAP_BLOCK_SZ_SHIFT		8



#include <asm/scratchpad.h>



#define __GET_CPUID(REG)				\

	/* Spitfire implementation (default). */	\

661:	ldxa		[%g0] ASI_UPA_CONFIG, REG;	\

	srlx		REG, 17, REG;			\

	 and		REG, 0x1f, REG;			\

	nop;						\

	.section	.cpuid_patch, "ax";		\

	/* Instruction location. */			\

	.word		661b;				\

	/* Cheetah Safari implementation. */		\

	ldxa		[%g0] ASI_SAFARI_CONFIG, REG;	\

	srlx		REG, 17, REG;			\

	and		REG, 0x3ff, REG;		\

	nop;						\

	/* Cheetah JBUS implementation. */		\

	ldxa		[%g0] ASI_JBUS_CONFIG, REG;	\

	srlx		REG, 17, REG;			\

	and		REG, 0x1f, REG;			\

	nop;						\

	/* Starfire implementation. */			\

	sethi		%hi(0x1fff40000d0 >> 9), REG;	\

	sllx		REG, 9, REG;			\

	or		REG, 0xd0, REG;			\

	lduwa		[REG] ASI_PHYS_BYPASS_EC_E, REG;\

	/* sun4v implementation. */			\

	mov		SCRATCHPAD_CPUID, REG;		\

	ldxa		[REG] ASI_SCRATCHPAD, REG;	\

	nop;						\

	nop;						\

	.previous;



#ifdef CONFIG_SMP



#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	__GET_CPUID(TMP)			\

	sethi	%hi(trap_block), DEST;		\

	sllx	TMP, TRAP_BLOCK_SZ_SHIFT, TMP;	\

	or	DEST, %lo(trap_block), DEST;	\

	add	DEST, TMP, DEST;		\



/* Clobbers TMP, current address space PGD phys address into DEST.  */

#define TRAP_LOAD_PGD_PHYS(DEST, TMP)		\

	TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	ldx	[DEST + TRAP_PER_CPU_PGD_PADDR], DEST;



/* Clobbers TMP, loads local processor's IRQ work area into DEST.  */

#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)	\

	TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	add	DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;



/* Clobbers TMP, loads DEST with current thread info pointer.  */

#define TRAP_LOAD_THREAD_REG(DEST, TMP)		\

	TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	ldx	[DEST + TRAP_PER_CPU_THREAD], DEST;



/* Given the current thread info pointer in THR, load the per-cpu

 * area base of the current processor into DEST.  REG1, REG2, and REG3 are

 * clobbered.

 *

 * You absolutely cannot use DEST as a temporary in this code.  The

 * reason is that traps can happen during execution, and return from

 * trap will load the fully resolved DEST per-cpu base.  This can corrupt

 * the calculations done by the macro mid-stream.

 */

#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)	\

	lduh	[THR + TI_CPU], REG1;			\

	sethi	%hi(__per_cpu_shift), REG3;		\

	sethi	%hi(__per_cpu_base), REG2;		\

	ldx	[REG3 + %lo(__per_cpu_shift)], REG3;	\

	ldx	[REG2 + %lo(__per_cpu_base)], REG2;	\

	sllx	REG1, REG3, REG3;			\

	add	REG3, REG2, DEST;



#else



#define TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	sethi	%hi(trap_block), DEST;		\

	or	DEST, %lo(trap_block), DEST;	\



/* Uniprocessor versions, we know the cpuid is zero.  */

#define TRAP_LOAD_PGD_PHYS(DEST, TMP)		\

	TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	ldx	[DEST + TRAP_PER_CPU_PGD_PADDR], DEST;



/* Clobbers TMP, loads local processor's IRQ work area into DEST.  */

#define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP)	\

	TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	add	DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST;



#define TRAP_LOAD_THREAD_REG(DEST, TMP)		\

	TRAP_LOAD_TRAP_BLOCK(DEST, TMP)		\

	ldx	[DEST + TRAP_PER_CPU_THREAD], DEST;



/* No per-cpu areas on uniprocessor, so no need to load DEST.  */

#define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3)



#endif /* !(CONFIG_SMP) */

#include <asm/trap_block.h>



#endif /* _SPARC64_CPUDATA_H */

arch/sparc/include/asm/dma-mapping.h

+163 −5
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_DMA_MAPPING_H

#define ___ASM_SPARC_DMA_MAPPING_H

#if defined(__sparc__) && defined(__arch64__)

#include <asm/dma-mapping_64.h>

#else

#include <asm/dma-mapping_32.h>

#endif



#include <linux/scatterlist.h>

#include <linux/mm.h>



#define DMA_ERROR_CODE	(~(dma_addr_t)0x0)



extern int dma_supported(struct device *dev, u64 mask);

extern int dma_set_mask(struct device *dev, u64 dma_mask);



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

#define dma_is_consistent(d, h)	(1)



struct dma_ops {

	void *(*alloc_coherent)(struct device *dev, size_t size,

				dma_addr_t *dma_handle, gfp_t flag);

	void (*free_coherent)(struct device *dev, size_t size,

			      void *cpu_addr, dma_addr_t dma_handle);

	dma_addr_t (*map_page)(struct device *dev, struct page *page,

			       unsigned long offset, size_t size,

			       enum dma_data_direction direction);

	void (*unmap_page)(struct device *dev, dma_addr_t dma_addr,

			   size_t size,

			   enum dma_data_direction direction);

	int (*map_sg)(struct device *dev, struct scatterlist *sg, int nents,

		      enum dma_data_direction direction);

	void (*unmap_sg)(struct device *dev, struct scatterlist *sg,

			 int nhwentries,

			 enum dma_data_direction direction);

	void (*sync_single_for_cpu)(struct device *dev,

				    dma_addr_t dma_handle, size_t size,

				    enum dma_data_direction direction);

	void (*sync_single_for_device)(struct device *dev,

				       dma_addr_t dma_handle, size_t size,

				       enum dma_data_direction direction);

	void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg,

				int nelems,

				enum dma_data_direction direction);

	void (*sync_sg_for_device)(struct device *dev,

				   struct scatterlist *sg, int nents,

				   enum dma_data_direction dir);

};

extern const struct dma_ops *dma_ops;



static inline void *dma_alloc_coherent(struct device *dev, size_t size,

				       dma_addr_t *dma_handle, gfp_t flag)

{

	return dma_ops->alloc_coherent(dev, size, dma_handle, flag);

}



static inline void dma_free_coherent(struct device *dev, size_t size,

				     void *cpu_addr, dma_addr_t dma_handle)

{

	dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);

}



static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,

					size_t size,

					enum dma_data_direction direction)

{

	return dma_ops->map_page(dev, virt_to_page(cpu_addr),

				 (unsigned long)cpu_addr & ~PAGE_MASK, size,

				 direction);

}



static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,

				    size_t size,

				    enum dma_data_direction direction)

{

	dma_ops->unmap_page(dev, dma_addr, size, direction);

}



static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,

				      unsigned long offset, size_t size,

				      enum dma_data_direction direction)

{

	return dma_ops->map_page(dev, page, offset, size, direction);

}



static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,

				  size_t size,

				  enum dma_data_direction direction)

{

	dma_ops->unmap_page(dev, dma_address, size, direction);

}



static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,

			     int nents, enum dma_data_direction direction)

{

	return dma_ops->map_sg(dev, sg, nents, direction);

}



static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,

				int nents, enum dma_data_direction direction)

{

	dma_ops->unmap_sg(dev, sg, nents, direction);

}



static inline void dma_sync_single_for_cpu(struct device *dev,

					   dma_addr_t dma_handle, size_t size,

					   enum dma_data_direction direction)

{

	dma_ops->sync_single_for_cpu(dev, dma_handle, size, direction);

}



static inline void dma_sync_single_for_device(struct device *dev,

					      dma_addr_t dma_handle,

					      size_t size,

					      enum dma_data_direction direction)

{

	if (dma_ops->sync_single_for_device)

		dma_ops->sync_single_for_device(dev, dma_handle, size,

						direction);

}



static inline void dma_sync_sg_for_cpu(struct device *dev,

				       struct scatterlist *sg, int nelems,

				       enum dma_data_direction direction)

{

	dma_ops->sync_sg_for_cpu(dev, sg, nelems, direction);

}



static inline void dma_sync_sg_for_device(struct device *dev,

					  struct scatterlist *sg, int nelems,

					  enum dma_data_direction direction)

{

	if (dma_ops->sync_sg_for_device)

		dma_ops->sync_sg_for_device(dev, sg, nelems, direction);

}



static inline void dma_sync_single_range_for_cpu(struct device *dev,

						 dma_addr_t dma_handle,

						 unsigned long offset,

						 size_t size,

						 enum dma_data_direction dir)

{

	dma_sync_single_for_cpu(dev, dma_handle+offset, size, dir);

}



static inline void dma_sync_single_range_for_device(struct device *dev,

						    dma_addr_t dma_handle,

						    unsigned long offset,

						    size_t size,

						    enum dma_data_direction dir)

{

	dma_sync_single_for_device(dev, dma_handle+offset, size, dir);

}





static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return (dma_addr == DMA_ERROR_CODE);

}



static inline int dma_get_cache_alignment(void)

{

	/*

	 * no easy way to get cache size on all processors, so return

	 * the maximum possible, to be safe

	 */

	return (1 << INTERNODE_CACHE_SHIFT);

}



#endif

arch/sparc/include/asm/dma-mapping_32.h

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC_DMA_MAPPING_H

#define _ASM_SPARC_DMA_MAPPING_H



#include <linux/types.h>



struct device;

struct scatterlist;

struct page;



#define DMA_ERROR_CODE	(~(dma_addr_t)0x0)



extern int dma_supported(struct device *dev, u64 mask);

extern int dma_set_mask(struct device *dev, u64 dma_mask);

extern void *dma_alloc_coherent(struct device *dev, size_t size,

				dma_addr_t *dma_handle, gfp_t flag);

extern void dma_free_coherent(struct device *dev, size_t size,

			      void *cpu_addr, dma_addr_t dma_handle);

extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,

				 size_t size,

				 enum dma_data_direction direction);

extern void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,

			     size_t size,

			     enum dma_data_direction direction);

extern dma_addr_t dma_map_page(struct device *dev, struct page *page,

			       unsigned long offset, size_t size,

			       enum dma_data_direction direction);

extern void dma_unmap_page(struct device *dev, dma_addr_t dma_address,

			   size_t size, enum dma_data_direction direction);

extern int dma_map_sg(struct device *dev, struct scatterlist *sg,

		      int nents, enum dma_data_direction direction);

extern void dma_unmap_sg(struct device *dev, struct scatterlist *sg,

			 int nents, enum dma_data_direction direction);

extern void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,

				    size_t size,

				    enum dma_data_direction direction);

extern void dma_sync_single_for_device(struct device *dev,

				       dma_addr_t dma_handle,

				       size_t size,

				       enum dma_data_direction direction);

extern void dma_sync_single_range_for_cpu(struct device *dev,

					  dma_addr_t dma_handle,

					  unsigned long offset,

					  size_t size,

					  enum dma_data_direction direction);

extern void dma_sync_single_range_for_device(struct device *dev,

					     dma_addr_t dma_handle,

					     unsigned long offset, size_t size,

					     enum dma_data_direction direction);

extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,

				int nelems, enum dma_data_direction direction);

extern void dma_sync_sg_for_device(struct device *dev,

				   struct scatterlist *sg, int nelems,

				   enum dma_data_direction direction);

extern int dma_mapping_error(struct device *dev, dma_addr_t dma_addr);

extern int dma_get_cache_alignment(void);



#define dma_alloc_noncoherent	dma_alloc_coherent

#define dma_free_noncoherent	dma_free_coherent



#endif /* _ASM_SPARC_DMA_MAPPING_H */