Message ID | 20240905124950.512973-1-kobak@nvidia.com |
---|---|
State | Superseded |
Headers | show |
Series | [V3] acpi/prmt: find block with specific type | expand |
Hi KobaK, kernel test robot noticed the following build warnings: [auto build test WARNING on rafael-pm/linux-next] [also build test WARNING on rafael-pm/bleeding-edge linus/master v6.11-rc6 next-20240906] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/KobaK/acpi-prmt-find-block-with-specific-type/20240905-205316 base: https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git linux-next patch link: https://lore.kernel.org/r/20240905124950.512973-1-kobak%40nvidia.com patch subject: [PATCH V3] acpi/prmt: find block with specific type config: x86_64-rhel-8.3-rust (https://download.01.org/0day-ci/archive/20240907/202409071245.bkGWWtfQ-lkp@intel.com/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240907/202409071245.bkGWWtfQ-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202409071245.bkGWWtfQ-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/acpi/prmt.c:163:5: warning: format specifies type 'int' but the argument has type 'u64' (aka 'unsigned long long') [-Wformat] 162 | "Idx: %d, Parts of handler(GUID: %pUB) are missed, handler_addr %llx, data_addr %llx, param_addr %llx", | ~~ | %llu 163 | cur_handler, th->handler_addr, | ^~~~~~~~~~~ include/linux/printk.h:518:37: note: expanded from macro 'pr_warn' 518 | printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) | ~~~ ^~~~~~~~~~~ include/linux/printk.h:465:60: note: expanded from macro 'printk' 465 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ~~~ ^~~~~~~~~~~ include/linux/printk.h:437:19: note: expanded from macro 'printk_index_wrap' 437 | _p_func(_fmt, ##__VA_ARGS__); \ | ~~~~ ^~~~~~~~~~~ >> drivers/acpi/prmt.c:162:105: warning: more '%' conversions than data arguments [-Wformat-insufficient-args] 162 | "Idx: %d, Parts of handler(GUID: %pUB) are missed, handler_addr %llx, data_addr %llx, param_addr %llx", | ~~~^ include/linux/printk.h:518:29: note: expanded from macro 'pr_warn' 518 | printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) | ^~~ include/linux/printk.h:355:21: note: expanded from macro 'pr_fmt' 355 | #define pr_fmt(fmt) fmt | ^~~ include/linux/printk.h:465:53: note: expanded from macro 'printk' 465 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~ include/linux/printk.h:437:11: note: expanded from macro 'printk_index_wrap' 437 | _p_func(_fmt, ##__VA_ARGS__); \ | ^~~~ 2 warnings generated. vim +163 drivers/acpi/prmt.c 93 94 static int __init 95 acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end) 96 { 97 struct acpi_prmt_module_info *module_info; 98 struct acpi_prmt_handler_info *handler_info; 99 struct prm_handler_info *th; 100 struct prm_module_info *tm; 101 u64 *mmio_count; 102 u64 cur_handler = 0; 103 u32 module_info_size = 0; 104 u64 mmio_range_size = 0; 105 void *temp_mmio; 106 107 module_info = (struct acpi_prmt_module_info *) header; 108 module_info_size = struct_size(tm, handlers, module_info->handler_info_count); 109 tm = kmalloc(module_info_size, GFP_KERNEL); 110 if (!tm) 111 goto parse_prmt_out1; 112 113 guid_copy(&tm->guid, (guid_t *) module_info->module_guid); 114 tm->major_rev = module_info->major_rev; 115 tm->minor_rev = module_info->minor_rev; 116 tm->handler_count = module_info->handler_info_count; 117 tm->updatable = true; 118 119 if (module_info->mmio_list_pointer) { 120 /* 121 * Each module is associated with a list of addr 122 * ranges that it can use during the service 123 */ 124 mmio_count = (u64 *) memremap(module_info->mmio_list_pointer, 8, MEMREMAP_WB); 125 if (!mmio_count) 126 goto parse_prmt_out2; 127 128 mmio_range_size = struct_size(tm->mmio_info, addr_ranges, *mmio_count); 129 tm->mmio_info = kmalloc(mmio_range_size, GFP_KERNEL); 130 if (!tm->mmio_info) 131 goto parse_prmt_out3; 132 133 temp_mmio = memremap(module_info->mmio_list_pointer, mmio_range_size, MEMREMAP_WB); 134 if (!temp_mmio) 135 goto parse_prmt_out4; 136 memmove(tm->mmio_info, temp_mmio, mmio_range_size); 137 } else { 138 tm->mmio_info = kmalloc(sizeof(*tm->mmio_info), GFP_KERNEL); 139 if (!tm->mmio_info) 140 goto parse_prmt_out2; 141 142 tm->mmio_info->mmio_count = 0; 143 } 144 145 INIT_LIST_HEAD(&tm->module_list); 146 list_add(&tm->module_list, &prm_module_list); 147 148 handler_info = get_first_handler(module_info); 149 do { 150 th = &tm->handlers[cur_handler]; 151 152 guid_copy(&th->guid, (guid_t *)handler_info->handler_guid); 153 th->handler_addr = 154 (void *)efi_pa_va_lookup(handler_info->handler_address, EFI_RUNTIME_SERVICES_CODE); 155 th->static_data_buffer_addr = 156 efi_pa_va_lookup(handler_info->static_data_buffer_address, EFI_RUNTIME_SERVICES_DATA); 157 th->acpi_param_buffer_addr = 158 efi_pa_va_lookup(handler_info->acpi_param_buffer_address, EFI_RUNTIME_SERVICES_DATA); 159 160 if (!th->handler_addr || !th->static_data_buffer_addr || !th->acpi_param_buffer_addr) 161 pr_warn( > 162 "Idx: %d, Parts of handler(GUID: %pUB) are missed, handler_addr %llx, data_addr %llx, param_addr %llx", > 163 cur_handler, th->handler_addr, 164 th->static_data_buffer_addr, th->acpi_param_buffer_addr); 165 } while (++cur_handler < tm->handler_count && (handler_info = get_next_handler(handler_info))); 166 167 return 0; 168 169 parse_prmt_out4: 170 kfree(tm->mmio_info); 171 parse_prmt_out3: 172 memunmap(mmio_count); 173 parse_prmt_out2: 174 kfree(tm); 175 parse_prmt_out1: 176 return -ENOMEM; 177 } 178
diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c index c78453c74ef5..a274636dfe8b 100644 --- a/drivers/acpi/prmt.c +++ b/drivers/acpi/prmt.c @@ -72,15 +72,17 @@ struct prm_module_info { struct prm_handler_info handlers[] __counted_by(handler_count); }; -static u64 efi_pa_va_lookup(u64 pa) +static u64 efi_pa_va_lookup(u64 pa, u32 type) { efi_memory_desc_t *md; u64 pa_offset = pa & ~PAGE_MASK; u64 page = pa & PAGE_MASK; for_each_efi_memory_desc(md) { - if (md->phys_addr < pa && pa < md->phys_addr + PAGE_SIZE * md->num_pages) + if ((md->type == type) && + (md->phys_addr < pa && pa < md->phys_addr + PAGE_SIZE * md->num_pages)) { return pa_offset + md->virt_addr + page - md->phys_addr; + } } return 0; @@ -148,9 +150,18 @@ acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end) th = &tm->handlers[cur_handler]; guid_copy(&th->guid, (guid_t *)handler_info->handler_guid); - th->handler_addr = (void *)efi_pa_va_lookup(handler_info->handler_address); - th->static_data_buffer_addr = efi_pa_va_lookup(handler_info->static_data_buffer_address); - th->acpi_param_buffer_addr = efi_pa_va_lookup(handler_info->acpi_param_buffer_address); + th->handler_addr = + (void *)efi_pa_va_lookup(handler_info->handler_address, EFI_RUNTIME_SERVICES_CODE); + th->static_data_buffer_addr = + efi_pa_va_lookup(handler_info->static_data_buffer_address, EFI_RUNTIME_SERVICES_DATA); + th->acpi_param_buffer_addr = + efi_pa_va_lookup(handler_info->acpi_param_buffer_address, EFI_RUNTIME_SERVICES_DATA); + + if (!th->handler_addr || !th->static_data_buffer_addr || !th->acpi_param_buffer_addr) + pr_warn( + "Idx: %d, Parts of handler(GUID: %pUB) are missed, handler_addr %llx, data_addr %llx, param_addr %llx", + cur_handler, th->handler_addr, + th->static_data_buffer_addr, th->acpi_param_buffer_addr); } while (++cur_handler < tm->handler_count && (handler_info = get_next_handler(handler_info))); return 0; @@ -250,8 +261,16 @@ static acpi_status acpi_platformrt_space_handler(u32 function, handler = find_prm_handler(&buffer->handler_guid); module = find_prm_module(&buffer->handler_guid); - if (!handler || !module) - goto invalid_guid; + if (!handler || !module) { + buffer->prm_status = PRM_HANDLER_GUID_NOT_FOUND; + return AE_OK; + } + + if (!handler->handler_addr || !handler->static_data_buffer_addr || + !handler->acpi_param_buffer_addr) { + buffer->prm_status = PRM_HANDLER_ERROR; + return AE_OK; + } ACPI_COPY_NAMESEG(context.signature, "PRMC"); context.revision = 0x0; @@ -274,8 +293,10 @@ static acpi_status acpi_platformrt_space_handler(u32 function, case PRM_CMD_START_TRANSACTION: module = find_prm_module(&buffer->handler_guid); - if (!module) - goto invalid_guid; + if (!module) { + buffer->prm_status = PRM_HANDLER_GUID_NOT_FOUND; + return AE_OK; + } if (module->updatable) module->updatable = false; @@ -286,8 +307,10 @@ static acpi_status acpi_platformrt_space_handler(u32 function, case PRM_CMD_END_TRANSACTION: module = find_prm_module(&buffer->handler_guid); - if (!module) - goto invalid_guid; + if (!module) { + buffer->prm_status = PRM_HANDLER_GUID_NOT_FOUND; + return AE_OK; + } if (module->updatable) buffer->prm_status = UPDATE_UNLOCK_WITHOUT_LOCK; @@ -302,10 +325,6 @@ static acpi_status acpi_platformrt_space_handler(u32 function, } return AE_OK; - -invalid_guid: - buffer->prm_status = PRM_HANDLER_GUID_NOT_FOUND; - return AE_OK; } void __init init_prmt(void)