tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

efi: switch to use new generic UUID API

There are new types and helpers that are supposed to be used in new code.

As a preparation to get rid of legacy types and API functions do
the conversion here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Andy Shevchenko and committed by
Christoph Hellwig c0020756 14ccee78

+54 -54
unified split
+5 -5
drivers/firmware/efi/cper.c
··· 534 534 cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata, 535 535 int sec_no) 536 536 { 537 - uuid_le *sec_type = (uuid_le *)gdata->section_type; 537 + guid_t *sec_type = (guid_t *)gdata->section_type; 538 538 __u16 severity; 539 539 char newpfx[64]; 540 540 ··· 545 545 printk("%s""Error %d, type: %s\n", pfx, sec_no, 546 546 cper_severity_str(severity)); 547 547 if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID) 548 - printk("%s""fru_id: %pUl\n", pfx, (uuid_le *)gdata->fru_id); 548 + printk("%s""fru_id: %pUl\n", pfx, gdata->fru_id); 549 549 if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT) 550 550 printk("%s""fru_text: %.20s\n", pfx, gdata->fru_text); 551 551 552 552 snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP); 553 - if (!uuid_le_cmp(*sec_type, CPER_SEC_PROC_GENERIC)) { 553 + if (guid_equal(sec_type, &CPER_SEC_PROC_GENERIC)) { 554 554 struct cper_sec_proc_generic *proc_err = acpi_hest_get_payload(gdata); 555 555 556 556 printk("%s""section_type: general processor error\n", newpfx); ··· 558 558 cper_print_proc_generic(newpfx, proc_err); 559 559 else 560 560 goto err_section_too_small; 561 - } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) { 561 + } else if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) { 562 562 struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); 563 563 564 564 printk("%s""section_type: memory error\n", newpfx); ··· 568 568 gdata->error_data_length); 569 569 else 570 570 goto err_section_too_small; 571 - } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) { 571 + } else if (guid_equal(sec_type, &CPER_SEC_PCIE)) { 572 572 struct cper_sec_pcie *pcie = acpi_hest_get_payload(gdata); 573 573 574 574 printk("%s""section_type: PCIe error\n", newpfx);
+47 -47
include/linux/cper.h
··· 74 74 * Corrected Machine Check 75 75 */ 76 76 #define CPER_NOTIFY_CMC \ 77 - UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \ 78 - 0xEB, 0xD4, 0xF8, 0x90) 77 + GUID_INIT(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \ 78 + 0xEB, 0xD4, 0xF8, 0x90) 79 79 /* Corrected Platform Error */ 80 80 #define CPER_NOTIFY_CPE \ 81 - UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \ 82 - 0xF2, 0x7E, 0xBE, 0xEE) 81 + GUID_INIT(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \ 82 + 0xF2, 0x7E, 0xBE, 0xEE) 83 83 /* Machine Check Exception */ 84 84 #define CPER_NOTIFY_MCE \ 85 - UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \ 86 - 0xE1, 0x49, 0x13, 0xBB) 85 + GUID_INIT(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \ 86 + 0xE1, 0x49, 0x13, 0xBB) 87 87 /* PCI Express Error */ 88 88 #define CPER_NOTIFY_PCIE \ 89 - UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \ 90 - 0xAF, 0x67, 0xC1, 0x04) 89 + GUID_INIT(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \ 90 + 0xAF, 0x67, 0xC1, 0x04) 91 91 /* INIT Record (for IPF) */ 92 92 #define CPER_NOTIFY_INIT \ 93 - UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \ 94 - 0xD3, 0x9B, 0xC9, 0x8E) 93 + GUID_INIT(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \ 94 + 0xD3, 0x9B, 0xC9, 0x8E) 95 95 /* Non-Maskable Interrupt */ 96 96 #define CPER_NOTIFY_NMI \ 97 - UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \ 98 - 0x85, 0xD6, 0xE9, 0x8A) 97 + GUID_INIT(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \ 98 + 0x85, 0xD6, 0xE9, 0x8A) 99 99 /* BOOT Error Record */ 100 100 #define CPER_NOTIFY_BOOT \ 101 - UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \ 102 - 0xD4, 0x64, 0xB3, 0x8F) 101 + GUID_INIT(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \ 102 + 0xD4, 0x64, 0xB3, 0x8F) 103 103 /* DMA Remapping Error */ 104 104 #define CPER_NOTIFY_DMAR \ 105 - UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \ 106 - 0x72, 0x2D, 0xEB, 0x41) 105 + GUID_INIT(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \ 106 + 0x72, 0x2D, 0xEB, 0x41) 107 107 108 108 /* 109 109 * Flags bits definitions for flags in struct cper_record_header ··· 170 170 * Processor Generic 171 171 */ 172 172 #define CPER_SEC_PROC_GENERIC \ 173 - UUID_LE(0x9876CCAD, 0x47B4, 0x4bdb, 0xB6, 0x5E, 0x16, 0xF1, \ 174 - 0x93, 0xC4, 0xF3, 0xDB) 173 + GUID_INIT(0x9876CCAD, 0x47B4, 0x4bdb, 0xB6, 0x5E, 0x16, 0xF1, \ 174 + 0x93, 0xC4, 0xF3, 0xDB) 175 175 /* Processor Specific: X86/X86_64 */ 176 176 #define CPER_SEC_PROC_IA \ 177 - UUID_LE(0xDC3EA0B0, 0xA144, 0x4797, 0xB9, 0x5B, 0x53, 0xFA, \ 178 - 0x24, 0x2B, 0x6E, 0x1D) 177 + GUID_INIT(0xDC3EA0B0, 0xA144, 0x4797, 0xB9, 0x5B, 0x53, 0xFA, \ 178 + 0x24, 0x2B, 0x6E, 0x1D) 179 179 /* Processor Specific: IA64 */ 180 180 #define CPER_SEC_PROC_IPF \ 181 - UUID_LE(0xE429FAF1, 0x3CB7, 0x11D4, 0x0B, 0xCA, 0x07, 0x00, \ 182 - 0x80, 0xC7, 0x3C, 0x88, 0x81) 181 + GUID_INIT(0xE429FAF1, 0x3CB7, 0x11D4, 0x0B, 0xCA, 0x07, 0x00, \ 182 + 0x80, 0xC7, 0x3C, 0x88, 0x81) 183 183 /* Processor Specific: ARM */ 184 184 #define CPER_SEC_PROC_ARM \ 185 - UUID_LE(0xE19E3D16, 0xBC11, 0x11E4, 0x9C, 0xAA, 0xC2, 0x05, \ 186 - 0x1D, 0x5D, 0x46, 0xB0) 185 + GUID_INIT(0xE19E3D16, 0xBC11, 0x11E4, 0x9C, 0xAA, 0xC2, 0x05, \ 186 + 0x1D, 0x5D, 0x46, 0xB0) 187 187 /* Platform Memory */ 188 188 #define CPER_SEC_PLATFORM_MEM \ 189 - UUID_LE(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \ 190 - 0xED, 0x7C, 0x83, 0xB1) 189 + GUID_INIT(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \ 190 + 0xED, 0x7C, 0x83, 0xB1) 191 191 #define CPER_SEC_PCIE \ 192 - UUID_LE(0xD995E954, 0xBBC1, 0x430F, 0xAD, 0x91, 0xB4, 0x4D, \ 193 - 0xCB, 0x3C, 0x6F, 0x35) 192 + GUID_INIT(0xD995E954, 0xBBC1, 0x430F, 0xAD, 0x91, 0xB4, 0x4D, \ 193 + 0xCB, 0x3C, 0x6F, 0x35) 194 194 /* Firmware Error Record Reference */ 195 195 #define CPER_SEC_FW_ERR_REC_REF \ 196 - UUID_LE(0x81212A96, 0x09ED, 0x4996, 0x94, 0x71, 0x8D, 0x72, \ 197 - 0x9C, 0x8E, 0x69, 0xED) 196 + GUID_INIT(0x81212A96, 0x09ED, 0x4996, 0x94, 0x71, 0x8D, 0x72, \ 197 + 0x9C, 0x8E, 0x69, 0xED) 198 198 /* PCI/PCI-X Bus */ 199 199 #define CPER_SEC_PCI_X_BUS \ 200 - UUID_LE(0xC5753963, 0x3B84, 0x4095, 0xBF, 0x78, 0xED, 0xDA, \ 201 - 0xD3, 0xF9, 0xC9, 0xDD) 200 + GUID_INIT(0xC5753963, 0x3B84, 0x4095, 0xBF, 0x78, 0xED, 0xDA, \ 201 + 0xD3, 0xF9, 0xC9, 0xDD) 202 202 /* PCI Component/Device */ 203 203 #define CPER_SEC_PCI_DEV \ 204 - UUID_LE(0xEB5E4685, 0xCA66, 0x4769, 0xB6, 0xA2, 0x26, 0x06, \ 205 - 0x8B, 0x00, 0x13, 0x26) 204 + GUID_INIT(0xEB5E4685, 0xCA66, 0x4769, 0xB6, 0xA2, 0x26, 0x06, \ 205 + 0x8B, 0x00, 0x13, 0x26) 206 206 #define CPER_SEC_DMAR_GENERIC \ 207 - UUID_LE(0x5B51FEF7, 0xC79D, 0x4434, 0x8F, 0x1B, 0xAA, 0x62, \ 208 - 0xDE, 0x3E, 0x2C, 0x64) 207 + GUID_INIT(0x5B51FEF7, 0xC79D, 0x4434, 0x8F, 0x1B, 0xAA, 0x62, \ 208 + 0xDE, 0x3E, 0x2C, 0x64) 209 209 /* Intel VT for Directed I/O specific DMAr */ 210 210 #define CPER_SEC_DMAR_VT \ 211 - UUID_LE(0x71761D37, 0x32B2, 0x45cd, 0xA7, 0xD0, 0xB0, 0xFE, \ 212 - 0xDD, 0x93, 0xE8, 0xCF) 211 + GUID_INIT(0x71761D37, 0x32B2, 0x45cd, 0xA7, 0xD0, 0xB0, 0xFE, \ 212 + 0xDD, 0x93, 0xE8, 0xCF) 213 213 /* IOMMU specific DMAr */ 214 214 #define CPER_SEC_DMAR_IOMMU \ 215 - UUID_LE(0x036F84E1, 0x7F37, 0x428c, 0xA7, 0x9E, 0x57, 0x5F, \ 216 - 0xDF, 0xAA, 0x84, 0xEC) 215 + GUID_INIT(0x036F84E1, 0x7F37, 0x428c, 0xA7, 0x9E, 0x57, 0x5F, \ 216 + 0xDF, 0xAA, 0x84, 0xEC) 217 217 218 218 #define CPER_PROC_VALID_TYPE 0x0001 219 219 #define CPER_PROC_VALID_ISA 0x0002 ··· 290 290 __u32 validation_bits; 291 291 __u32 record_length; 292 292 __u64 timestamp; 293 - uuid_le platform_id; 294 - uuid_le partition_id; 295 - uuid_le creator_id; 296 - uuid_le notification_type; 293 + guid_t platform_id; 294 + guid_t partition_id; 295 + guid_t creator_id; 296 + guid_t notification_type; 297 297 __u64 record_id; 298 298 __u32 flags; 299 299 __u64 persistence_information; ··· 309 309 __u8 validation_bits; 310 310 __u8 reserved; /* must be zero */ 311 311 __u32 flags; 312 - uuid_le section_type; 313 - uuid_le fru_id; 312 + guid_t section_type; 313 + guid_t fru_id; 314 314 __u32 section_severity; 315 315 __u8 fru_text[20]; 316 316 }; ··· 343 343 344 344 /* IA32/X64 Processor Error Information Structure */ 345 345 struct cper_ia_err_info { 346 - uuid_le err_type; 346 + guid_t err_type; 347 347 __u64 validation_bits; 348 348 __u64 check_info; 349 349 __u64 target_id;
+2 -2
include/linux/efi.h
··· 47 47 typedef u64 efi_physical_addr_t; 48 48 typedef void *efi_handle_t; 49 49 50 - typedef uuid_le efi_guid_t; 50 + typedef guid_t efi_guid_t; 51 51 52 52 #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \ 53 - UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) 53 + GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) 54 54 55 55 /* 56 56 * Generic EFI table header