public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stable/for-linus-5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft

Browse source 
Pull ibft fix from Konrad Rzeszutek Wilk:
 "An arm64 compile fix for the new code that fixed the iBFT KASLR
  handling. I missed the original 0-day build email report"

* 'stable/for-linus-5.15-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: Fix isa_bus_to_virt not working under ARM
This commit is contained in:
Linus Torvalds 2021-09-03 15:21:54 -07:00
commit 4e71add028
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/firmware/iscsi_ibft.c
View file

@ -86,10 +86,6 @@ MODULE_VERSION(IBFT_ISCSI_VERSION);
static struct acpi_table_ibft *ibft_addr; static struct acpi_table_ibft *ibft_addr;
#ifndef CONFIG_ISCSI_IBFT_FIND
phys_addr_t ibft_phys_addr;
#endif
struct ibft_hdr { struct ibft_hdr {
u8 id; u8 id;
u8 version; u8 version;
@ -851,7 +847,21 @@ static void __init acpi_find_ibft_region(void)
{ {
} }
#endif #endif
#ifdef CONFIG_ISCSI_IBFT_FIND
static int __init acpi_find_isa_region(void)
{
if (ibft_phys_addr) {
ibft_addr = isa_bus_to_virt(ibft_phys_addr);
return 0;
}
return -ENODEV;
}
#else
static int __init acpi_find_isa_region(void)
{
return -ENODEV;
}
#endif
/* /*
* ibft_init() - creates sysfs tree entries for the iBFT data. * ibft_init() - creates sysfs tree entries for the iBFT data.
*/ */
@ -864,9 +874,7 @@ static int __init ibft_init(void)
is called before ACPI tables are parsed and it only does is called before ACPI tables are parsed and it only does
legacy finding. legacy finding.
*/ */
if (ibft_phys_addr) if (acpi_find_isa_region())
ibft_addr = isa_bus_to_virt(ibft_phys_addr);
else
acpi_find_ibft_region(); acpi_find_ibft_region();
if (ibft_addr) { if (ibft_addr) {