mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

[POWERPC] spufs: wrap mfc sdr access

Browse source 
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>
This commit is contained in:
Masato Noguchi 2006-10-24 18:31:14 +02:00 committed by Paul Mackerras
parent 5414c6be57
commit 24f43b33f7
5 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/platforms/cell/spu_base.c
View file

@ -805,7 +805,7 @@ static int __init create_spu(struct device_node *spe)
if (ret) if (ret)
goto out_unmap; goto out_unmap;
spin_lock_init(&spu->register_lock); spin_lock_init(&spu->register_lock);
spu_mfc_sdr_set(spu, mfspr(SPRN_SDR1)); spu_mfc_sdr_setup(spu);
spu_mfc_sr1_set(spu, 0x33); spu_mfc_sr1_set(spu, 0x33);
mutex_lock(&spu_mutex); mutex_lock(&spu_mutex);

6
arch/powerpc/platforms/cell/spu_priv1_mmio.c
View file

@ -84,9 +84,9 @@ static void mfc_dsisr_set(struct spu *spu, u64 dsisr)
out_be64(&spu->priv1->mfc_dsisr_RW, dsisr); out_be64(&spu->priv1->mfc_dsisr_RW, dsisr);
} }
static void mfc_sdr_set(struct spu *spu, u64 sdr) static void mfc_sdr_setup(struct spu *spu)
{ {
out_be64(&spu->priv1->mfc_sdr_RW, sdr); out_be64(&spu->priv1->mfc_sdr_RW, mfspr(SPRN_SDR1));
} }
static void mfc_sr1_set(struct spu *spu, u64 sr1) static void mfc_sr1_set(struct spu *spu, u64 sr1)
@ -146,7 +146,7 @@ const struct spu_priv1_ops spu_priv1_mmio_ops =
.mfc_dar_get = mfc_dar_get, .mfc_dar_get = mfc_dar_get,
.mfc_dsisr_get = mfc_dsisr_get, .mfc_dsisr_get = mfc_dsisr_get,
.mfc_dsisr_set = mfc_dsisr_set, .mfc_dsisr_set = mfc_dsisr_set,
.mfc_sdr_set = mfc_sdr_set, .mfc_sdr_setup = mfc_sdr_setup,
.mfc_sr1_set = mfc_sr1_set, .mfc_sr1_set = mfc_sr1_set,
.mfc_sr1_get = mfc_sr1_get, .mfc_sr1_get = mfc_sr1_get,
.mfc_tclass_id_set = mfc_tclass_id_set, .mfc_tclass_id_set = mfc_tclass_id_set,

3
arch/powerpc/platforms/cell/spufs/switch.c
View file

@ -2165,9 +2165,6 @@ static void init_priv1(struct spu_state *csa)
MFC_STATE1_PROBLEM_STATE_MASK | MFC_STATE1_PROBLEM_STATE_MASK |
MFC_STATE1_RELOCATE_MASK | MFC_STATE1_BUS_TLBIE_MASK; MFC_STATE1_RELOCATE_MASK | MFC_STATE1_BUS_TLBIE_MASK;
/* Set storage description. */
csa->priv1.mfc_sdr_RW = mfspr(SPRN_SDR1);
/* Enable OS-specific set of interrupts. */ /* Enable OS-specific set of interrupts. */
csa->priv1.int_mask_class0_RW = CLASS0_ENABLE_DMA_ALIGNMENT_INTR | csa->priv1.int_mask_class0_RW = CLASS0_ENABLE_DMA_ALIGNMENT_INTR |
CLASS0_ENABLE_INVALID_DMA_COMMAND_INTR | CLASS0_ENABLE_INVALID_DMA_COMMAND_INTR |

1
include/asm-powerpc/spu_csa.h
View file

@ -151,7 +151,6 @@ struct spu_priv1_collapsed {
u64 mfc_fir_chkstp_enable_RW; u64 mfc_fir_chkstp_enable_RW;
u64 smf_sbi_signal_sel; u64 smf_sbi_signal_sel;
u64 smf_ato_signal_sel; u64 smf_ato_signal_sel;
u64 mfc_sdr_RW;
u64 tlb_index_hint_RO; u64 tlb_index_hint_RO;
u64 tlb_index_W; u64 tlb_index_W;
u64 tlb_vpn_RW; u64 tlb_vpn_RW;

6
include/asm-powerpc/spu_priv1.h
View file

@ -37,7 +37,7 @@ struct spu_priv1_ops
u64 (*mfc_dar_get) (struct spu *spu); u64 (*mfc_dar_get) (struct spu *spu);
u64 (*mfc_dsisr_get) (struct spu *spu); u64 (*mfc_dsisr_get) (struct spu *spu);
void (*mfc_dsisr_set) (struct spu *spu, u64 dsisr); 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); void (*mfc_sr1_set) (struct spu *spu, u64 sr1);
u64 (*mfc_sr1_get) (struct spu *spu); u64 (*mfc_sr1_get) (struct spu *spu);
void (*mfc_tclass_id_set) (struct spu *spu, u64 tclass_id); 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 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 static inline void