Pull EFI fix from Thomas Gleixner: "A single fix for a EFI mixed mode regression caused by recent rework which did not take the firmware bitwidth into account" * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi-stub: Fix get_efi_config_table on mixed-mode setups
Unified · Split
| @@ -927,17 +927,33 @@ fail: · 926 unmodified lines | |||
| 927 | return status; | 927 | return status; |
| 928 | } | 928 | } |
| 929 | 929 | ||
| 930 | #define GET_EFI_CONFIG_TABLE(bits) \ | ||
| 931 | static void *get_efi_config_table##bits(efi_system_table_t *_sys_table, \ | ||
| 932 | efi_guid_t guid) \ | ||
| 933 | { \ | ||
| 934 | efi_system_table_##bits##_t *sys_table; \ | ||
| 935 | efi_config_table_##bits##_t *tables; \ | ||
| 936 | int i; \ | ||
| 937 | \ | ||
| 938 | sys_table = (typeof(sys_table))_sys_table; \ | ||
| 939 | tables = (typeof(tables))(unsigned long)sys_table->tables; \ | ||
| 940 | \ | ||
| 941 | for (i = 0; i < sys_table->nr_tables; i++) { \ | ||
| 942 | if (efi_guidcmp(tables[i].guid, guid) != 0) \ | ||
| 943 | continue; \ | ||
| 944 | \ | ||
| 945 | return (void *)(unsigned long)tables[i].table; \ | ||
| 946 | } \ | ||
| 947 | \ | ||
| 948 | return NULL; \ | ||
| 949 | } | ||
| 950 | GET_EFI_CONFIG_TABLE(32) | ||
| 951 | GET_EFI_CONFIG_TABLE(64) | ||
| 952 | |||
| 930 | void *get_efi_config_table(efi_system_table_t *sys_table, efi_guid_t guid) | 953 | void *get_efi_config_table(efi_system_table_t *sys_table, efi_guid_t guid) |
| 931 | { | 954 | { |
| 932 | efi_config_table_t *tables = (efi_config_table_t *)sys_table->tables; | 955 | if (efi_is_64bit()) |
| 933 | int i; | 956 | return get_efi_config_table64(sys_table, guid); |
| 934 | 957 | else | |
| 935 | for (i = 0; i < sys_table->nr_tables; i++) { | 958 | return get_efi_config_table32(sys_table, guid); |
| 936 | if (efi_guidcmp(tables[i].guid, guid) != 0) | ||
| 937 | continue; | ||
| 938 | |||
| 939 | return (void *)tables[i].table; | ||
| 940 | } | ||
| 941 | |||
| 942 | return NULL; | ||
| 943 | } | 959 | } |