Commit f4c16c58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-3.5' of git://openrisc.net/jonas/linux 

Pull OpenRISC updates from Jonas Bonn:
 "A couple of cleanups for the OpenRISC architecture:

   - Implement IRQ domains
   - Use DMA mapping framework completely and catch up with recent
     changes to dma_map_ops
   - One bug fix to the "or1k_atomic" syscall to not clobber call-saved
     registers
   - OOM killer patches to the pagefault handler ported from the X86
     arch
   - ...and a couple of header file cleanups"

* tag 'for-3.5' of git://openrisc.net/jonas/linux:
  openrisc: use scratch regs in atomic syscall
  openrisc: provide dma_map_ops
  openrisc: header file cleanups
  openrisc/mm/fault.c: Port OOM changes to do_page_fault
  openrisc: remove unnecessary includes
  openrisc: implement irqdomains
parents 3d1482fe 207e715f

arch/openrisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config OPENRISC 
	def_bool y

	select OF

	select OF_EARLY_FLATTREE

	select IRQ_DOMAIN

	select HAVE_MEMBLOCK

	select ARCH_WANT_OPTIONAL_GPIOLIB

        select HAVE_ARCH_TRACEHOOK

arch/openrisc/include/asm/Kbuild

+2 −1
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += spr_defs.h

header-y += elf.h

header-y += ucontext.h



generic-y += atomic.h

generic-y += auxvec.h

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

+34 −113
Original line number Diff line number Diff line
@@ -20,150 +20,71 @@ 
/*

 * See Documentation/DMA-API-HOWTO.txt and

 * Documentation/DMA-API.txt for documentation.

 *

 * This file is written with the intention of eventually moving over

 * to largely using asm-generic/dma-mapping-common.h in its place.

 */



#include <linux/dma-debug.h>

#include <asm-generic/dma-coherent.h>

#include <linux/kmemcheck.h>

#include <linux/dma-mapping.h>



#define DMA_ERROR_CODE		(~(dma_addr_t)0x0)



extern struct dma_map_ops or1k_dma_map_ops;



#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)



void *or1k_dma_alloc_coherent(struct device *dev, size_t size,

			      dma_addr_t *dma_handle, gfp_t flag);

void or1k_dma_free_coherent(struct device *dev, size_t size, void *vaddr,

			    dma_addr_t dma_handle);

dma_addr_t or1k_map_page(struct device *dev, struct page *page,

			 unsigned long offset, size_t size,

			 enum dma_data_direction dir,

			 struct dma_attrs *attrs);

void or1k_unmap_page(struct device *dev, dma_addr_t dma_handle,

		     size_t size, enum dma_data_direction dir,

		     struct dma_attrs *attrs);

int or1k_map_sg(struct device *dev, struct scatterlist *sg,

		int nents, enum dma_data_direction dir,

		struct dma_attrs *attrs);

void or1k_unmap_sg(struct device *dev, struct scatterlist *sg,

		   int nents, enum dma_data_direction dir,

		   struct dma_attrs *attrs);

void or1k_sync_single_for_cpu(struct device *dev,

			      dma_addr_t dma_handle, size_t size,

			      enum dma_data_direction dir);

void or1k_sync_single_for_device(struct device *dev,

			         dma_addr_t dma_handle, size_t size,

			         enum dma_data_direction dir);



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

					dma_addr_t *dma_handle, gfp_t flag)

static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

	void *memory;



	memory = or1k_dma_alloc_coherent(dev, size, dma_handle, flag);



	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);

	return memory;

	return &or1k_dma_map_ops;

}



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

				     void *cpu_addr, dma_addr_t dma_handle)

{

	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);

	or1k_dma_free_coherent(dev, size, cpu_addr, dma_handle);

}

#include <asm-generic/dma-mapping-common.h>



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

					size_t size,

					enum dma_data_direction dir)

{

	dma_addr_t addr;



	kmemcheck_mark_initialized(ptr, size);

	BUG_ON(!valid_dma_direction(dir));

	addr = or1k_map_page(dev, virt_to_page(ptr),

			     (unsigned long)ptr & ~PAGE_MASK, size,

			     dir, NULL);

	debug_dma_map_page(dev, virt_to_page(ptr),

			   (unsigned long)ptr & ~PAGE_MASK, size,

			   dir, addr, true);

	return addr;

}

#define dma_alloc_coherent(d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL) 



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

					  size_t size,

					  enum dma_data_direction dir)

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

				    dma_addr_t *dma_handle, gfp_t gfp,

				    struct dma_attrs *attrs)

{

	BUG_ON(!valid_dma_direction(dir));

	or1k_unmap_page(dev, addr, size, dir, NULL);

	debug_dma_unmap_page(dev, addr, size, dir, true);

}

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *memory;



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

				   int nents, enum dma_data_direction dir)

{

	int i, ents;

	struct scatterlist *s;

	memory = ops->alloc(dev, size, dma_handle, gfp, attrs);



	for_each_sg(sg, s, nents, i)

		kmemcheck_mark_initialized(sg_virt(s), s->length);

	BUG_ON(!valid_dma_direction(dir));

	ents = or1k_map_sg(dev, sg, nents, dir, NULL);

	debug_dma_map_sg(dev, sg, nents, ents, dir);

	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);



	return ents;

	return memory;

}



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

				      int nents, enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));

	debug_dma_unmap_sg(dev, sg, nents, dir);

	or1k_unmap_sg(dev, sg, nents, dir, NULL);

}

#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)



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

				      size_t offset, size_t size,

				      enum dma_data_direction dir)

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

				  void *cpu_addr, dma_addr_t dma_handle,

				  struct dma_attrs *attrs)

{

	dma_addr_t addr;

	struct dma_map_ops *ops = get_dma_ops(dev);



	kmemcheck_mark_initialized(page_address(page) + offset, size);

	BUG_ON(!valid_dma_direction(dir));

	addr = or1k_map_page(dev, page, offset, size, dir, NULL);

	debug_dma_map_page(dev, page, offset, size, dir, addr, false);

	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);



	return addr;

	ops->free(dev, size, cpu_addr, dma_handle, attrs);

}



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

				  size_t size, enum dma_data_direction dir)

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

					  dma_addr_t *dma_handle, gfp_t gfp)

{

	BUG_ON(!valid_dma_direction(dir));

	or1k_unmap_page(dev, addr, size, dir, NULL);

	debug_dma_unmap_page(dev, addr, size, dir, true);

}

	struct dma_attrs attrs;



static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,

					   size_t size,

					   enum dma_data_direction dir)

{

	BUG_ON(!valid_dma_direction(dir));

	or1k_sync_single_for_cpu(dev, addr, size, dir);

	debug_dma_sync_single_for_cpu(dev, addr, size, dir);

	dma_set_attr(DMA_ATTR_NON_CONSISTENT, &attrs);



	return dma_alloc_attrs(dev, size, dma_handle, gfp, &attrs);

}



static inline void dma_sync_single_for_device(struct device *dev,

					      dma_addr_t addr, size_t size,

					      enum dma_data_direction dir)

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

					 void *cpu_addr, dma_addr_t dma_handle)

{

	BUG_ON(!valid_dma_direction(dir));

	or1k_sync_single_for_device(dev, addr, size, dir);

	debug_dma_sync_single_for_device(dev, addr, size, dir);

	struct dma_attrs attrs;



	dma_set_attr(DMA_ATTR_NON_CONSISTENT, &attrs);



	dma_free_attrs(dev, size, cpu_addr, dma_handle, &attrs);

}



static inline int dma_supported(struct device *dev, u64 dma_mask)

arch/openrisc/include/asm/elf.h

+10 −2
Original line number Diff line number Diff line
@@ -19,12 +19,18 @@ 
#ifndef __ASM_OPENRISC_ELF_H

#define __ASM_OPENRISC_ELF_H



/*

 * This files is partially exported to userspace.  This allows us to keep

 * the ELF bits in one place which should assist in keeping the kernel and

 * userspace in sync.

 */



/*

 * ELF register definitions..

 */

#include <linux/types.h>

#include <linux/ptrace.h>



/* for struct user_regs_struct definition */

#include <asm/ptrace.h>



/* The OR1K relocation types... not all relevant for module loader */

#define R_OR32_NONE	0
@@ -62,6 +68,8 @@ typedef unsigned long elf_fpregset_t; 


#ifdef __KERNEL__



#include <linux/types.h>



/*

 * This is used to ensure we don't load something for the wrong architecture.

 */

arch/openrisc/include/asm/ptrace.h

+2 −4
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#ifndef __ASM_OPENRISC_PTRACE_H

#define __ASM_OPENRISC_PTRACE_H



#include <asm/spr_defs.h>



#ifndef __ASSEMBLY__

/*

 * This is the layout of the regset returned by the GETREGSET ptrace call
@@ -30,13 +28,13 @@ struct user_regs_struct { 
	unsigned long gpr[32];

	unsigned long pc;

	unsigned long sr;

	unsigned long pad1;

	unsigned long pad2;

};

#endif



#ifdef __KERNEL__



#include <asm/spr_defs.h>



/*

 * Make kernel PTrace/register structures opaque to userspace... userspace can

 * access thread state via the regset mechanism.  This allows us a bit of

CRA Git | Maintained and supported by SUSTech CRA and CCSE