Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix minor build issue and add support new SPCR field semantics #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArthurHeymans wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix minor build issue and add support new SPCR field semantics #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea843f5
acpi/spcr: Update supported port types
ArthurHeymans Jun 29, 2023
827ae68
acpi/scpr: spcr->interrupt_type == 0 is valid
ArthurHeymans Jun 29, 2023
5ece138
Fix gcc -Werror=enum-int-mismatch
ArthurHeymans Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 44 additions & 9 deletions src/acpi/spcr/spcr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,42 @@ static int spcr_test1(fwts_framework *fw)
str = "16550 compatible";
break;
case 0x01:
str = "16450 compatible";
str = "16550 subset compatible with DBGP Revision 1";
break;
case 0x02:
str = "MAX311xE SPI UART";
break;
case 0x03:
str = "ARM PL011 UART";
break;
case 0x02:
case 0x04 ... 0x0c:
case 0x04:
str = "MSM8x60 (e.g. 8960)";
break;
case 0x05:
str = "Nvidia 16550";
break;
case 0x06:
str = "TI OMAP";
break;
case 0x07:
str = "Reserved (Do not Use)";
reserved = true;
break;
case 0x08:
str = "APM88xxxx";
break;
case 0x09:
str = "MSM8974";
break;
case 0x0a:
str = "SAM5250";
break;
case 0x0b:
str = "Intel USIF";
break;
case 0x0c:
str = "i.MX6";
break;
case 0x0d:
str = "(deprecated) ARM SBSA";
break;
Expand All @@ -122,6 +148,21 @@ static int spcr_test1(fwts_framework *fw)
case 0x10:
str = "BCM2835";
break;
case 0x11:
str = "SDM845 with clock rate of 1.8432 MHz";
break;
case 0x12:
str = "16550-compatible with parameters defined in Generic Address Structure";
break;
case 0x13:
str = "SDM845 with clock rate of 7.372 MHz";
break;
case 0x14:
str = "Intel LPSS";
break;
case 0x15:
str = "RISC-V SBI console (any supported SBI mechanism)";
break;
default:
str = "Reserved";
reserved = true;
Expand All @@ -140,12 +181,6 @@ static int spcr_test1(fwts_framework *fw)
reserved1 = spcr->reserved1[0] + (spcr->reserved1[1] << 8) + (spcr->reserved1[2] << 16);
fwts_acpi_reserved_zero("SPCR", "Reserved1", reserved1, &passed);

if (spcr->interrupt_type == 0) {
passed = false;
fwts_failed(fw, LOG_LEVEL_HIGH,
"SPCRUnknownInterruptType",
"SPCR interrupt type field is zero, expecting support bits to be set");
}
if (spcr->interrupt_type & 0xf0) {
passed = false;
fwts_failed(fw, LOG_LEVEL_HIGH,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/include/fwts_cpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int fwts_cpu_is_Intel(bool *is_intel);
int fwts_cpu_is_AMD(bool *is_amd);
int fwts_cpu_is_Hygon(bool *is_hygon);

int fwts_cpu_has_c1e(void);
fwts_bool fwts_cpu_has_c1e(void);
fwts_cpuinfo_x86 *fwts_cpu_get_info(const int which_cpu);
void fwts_cpu_free_info(fwts_cpuinfo_x86 *cpu);

Expand Down
2 changes: 1 addition & 1 deletion src/lib/include/fwts_memorymap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ typedef struct {
} fwts_memory_map_entry;

int fwts_memory_map_type(fwts_list *memory_map_list, const uint64_t memory);
int fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory);
fwts_bool fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory);
fwts_list *fwts_memory_map_table_load(fwts_framework *fw);
void fwts_memory_map_table_free(fwts_list *memory_map_list);
void fwts_memory_map_table_dump(fwts_framework *fw, fwts_list *memory_map_list);
Expand Down