Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 280a5ba22ca35575721d42e536176a3561f4ec43

Authored by Michael Neuling
Committed by Benjamin Herrenschmidt
1 parent a515348fc6
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

powerpc/pseries: Improve stream generation comments in copypage/user 

No code changes, just documenting what's happening a little better.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 2 changed files with 18 additions and 13 deletions Side-by-side Diff

arch/powerpc/lib/copypage_power7.S
Diff comments   View file @ 280a5ba
... ... @@ -28,13 +28,14 @@
28 28 * aligned we don't need to clear the bottom 7 bits of either
29 29 * address.
30 30 */
31   - ori r9,r3,1 /* stream=1 */
  31 + ori r9,r3,1 /* stream=1 => to */
32 32  
33 33 #ifdef CONFIG_PPC_64K_PAGES
34   - lis r7,0x0E01 /* depth=7, units=512 */
  34 + lis r7,0x0E01 /* depth=7
  35 + * units/cachelines=512 */
35 36 #else
36 37 lis r7,0x0E00 /* depth=7 */
37   - ori r7,r7,0x1000 /* units=32 */
  38 + ori r7,r7,0x1000 /* units/cachelines=32 */
38 39 #endif
39 40 ori r10,r7,1 /* stream=1 */
40 41  
41 42  
... ... @@ -43,12 +44,14 @@
43 44  
44 45 .machine push
45 46 .machine "power4"
46   - dcbt r0,r4,0b01000
47   - dcbt r0,r7,0b01010
48   - dcbtst r0,r9,0b01000
49   - dcbtst r0,r10,0b01010
  47 + /* setup read stream 0 */
  48 + dcbt r0,r4,0b01000 /* addr from */
  49 + dcbt r0,r7,0b01010 /* length and depth from */
  50 + /* setup write stream 1 */
  51 + dcbtst r0,r9,0b01000 /* addr to */
  52 + dcbtst r0,r10,0b01010 /* length and depth to */
50 53 eieio
51   - dcbt r0,r8,0b01010 /* GO */
  54 + dcbt r0,r8,0b01010 /* all streams GO */
52 55 .machine pop
53 56  
54 57 #ifdef CONFIG_ALTIVEC
arch/powerpc/lib/copyuser_power7.S
Diff comments   View file @ 280a5ba
... ... @@ -318,12 +318,14 @@
318 318  
319 319 .machine push
320 320 .machine "power4"
321   - dcbt r0,r6,0b01000
322   - dcbt r0,r7,0b01010
323   - dcbtst r0,r9,0b01000
324   - dcbtst r0,r10,0b01010
  321 + /* setup read stream 0 */
  322 + dcbt r0,r6,0b01000 /* addr from */
  323 + dcbt r0,r7,0b01010 /* length and depth from */
  324 + /* setup write stream 1 */
  325 + dcbtst r0,r9,0b01000 /* addr to */
  326 + dcbtst r0,r10,0b01010 /* length and depth to */
325 327 eieio
326   - dcbt r0,r8,0b01010 /* GO */
  328 + dcbt r0,r8,0b01010 /* all streams GO */
327 329 .machine pop
328 330  
329 331 beq cr1,.Lunwind_stack_nonvmx_copy