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

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (27 commits)
  microblaze: entry.S use delay slot for return handlers
  microblaze: Save current task directly
  microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap
  microblaze: PCI early support for noMMU system
  microblaze: Fix dma alloc and free coherent dma functions
  microblaze: Add consistent code
  microblaze: pgtable.h: move consistent functions
  microblaze: Remove ancient Kconfig option for consistent mapping
  microblaze: Remove VMALLOC_VMADDR
  microblaze: Add define for ASM_LOOP
  microblaze: Preliminary support for dma drivers
  microblaze: remove trailing space in messages
  microblaze: Use generic show_mem()
  microblaze: Change temp register for cmdline
  microblaze: Preliminary support for dma drivers
  microblaze: Move cache function to cache.c
  microblaze: Add support from PREEMPT
  microblaze: Add support for Xilinx PCI host bridge
  microblaze: Enable PCI, missing files
  microblaze: Add core PCI files
  ...
parents 31cc1dd3 841d6e8c

arch/microblaze/Kconfig

+31 −33
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ config MICROBLAZE 
	select USB_ARCH_HAS_EHCI

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_OPROFILE

	select HAVE_DMA_ATTRS

	select HAVE_DMA_API_DEBUG

	select TRACING_SUPPORT



config SWAP
@@ -76,9 +78,6 @@ config HAVE_LATENCYTOP_SUPPORT 
config PCI

	def_bool n



config NO_DMA

	def_bool y



config DTC

	def_bool y
@@ -146,7 +145,6 @@ menu "Advanced setup" 


config ADVANCED_OPTIONS

	bool "Prompt for advanced kernel configuration options"

	depends on MMU

	help

	  This option will enable prompting for a variety of advanced kernel

	  configuration options.  These options can cause the kernel to not
@@ -158,6 +156,15 @@ config ADVANCED_OPTIONS 
comment "Default settings for advanced configuration options are used"

	depends on !ADVANCED_OPTIONS



config XILINX_UNCACHED_SHADOW

	bool "Are you using uncached shadow for RAM ?"

	depends on ADVANCED_OPTIONS && !MMU

	default n

	help

	  This is needed to be able to allocate uncachable memory regions.

	  The feature requires the design to define the RAM memory controller

	  window to be twice as large as the actual physical memory.



config HIGHMEM_START_BOOL

	bool "Set high memory pool address"

	depends on ADVANCED_OPTIONS && HIGHMEM
@@ -175,7 +182,7 @@ config HIGHMEM_START 


config LOWMEM_SIZE_BOOL

	bool "Set maximum low memory"

	depends on ADVANCED_OPTIONS

	depends on ADVANCED_OPTIONS && MMU

	help

	  This option allows you to set the maximum amount of memory which

	  will be used as "low memory", that is, memory which the kernel can
@@ -187,7 +194,6 @@ config LOWMEM_SIZE_BOOL 


config LOWMEM_SIZE

	hex "Maximum low memory size (in bytes)" if LOWMEM_SIZE_BOOL

	depends on MMU

	default "0x30000000"



config KERNEL_START_BOOL
@@ -208,7 +214,7 @@ config KERNEL_START 


config TASK_SIZE_BOOL

	bool "Set custom user task size"

	depends on ADVANCED_OPTIONS

	depends on ADVANCED_OPTIONS && MMU

	help

	  This option allows you to set the amount of virtual address space

	  allocated to user tasks.  This can be useful in optimizing the
@@ -218,42 +224,34 @@ config TASK_SIZE_BOOL 


config TASK_SIZE

	hex "Size of user task space" if TASK_SIZE_BOOL

	depends on MMU

	default "0x80000000"



config CONSISTENT_START_BOOL

	bool "Set custom consistent memory pool address"

	depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE

	help

	  This option allows you to set the base virtual address

	  of the the consistent memory pool.  This pool of virtual

	  memory is used to make consistent memory allocations.

endmenu



config CONSISTENT_START

	hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL

	depends on MMU

	default "0xff100000" if NOT_COHERENT_CACHE

source "mm/Kconfig"



config CONSISTENT_SIZE_BOOL

	bool "Set custom consistent memory pool size"

	depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE

	help

	  This option allows you to set the size of the the

	  consistent memory pool.  This pool of virtual memory

	  is used to make consistent memory allocations.

menu "Exectuable file formats"



config CONSISTENT_SIZE

	hex "Size of consistent memory pool" if CONSISTENT_SIZE_BOOL

	depends on MMU

	default "0x00200000" if NOT_COHERENT_CACHE

source "fs/Kconfig.binfmt"



endmenu



source "mm/Kconfig"

menu "Bus Options"



menu "Exectuable file formats"

config PCI

	bool "PCI support"



source "fs/Kconfig.binfmt"

config PCI_DOMAINS

	def_bool PCI



config PCI_SYSCALL

	def_bool PCI



config PCI_XILINX

	bool "Xilinx PCI host bridge support"

	depends on PCI



source "drivers/pci/Kconfig"



endmenu

arch/microblaze/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ libs-y += $(LIBGCC) 
core-y += arch/microblaze/kernel/

core-y += arch/microblaze/mm/

core-y += arch/microblaze/platform/

core-$(CONFIG_PCI) += arch/microblaze/pci/



drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/

arch/microblaze/include/asm/device.h

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ struct device_node; 
struct dev_archdata {

	/* Optional pointer to an OF device node */

	struct device_node	*of_node;



	/* DMA operations on that device */

	struct dma_map_ops	*dma_ops;

	void                    *dma_data;

};



struct pdev_archdata {

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

+153 −1
Original line number Diff line number Diff line 
#include <asm-generic/dma-mapping-broken.h>
 
/*

 * Implements the generic device dma API for microblaze and the pci

 *

 * Copyright (C) 2009-2010 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2009-2010 PetaLogix

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License. See the file COPYING in the main directory of this

 * archive for more details.

 *

 * This file is base on powerpc and x86 dma-mapping.h versions

 * Copyright (C) 2004 IBM

 */



#ifndef _ASM_MICROBLAZE_DMA_MAPPING_H

#define _ASM_MICROBLAZE_DMA_MAPPING_H



/*

 * See Documentation/PCI/PCI-DMA-mapping.txt and

 * Documentation/DMA-API.txt for documentation.

 */



#include <linux/types.h>

#include <linux/cache.h>

#include <linux/mm.h>

#include <linux/scatterlist.h>

#include <linux/dma-debug.h>

#include <linux/dma-attrs.h>

#include <asm/io.h>

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



#define DMA_ERROR_CODE		(~(dma_addr_t)0x0)



#define __dma_alloc_coherent(dev, gfp, size, handle)	NULL

#define __dma_free_coherent(size, addr)		((void)0)

#define __dma_sync(addr, size, rw)		((void)0)



static inline unsigned long device_to_mask(struct device *dev)

{

	if (dev->dma_mask && *dev->dma_mask)

		return *dev->dma_mask;

	/* Assume devices without mask can take 32 bit addresses */

	return 0xfffffffful;

}



extern struct dma_map_ops *dma_ops;



/*

 * Available generic sets of operations

 */

extern struct dma_map_ops dma_direct_ops;



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

{

	/* We don't handle the NULL dev case for ISA for now. We could

	 * do it via an out of line call but it is not needed for now. The

	 * only ISA DMA device we support is the floppy and we have a hack

	 * in the floppy driver directly to get a device for us.

	 */

	if (unlikely(!dev) || !dev->archdata.dma_ops)

		return NULL;



	return dev->archdata.dma_ops;

}



static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)

{

	dev->archdata.dma_ops = ops;

}



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

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	if (unlikely(!ops))

		return 0;

	if (!ops->dma_supported)

		return 1;

	return ops->dma_supported(dev, mask);

}



#ifdef CONFIG_PCI

/* We have our own implementation of pci_set_dma_mask() */

#define HAVE_ARCH_PCI_SET_DMA_MASK



#endif



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

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	if (unlikely(ops == NULL))

		return -EIO;

	if (ops->set_dma_mask)

		return ops->set_dma_mask(dev, dma_mask);

	if (!dev->dma_mask || !dma_supported(dev, dma_mask))

		return -EIO;

	*dev->dma_mask = dma_mask;

	return 0;

}



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



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

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	if (ops->mapping_error)

		return ops->mapping_error(dev, dma_addr);



	return (dma_addr == DMA_ERROR_CODE);

}



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



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

					dma_addr_t *dma_handle, gfp_t flag)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *memory;



	BUG_ON(!ops);



	memory = ops->alloc_coherent(dev, size, dma_handle, flag);



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

	return memory;

}



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

				     void *cpu_addr, dma_addr_t dma_handle)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	BUG_ON(!ops);

	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);

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

}



static inline int dma_get_cache_alignment(void)

{

	return L1_CACHE_BYTES;

}



static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,

		enum dma_data_direction direction)

{

	BUG_ON(direction == DMA_NONE);

	__dma_sync(vaddr, size, (int)direction);

}



#endif	/* _ASM_MICROBLAZE_DMA_MAPPING_H */

arch/microblaze/include/asm/io.h

+18 −13
Original line number Diff line number Diff line
@@ -15,7 +15,23 @@ 
#include <asm/page.h>

#include <linux/types.h>

#include <linux/mm.h>          /* Get struct page {...} */

#include <asm-generic/iomap.h>



#ifndef CONFIG_PCI

#define _IO_BASE	0

#define _ISA_MEM_BASE	0

#define PCI_DRAM_OFFSET	0

#else

#define _IO_BASE	isa_io_base

#define _ISA_MEM_BASE	isa_mem_base

#define PCI_DRAM_OFFSET	pci_dram_offset

#endif



extern unsigned long isa_io_base;

extern unsigned long pci_io_base;

extern unsigned long pci_dram_offset;



extern resource_size_t isa_mem_base;



#define IO_SPACE_LIMIT (0xFFFFFFFF)
@@ -124,9 +140,6 @@ static inline void writel(unsigned int v, volatile void __iomem *addr) 
#define virt_to_phys(addr)	((unsigned long)__virt_to_phys(addr))

#define virt_to_bus(addr)	((unsigned long)__virt_to_phys(addr))



#define __page_address(page) \

		(PAGE_OFFSET + (((page) - mem_map) << PAGE_SHIFT))

#define page_to_phys(page)	virt_to_phys((void *)__page_address(page))

#define page_to_bus(page)	(page_to_phys(page))

#define bus_to_virt(addr)	(phys_to_virt(addr))
@@ -227,15 +240,7 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size, 
#define out_8(a, v) __raw_writeb((v), (a))

#define in_8(a) __raw_readb(a)



/* FIXME */

static inline void __iomem *ioport_map(unsigned long port, unsigned int len)

{

	return (void __iomem *) (port);

}



static inline void ioport_unmap(void __iomem *addr)

{

	/* Nothing to do */

}

#define ioport_map(port, nr)	((void __iomem *)(port))

#define ioport_unmap(addr)



#endif /* _ASM_MICROBLAZE_IO_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE