Linaro-uefi May 2015

linaro-uefi@lists.linaro.org

14 participants
13 discussions

[PATCH] BaseTools: aarch64: add -fno-asynchronous-unwind-tables to cflags

by Leif Lindholm

Some toolchains, at least Fedora GCC, generate inline unwind tables in object files. These confuses GenFw to no end, leading to build failures: GenFw: ERROR 3000: Invalid WriteSections64(): ... unsupported ELF EM_AARCH64 relocation 0x105. GenFw: ERROR 3000: Invalid WriteSections64(): ... unsupported ELF EM_AARCH64 relocation 0x0. I am aware of no current use of these tables, so explicitly disable their generation for aarch64. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- BaseTools/Conf/tools_def.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index f008024..04fdeba 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -3817,7 +3817,7 @@ DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double - DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mword-relocations -mlittle-endian -mabi=aapcs -mapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address +DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mcmodel=large -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address -fno-asynchronous-unwind-tables DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Ttext=0x0 --emit-relocs -nostdlib --gc-sections -u $(IMAGE_ENTRY_POINT) -e $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map -- 2.1.3

8 years, 9 months

[RFC 0/4] New terminal type for Linux

by Roy Franz

This patchset is a follow on to my previous backspace patchse, and adds a new terminal type "LinuxTerm" (for lack of a better name) that better handles the typical Linux terminal (xterm/rxvt/gnome terminal/etc.) These often treat backspace/delete differently than the existing EDK2 terminal types expect, particularly in emulated environments where the emulated serial port is connected to a graphical terminal rather than a serial console. For a description of how Debian has dealt with the terminal backspace/delete/^H mess, see the "Keyboard configuration" section of: https://www.debian.org/doc/debian-policy/ch-opersys.html#s9.8">KeyboardConfiguration I do not think that all Linux distributions agree on all the details, so my goal is to have a terminal defition that mostly works in many configurations. Backspace being broken in these environments is the primary motivation for this, but this terminal type could be exentend to better support the typical graphical terminal now in use. This terminal type may be of use in BSD environments as well, so I'm open to more generic name suggestions. I deliberately avoided calling it "xterm", as my intention is to try to work with multiple terminal types to the degree possible. Roy Franz (4): Add "LinuxTerm" terminal type to TerminalDxe Treat ASCII 0x7F as backspace for LinuxTerm terminal accept [3~ as delete for LinuxTerm terminals Change QEMU terminal type to LinuxTerm .../ArmVirtualizationPkg/ArmVirtualizationQemu.dsc | 4 +- BaseTools/Source/C/Include/Guid/PcAnsi.h | 6 +++ .../Foundation/Efi/Guid/PcAnsi/PcAnsi.c | 2 + .../Foundation/Efi/Guid/PcAnsi/PcAnsi.h | 6 +++ .../Universal/BdsDxe/BootMaint/BootMaint.h | 2 +- .../Universal/BdsDxe/BootMaint/Data.c | 5 ++- .../Universal/Console/TerminalDxe/Terminal.c | 44 ++++++++++++++++---- .../Universal/Console/TerminalDxe/Terminal.h | 2 + .../Universal/Console/TerminalDxe/TerminalConIn.c | 47 ++++++++++++++++++++-- .../Universal/Console/TerminalDxe/TerminalConOut.c | 2 + .../Universal/Console/TerminalDxe/TerminalDxe.inf | 1 + MdePkg/Include/Guid/PcAnsi.h | 6 +++ MdePkg/Include/Protocol/DevicePath.h | 1 + .../Library/UefiDevicePathLib/DevicePathFromText.c | 27 +++++++++++++ .../Library/UefiDevicePathLib/DevicePathToText.c | 3 ++ .../UefiDevicePathLib/UefiDevicePathLib.inf | 2 + ...UefiDevicePathLibOptionalDevicePathProtocol.inf | 4 +- MdePkg/MdePkg.dec | 3 ++ .../UefiHandleParsingLib/UefiHandleParsingLib.c | 1 + .../UefiHandleParsingLib/UefiHandleParsingLib.inf | 1 + 20 files changed, 153 insertions(+), 16 deletions(-) -- 1.9.1

8 years, 10 months

[RFC PATCH] Avoid all Linux /dev/mem accesses when -c is specified

by Roy Franz

Don't try to read the RSDP structure or RSDT/XSDT tables from memory with the -c option. These are now provided as files in /sysfs, and this allows acpidump to function when /dev/mem is not available, which will be the case for Aarch64 servers. Signed-off-by: Roy Franz <roy.franz(a)linaro.org> --- Graeme - all this is tested with your patch, which looks good. It takes care of what acpidump needs from sysfs. Al - this fixes acpidump. Are there other utilities that I need to look at within acpica-tools? This produces almost the same output with/without the "-c" option, with the /sysfs files being used with "-c", with the following differences: * Table address are 0x0 with -c, since we don't get them from the sysfs files * the tables are listed in a different order. I have verified with strace that no /dev/mem accesses are made with "-c". An issue that this patch doesn't address, is what should be the default, and what should be done if /dev/mem is missing, or there but not readable. source/os_specific/service_layers/oslinuxtbl.c | 87 +++++++++++++------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/source/os_specific/service_layers/oslinuxtbl.c b/source/os_specific/service_layers/oslinuxtbl.c index e090a3c..95cc674 100644 --- a/source/os_specific/service_layers/oslinuxtbl.c +++ b/source/os_specific/service_layers/oslinuxtbl.c @@ -686,70 +686,69 @@ OslTableInitialize ( return (AE_OK); } + if (!Gbl_DumpCustomizedTables) + { /* Get RSDP from memory */ - Status = OslLoadRsdp (); - if (ACPI_FAILURE (Status)) - { - return (Status); - } + Status = OslLoadRsdp (); + if (ACPI_FAILURE (Status)) + { + return (Status); + } - /* Get XSDT from memory */ + /* Get XSDT from memory */ - if (Gbl_Rsdp.Revision && !Gbl_DoNotDumpXsdt) - { - if (Gbl_Xsdt) + if (Gbl_Rsdp.Revision && !Gbl_DoNotDumpXsdt) { - free (Gbl_Xsdt); - Gbl_Xsdt = NULL; + if (Gbl_Xsdt) + { + free (Gbl_Xsdt); + Gbl_Xsdt = NULL; + } + + Gbl_Revision = 2; + Status = OslGetBiosTable (ACPI_SIG_XSDT, 0, + ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Xsdt), &Address); + if (ACPI_FAILURE (Status)) + { + return (Status); + } } - Gbl_Revision = 2; - Status = OslGetBiosTable (ACPI_SIG_XSDT, 0, - ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Xsdt), &Address); - if (ACPI_FAILURE (Status)) + /* Get RSDT from memory */ + + if (Gbl_Rsdp.RsdtPhysicalAddress) { - return (Status); + if (Gbl_Rsdt) + { + free (Gbl_Rsdt); + Gbl_Rsdt = NULL; + } + + Status = OslGetBiosTable (ACPI_SIG_RSDT, 0, + ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Rsdt), &Address); + if (ACPI_FAILURE (Status)) + { + return (Status); + } } - } - /* Get RSDT from memory */ + /* Get FADT from memory */ - if (Gbl_Rsdp.RsdtPhysicalAddress) - { - if (Gbl_Rsdt) + if (Gbl_Fadt) { - free (Gbl_Rsdt); - Gbl_Rsdt = NULL; + free (Gbl_Fadt); + Gbl_Fadt = NULL; } - Status = OslGetBiosTable (ACPI_SIG_RSDT, 0, - ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Rsdt), &Address); + Status = OslGetBiosTable (ACPI_SIG_FADT, 0, + ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Fadt), &Gbl_FadtAddress); if (ACPI_FAILURE (Status)) { return (Status); } - } - /* Get FADT from memory */ - - if (Gbl_Fadt) - { - free (Gbl_Fadt); - Gbl_Fadt = NULL; - } - - Status = OslGetBiosTable (ACPI_SIG_FADT, 0, - ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Fadt), &Gbl_FadtAddress); - if (ACPI_FAILURE (Status)) - { - return (Status); - } - - if (!Gbl_DumpCustomizedTables) - { /* Add mandatory tables to global table list first */ - Status = OslAddTableToList (ACPI_RSDP_NAME, 0); if (ACPI_FAILURE (Status)) { -- 1.9.1

8 years, 10 months

FastBoot: Add support for sparse images

by riku.voipio＠linaro.org

From: Riku Voipio <riku.voipio(a)linaro.org> For linaro-uefi: This patch is for Hikey - ArmVExpressFastBoot is obviously the wrong place to implement this, but something is needed now ;) As for proper implementation, it seems AndroidFastbootApp is the right place. This requires changing at least FASTBOOT_PLATFORM_FLASH, adding with a "offset" parameter. Since I'm new to the codebase and conventions, I don't think it make sense for me to try to fit the code for upstream, until I've got instructions from you UEFI team.. Particularly if ABI compatability is needed or it is ok to change the function parameters. Original commit comments: Adds support for current Fastboot Sparse images. Tested to be able to flash both a a small image (60MB) And a large 1.5GB image. The code in it's current form doesn't do many checks, so no defences against corrupt and bad images. That is on todo after the AndroidFastbootApp / ArmVExpressFastBoot code is clear. Cc: Zhangfei Gao <zhangfei.gao(a)linaro.org> Cc: Olivier Martin <olivier.martin(a)arm.com> Signed-off-by: Riku Voipio <riku.voipio(a)linaro.org> --- .../ArmVExpressFastBootDxe/ArmVExpressFastBoot.c | 58 ++++++++++++++++++++-- .../Include/Protocol/AndroidFastbootPlatform.h | 26 ++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c index d35ddab..8888dcd 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c @@ -319,6 +319,11 @@ ArmFastbootPlatformFlashPartition ( FASTBOOT_PARTITION_LIST *Entry; CHAR16 PartitionNameUnicode[60]; BOOLEAN PartitionFound; + SPARSE_HEADER *SparseHeader; + CHUNK_HEADER *ChunkHeader; + UINTN Offset = 0; + UINT32 Chunk; + AsciiStrToUnicodeStr (PartitionName, PartitionNameUnicode); @@ -350,6 +355,22 @@ ArmFastbootPlatformFlashPartition ( return EFI_NOT_FOUND; } + SparseHeader=(SPARSE_HEADER *)Image; + + if (SparseHeader->Magic == SPARSE_HEADER_MAGIC) { + DEBUG ((EFI_D_INFO, "Sparse Magic: 0x%x Major: %d Minor: %d fhs: %d chs: %d bs: %d tbs: %d tcs: %d checksum: %d \n", + SparseHeader->Magic, SparseHeader->MajorVersion, SparseHeader->MinorVersion, SparseHeader->FileHeaderSize, + SparseHeader->ChunkHeaderSize, SparseHeader->BlockSize, SparseHeader->TotalBlocks, + SparseHeader->TotalChunks, SparseHeader->ImageChecksum)); + if (SparseHeader->MajorVersion != 1) { + DEBUG ((EFI_D_ERROR, "Sparse image version %d.%d not supported.\n", + SparseHeader->MajorVersion, SparseHeader->MinorVersion)); + return EFI_INVALID_PARAMETER; + } + + Size = SparseHeader->BlockSize * SparseHeader->TotalBlocks; + } + // Check image will fit on device PartitionSize = (BlockIo->Media->LastBlock + 1) * BlockIo->Media->BlockSize; if (PartitionSize < Size) { @@ -371,9 +392,40 @@ ArmFastbootPlatformFlashPartition ( ); ASSERT_EFI_ERROR (Status); - Status = DiskIo->WriteDisk (DiskIo, MediaId, 0, Size, Image); - if (EFI_ERROR (Status)) { - return Status; + if (SparseHeader->Magic == SPARSE_HEADER_MAGIC) { + Image += SparseHeader->FileHeaderSize; + for (Chunk = 0; Chunk < SparseHeader->TotalChunks; Chunk++) { + UINTN WriteSize; + ChunkHeader = (CHUNK_HEADER *)Image; + DEBUG ((EFI_D_INFO, "Chunk #%d - Type: 0x%x Size: %d TotalSize: %d Offset %d\n", + (Chunk+1), ChunkHeader->ChunkType, ChunkHeader->ChunkSize, + ChunkHeader->TotalSize, Offset)); + Image += sizeof(CHUNK_HEADER); + WriteSize=(SparseHeader->BlockSize) * ChunkHeader->ChunkSize; + switch (ChunkHeader->ChunkType) { + case CHUNK_TYPE_RAW: + DEBUG ((EFI_D_INFO, "Writing %d at Offset %d\n", WriteSize, Offset)); + Status = DiskIo->WriteDisk (DiskIo, MediaId, Offset, WriteSize, Image); + if (EFI_ERROR (Status)) { + return Status; + } + Image+=WriteSize; + break; + case CHUNK_TYPE_DONT_CARE: + break; + case CHUNK_TYPE_CRC32: + break; + default: + DEBUG ((EFI_D_ERROR, "Unknown Chunk Type: 0x%x")); + return EFI_PROTOCOL_ERROR; + } + Offset += WriteSize; + } + } else { + Status = DiskIo->WriteDisk (DiskIo, MediaId, 0, Size, Image); + if (EFI_ERROR (Status)) { + return Status; + } } BlockIo->FlushBlocks(BlockIo); diff --git a/EmbeddedPkg/Include/Protocol/AndroidFastbootPlatform.h b/EmbeddedPkg/Include/Protocol/AndroidFastbootPlatform.h index a9b4aac..d0693c1 100644 --- a/EmbeddedPkg/Include/Protocol/AndroidFastbootPlatform.h +++ b/EmbeddedPkg/Include/Protocol/AndroidFastbootPlatform.h @@ -142,4 +142,30 @@ typedef struct _FASTBOOT_PLATFORM_PROTOCOL { FASTBOOT_PLATFORM_OEM_COMMAND DoOemCommand; } FASTBOOT_PLATFORM_PROTOCOL; +/* See sparse_format.h in AOSP */ +#define SPARSE_HEADER_MAGIC 0xed26ff3a +#define CHUNK_TYPE_RAW 0xCAC1 +#define CHUNK_TYPE_FILL 0xCAC2 +#define CHUNK_TYPE_DONT_CARE 0xCAC3 +#define CHUNK_TYPE_CRC32 0xCAC4 + +typedef struct _SPARSE_HEADER { + UINT32 Magic; + UINT16 MajorVersion; + UINT16 MinorVersion; + UINT16 FileHeaderSize; + UINT16 ChunkHeaderSize; + UINT32 BlockSize; + UINT32 TotalBlocks; + UINT32 TotalChunks; + UINT32 ImageChecksum; +} SPARSE_HEADER; + +typedef struct _CHUNK_HEADER { + UINT16 ChunkType; + UINT16 Reserved1; + UINT32 ChunkSize; + UINT32 TotalSize; +} CHUNK_HEADER; + #endif -- 2.1.4

8 years, 10 months

ArmVirtualizationPkg name change

by Ard Biesheuvel

Hi all, As part of the promotion of the ArmVirtualizationPkg/ to a top-level Tianocore package, we used the opportunity to shorten its name (and other derived names). So the new top level package will be called ArmVirtPkg/. Other occurrences have been shortened as well, e.g., the QEMU platform DSC is now called ArmVirtPkg/ArmVirtQemu.dsc, and the AArch64 targeted build will be created in Build/ArmVirtQemu-AARCH64/ This change is effective immediately: the change has been submitted to the authoritative Subversion server, so the change will be synced to GitHub later today. Regards, Ard.

8 years, 10 months

[RFC PATCH] Avoid all Linux /dev/mem accesses when -c is specified

by Roy Franz

Don't try to read the RSDP structure or RSDT/XSDT tables from memory with the -c option. These are now provided as files in /sysfs, and this allows acpidump to function when /dev/mem is not available, which is the case when booted in UEFI secure boot mode, and also for ARM servers. Signed-off-by: Roy Franz <roy.franz(a)linaro.org> --- This produces almost the same output with/without the "-c" option, with the /sysfs files being used with "-c", with the following differences: * Table address are 0x0 with -c, since we don't get them from the sysfs files * the tables are listed in a different order. This has been tested against the following Linux patch which is being submitted upstream: https://lists.linaro.org/pipermail/linaro-acpi/2015-May/004549.html source/os_specific/service_layers/oslinuxtbl.c | 87 +++++++++++++------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/source/os_specific/service_layers/oslinuxtbl.c b/source/os_specific/service_layers/oslinuxtbl.c index e090a3c..95cc674 100644 --- a/source/os_specific/service_layers/oslinuxtbl.c +++ b/source/os_specific/service_layers/oslinuxtbl.c @@ -686,70 +686,69 @@ OslTableInitialize ( return (AE_OK); } + if (!Gbl_DumpCustomizedTables) + { /* Get RSDP from memory */ - Status = OslLoadRsdp (); - if (ACPI_FAILURE (Status)) - { - return (Status); - } + Status = OslLoadRsdp (); + if (ACPI_FAILURE (Status)) + { + return (Status); + } - /* Get XSDT from memory */ + /* Get XSDT from memory */ - if (Gbl_Rsdp.Revision && !Gbl_DoNotDumpXsdt) - { - if (Gbl_Xsdt) + if (Gbl_Rsdp.Revision && !Gbl_DoNotDumpXsdt) { - free (Gbl_Xsdt); - Gbl_Xsdt = NULL; + if (Gbl_Xsdt) + { + free (Gbl_Xsdt); + Gbl_Xsdt = NULL; + } + + Gbl_Revision = 2; + Status = OslGetBiosTable (ACPI_SIG_XSDT, 0, + ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Xsdt), &Address); + if (ACPI_FAILURE (Status)) + { + return (Status); + } } - Gbl_Revision = 2; - Status = OslGetBiosTable (ACPI_SIG_XSDT, 0, - ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Xsdt), &Address); - if (ACPI_FAILURE (Status)) + /* Get RSDT from memory */ + + if (Gbl_Rsdp.RsdtPhysicalAddress) { - return (Status); + if (Gbl_Rsdt) + { + free (Gbl_Rsdt); + Gbl_Rsdt = NULL; + } + + Status = OslGetBiosTable (ACPI_SIG_RSDT, 0, + ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Rsdt), &Address); + if (ACPI_FAILURE (Status)) + { + return (Status); + } } - } - /* Get RSDT from memory */ + /* Get FADT from memory */ - if (Gbl_Rsdp.RsdtPhysicalAddress) - { - if (Gbl_Rsdt) + if (Gbl_Fadt) { - free (Gbl_Rsdt); - Gbl_Rsdt = NULL; + free (Gbl_Fadt); + Gbl_Fadt = NULL; } - Status = OslGetBiosTable (ACPI_SIG_RSDT, 0, - ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Rsdt), &Address); + Status = OslGetBiosTable (ACPI_SIG_FADT, 0, + ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Fadt), &Gbl_FadtAddress); if (ACPI_FAILURE (Status)) { return (Status); } - } - /* Get FADT from memory */ - - if (Gbl_Fadt) - { - free (Gbl_Fadt); - Gbl_Fadt = NULL; - } - - Status = OslGetBiosTable (ACPI_SIG_FADT, 0, - ACPI_CAST_PTR (ACPI_TABLE_HEADER *, &Gbl_Fadt), &Gbl_FadtAddress); - if (ACPI_FAILURE (Status)) - { - return (Status); - } - - if (!Gbl_DumpCustomizedTables) - { /* Add mandatory tables to global table list first */ - Status = OslAddTableToList (ACPI_RSDP_NAME, 0); if (ACPI_FAILURE (Status)) { -- 1.9.1

8 years, 10 months

[[edk2][PATCHv2]] ArmPkg: Generic Watchdog address map

by Jayanthi A

Modify generic watchdog base address type to 64 bit PCD to allow platforms to map generic watchdog in 64bit address space and replace FixedPcdGet32 with FixedPcdGet64. Signed-off-by: Jayanthi A <jayanthi.annadurai(a)broadcom.com> --- ArmPkg/ArmPkg.dec | 4 ++-- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h | 8 ++++---- ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 7ca80a1..b5cdd49 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -238,8 +238,8 @@ # ARM Generic Watchdog # - gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x2A440000|UINT32|0x00000007 - gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT32|0x00000008 + gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x2A440000|UINT64|0x00000007 + gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT64|0x00000008 gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|93|UINT32|0x00000009 # diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h index 578fd1e..6641b9e 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h @@ -15,12 +15,12 @@ #define __GENERIC_WATCHDOG_H__ // Refresh Frame: -#define GENERIC_WDOG_REFRESH_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogRefreshBase) + 0x000) +#define GENERIC_WDOG_REFRESH_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogRefreshBase) + 0x000) // Control Frame: -#define GENERIC_WDOG_CONTROL_STATUS_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x000) -#define GENERIC_WDOG_OFFSET_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x008) -#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x010) +#define GENERIC_WDOG_CONTROL_STATUS_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x000) +#define GENERIC_WDOG_OFFSET_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x008) +#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x010) // Values of bit 0 of the Control/Status Register #define GENERIC_WDOG_ENABLED 1 diff --git a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc index 49d6e8e..441f4fa 100644 --- a/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc +++ b/ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc @@ -89,9 +89,9 @@ }, { EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( - FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 93, 0), + FixedPcdGet64 (PcdGenericWatchdogRefreshBase), FixedPcdGet64 (PcdGenericWatchdogControlBase), 93, 0), EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( - FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER) + FixedPcdGet64 (PcdGenericWatchdogRefreshBase), FixedPcdGet64 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER) } }; #endif -- 2.1.0

8 years, 11 months

[[edk2][PATCHv1] 0/2] ArmPkg: Generic Watchdog address

by Jayanthi A

Add support to map generic watchdog in 64 bit address space. v0 --> v1 Replace FixedPcdGet32 with FixedPcdGet64 in ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc to read the 64 bit base address of generic watchdog control and refresh frame. Jayanthi A (2): ArmPkg: Generic Watchdog address map ArmPlatformPkg: Replace FixedPcdGet32 with FixedPcdGet64 ArmPkg/ArmPkg.dec | 4 ++-- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h | 8 ++++---- ArmPlatformPkg/ArmJunoPkg/AcpiTables/Gtdt.aslc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.1.0

8 years, 11 months

[[edk2][PATCHv0]] ArmPkg: Generic Watchdog address map

by Jayanthi A

Modify generic watchdog base address type to 64 bit PCD to allow platforms to map generic watchdog in 64bit address space. Signed-off-by: Jayanthi A <jayanthi.annadurai(a)broadcom.com> --- ArmPkg/ArmPkg.dec | 4 ++-- ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 7ca80a1..b5cdd49 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -238,8 +238,8 @@ # ARM Generic Watchdog # - gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x2A440000|UINT32|0x00000007 - gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT32|0x00000008 + gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x2A440000|UINT64|0x00000007 + gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x2A450000|UINT64|0x00000008 gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|93|UINT32|0x00000009 # diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h index 578fd1e..6641b9e 100644 --- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h +++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdog.h @@ -15,12 +15,12 @@ #define __GENERIC_WATCHDOG_H__ // Refresh Frame: -#define GENERIC_WDOG_REFRESH_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogRefreshBase) + 0x000) +#define GENERIC_WDOG_REFRESH_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogRefreshBase) + 0x000) // Control Frame: -#define GENERIC_WDOG_CONTROL_STATUS_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x000) -#define GENERIC_WDOG_OFFSET_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x008) -#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINT32)FixedPcdGet32 (PcdGenericWatchdogControlBase) + 0x010) +#define GENERIC_WDOG_CONTROL_STATUS_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x000) +#define GENERIC_WDOG_OFFSET_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x008) +#define GENERIC_WDOG_COMPARE_VALUE_REG ((UINT64)FixedPcdGet64 (PcdGenericWatchdogControlBase) + 0x010) // Values of bit 0 of the Control/Status Register #define GENERIC_WDOG_ENABLED 1 -- 2.1.0

8 years, 11 months

[PATCH] Treat ASCII DEL (0x7f) as backspace

by Roy Franz

Most Linux terminal emulators use ASCII 0x7f (^?) for backspace, rather than 0x08 (^H) since ^H is used by some programs for other purposes, such as help menus. This results in backspace not working in most Linux environments, particularly in emulated environments such as QEMU where telnet or xterm may be used to connect to the emulated UART. While in some cases this can be configured in the terminal emulator, it must be done on every connection, as if permently configured this will break all other uses of the terminal. This change causes both ASCII 0x08 and 0x7F to be treated as backspace. This provides a working backspace when tested with minicom, screen, telnet, and xterm under Linux. I also tested teraterm and hyperterm under Windows connecting via rs232, and saw no regressions. (The delete key doesn't work on hyperterm both before and after the change) This change removes the ASCII encoding for delete, however this did not cause regressions on any tested terminal emulators as they do not use the ASCII encoding for the delete key. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Roy Franz <roy.franz(a)linaro.org> --- MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c index 4a008c9..c92d3d4 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c @@ -1212,6 +1212,14 @@ UnicodeToEfiKey ( switch (TerminalDevice->InputState) { case INPUT_STATE_DEFAULT: + switch (UnicodeChar) { + case 0x7f: + UnicodeChar = CHAR_BACKSPACE; + break; + default : + break; + } + break; case INPUT_STATE_ESC: -- 1.9.1

8 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-uefi May 2015