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

Commit 5cad3598 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull microblaze arch updates from Michal Simek.

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  Revert "microblaze_mmu_v2: Update signal returning address"
  microblaze: Added more support for PCI
  microblaze: Prefer to use pr_XXX instead of printk(KERN_XX)
  microblaze: Fix bug with passing command line
  microblaze: Remove PAGE properties duplication
  microblaze: Remove additional andi which has been already done
  microblaze: Use predefined macro for ESR_DIZ
  microblaze: Support 4k/16k/64k pages
  microblaze: Do not used hardcoded value in exception handler
  microblaze: Added fdt chosen capability for timer
  microblaze: Add support for ioreadXX/iowriteXX_rep
  microblaze: Improve failure handling for GPIO reset
  microblaze: clinkage.h
parents 638c87a9 94fda49a

arch/microblaze/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -243,14 +243,11 @@ choice 
config MICROBLAZE_4K_PAGES

	bool "4k page size"



config MICROBLAZE_8K_PAGES

	bool "8k page size"



config MICROBLAZE_16K_PAGES

	bool "16k page size"



config MICROBLAZE_32K_PAGES

	bool "32k page size"

config MICROBLAZE_64K_PAGES

	bool "64k page size"



endchoice

arch/microblaze/include/asm/clinkage.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <linux/linkage.h>

arch/microblaze/include/asm/io.h

+94 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ extern resource_size_t isa_mem_base; 


#define IO_SPACE_LIMIT (0xFFFFFFFF)



/* the following is needed to support PCI with some drivers */



#define mmiowb()



static inline unsigned char __raw_readb(const volatile void __iomem *addr)

{

	return *(volatile unsigned char __force *)addr;
@@ -248,4 +252,94 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size, 
#define ioport_map(port, nr)	((void __iomem *)(port))

#define ioport_unmap(addr)



/* from asm-generic/io.h */

#ifndef insb

static inline void insb(unsigned long addr, void *buffer, int count)

{

	if (count) {

		u8 *buf = buffer;

		do {

			u8 x = inb(addr);

			*buf++ = x;

		} while (--count);

	}

}

#endif



#ifndef insw

static inline void insw(unsigned long addr, void *buffer, int count)

{

	if (count) {

		u16 *buf = buffer;

		do {

			u16 x = inw(addr);

			*buf++ = x;

		} while (--count);

	}

}

#endif



#ifndef insl

static inline void insl(unsigned long addr, void *buffer, int count)

{

	if (count) {

		u32 *buf = buffer;

		do {

			u32 x = inl(addr);

			*buf++ = x;

		} while (--count);

	}

}

#endif



#ifndef outsb

static inline void outsb(unsigned long addr, const void *buffer, int count)

{

	if (count) {

		const u8 *buf = buffer;

		do {

			outb(*buf++, addr);

		} while (--count);

	}

}

#endif



#ifndef outsw

static inline void outsw(unsigned long addr, const void *buffer, int count)

{

	if (count) {

		const u16 *buf = buffer;

		do {

			outw(*buf++, addr);

		} while (--count);

	}

}

#endif



#ifndef outsl

static inline void outsl(unsigned long addr, const void *buffer, int count)

{

	if (count) {

		const u32 *buf = buffer;

		do {

			outl(*buf++, addr);

		} while (--count);

	}

}

#endif



#define ioread8_rep(p, dst, count) \

	insb((unsigned long) (p), (dst), (count))

#define ioread16_rep(p, dst, count) \

	insw((unsigned long) (p), (dst), (count))

#define ioread32_rep(p, dst, count) \

	insl((unsigned long) (p), (dst), (count))



#define iowrite8_rep(p, src, count) \

	outsb((unsigned long) (p), (src), (count))

#define iowrite16_rep(p, src, count) \

	outsw((unsigned long) (p), (src), (count))

#define iowrite32_rep(p, src, count) \

	outsl((unsigned long) (p), (src), (count))



#endif /* _ASM_MICROBLAZE_IO_H */

arch/microblaze/include/asm/page.h

+4 −5
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ 
#ifdef __KERNEL__



/* PAGE_SHIFT determines the page size */

#if defined(CONFIG_MICROBLAZE_32K_PAGES)

#define PAGE_SHIFT		15

#if defined(CONFIG_MICROBLAZE_64K_PAGES)

#define PAGE_SHIFT		16

#elif defined(CONFIG_MICROBLAZE_16K_PAGES)

#define PAGE_SHIFT		14

#elif defined(CONFIG_MICROBLAZE_8K_PAGES)

#define PAGE_SHIFT		13

#else

#define PAGE_SHIFT		12

#endif
@@ -37,6 +35,8 @@ 


#define LOAD_OFFSET	ASM_CONST((CONFIG_KERNEL_START-CONFIG_KERNEL_BASE_ADDR))



#define PTE_SHIFT	(PAGE_SHIFT - 2)	/* 1024 ptes per page */



#ifndef __ASSEMBLY__



/* MS be sure that SLAB allocates aligned objects */
@@ -71,7 +71,6 @@ extern unsigned int __page_offset; 
 * The basic type of a PTE - 32 bit physical addressing.

 */

typedef unsigned long pte_basic_t;

#define PTE_SHIFT	(PAGE_SHIFT - 2)	/* 1024 ptes per page */

#define PTE_FMT		"%.8lx"



#endif /* CONFIG_MMU */

arch/microblaze/include/asm/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <asm/prom.h>

#include <asm/pci-bridge.h>



#include <asm-generic/pci-dma-compat.h>



#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_MEM		0x10000000