Re: [PATCH] Documentation:Update Documentation/zh_CN/arm64/booting.txt

From: Weiwei Jia
Date: Tue Feb 16 2016 - 03:52:00 EST


2016-02-16 16:41 GMT+08:00 <wefu@xxxxxxxxxx>:
> From: Fu Wei <wefu@xxxxxxxxxx>
>
> This is a update of Chinese documentation: Documentation/zh_CN/arm64/booting.txt
>
> It is based on the modifications of Documentation/arm64/booting.txt in submission:
> "61bd93ce", "6c020ea8", "9d372c9f", "6d32ab2d".
> And improve the format of documentation.
>
> Signed-off-by: Fu Wei <wefu@xxxxxxxxxx>

Reviewed-by: Weiwei Jia <harryxiyou@xxxxxxxxx>

> ---
> Documentation/zh_CN/arm64/booting.txt | 93 ++++++++++++++++++++++-------------
> 1 file changed, 58 insertions(+), 35 deletions(-)
>
> diff --git a/Documentation/zh_CN/arm64/booting.txt b/Documentation/zh_CN/arm64/booting.txt
> index 7cd36af..1145bf8 100644
> --- a/Documentation/zh_CN/arm64/booting.txt
> +++ b/Documentation/zh_CN/arm64/booting.txt
> @@ -6,8 +6,9 @@ communicating in English you can also ask the Chinese maintainer for
> help. Contact the Chinese maintainer if this translation is outdated
> or if there is a problem with the translation.
>
> -Maintainer: Will Deacon <will.deacon@xxxxxxx>
> -Chinese maintainer: Fu Wei <wefu@xxxxxxxxxx>
> +M: Will Deacon <will.deacon@xxxxxxx>
> +zh_CN: Fu Wei <wefu@xxxxxxxxxx>
> +C: 1926e54f115725a9248d0c4c65c22acaf94de4c4
> ---------------------------------------------------------------------
> Documentation/arm64/booting.txt çäæçè
>
> @@ -15,12 +16,11 @@ Documentation/arm64/booting.txt çäæçè
> äææåéçèïäåäåäæççæèæåãåææçèææäåææèç
> èååééïèèçäæççæèã
>
> -ææçèæäæç Git æåçäï bc465aa9d045feb0e13b4a8f32cc33c1943f62d6
> -
> èæççæèï Will Deacon <will.deacon@xxxxxxx>
> äæççæèï åç Fu Wei <wefu@xxxxxxxxxx>
> äæççèèï åç Fu Wei <wefu@xxxxxxxxxx>
> äæçæèèï åç Fu Wei <wefu@xxxxxxxxxx>
> +ææçèæäæç Git æåçäï 1926e54f115725a9248d0c4c65c22acaf94de4c4
>
> äääææ
> ---------------------------------------------------------------------
> @@ -33,9 +33,9 @@ Documentation/arm64/booting.txt çäæçè
> æææåä Russell King ç ARM ååææïäéçäææååååç
> AArch64 Linux åæäçã
>
> -AArch64 ååæåçåäååçåïEL0 - EL3ïçæïåä EL0 å EL1
> -ååçæååçåååéååæåãEL2 æçççççïääååä
> -éååæåäãEL3 ææéçæçïääååäååæåäã
> +AArch64 ååæåçåäååçïEL0 - EL3ïçæïåä EL0 å EL1 ååç
> +æååçåååéååæåãEL2 æçççççïääååäéååæåäã
> +EL3 ææéçæçïääååäååæåäã
>
> åäæææçççïæäåçååäçâååèèçåâïâboot loaderâï
> èäæèæåäååæåæäç Linux åæå CPU äæèçææèäã
> @@ -56,9 +56,9 @@ AArch64 ååæåçåäååçåïEL0 - EL3ïçæïåä EL0 å
> åèæ: åå
>
> ååèèçååèæåååååççäææåæçääæççåéææç RAMã
> -èäæäçæèæèåäèçãïååèäçåéçææèååäåèçææ
> -RAMïæåèäçåèäèååçç RAM äæïèåèäçääååèèçå
> -èèèæåçåéææãï
> +èäæäçæèæååèåèåãïååèäçåéçææèååäåèçææ
> +RAMïæåèäçåèäèååçç RAM äæïèåèæååèèçåèèè
> +æåçääåéçææãï
>
>
> 2ãèçèåæææ
> @@ -66,10 +66,12 @@ RAMïæåèäçåèäèååçç RAM äæïèåèäçää
>
> åèæ: åå
>
> -èåæææåïdtbïåé 8 åèåéïåäääåææåèåçèçää 512MB
> -åïääåèè 2MB åéèçãèäååæåäéèååéèäçåäèæèçæ
> -æåæææåã
> +èåæææåïdtbïåé 8 åèåéïäååäèèè 2MBãçäèåæ
> +ææåååäèçåçæåää 2MB çåèæåïæåäèèçäåäæ
> +çååæèæåç 2MB åååã
>
> +æï v4.2 äåççæåæèæèåæææåèçääåææåää
> +text_offset åèåçèçää 512MB åã
>
> 3ãèååææå
> -------------
> @@ -78,7 +80,7 @@ RAMïæåèäçåèäèååçç RAM äæïèåèäçää
>
> AArch64 åæååæææäèèåäçïåæåæäçäåçåææåæä
> ïæå Image.gzïïåéèéèååèèçåïäç gzip çïæèèèåã
> -èååèèçåææåçèäéæïåèäçéåçåææåæäã
> +èååèèçåææåçèäåèïåèäçéåçåææåæäã
>
>
> 4ãèçåææå
> @@ -97,7 +99,7 @@ AArch64 åæååæææäèèåäçïåæåæäçäåçå
> u64 res3 = 0; /* äç */
> u64 res4 = 0; /* äç */
> u32 magic = 0x644d5241; /* éæ, åç, "ARM\x64" */
> - u32 res5; /* äç ïçä PE COFF åçï */
> + u32 res5; /* äç ïçä PE COFF åçï */
>
>
> æååæéï
> @@ -107,26 +109,36 @@ AArch64 åæååæææäèèåäçïåæåæäçäåçå
> - code0/code1 èèèèå stext.
>
> - åéè EFI ååæï æå code0/code1 èèèã
> - res5 æå PE æäåçåçïè PE æäååæ EFI çååååç ïefi_stub_entryïã
> - å stub äçåæäåçäåïåäèèå code0 ççæåçååæçã
> + res5 æå PE æäåçåçïè PE æäååæ EFI çååååç
> + ïefi_stub_entryïãå stub äçåæäåçäåïåäèèå code0
> + ççæåçååæçã
>
> - v3.17 äåïææçæå text_offset çåèåãææïimage_size äéï
> ä text_offset äçåæåèåä 0x80000ã
> - å image_size ééïtext_offset äåçæåäæææåïåèåååèçåäçã
> - å image_size äéïtext_offset åååä 0x80000ã
> + å image_size ééïtext_offset äåçæåäæææåïåèåååè
> + çåäçãå image_size äéïtext_offset åååä 0x80000ã
>
> - flags å (v3.17 åå) ä 64 äåçæåïåççåäï
> ä 0: åæåèåã 1 èçåçæåï0 èçåçæåã
> - ä 1-63: äçã
> -
> -- å image_size äéæïååèèçååèèåååææåæåäåååèååäççéåå
> - äåæçæäçãåååçéçéæéåæéåçåæçæèå, äæåééåã
> -
> -åææååéèæçåéèåçççååèåç 2MB åéäååç text_offset åèåïåäééèèçã
> -ååïå Linux æèåæååääçååæææäççïåæåçåèåççååçèåääèäååã
> -äæåèåååçèïæååéäåæéæå image_size åèççéã
> -
> -ääæäçåæçååïçèå 2MB åéçåååäåïïèæäåæäæèääç
> + ä 1-2: åæéååã
> + 0 - ææåã
> + 1 - 4K
> + 2 - 16K
> + 3 - 64K
> + ä 3-63: äçã
> +
> +- å image_size äéæïååèèçååèåååææåæåäåååè
> + ååäççéååäåæçæäçãåååçéçéæéåæéåçåæ
> + çæèå, åæåééåã
> +
> +åææååéèæçåéèåçççååèåç 2MB åéäååç
> +text_offset åèåïåäèåèèçãååïå Linux æèåæååääç
> +ååæææäççïåæåçåèåççååçèåääèäååã2MB åé
> +ååååææåèåååäéçåååäåææèææçææäïäåèè
> +çäåäççã
> +äæåèåååçèïæååéåå image_size åèççéååäåæäçã
> +
> +ääæäçåæçååïçèåæåèåååäåïïèæäåæäæèääç
> (ååèåæïdtbïç memreserve ååïïéåèèäååææåçã
>
> åèèååæåïåéçåääçæï
> @@ -147,13 +159,16 @@ AArch64 åæååæææäèèåäçïåæåæäçäåçå
>
> - ééçåãMMU
> MMU åéåéã
> - æäçåååæåééåäã
> + æäçåååæåéçåã
> åèåçåææåççåååååéèæçïäèåçåäèæçïPoCïã
> - åååçççåæåääèçåçäèæäæåæïéåéäçèæååçæåçåïèé set/way æäã
> + åååçççåæåääèçåçäèæäæåæïéåéäçèæåå
> + çæåçåïèé set/way æäã
> éäéèèæååæäçæææçåççççååéèéçïååäèäèã
> - èäéèèæååæäçæææçåççççåïäæèïïåéèéçäççã
> + èäéèèæååæäçæææçåççççåïäæèïïåéèéçä
> + ççã
>
> - *èèæïåä PoC äåçåçåååïèåè ARMv8 ææåèæå ARM DDI 0487A
> + *èèæïåä PoC äåçåçåååïèåè ARMv8 ææåèæå
> + ARM DDI 0487A
>
> - ææèæå
> CNTFRQ åéèåäèæåçéçïä CNTVOFF åéèåäåææ CPU
> @@ -169,13 +184,21 @@ AArch64 åæååæææäèèåäçïåæåæäçäåçå
> åèååææåçååçäïææææäååçççååååééèèä
> åääæéçååçåäåååïäéæå æç çæäèèã
>
> - åäææ GICv3 äææååçççï
> - - èååå EL3 ï
> + åäææ GICv3 äææåååä v3 æåèèçççï
> + - åæ EL3 ååï
> ICC_SRE_EL3.Enable (ä 3) åéåååä 0b1ã
> ICC_SRE_EL3.SRE (ä 0) åéåååä 0b1ã
> - èåæèèå EL1ï
> ICC_SRE_EL2.Enable (ä 3) åéåååä 0b1ã
> ICC_SRE_EL2.SRE (ä 0) åéåååä 0b1ã
> + - èåæïDTïæ ACPI èåéæèää GICv3 äææååã
> +
> + åäææ GICv3 äææåååäååïv2ïæåèèçççï
> + - åæ EL3 ååï
> + ICC_SRE_EL3.SRE (ä 0) åéåååä 0b0ã
> + - èåæèèå EL1ï
> + ICC_SRE_EL2.SRE (ä 0) åéåååä 0b0ã
> + - èåæïDTïæ ACPI èåéæèää GICv2 äææååã
>
> ääåä CPU æåãééçåãMMUãææèæåãäèæãççåååç
> åèæäæèéçäææ CPUãææ CPU åéååäååçåèååæã
> --
> 2.5.0
>