- Linaro-acpi - lists.linaro.org

by Graeme Gregory

There is only one change in this since V2. It turns out we only have a 2MB window in early boot in which to play with. So move the ACPI blob to within 1M of the FDT putting it inside the window.

11 years, 11 months

1
1
0 0

[PATCH] PROTO: ARM: ACPI: mark ACPI table location as reserved.

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> Reserve the ACPI table location to prevent kernel overwrite. This may fix the issue Al observed with bigger tables. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- drivers/of/fdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index b2c7674..12eb351 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -732,6 +732,8 @@ int __init early_init_dt_scan_acpi(unsigned long node, const char *uname, printk(KERN_DEBUG "acpi: start info is 0x%08lX, %lu bytes\n", pinfo->phys_address, pinfo->size); + memblock_reserve(pinfo->phys_address, pinfo->size); + sig = phys_to_virt(pinfo->phys_address); printk(KERN_DEBUG "acpi: sig is \"%c%c%c%c\"\n", sig[0], sig[1], sig[2], sig[3]); -- 1.7.10.4

11 years, 11 months

1
0
0 0

[PATCH] ACPI: ARM: set OEM ID to correct name in arndale ASL files

by al.stone＠linaro.org

From: Al Stone <ahs3(a)redhat.com> arch/arm/boot/asl/exynos5250-arndale.acpi/*.asl: set OEM ID to SAMSNG arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt.asl: unused, removed Signed-off-by: Al Stone <ahs3(a)redhat.com> --- arch/arm/boot/asl/exynos5250-arndale.acpi/apic.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/asf!.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/bert.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/bgrt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/boot.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/cpep.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/csrt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/dbgp.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/dmar.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/ecdt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/einj.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/erst.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/facp.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/fpdt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/gtdt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/hest.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/hpet.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/ivrs.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/mcfg.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/mchi.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/mpst.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/msct.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/oem0.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/pmtt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/rsdp.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/rsdt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/sbst.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/slic.asl | 4 ++-- arch/arm/boot/asl/exynos5250-arndale.acpi/slit.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/spcr.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/spmi.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/srat.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt.asl | 16 ---------------- arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt0.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/tcpa.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/tpm2.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/uefi.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/waet.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/wdat.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/wddt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/wdrt.asl | 2 +- arch/arm/boot/asl/exynos5250-arndale.acpi/xsdt.asl | 2 +- 43 files changed, 43 insertions(+), 59 deletions(-) delete mode 100644 arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt.asl diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/apic.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/apic.asl index 80582d4..2f4bbd6 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/apic.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/apic.asl @@ -11,7 +11,7 @@ [0004] Table Length : 000000F6 [0001] Revision : 01 [0001] Checksum : B0 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/asf!.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/asf!.asl index a05f924..eb39b24 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/asf!.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/asf!.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000072 [0001] Revision : 10 [0001] Checksum : 0B -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/bert.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/bert.asl index d38cdef..7dc90d8 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/bert.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/bert.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000030 [0001] Revision : 01 [0001] Checksum : 15 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/bgrt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/bgrt.asl index c8af10e..f1c1864 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/bgrt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/bgrt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000038 [0001] Revision : 01 [0001] Checksum : 0D -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/boot.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/boot.asl index 5a567fb..4caf1e0 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/boot.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/boot.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000028 [0001] Revision : 01 [0001] Checksum : 0D -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 06040000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/cpep.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/cpep.asl index c58eac0..f3bbd65 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/cpep.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/cpep.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000034 [0001] Revision : 01 [0001] Checksum : 0F -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/csrt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/csrt.asl index ab43ea5..34217e6 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/csrt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/csrt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 0000014C [0001] Revision : 01 [0001] Checksum : 0D -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/dbgp.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/dbgp.asl index d1a826f..741f47a 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/dbgp.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/dbgp.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000034 [0001] Revision : 01 [0001] Checksum : 1A -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/dmar.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/dmar.asl index e10c8c3..7df438b 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/dmar.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/dmar.asl @@ -11,7 +11,7 @@ [0004] Table Length : 0000008C [0001] Revision : 01 [0001] Checksum : 15 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl index d03b011..6b9c91e 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl @@ -10,7 +10,7 @@ DefinitionBlock ( "dsdt.aml", // output filename "DSDT", // table signature 1, // DSDT compliance revision - "REDHAT", // OEM ID + "SAMSNG", // OEM ID "ARNDALE ", // table ID 0x00000002) // OEM revision { diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/ecdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/ecdt.asl index aae7637..b8d2c28 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/ecdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/ecdt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000042 [0001] Revision : 01 [0001] Checksum : 2D -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/einj.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/einj.asl index e334180..5b794a2 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/einj.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/einj.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000130 [0001] Revision : 01 [0001] Checksum : 09 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/erst.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/erst.asl index 2620a94..0b06a49 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/erst.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/erst.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000230 [0001] Revision : 01 [0001] Checksum : AB -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/facp.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/facp.asl index d1d2fc9..d525d16 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/facp.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/facp.asl @@ -10,7 +10,7 @@ [0004] Table Length : 0000010C [0001] Revision : 05 [0001] Checksum : 18 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/fpdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/fpdt.asl index fcfc708..1e936e4 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/fpdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/fpdt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000064 [0001] Revision : 01 [0001] Checksum : BD -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/gtdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/gtdt.asl index 6bb486c..3820aa0 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/gtdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/gtdt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000050 [0001] Revision : 01 [0001] Checksum : F1 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/hest.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/hest.asl index 7da782a..ed9612d 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/hest.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/hest.asl @@ -11,7 +11,7 @@ [0004] Table Length : 000001D4 [0001] Revision : 01 [0001] Checksum : 20 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/hpet.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/hpet.asl index c150282..4e475f4 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/hpet.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/hpet.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000038 [0001] Revision : 01 [0001] Checksum : 09 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/ivrs.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/ivrs.asl index 9f64314..09fa62c 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/ivrs.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/ivrs.asl @@ -11,7 +11,7 @@ [0004] Table Length : 000000BC [0001] Revision : 01 [0001] Checksum : 87 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/mcfg.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/mcfg.asl index 615d90c..00136e7 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/mcfg.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/mcfg.asl @@ -11,7 +11,7 @@ [0004] Table Length : 0000003C [0001] Revision : 01 [0001] Checksum : 19 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/mchi.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/mchi.asl index d57c52d..ec2bc7f 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/mchi.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/mchi.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000045 [0001] Revision : 01 [0001] Checksum : E4 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 02000715 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/mpst.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/mpst.asl index d9be8f5..0ac3f96 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/mpst.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/mpst.asl @@ -11,7 +11,7 @@ [0004] Table Length : 000000B6 [0001] Revision : 01 [0001] Checksum : 77 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/msct.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/msct.asl index b2bf22f..62fef4f 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/msct.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/msct.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000090 [0001] Revision : 01 [0001] Checksum : B7 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/oem0.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/oem0.asl index 5808009..10a5c9d 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/oem0.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/oem0.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000024 [0001] Revision : 01 [0001] Checksum : 8B -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 0000000A [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/pmtt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/pmtt.asl index e757170..d91b939 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/pmtt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/pmtt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 000000B4 [0001] Revision : 01 [0001] Checksum : 3A -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdp.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdp.asl index a6e827b..0e091a3 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdp.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdp.asl @@ -8,7 +8,7 @@ [0008] Signature : "RSD PTR " [0001] Checksum : 43 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0001] Revision : 02 [0004] RSDT Address : 00000000 [0004] Length : 00000024 diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdt.asl index 4494a43..4bf05ff 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/rsdt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000044 [0001] Revision : 01 [0001] Checksum : 8B -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/sbst.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/sbst.asl index 714b15f..a5eb31c 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/sbst.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/sbst.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000030 [0001] Revision : 01 [0001] Checksum : 06 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/slic.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/slic.asl index df77bf2..a17bcde 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/slic.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/slic.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000176 [0001] Revision : 01 [0001] Checksum : 07 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" @@ -41,7 +41,7 @@ [0004] Length : 000000B6 [0004] Version : 00020000 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0008] Windows Flag : "WINDOWS " [0004] SLIC Version : 00020001 diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/slit.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/slit.asl index 692e065..cc3ea61 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/slit.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/slit.asl @@ -11,7 +11,7 @@ [0004] Table Length : 000001BC [0001] Revision : 01 [0001] Checksum : 00 -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/spcr.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/spcr.asl index 7998ba8..dae146d 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/spcr.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/spcr.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000050 [0001] Revision : 01 [0001] Checksum : E3 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/spmi.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/spmi.asl index 28d6307..a29a9e8 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/spmi.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/spmi.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000041 [0001] Revision : 04 [0001] Checksum : ED -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/srat.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/srat.asl index 2170445..7a25acf 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/srat.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/srat.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000080 [0001] Revision : 03 [0001] Checksum : 5A -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt.asl deleted file mode 100644 index 02d3acc..0000000 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Intel ACPI Component Architecture - * iASL Compiler/Disassembler version 20130117-64 [Jan 31 2013] - * Copyright (c) 2000 - 2013 Intel Corporation - * - * Template for [SSDT] ACPI Table - */ - -DefinitionBlock ("ssdt.aml", "SSDT", 2, "Intel", "Template", 0x00000001) -{ - Method (MAIN, 0, NotSerialized) - { - Return (Zero) - } -} - diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt0.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt0.asl index e2397b8..ebe4875 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt0.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/ssdt0.asl @@ -10,7 +10,7 @@ DefinitionBlock ( "ssdt0.aml", // output filename "SSDT", // table signature 2, // SSDT compliance revision - "REDHAT", // OEM ID + "SAMSNG", // OEM ID "ARNDALE ", // table ID 0x00000001) // OEM revision { diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/tcpa.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/tcpa.asl index cfdfa39..023acb6 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/tcpa.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/tcpa.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000032 [0001] Revision : 01 [0001] Checksum : 67 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00003180 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/tpm2.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/tpm2.asl index 38cc502..1e40916 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/tpm2.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/tpm2.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000034 [0001] Revision : 03 [0001] Checksum : 42 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/uefi.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/uefi.asl index 15585a0..b2e0246 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/uefi.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/uefi.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000036 [0001] Revision : 01 [0001] Checksum : 9B -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/waet.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/waet.asl index b459110..da3b8aa 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/waet.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/waet.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000028 [0001] Revision : 01 [0001] Checksum : 19 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/wdat.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/wdat.asl index e49205a..1e958c9 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/wdat.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/wdat.asl @@ -11,7 +11,7 @@ [0004] Table Length : 0000005C [0001] Revision : 01 [0001] Checksum : E3 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/wddt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/wddt.asl index a0b039e..024f46a 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/wddt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/wddt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000040 [0001] Revision : 01 [0001] Checksum : 00 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000000 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/wdrt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/wdrt.asl index 14453c7..9fc804f 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/wdrt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/wdrt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000047 [0001] Revision : 01 [0001] Checksum : B0 -[0006] Oem ID : "INTEL " +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "TEMPLATE" [0004] Oem Revision : 00000001 [0004] Asl Compiler ID : "INTL" diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/xsdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/xsdt.asl index 057b5dc..295b4ac 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/xsdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/xsdt.asl @@ -11,7 +11,7 @@ [0004] Table Length : 00000064 [0001] Revision : 01 [0001] Checksum : 8B -[0006] Oem ID : "REDHAT" +[0006] Oem ID : "SAMSNG" [0008] Oem Table ID : "ARNDALE " [0004] Oem Revision : 00000014 [0004] Asl Compiler ID : "INTL" -- 1.8.1.4

11 years, 11 months

1
0
0 0

WIP Patch ACPI armv8

by Graeme Gregory

This is just me giving a headsup on the current progress of getting armv7 ACPI prototype stuff into armv8. Currently it can see the linux,acpi-start and linux,acpi-len values passed from bootwrapper but when I try and access the address given by virt_to_phys on that it locks up the model. Thanks Graeme

11 years, 11 months

1
1
0 0

[PATCHv2] Add ACPI blob handling

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> For armv8 ACPI on model before there is bootloader support pass an ACPI blob via the chosen node of the FDT. This is the same method used on armv7 prototype. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- Makefile | 36 +++++++++++++++++++++++++++--------- model.lds.S | 9 +++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 38595a3..6704a69 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,8 @@ GIC_CPU_BASE := 0x2c002000 CNTFRQ := 0x01800000 # 24Mhz #INITRD_FLAGS := -DUSE_INITRD -CPPFLAGS += $(INITRD_FLAGS) +ACPI_FLAGS := -DUSE_ACPI +CPPFLAGS += $(INITRD_FLAGS) $(ACPI_FLAGS) BOOTLOADER := boot.S MBOX_OFFSET := 0xfff8 @@ -30,6 +31,12 @@ FILESYSTEM_START:= $(shell echo $$(($(PHYS_OFFSET) + $(FS_OFFSET)))) FILESYSTEM_SIZE := $(shell stat -Lc %s $(FILESYSTEM) 2>/dev/null || echo 0) FILESYSTEM_END := $(shell echo $$(($(FILESYSTEM_START) + $(FILESYSTEM_SIZE)))) +ACPI := tables.acpi +ACPI_OFFSET := 0xF000000 +ACPI_START := $(shell echo $$(($(PHYS_OFFSET) + $(ACPI_OFFSET)))) +ACPI_SIZE := $(shell stat -Lc %s $(ACPI) 2>/dev/null || echo 0) +ACPI_END := $(shell echo $$(($(ACPI_START) + $(ACPI_SIZE)))) + FDT_SRC := rtsm_ve-aemv8a.dts FDT_INCL_REGEX := $/include/[[:space:]]*"$$[^"]\+$$".*$ FDT_DEPS := $(FDT_SRC) $(addprefix $(dir $(FDT_SRC)), $(shell sed -ne 'sq$(strip $(FDT_INCL_REGEX)q\2q p' < $(FDT_SRC)))) @@ -37,19 +44,30 @@ FDT_OFFSET := 0x08000000 BOOTARGS_COMMON := "console=ttyAMA0 earlyprintk=pl011,0x1c090000 $(BOOTARGS_EXTRA)" +CHOSEN_NODE := chosen { ifneq (,$(findstring USE_INITRD,$(CPPFLAGS))) BOOTARGS := "$(BOOTARGS_COMMON)" -CHOSEN_NODE := chosen { \ - bootargs = \"$(BOOTARGS)\"; \ +CHOSEN_NODE += bootargs = \"$(BOOTARGS)\"; \ linux,initrd-start = <$(FILESYSTEM_START)>; \ - linux,initrd-end = <$(FILESYSTEM_END)>; \ - }; + linux,initrd-end = <$(FILESYSTEM_END)>; + +ifneq (,$(findstring USE_ACPI,$(CPPFLAGS))) +CHOSEN_NODE += linux,acpi-start = <$(ACPI_START)>; \ + linux,acpi-len = <$(ACPI_SIZE)>; +endif + else BOOTARGS := "root=/dev/nfs nfsroot=\<serverip\>:\<rootfs\>,tcp rw ip=dhcp $(BOOTARGS_COMMON)" CHOSEN_NODE := chosen { \ - bootargs = \"$(BOOTARGS)\"; \ - }; + bootargs = \"$(BOOTARGS)\"; + +ifneq (,$(findstring USE_ACPI,$(CPPFLAGS))) +CHOSEN_NODE += linux,acpi-start = <$(ACPI_START)>; \ + linux,acpi-len = <$(ACPI_SIZE)>; +endif + endif +CHOSEN_NODE += }; CROSS_COMPILE ?= aarch64-none-linux-gnu- CC := $(CROSS_COMPILE)gcc @@ -68,14 +86,14 @@ boot.o: $(BOOTLOADER) Makefile $(CC) $(CPPFLAGS) -DCNTFRQ=$(CNTFRQ) -DUART_BASE=$(UART_BASE) -DSYSREGS_BASE=$(SYSREGS_BASE) -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DGIC_CPU_BASE=$(GIC_CPU_BASE) -c -o $@ $(BOOTLOADER) model.lds: $(LD_SCRIPT) Makefile - $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -E -P -C -o $@ $< + $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -DACPI=$(ACPI) -DACPI_OFFSET=$(ACPI_OFFSET) -E -P -C -o $@ $< ifeq ($(DTC),) $(error No dtc found! You can git clone from git://git.jdl.com/software/dtc.git) endif fdt.dtb: $(FDT_DEPS) Makefile - ( echo "/include/ \"$(FDT_SRC)\"" ; echo "/ { $(CHOSEN_NODE) };" ) | $(DTC) -O dtb -o $@ - + ( echo "/include/ \"$(FDT_SRC)\"" ; echo "/ { $(CHOSEN_NODE) };" ) | tee chosen.dts | $(DTC) -O dtb -o $@ - # The filesystem archive might not exist if INITRD is not being used .PHONY: all clean $(FILESYSTEM) diff --git a/model.lds.S b/model.lds.S index ec27433..f8d4683 100644 --- a/model.lds.S +++ b/model.lds.S @@ -15,6 +15,10 @@ INPUT(./boot.o) INPUT(KERNEL) INPUT(./fdt.dtb) +#ifdef USE_ACPI +INPUT(ACPI) +#endif + #ifdef USE_INITRD INPUT(FILESYSTEM) #endif @@ -33,6 +37,11 @@ SECTIONS . = PHYS_OFFSET + FDT_OFFSET; dtb = .; .dtb : { ./fdt.dtb } + . = PHYS_OFFSET + ACPI_OFFSET; + acpi = .; +#ifdef USE_ACPI + .acpi : { ACPI } +#endif . = PHYS_OFFSET + FS_OFFSET; filesystem = .; #ifdef USE_INITRD -- 1.7.10.4

11 years, 11 months

1
1
0 0

[PATCHv2] Add ACPI blob handling

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> For armv8 ACPI on model before there is bootloader support pass an ACPI blob via the chosen node of the FDT. This is the same method used on armv7 prototype. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- Makefile | 36 +++++++++++++++++++++++++++--------- model.lds.S | 9 +++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 38595a3..6704a69 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,8 @@ GIC_CPU_BASE := 0x2c002000 CNTFRQ := 0x01800000 # 24Mhz #INITRD_FLAGS := -DUSE_INITRD -CPPFLAGS += $(INITRD_FLAGS) +ACPI_FLAGS := -DUSE_ACPI +CPPFLAGS += $(INITRD_FLAGS) $(ACPI_FLAGS) BOOTLOADER := boot.S MBOX_OFFSET := 0xfff8 @@ -30,6 +31,12 @@ FILESYSTEM_START:= $(shell echo $$(($(PHYS_OFFSET) + $(FS_OFFSET)))) FILESYSTEM_SIZE := $(shell stat -Lc %s $(FILESYSTEM) 2>/dev/null || echo 0) FILESYSTEM_END := $(shell echo $$(($(FILESYSTEM_START) + $(FILESYSTEM_SIZE)))) +ACPI := tables.acpi +ACPI_OFFSET := 0xF000000 +ACPI_START := $(shell echo $$(($(PHYS_OFFSET) + $(ACPI_OFFSET)))) +ACPI_SIZE := $(shell stat -Lc %s $(ACPI) 2>/dev/null || echo 0) +ACPI_END := $(shell echo $$(($(ACPI_START) + $(ACPI_SIZE)))) + FDT_SRC := rtsm_ve-aemv8a.dts FDT_INCL_REGEX := $/include/[[:space:]]*"$$[^"]\+$$".*$ FDT_DEPS := $(FDT_SRC) $(addprefix $(dir $(FDT_SRC)), $(shell sed -ne 'sq$(strip $(FDT_INCL_REGEX)q\2q p' < $(FDT_SRC)))) @@ -37,19 +44,30 @@ FDT_OFFSET := 0x08000000 BOOTARGS_COMMON := "console=ttyAMA0 earlyprintk=pl011,0x1c090000 $(BOOTARGS_EXTRA)" +CHOSEN_NODE := chosen { ifneq (,$(findstring USE_INITRD,$(CPPFLAGS))) BOOTARGS := "$(BOOTARGS_COMMON)" -CHOSEN_NODE := chosen { \ - bootargs = \"$(BOOTARGS)\"; \ +CHOSEN_NODE += bootargs = \"$(BOOTARGS)\"; \ linux,initrd-start = <$(FILESYSTEM_START)>; \ - linux,initrd-end = <$(FILESYSTEM_END)>; \ - }; + linux,initrd-end = <$(FILESYSTEM_END)>; + +ifneq (,$(findstring USE_ACPI,$(CPPFLAGS))) +CHOSEN_NODE += linux,acpi-start = <$(ACPI_START)>; \ + linux,acpi-len = <$(ACPI_SIZE)>; +endif + else BOOTARGS := "root=/dev/nfs nfsroot=\<serverip\>:\<rootfs\>,tcp rw ip=dhcp $(BOOTARGS_COMMON)" CHOSEN_NODE := chosen { \ - bootargs = \"$(BOOTARGS)\"; \ - }; + bootargs = \"$(BOOTARGS)\"; + +ifneq (,$(findstring USE_ACPI,$(CPPFLAGS))) +CHOSEN_NODE += linux,acpi-start = <$(ACPI_START)>; \ + linux,acpi-len = <$(ACPI_SIZE)>; +endif + endif +CHOSEN_NODE += }; CROSS_COMPILE ?= aarch64-none-linux-gnu- CC := $(CROSS_COMPILE)gcc @@ -68,14 +86,14 @@ boot.o: $(BOOTLOADER) Makefile $(CC) $(CPPFLAGS) -DCNTFRQ=$(CNTFRQ) -DUART_BASE=$(UART_BASE) -DSYSREGS_BASE=$(SYSREGS_BASE) -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DGIC_CPU_BASE=$(GIC_CPU_BASE) -c -o $@ $(BOOTLOADER) model.lds: $(LD_SCRIPT) Makefile - $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -E -P -C -o $@ $< + $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -DACPI=$(ACPI) -DACPI_OFFSET=$(ACPI_OFFSET) -E -P -C -o $@ $< ifeq ($(DTC),) $(error No dtc found! You can git clone from git://git.jdl.com/software/dtc.git) endif fdt.dtb: $(FDT_DEPS) Makefile - ( echo "/include/ \"$(FDT_SRC)\"" ; echo "/ { $(CHOSEN_NODE) };" ) | $(DTC) -O dtb -o $@ - + ( echo "/include/ \"$(FDT_SRC)\"" ; echo "/ { $(CHOSEN_NODE) };" ) | tee chosen.dts | $(DTC) -O dtb -o $@ - # The filesystem archive might not exist if INITRD is not being used .PHONY: all clean $(FILESYSTEM) diff --git a/model.lds.S b/model.lds.S index ec27433..f8d4683 100644 --- a/model.lds.S +++ b/model.lds.S @@ -15,6 +15,10 @@ INPUT(./boot.o) INPUT(KERNEL) INPUT(./fdt.dtb) +#ifdef USE_ACPI +INPUT(ACPI) +#endif + #ifdef USE_INITRD INPUT(FILESYSTEM) #endif @@ -33,6 +37,11 @@ SECTIONS . = PHYS_OFFSET + FDT_OFFSET; dtb = .; .dtb : { ./fdt.dtb } + . = PHYS_OFFSET + ACPI_OFFSET; + acpi = .; +#ifdef USE_ACPI + .acpi : { ACPI } +#endif . = PHYS_OFFSET + FS_OFFSET; filesystem = .; #ifdef USE_INITRD -- 1.7.10.4

11 years, 11 months

1
0
0 0

[PATCH] Add ACPI blob handling

by Graeme Gregory

From: Graeme Gregory <graeme.gregory(a)linaro.org> For armv8 ACPI on model before there is bootloader support pass an ACPI blob via the chosen node of the FDT. This is the same method used on armv7 prototype. Signed-off-by: Graeme Gregory <graeme.gregory(a)linaro.org> --- Makefile | 36 +++++++++++++++++++++++++++--------- model.lds.S | 9 +++++++++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 38595a3..11182a0 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,8 @@ GIC_CPU_BASE := 0x2c002000 CNTFRQ := 0x01800000 # 24Mhz #INITRD_FLAGS := -DUSE_INITRD -CPPFLAGS += $(INITRD_FLAGS) +ACPI_FLAGS := -DUSE_ACPI +CPPFLAGS += $(INITRD_FLAGS) $(ACPI_FLAGS) BOOTLOADER := boot.S MBOX_OFFSET := 0xfff8 @@ -30,6 +31,12 @@ FILESYSTEM_START:= $(shell echo $$(($(PHYS_OFFSET) + $(FS_OFFSET)))) FILESYSTEM_SIZE := $(shell stat -Lc %s $(FILESYSTEM) 2>/dev/null || echo 0) FILESYSTEM_END := $(shell echo $$(($(FILESYSTEM_START) + $(FILESYSTEM_SIZE)))) +ACPI := tables.acpi +ACPI_OFFSET := 0xF000000 +ACPI_START := $(shell echo $$(($(PHYS_OFFSET) + ($ACPI_OFFSET)))) +ACPI_SIZE := $(shell stat -Lc %s $(ACPI) 2>/dev/null || echo 0) +ACPI_END := $(shell echo $$(($(ACPI_START) + $(ACPI_SIZE)))) + FDT_SRC := rtsm_ve-aemv8a.dts FDT_INCL_REGEX := $/include/[[:space:]]*"$$[^"]\+$$".*$ FDT_DEPS := $(FDT_SRC) $(addprefix $(dir $(FDT_SRC)), $(shell sed -ne 'sq$(strip $(FDT_INCL_REGEX)q\2q p' < $(FDT_SRC)))) @@ -37,19 +44,30 @@ FDT_OFFSET := 0x08000000 BOOTARGS_COMMON := "console=ttyAMA0 earlyprintk=pl011,0x1c090000 $(BOOTARGS_EXTRA)" +CHOSEN_NODE := chosen { ifneq (,$(findstring USE_INITRD,$(CPPFLAGS))) BOOTARGS := "$(BOOTARGS_COMMON)" -CHOSEN_NODE := chosen { \ - bootargs = \"$(BOOTARGS)\"; \ +CHOSEN_NODE += bootargs = \"$(BOOTARGS)\"; \ linux,initrd-start = <$(FILESYSTEM_START)>; \ - linux,initrd-end = <$(FILESYSTEM_END)>; \ - }; + linux,initrd-end = <$(FILESYSTEM_END)>; + +ifneq (,$(findstring USE_ACPI,$(CPPFLAGS))) +CHOSEN_NODE += linux,acpi-start = <$(ACPI_START)>; \ + linux,acpi-len = <$(ACPI_SIZE)>; +endif + else BOOTARGS := "root=/dev/nfs nfsroot=\<serverip\>:\<rootfs\>,tcp rw ip=dhcp $(BOOTARGS_COMMON)" CHOSEN_NODE := chosen { \ - bootargs = \"$(BOOTARGS)\"; \ - }; + bootargs = \"$(BOOTARGS)\"; + +ifneq (,$(findstring USE_ACPI,$(CPPFLAGS))) +CHOSEN_NODE += linux,acpi-start = <$(ACPI_START)>; \ + linux,acpi-len = <$(ACPI_SIZE)>; +endif + endif +CHOSEN_NODE += }; CROSS_COMPILE ?= aarch64-none-linux-gnu- CC := $(CROSS_COMPILE)gcc @@ -68,14 +86,14 @@ boot.o: $(BOOTLOADER) Makefile $(CC) $(CPPFLAGS) -DCNTFRQ=$(CNTFRQ) -DUART_BASE=$(UART_BASE) -DSYSREGS_BASE=$(SYSREGS_BASE) -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DGIC_CPU_BASE=$(GIC_CPU_BASE) -c -o $@ $(BOOTLOADER) model.lds: $(LD_SCRIPT) Makefile - $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -E -P -C -o $@ $< + $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -DACPI=$(ACPI) -DACPI_OFFSET=$(ACPI_OFFSET) -E -P -C -o $@ $< ifeq ($(DTC),) $(error No dtc found! You can git clone from git://git.jdl.com/software/dtc.git) endif fdt.dtb: $(FDT_DEPS) Makefile - ( echo "/include/ \"$(FDT_SRC)\"" ; echo "/ { $(CHOSEN_NODE) };" ) | $(DTC) -O dtb -o $@ - + ( echo "/include/ \"$(FDT_SRC)\"" ; echo "/ { $(CHOSEN_NODE) };" ) | tee chosen.dts | $(DTC) -O dtb -o $@ - # The filesystem archive might not exist if INITRD is not being used .PHONY: all clean $(FILESYSTEM) diff --git a/model.lds.S b/model.lds.S index ec27433..f8d4683 100644 --- a/model.lds.S +++ b/model.lds.S @@ -15,6 +15,10 @@ INPUT(./boot.o) INPUT(KERNEL) INPUT(./fdt.dtb) +#ifdef USE_ACPI +INPUT(ACPI) +#endif + #ifdef USE_INITRD INPUT(FILESYSTEM) #endif @@ -33,6 +37,11 @@ SECTIONS . = PHYS_OFFSET + FDT_OFFSET; dtb = .; .dtb : { ./fdt.dtb } + . = PHYS_OFFSET + ACPI_OFFSET; + acpi = .; +#ifdef USE_ACPI + .acpi : { ACPI } +#endif . = PHYS_OFFSET + FS_OFFSET; filesystem = .; #ifdef USE_INITRD -- 1.7.10.4

11 years, 11 months

1
0
0 0

[PATCH][RFC] ARM:ACPI: Introduce map_gic_id() to get the apic id

by Hanjun Guo

Introduce map_gic_id() to get the apic id for ARM platform Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/processor_core.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 43363ef..2874fd4 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -90,6 +90,22 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, return 1; } +static int map_gic_id(struct acpi_subtable_header *entry, + u32 acpi_id, int *apic_id) +{ + struct acpi_madt_generic_interrupt *gic = + (struct acpi_madt_generic_interrupt *)entry; + + if (!(gic->flags & ACPI_MADT_ENABLED)) + return 0; + + if (gic->uid != acpi_id) + return 0; + + *apic_id = gic->gic_id; + return 1; +} + static int map_madt_entry(int type, u32 acpi_id) { unsigned long madt_end, entry; @@ -125,7 +141,10 @@ static int map_madt_entry(int type, u32 acpi_id) } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { if (map_lsapic_id(header, type, acpi_id, &apic_id)) break; - } + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { + if (map_gic_id(header, acpi_id, &apic_id)) + break; + } entry += header->length; } return apic_id; @@ -155,6 +174,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) map_lapic_id(header, acpi_id, &apic_id); } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { map_lsapic_id(header, type, acpi_id, &apic_id); + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { + map_gic_id(header, acpi_id, &apic_id); } exit: @@ -197,7 +218,7 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) } #ifdef CONFIG_ARM - + return apic_id; /* * BOZO: need to abstract this out to have it make sense -- * it's not that ARM has no equivalent, it's that apic_id is -- 1.7.9.5

11 years, 11 months

1
1
0 0

[PATCH 0/5] ARM:ACPI: CPU topology support for ACPI processor driver

by Hanjun Guo

This patch set is about to implement the CPU topology support for ACPI processor driver, which includes the os lever code and the ASL code. both are compiled ok, but not tested on the hardware; For the ACPI processor driver, when cpu is hot added, arch_fix_phys_package_id(), acpi_map_lsapic() and arch_register_cpu() are arch specific; When cpu is hot removed, arch_unregister_cpu()/acpi_unmap_lsapic() is arch specific. arch_register_cpu() will register the logic cpu on sysfs, create topology information interface, and create online/offline interface for cpu hotplug. unregister is doing the reverse. For the ASL part, I implement the proto code for the CPU topology with one physical CPU and two cpu cores. Hanjun Guo (5): ARM:ACPI: introduce arch_fix_phys_package_id() for armv7 ARM:ACPI: move topology_init() to arch/arm/kernel/topology.c ARM:ACPI: introduce arch_register_cpu() and arch_unregister_cpu() ARM:ACPI: remove CONFIG_X86 in processor_driver.c ASL code for CPU topology support for ACPI processor driver arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl | 106 +++++++++++++++++++- arch/arm/include/asm/cpu.h | 6 ++ arch/arm/include/asm/topology.h | 1 + arch/arm/kernel/setup.c | 21 ---- arch/arm/kernel/topology.c | 54 ++++++++++ drivers/acpi/processor_driver.c | 9 -- 6 files changed, 165 insertions(+), 32 deletions(-) -- 1.7.9.5

11 years, 11 months

3
11
0 0

[PATCH 0/5] Prototype i2c bus probe from ACPI

by Graeme Gregory

This patch series implements probing the s3c24xx i2c bus device from ACPI tables. I have included an update to the DSDT for the correct information for I2C0 which is the port connected to the PMIC so is easy to test with i2c tools. On boot I can successfully communicate with the slave at 0x66 on this bus. root@arndale:~# i2cdump -f -y 0 0x66 No size specified (using byte-data access) 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef 00: 03 00 00 00 c0 78 00 01 17 07 01 0e e5 85 4f de ?...?x.???????O? 10: 03 03 03 23 23 23 23 23 23 23 23 23 23 23 23 23 ???############# 20: 23 23 23 23 23 23 23 23 23 23 23 23 23 23 23 00 ###############. 30: 00 45 d9 38 fa 34 00 50 50 50 50 50 50 db 40 00 .E?8?4.PPPPPP?@. 40: 40 40 40 40 40 40 3a 40 00 40 40 40 40 40 40 d9 @@@@@@:@.@@@@@@? 50: 58 70 88 b8 18 58 d8 68 d8 30 98 a8 cc d0 16 1c Xp???X?h?0?????? 60: 28 d4 d4 d4 cc cc c8 2c d4 d4 ec d4 d4 c8 d4 e8 (??????,???????? 70: 28 2c 2c 2c 32 28 2c 08 14 14 14 00 00 00 00 00 (,,,2(,????..... 80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 90: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ e0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ?............... f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ can see the correct IRQ allocated root@arndale:~# cat /proc/interrupts CPU0 CPU1 29: 0 0 GIC arch_timer 30: 24177 6574 GIC arch_timer 66: 0 0 GIC dma-pl330.0 67: 0 0 GIC dma-pl330.1 85: 538 0 GIC exynos4210-uart.2 88: 1024 0 GIC LINA0001:00 97: 0 0 GIC exynos-tmu 103: 11813 0 GIC ehci_hcd:usb1, ohci_hcd:usb2 104: 0 0 GIC xhci-hcd:usb3 107: 432 0 GIC dw-mci 109: 67422 0 GIC dw-mci 126: 0 0 GIC drm_mixer 152: 0 0 GIC mct_tick0_irq 153: 0 0 GIC mct_tick1_irq 156: 0 0 GIC dma-pl330.2 347: 0 0 COMBINER mct_comp_irq IPI0: 0 1 CPU wakeup interrupts IPI1: 0 0 Timer broadcast interrupts IPI2: 5233 6766 Rescheduling interrupts IPI3: 0 0 Function call interrupts IPI4: 98 44 Single function call interrupts IPI5: 0 0 CPU stop interrupts IPI6: 0 0 CPU backtrace Err: 0 and can see the correct GPIO allocated. GPIOs 42-45, GPB3: gpio-42 (i2c-bus ) in hi gpio-43 (i2c-bus ) in hi The GPIO allocation is not how it would be in a final implementation as similar to FDT the GPIO providers (like GIC) can be hierachical so you would normally use the device name + offset to locate the correct GPIO. This is very similar to how it works in FDT as well. Thanks Graeme

11 years, 11 months

4
12
0 0

[PATCH 1/1] [RFC] ASL code for CPU topology support for ACPI processor driver

by Hanjun Guo

This is the proto ASL code for CPU topology support. In the code, I not sure about the parking_version, performance_interrupt, parked_address and base_address value of the _MAT Method return buffer. Comments are welcomed! Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl | 106 +++++++++++++++++++- 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl index 0ae1b12..cab32db 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl @@ -14,14 +14,116 @@ DefinitionBlock ( "ARNDALE ", // table ID 0x00000001) // OEM revision { + /* Scope (\_PR) { Processor (CPU0, 0x01, 0x00000410, 0x06) {} Processor (CPU1, 0x02, 0x00000410, 0x06) {} } + */ Scope (\_SB) { - } -} + Device (SCK0) + { + Name (_HID, "ACPI0004") + Name (_UID, 0x00) + Method (_STA, 0, NotSerialized) + { + Return (0x0F) + } + + Device (PRC0) + { + Name (_HID, "ACPI0007") + Name (_UID, 0x00) + + /* CPU0 will be always present */ + Method (_STA, 0, NotSerialized) + { + Return (0x0F) + } + + Name (MAT0, Buffer (0x28) + { + /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* type, len, reserved, gic_id */ + /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* uid, flags */ + /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parking_version, performance_interrupt */ + /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parked_address */ + /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* base_address */ + }) + + Name (MAT1, Buffer (0x28) + { + /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }) + + Method (_MAT, 0, NotSerialized) + { + If (_STA()) + { + Return (MAT0) + } + Else + { + Return (MAT1) + } + } + } + + Device (PRC1) + { + Name (_HID, "ACPI0007") + Name (_UID, 0x01) + Name (STA1, 0x0F) + Method (_STA, 0, NotSerialized) + { + Return (STA1) + } + + Method (_EJ0, 1, NotSerialized) + { + If (LEqual (STA1, 0x0F)) + { + Store (0x00, STA1) + } + } + + Name (MAT0, Buffer (0x28) + { + /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* type, len, reserved, gic_id */ + /* 0008 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, /* uid, flags */ + /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parking_version, performance_interrupt */ + /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parked_address */ + /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* base_address */ + }) + + Name (MAT1, Buffer (0x28) + { + /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, + /* 0008 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, + /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + }) + + Method (_CRS, 0, NotSerialized) + { + If (LEqual (STA1, 0x0F)) + { + Return (MAT0) + } + Else + { + Return (MAT1) + } + } + } + } +} +} -- 1.7.9.5

11 years, 11 months

2
2
0 0

[PATCH 0/4] ARM:ACPI: CPU topology support for ACPI processor driver

by Hanjun Guo

This patch set is about to implement the CPU topology support for ACPI processor driver, it is compiled ok, but not tested on the hardware; This part of the patch set is the os lever code for ACPI processor driver, and ASL code will send out in another patch set. (not finished yet) For the ACPI processor driver, when cpu is hot added, arch_fix_phys_package_id(), acpi_map_lsapic() and arch_register_cpu() are arch specific; When cpu is hot removed, arch_unregister_cpu()/acpi_unmap_lsapic() are arch specific. arch_register_cpu() will register the logic cpu on sysfs, create topology information interface, and create online/offline interface for cpu hotplug. unregister is doing the reverse. Hanjun Guo (4): ARM:ACPI: introduce arch_fix_phys_package_id() for armv7 ARM:ACPI: move topology_init() to arch/arm/kernel/topology.c ARM:ACPI: introduce arch_register_cpu() and arch_unregister_cpu() ARM:ACPI: remove CONFIG_X86 in processor_driver.c arch/arm/include/asm/cpu.h | 6 ++++ arch/arm/include/asm/topology.h | 1 + arch/arm/kernel/setup.c | 21 --------------- arch/arm/kernel/topology.c | 54 +++++++++++++++++++++++++++++++++++++++ drivers/acpi/processor_driver.c | 9 ------ 5 files changed, 61 insertions(+), 30 deletions(-)

11 years, 11 months

2
2
0 0

[PATCH 2/4] ARM:ACPI: move topology_init() to arch/arm/kernel/topology.c

by Hanjun Guo

move topology_init() to where it belongs to. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/arm/kernel/setup.c | 21 --------------------- arch/arm/kernel/topology.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7b3d3d3..b00bb7a 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -859,27 +859,6 @@ void __init setup_arch(char **cmdline_p) #endif } - -static int __init topology_init(void) -{ - int cpu; - -#ifdef CONFIG_NUMA - int node; - for_each_online_node(node) - register_one_node(node); -#endif - - for_each_possible_cpu(cpu) { - struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu); - cpuinfo->cpu.hotpluggable = 1; - register_cpu(&cpuinfo->cpu, cpu); - } - - return 0; -} -subsys_initcall(topology_init); - #ifdef CONFIG_HAVE_PROC_CPU static int __init proc_cpu_init(void) { diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index d951ae2..dcc551f 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -25,6 +25,7 @@ #include <asm/cputype.h> #include <asm/smp_plat.h> #include <asm/topology.h> +#include <asm/cpu.h> /* * cpu power scale management @@ -455,3 +456,23 @@ void __init init_cpu_topology(void) parse_dt_topology(); } + +static int __init topology_init(void) +{ + int cpu; + +#ifdef CONFIG_NUMA + int node; + for_each_online_node(node) + register_one_node(node); +#endif + + for_each_possible_cpu(cpu) { + struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu); + cpuinfo->cpu.hotpluggable = 1; + register_cpu(&cpuinfo->cpu, cpu); + } + + return 0; +} +subsys_initcall(topology_init); -- 1.7.1

11 years, 11 months

1
1
0 0

[PATCH 4/4] ARM:ACPI: remove CONFIG_X86 in processor_driver.c

by Hanjun Guo

Since the fuctions needed by the ACPI processor driver are implemented, just remove CONFIG_X86. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- drivers/acpi/processor_driver.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 0fe57d3..bec717f 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -374,12 +374,9 @@ static int acpi_processor_get_info(struct acpi_device *device) * ensure we get the right value in the "physical id" field * of /proc/cpuinfo */ -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer); if (ACPI_SUCCESS(status)) arch_fix_phys_package_id(pr->id, object.integer.value); -#endif return 0; } @@ -841,13 +838,10 @@ static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr) if (acpi_map_lsapic(handle, &pr->id)) return AE_ERROR; -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ if (arch_register_cpu(pr->id)) { acpi_unmap_lsapic(pr->id); return AE_ERROR; } -#endif /* CPU got hot-plugged, but cpu_data is not initialized yet * Set flag to delay cpu_idle/throttling initialization @@ -881,10 +875,7 @@ static int acpi_processor_handle_eject(struct acpi_processor *pr) "brought the CPU back online\n", pr->id); return -EAGAIN; } -#ifdef CONFIG_X86 - /* BOZO: abstract out? */ arch_unregister_cpu(pr->id); -#endif acpi_unmap_lsapic(pr->id); put_online_cpus(); return (0); -- 1.7.1

11 years, 11 months

1
0
0 0

[PATCH 3/4] ARM:ACPI: introduce arch_register_cpu() and arch_unregister_cpu()

by Hanjun Guo

Introduce arch_register_cpu() and arch_unregister_cpu() for ACPI processor driver. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/arm/include/asm/cpu.h | 6 ++++++ arch/arm/kernel/topology.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/cpu.h b/arch/arm/include/asm/cpu.h index 2744f06..a72f974 100644 --- a/arch/arm/include/asm/cpu.h +++ b/arch/arm/include/asm/cpu.h @@ -12,6 +12,7 @@ #include <linux/percpu.h> #include <linux/cpu.h> +#include <linux/topology.h> struct cpuinfo_arm { struct cpu cpu; @@ -21,6 +22,11 @@ struct cpuinfo_arm { #endif }; +#ifdef CONFIG_HOTPLUG_CPU +extern int arch_register_cpu(int cpu); +extern void arch_unregister_cpu(int cpu); +#endif + DECLARE_PER_CPU(struct cpuinfo_arm, cpu_data); #endif diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index dcc551f..4e03ee4 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -457,6 +457,32 @@ void __init init_cpu_topology(void) parse_dt_topology(); } +#ifdef CONFIG_HOTPLUG_CPU +int __ref arch_register_cpu(int cpu) +{ + struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu); + + /* BSP cann't be taken down on arm */ + if (cpu) + cpuinfo->cpu.hotpluggable = 1; + + return register_cpu(&cpuinfo->cpu, cpu); +} +EXPORT_SYMBOL(arch_register_cpu); + +void arch_unregister_cpu(int cpu) +{ + unregister_cpu(&per_cpu(cpu_data, cpu).cpu); +} +EXPORT_SYMBOL(arch_unregister_cpu); +#else /* CONFIG_HOTPLUG_CPU */ + +static int __init arch_register_cpu(int cpu) +{ + return register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu); +} +#endif /* CONFIG_HOTPLUG_CPU */ + static int __init topology_init(void) { int cpu; @@ -467,11 +493,8 @@ static int __init topology_init(void) register_one_node(node); #endif - for_each_possible_cpu(cpu) { - struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu); - cpuinfo->cpu.hotpluggable = 1; - register_cpu(&cpuinfo->cpu, cpu); - } + for_each_possible_cpu(cpu) + arch_register_cpu(cpu); return 0; } -- 1.7.1

11 years, 11 months

1
0
0 0

[PATCH 1/4] ARM:ACPI: introduce arch_fix_phys_package_id() for armv7

by Hanjun Guo

arch_fix_phys_package_id() will use the slot number provided by ACPI, then we can get the right value in the "physical id" field of /proc/cpuinfo. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- arch/arm/include/asm/topology.h | 1 + arch/arm/kernel/topology.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h index 5357eb1..932b75b 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -27,6 +27,7 @@ void init_cpu_topology(void); void store_cpu_topology(unsigned int cpuid); const struct cpumask *cpu_coregroup_mask(int cpu); int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask); +extern void arch_fix_phys_package_id(int num, u32 slot); #ifdef CONFIG_DISABLE_CPU_SCHED_DOMAIN_BALANCE /* Common values for CPUs */ diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 8df74d6..d951ae2 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -290,6 +290,16 @@ void store_cpu_topology(unsigned int cpuid) cpu_topology[cpuid].socket_id, mpidr); } +void arch_fix_phys_package_id(int num, u32 slot) +{ +#ifdef CONFIG_SMP + struct cputopo_arm *cpuid_topo = &cpu_topology[num]; + + if (cpuid_topo->socket_id == -1) + cpuid_topo->socket_id = slot; +#endif +} +EXPORT_SYMBOL_GPL(arch_fix_phys_package_id); #ifdef CONFIG_SCHED_HMP -- 1.7.1

11 years, 11 months

1
0
0 0

[PATCH 0/2] Add handling of more fields in s3c24xx-i2c

by Graeme Gregory

There were three fields used in the DT version of probing this driver which were not yet in ACPI so handle those fields as well. samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; samsung,i2c-slave-addr = <0x66>; becomes Method (DLAY, 0x0, NotSerialized) { Return (100) } Method (SADD, 0x0, NotSerialized) { Return (0x66) } Method (FREQ, 0x0, NotSerialized) { Return (20000) } Thanks Graeme

11 years, 11 months

1
2
0 0

[PATCH] ACPICA: Remove redundant macro defines for ACPI_DEBUG_PRINT()

by Hanjun Guo

In commit 0377b5acba2 (ACPICA: Merge all debug output macros into a single file, acoutput.), the patch introdices redundant macro defines for ACPI_DEBUG_PRINT() and ACPI_DEBUG_PRINT_RAW(), just remove it. I will send this to upstream. Signed-off-by: Hanjun Guo <hanjun.guo(a)linaro.org> --- include/acpi/acoutput.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h index 4f52ea7..e1c7474 100644 --- a/include/acpi/acoutput.h +++ b/include/acpi/acoutput.h @@ -447,8 +447,6 @@ #define ACPI_DUMP_TABLES(a, b) #define ACPI_DUMP_PATHNAME(a, b, c, d) #define ACPI_DUMP_BUFFER(a, b) -#define ACPI_DEBUG_PRINT(pl) -#define ACPI_DEBUG_PRINT_RAW(pl) #define ACPI_IS_DEBUG_ENABLED(level, component) 0 /* Return macros must have a return statement at the minimum */ -- 1.8.2.1

11 years, 11 months

1
0
0 0

[PATCH 0/1] start to make use of irq domains

by Graeme Gregory

This series is just a start of attaching the ACPI code to the IRQ domain so we map IRQs in a method compatible with FDT booting. Firstly get the GIC to register itself as the default domain. Then change the ARM ACPI code to use default domain to map IRQs. Graeme

11 years, 11 months

1
2
0 0

Patches for Al to help debug memory alloc issue!

by Graeme Gregory

Hi Al, These two patches will give some extra ACPI debug output in u-boot so you can see the start/end of the ACPI address allocation. You can also see the size and physical address of each ram bank. Hopefully this helps you track down the issue. My DSDT changes are not big enough to cross the 0x50000000 boundary yet. Thanks Graeme

11 years, 11 months

2
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-acpi