Skip to content

Commit

Permalink
iscsi_ibft: Fix isa_bus_to_virt not working under ARM
Browse files Browse the repository at this point in the history
The isa_bus_to_virt is only needed under X86 and in fact the code
that sets the ibft_phys_addr is only compiled under X86.

As such lets just ifdef the code.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Vijayendra Suman <vijayendra.suman@oracle.com>
CC: Maurizio Lombardi <mlombard@redhat.com>
CC: Mike Rapoport <rppt@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
v2: Remove the ibft_phys_addr as it is defined in iscsi_ibft.h
  • Loading branch information
Konrad Rzeszutek Wilk committed Sep 2, 2021
1 parent 7fd1d00 commit 799206c
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions drivers/firmware/iscsi_ibft.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ MODULE_VERSION(IBFT_ISCSI_VERSION);

static struct acpi_table_ibft *ibft_addr;

#ifndef CONFIG_ISCSI_IBFT_FIND
phys_addr_t ibft_phys_addr;
#endif

struct ibft_hdr {
u8 id;
u8 version;
Expand Down Expand Up @@ -851,7 +847,21 @@ static void __init acpi_find_ibft_region(void)
{
}
#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.
*/
Expand All @@ -864,9 +874,7 @@ static int __init ibft_init(void)
is called before ACPI tables are parsed and it only does
legacy finding.
*/
if (ibft_phys_addr)
ibft_addr = isa_bus_to_virt(ibft_phys_addr);
else
if (acpi_find_isa_region())
acpi_find_ibft_region();

if (ibft_addr) {
Expand Down

0 comments on commit 799206c

Please sign in to comment.