[POWERPC] spufs: wrap mfc sdr access

SPRN_SDR1 and the SPE's MFC SDR are hypervisor resources and
are not accessible from a logical partition.  This change adds an
access wrapper.

When running on bare H/W, the spufs needs to only set the SPE's MFC SDR
to the value of the PPE's SPRN_SDR1 once at SPE initialization, so this
change renames mfc_sdr_set() to mfc_sdr_setup() and moves the
access of SPRN_SDR1 into the mmio wrapper.  It also removes the now
unneeded member mfc_sdr_RW from struct spu_priv1_collapsed.

Signed-off-by: Masato Noguchi <Masato.Noguchi@jp.sony.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

--
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 3 insertions, 4 deletions

diff --git a/include/asm-powerpc/spu_csa.h b/include/asm-powerpc/spu_csa.h
index 964c2d38ccb7..bdbf906a767f 100644
--- a/include/asm-powerpc/spu_csa.h
+++ b/include/asm-powerpc/spu_csa.h
@@ -151,7 +151,6 @@ struct spu_priv1_collapsed {
         u64 mfc_fir_chkstp_enable_RW;
         u64 smf_sbi_signal_sel;
         u64 smf_ato_signal_sel;
-        u64 mfc_sdr_RW;
         u64 tlb_index_hint_RO;
         u64 tlb_index_W;
         u64 tlb_vpn_RW;
diff --git a/include/asm-powerpc/spu_priv1.h b/include/asm-powerpc/spu_priv1.h
index 300c458b6d06..4f9a04db99f7 100644
--- a/include/asm-powerpc/spu_priv1.h
+++ b/include/asm-powerpc/spu_priv1.h
@@ -37,7 +37,7 @@ struct spu_priv1_ops
         u64 (*mfc_dar_get) (struct spu *spu);
         u64 (*mfc_dsisr_get) (struct spu *spu);
         void (*mfc_dsisr_set) (struct spu *spu, u64 dsisr);
-        void (*mfc_sdr_set) (struct spu *spu, u64 sdr);
+        void (*mfc_sdr_setup) (struct spu *spu);
         void (*mfc_sr1_set) (struct spu *spu, u64 sr1);
         u64 (*mfc_sr1_get) (struct spu *spu);
         void (*mfc_tclass_id_set) (struct spu *spu, u64 tclass_id);
@@ -112,9 +112,9 @@ spu_mfc_dsisr_set (struct spu *spu, u64 dsisr)
 }
 
 static inline void
-spu_mfc_sdr_set (struct spu *spu, u64 sdr)
+spu_mfc_sdr_setup (struct spu *spu)
 {
-        spu_priv1_ops->mfc_sdr_set(spu, sdr);
+        spu_priv1_ops->mfc_sdr_setup(spu);
 }
 
 static inline void