Commit 837e8ac8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ff36c447 010b6761

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ ForEachMacros: 
  - 'perf_hpp_list__for_each_sort_list_safe'

  - 'perf_pmu__for_each_hybrid_pmu'

  - 'ping_portaddr_for_each_entry'

  - 'ping_portaddr_for_each_entry_rcu'

  - 'plist_for_each'

  - 'plist_for_each_continue'

  - 'plist_for_each_entry'

Documentation/devicetree/bindings/clock/samsung,exynosautov9-clock.yaml

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ allOf: 
          items:

            - const: oscclk

            - const: dout_clkcmu_fsys1_bus

            - const: dout_clkcmu_fsys1_mmc_card

            - const: gout_clkcmu_fsys1_mmc_card

            - const: dout_clkcmu_fsys1_usbdrd



  - if:

Documentation/loongarch/booting.rst

0 → 100644
+42 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



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

Booting Linux/LoongArch

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



:Author: Yanteng Si <siyanteng@loongson.cn>

:Date:   18 Nov 2022



Information passed from BootLoader to kernel

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



LoongArch supports ACPI and FDT. The information that needs to be passed

to the kernel includes the memmap, the initrd, the command line, optionally

the ACPI/FDT tables, and so on.



The kernel is passed the following arguments on `kernel_entry` :



      - a0 = efi_boot: `efi_boot` is a flag indicating whether

        this boot environment is fully UEFI-compliant.



      - a1 = cmdline: `cmdline` is a pointer to the kernel command line.



      - a2 = systemtable: `systemtable` points to the EFI system table.

        All pointers involved at this stage are in physical addresses.



Header of Linux/LoongArch kernel images

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



Linux/LoongArch kernel images are EFI images. Being PE files, they have

a 64-byte header structured like::



	u32	MZ_MAGIC                /* "MZ", MS-DOS header */

	u32	res0 = 0                /* Reserved */

	u64	kernel_entry            /* Kernel entry point */

	u64	_end - _text            /* Kernel image effective size */

	u64	load_offset             /* Kernel image load offset from start of RAM */

	u64	res1 = 0                /* Reserved */

	u64	res2 = 0                /* Reserved */

	u64	res3 = 0                /* Reserved */

	u32	LINUX_PE_MAGIC          /* Magic number */

	u32	pe_header - _head       /* Offset to the PE header */

Documentation/loongarch/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ LoongArch Architecture 
   :numbered:



   introduction

   booting

   irq-chip-model



   features

Documentation/translations/zh_CN/loongarch/booting.rst

0 → 100644
+48 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



.. include:: ../disclaimer-zh_CN.rst



:Original: Documentation/loongarch/booting.rst



:翻译:



 司延腾 Yanteng Si <siyanteng@loongson.cn>



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

启动 Linux/LoongArch

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



:作者: 司延腾 <siyanteng@loongson.cn>

:日期: 2022年11月18日



BootLoader传递给内核的信息

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



LoongArch支持ACPI和FDT启动，需要传递给内核的信息包括memmap、initrd、cmdline、可

选的ACPI/FDT表等。



内核在 `kernel_entry` 入口处被传递以下参数:



      - a0 = efi_boot: `efi_boot` 是一个标志，表示这个启动环境是否完全符合UEFI

        的要求。



      - a1 = cmdline: `cmdline` 是一个指向内核命令行的指针。



      - a2 = systemtable: `systemtable` 指向EFI的系统表，在这个阶段涉及的所有

        指针都是物理地址。



Linux/LoongArch内核镜像文件头

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



内核镜像是EFI镜像。作为PE文件，它们有一个64字节的头部结构体，如下所示::



	u32	MZ_MAGIC                /* "MZ", MS-DOS 头 */

	u32	res0 = 0                /* 保留 */

	u64	kernel_entry            /* 内核入口点 */

	u64	_end - _text            /* 内核镜像有效大小 */

	u64	load_offset             /* 加载内核镜像相对内存起始地址的偏移量 */

	u64	res1 = 0                /* 保留 */

	u64	res2 = 0                /* 保留 */

	u64	res3 = 0                /* 保留 */

	u32	LINUX_PE_MAGIC          /* 魔术数 */

	u32	pe_header - _head       /* 到PE头的偏移量 */