4 files changed, 52 insertions, 29 deletions

diff --git a/arch/csky/include/asm/io.h b/arch/csky/include/asm/io.h
index ecae6b358f95..c1dfa9c10e36 100644
--- a/arch/csky/include/asm/io.h
+++ b/arch/csky/include/asm/io.h
@@ -15,6 +15,31 @@ extern void iounmap(void *addr);
 extern int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
                 size_t size, unsigned long flags);
 
+/*
+ * I/O memory access primitives. Reads are ordered relative to any
+ * following Normal memory access. Writes are ordered relative to any prior
+ * Normal memory access.
+ *
+ * For CACHEV1 (807, 810), store instruction could fast retire, so we need
+ * another mb() to prevent st fast retire.
+ *
+ * For CACHEV2 (860), store instruction with PAGE_ATTR_NO_BUFFERABLE won't
+ * fast retire.
+ */
+#define readb(c)                ({ u8  __v = readb_relaxed(c); rmb(); __v; })
+#define readw(c)                ({ u16 __v = readw_relaxed(c); rmb(); __v; })
+#define readl(c)                ({ u32 __v = readl_relaxed(c); rmb(); __v; })
+
+#ifdef CONFIG_CPU_HAS_CACHEV2
+#define writeb(v,c)             ({ wmb(); writeb_relaxed((v),(c)); })
+#define writew(v,c)             ({ wmb(); writew_relaxed((v),(c)); })
+#define writel(v,c)             ({ wmb(); writel_relaxed((v),(c)); })
+#else
+#define writeb(v,c)             ({ wmb(); writeb_relaxed((v),(c)); mb(); })
+#define writew(v,c)             ({ wmb(); writew_relaxed((v),(c)); mb(); })
+#define writel(v,c)             ({ wmb(); writel_relaxed((v),(c)); mb(); })
+#endif
+
 #define ioremap_nocache(phy, sz)        ioremap(phy, sz)
 #define ioremap_wc ioremap_nocache
 #define ioremap_wt ioremap_nocache
diff --git a/arch/csky/include/asm/pgalloc.h b/arch/csky/include/asm/pgalloc.h
index bf4f4a0e140e..d213bb47b717 100644
--- a/arch/csky/include/asm/pgalloc.h
+++ b/arch/csky/include/asm/pgalloc.h
@@ -24,41 +24,34 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 
 extern void pgd_init(unsigned long *p);
 
-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-                                        unsigned long address)
+static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
 {
         pte_t *pte;
-        unsigned long *kaddr, i;
+        unsigned long i;
 
-        pte = (pte_t *) __get_free_pages(GFP_KERNEL | __GFP_RETRY_MAYFAIL,
-                                         PTE_ORDER);
-        kaddr = (unsigned long *)pte;
-        if (address & 0x80000000)
-                for (i = 0; i < (PAGE_SIZE/4); i++)
-                        *(kaddr + i) = 0x1;
-        else
-                clear_page(kaddr);
+        pte = (pte_t *) __get_free_page(GFP_KERNEL);
+        if (!pte)
+                return NULL;
+
+        for (i = 0; i < PAGE_SIZE/sizeof(pte_t); i++)
+                (pte + i)->pte_low = _PAGE_GLOBAL;
 
         return pte;
 }
 
-static inline struct page *pte_alloc_one(struct mm_struct *mm,
-                                                unsigned long address)
+static inline struct page *pte_alloc_one(struct mm_struct *mm)
 {
         struct page *pte;
-        unsigned long *kaddr, i;
-
-        pte = alloc_pages(GFP_KERNEL | __GFP_RETRY_MAYFAIL, PTE_ORDER);
-        if (pte) {
-                kaddr = kmap_atomic(pte);
-                if (address & 0x80000000) {
-                        for (i = 0; i < (PAGE_SIZE/4); i++)
-                                *(kaddr + i) = 0x1;
-                } else
-                        clear_page(kaddr);
-                kunmap_atomic(kaddr);
-                pgtable_page_ctor(pte);
+
+        pte = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0);
+        if (!pte)
+                return NULL;
+
+        if (!pgtable_page_ctor(pte)) {
+                __free_page(pte);
+                return NULL;
         }
+
         return pte;
 }
 
diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h
index edfcbb25fd9f..dcea277c09ae 100644
--- a/arch/csky/include/asm/pgtable.h
+++ b/arch/csky/include/asm/pgtable.h
@@ -45,8 +45,8 @@
         ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset_t(address))
 #define pmd_page(pmd)   (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))
 #define pte_clear(mm, addr, ptep)       set_pte((ptep), \
-                        (((unsigned int)addr&0x80000000)?__pte(1):__pte(0)))
-#define pte_none(pte)   (!(pte_val(pte)&0xfffffffe))
+        (((unsigned int) addr & PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0)))
+#define pte_none(pte)           (!(pte_val(pte) & ~_PAGE_GLOBAL))
 #define pte_present(pte)        (pte_val(pte) & _PAGE_PRESENT)
 #define pte_pfn(x)      ((unsigned long)((x).pte_low >> PAGE_SHIFT))
 #define pfn_pte(pfn, prot) __pte(((unsigned long long)(pfn) << PAGE_SHIFT) \
@@ -241,6 +241,11 @@ static inline pte_t pte_mkyoung(pte_t pte)
 
 #define pgd_index(address)      ((address) >> PGDIR_SHIFT)
 
+#define __HAVE_PHYS_MEM_ACCESS_PROT
+struct file;
+extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
+                                     unsigned long size, pgprot_t vma_prot);
+
 /*
  * Macro to make mark a page protection value as "uncacheable".  Note
  * that "protection" is really a misnomer here as the protection value
diff --git a/arch/csky/include/asm/processor.h b/arch/csky/include/asm/processor.h
index 8f454810514f..21e0bd5293dd 100644
--- a/arch/csky/include/asm/processor.h
+++ b/arch/csky/include/asm/processor.h
@@ -49,7 +49,7 @@ struct thread_struct {
 };
 
 #define INIT_THREAD  { \
-        .ksp = (unsigned long) init_thread_union.stack + THREAD_SIZE, \
+        .ksp = sizeof(init_stack) + (unsigned long) &init_stack, \
         .sr = DEFAULT_PSR_VALUE, \
 }
 
@@ -95,7 +95,7 @@ unsigned long get_wchan(struct task_struct *p);
 #define KSTK_ESP(tsk)           (task_pt_regs(tsk)->usp)
 
 #define task_pt_regs(p) \
-        ((struct pt_regs *)(THREAD_SIZE + p->stack) - 1)
+        ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)
 
 #define cpu_relax() barrier()