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

Commit e83d0169 authored by Ian Munsie's avatar Ian Munsie Committed by Michael Ellerman
Browse files

powerpc/cell: Move spu_handle_mm_fault() out of cell platform 



Currently spu_handle_mm_fault() is in the cell platform.

This code is generically useful for other non-cell co-processors on powerpc.

This patch moves this function out of the cell platform into arch/powerpc/mm so
that others may use it.

Signed-off-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 60666de2

arch/powerpc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -608,6 +608,10 @@ config PPC_SUBPAGE_PROT 
	  to set access permissions (read/write, readonly, or no access)

	  on the 4k subpages of each 64k page.



config PPC_COPRO_BASE

	bool

	default n



config SCHED_SMT

	bool "SMT (Hyperthreading) scheduler support"

	depends on PPC64 && SMP

arch/powerpc/include/asm/copro.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2014 IBM Corp.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#ifndef _ASM_POWERPC_COPRO_H

#define _ASM_POWERPC_COPRO_H



int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea,

			  unsigned long dsisr, unsigned *flt);



#endif /* _ASM_POWERPC_COPRO_H */

arch/powerpc/include/asm/spu.h

+2 −3
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <linux/workqueue.h>

#include <linux/device.h>

#include <linux/mutex.h>

#include <asm/reg.h>

#include <asm/copro.h>



#define LS_SIZE (256 * 1024)

#define LS_ADDR_MASK (LS_SIZE - 1)
@@ -277,9 +279,6 @@ void spu_remove_dev_attr(struct device_attribute *attr); 
int spu_add_dev_attr_group(struct attribute_group *attrs);

void spu_remove_dev_attr_group(struct attribute_group *attrs);



int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,

		unsigned long dsisr, unsigned *flt);



/*

 * Notifier blocks:

 *

arch/powerpc/mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,3 +34,4 @@ obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += hugepage-hash64.o 
obj-$(CONFIG_PPC_SUBPAGE_PROT)	+= subpage-prot.o

obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o

obj-$(CONFIG_HIGHMEM)		+= highmem.o

obj-$(CONFIG_PPC_COPRO_BASE)	+= copro_fault.o

arch/powerpc/platforms/cell/spu_fault.c→arch/powerpc/mm/copro_fault.c

+6 −8
Original line number Diff line number Diff line 
/*

 * SPU mm fault handler

 * CoProcessor (SPU/AFU) mm fault handler

 *

 * (C) Copyright IBM Deutschland Entwicklung GmbH 2007

 *
@@ -23,16 +23,14 @@ 
#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/export.h>



#include <asm/spu.h>

#include <asm/spu_csa.h>

#include <asm/reg.h>



/*

 * This ought to be kept in sync with the powerpc specific do_page_fault

 * function. Currently, there are a few corner cases that we haven't had

 * to handle fortunately.

 */

int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea,

int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea,

		unsigned long dsisr, unsigned *flt)

{

	struct vm_area_struct *vma;
@@ -58,12 +56,12 @@ int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea, 
			goto out_unlock;

	}



	is_write = dsisr & MFC_DSISR_ACCESS_PUT;

	is_write = dsisr & DSISR_ISSTORE;

	if (is_write) {

		if (!(vma->vm_flags & VM_WRITE))

			goto out_unlock;

	} else {

		if (dsisr & MFC_DSISR_ACCESS_DENIED)

		if (dsisr & DSISR_PROTFAULT)

			goto out_unlock;

		if (!(vma->vm_flags & (VM_READ | VM_EXEC)))

			goto out_unlock;
@@ -91,4 +89,4 @@ int spu_handle_mm_fault(struct mm_struct *mm, unsigned long ea, 
	up_read(&mm->mmap_sem);

	return ret;

}

EXPORT_SYMBOL_GPL(spu_handle_mm_fault);
 
EXPORT_SYMBOL_GPL(copro_handle_mm_fault);