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

Commit f8785d94 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'doc/4.2' into docs-next

parents 8d13be53 0d03943c

Documentation/CodingStyle

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ functions: 
	typeof(x) ret;			\

	ret = calc_ret(x);		\

	(ret);				\

)}

})



ret is a common name for a local variable - __foo_ret is less likely

to collide with an existing variable.

Documentation/DMA-API-HOWTO.txt

+2 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ There are two types of DMA mappings: 
  transfer, unmapped right after it (unless you use dma_sync_* below)

  and for which hardware can optimize for sequential accesses.



  This of "streaming" as "asynchronous" or "outside the coherency

  Think of "streaming" as "asynchronous" or "outside the coherency

  domain".



  Good examples of what to use streaming mappings for are:

Documentation/DocBook/kernel-hacking.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -954,6 +954,8 @@ printk(KERN_INFO "my ip: %pI4\n", &ipaddress); 
    <function>MODULE_LICENSE()</function> that specifies a GPL

    compatible license.  It implies that the function is considered

    an internal implementation issue, and not really an interface.

    Some maintainers and developers may however

    require EXPORT_SYMBOL_GPL() when adding any new APIs or functionality.

   </para>

  </sect1>

 </chapter>

Documentation/SubmittingPatches

+3 −1
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ toward the stable maintainers by putting a line like this: 


  Cc: stable@vger.kernel.org



into your patch.

into the sign-off area of your patch (note, NOT an email recipient).  You

should also read Documentation/stable_kernel_rules.txt in addition to this

file.



Note, however, that some subsystem maintainers want to come to their own

conclusions on which patches should go to the stable trees.  The networking

Documentation/arm/Samsung/Bootloader-interface.txt

0 → 100644
+53 −0
Original line number Diff line number Diff line 
      Interface between kernel and boot loaders on Exynos boards

      ==========================================================



Author: Krzysztof Kozlowski

Date  : 6 June 2015



The document tries to describe currently used interface between Linux kernel

and boot loaders on Samsung Exynos based boards. This is not a definition

of interface but rather a description of existing state, a reference

for information purpose only.



In the document "boot loader" means any of following: U-boot, proprietary

SBOOT or any other firmware for ARMv7 and ARMv8 initializing the board before

executing kernel.





1. Non-Secure mode

Address:      sysram_ns_base_addr

Offset        Value                                        Purpose

=============================================================================

0x08          exynos_cpu_resume_ns                         System suspend

0x0c          0x00000bad (Magic cookie)                    System suspend

0x1c          exynos4_secondary_startup                    Secondary CPU boot

0x1c + 4*cpu  exynos4_secondary_startup (Exynos4412)       Secondary CPU boot

0x20          0xfcba0d10 (Magic cookie)                    AFTR

0x24          exynos_cpu_resume_ns                         AFTR

0x28 + 4*cpu  0x8 (Magic cookie, Exynos3250)               AFTR





2. Secure mode

Address:      sysram_base_addr

Offset        Value                                        Purpose

=============================================================================

0x00          exynos4_secondary_startup                    Secondary CPU boot

0x04          exynos4_secondary_startup (Exynos542x)       Secondary CPU boot

4*cpu         exynos4_secondary_startup (Exynos4412)       Secondary CPU boot

0x20          exynos_cpu_resume (Exynos4210 r1.0)          AFTR

0x24          0xfcba0d10 (Magic cookie, Exynos4210 r1.0)   AFTR



Address:      pmu_base_addr

Offset        Value                                        Purpose

=============================================================================

0x0800        exynos_cpu_resume                            AFTR

0x0814        exynos4_secondary_startup (Exynos4210 r1.1)  Secondary CPU boot

0x0818        0xfcba0d10 (Magic cookie, Exynos4210 r1.1)   AFTR

0x081C        exynos_cpu_resume (Exynos4210 r1.1)          AFTR





3. Other (regardless of secure/non-secure mode)

Address:      pmu_base_addr

Offset        Value                           Purpose

=============================================================================

0x0908        Non-zero (only Exynos3250)      Secondary CPU boot up indicator