iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft into HEAD

Browse Source 
* 'linux-next' 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:
Konrad Rzeszutek Wilk 2021-09-03 11:57:31 -04:00
commit 8b7084b848
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) {