2019-02-11 13:48:18

by Christoph Hellwig

Subject: [PATCH] iscsi_ibft: use virt_to_phys instead of isa_virt_to_bus

As far as I can tell IBFT is a firmware table and has nothing to do with
the good old ISA bus. And even if it the two would be the same on x86
anyway. So remove the isa_virt_to_bus call in preparation of eventually
removing that API entirely.

Signed-off-by: Christoph Hellwig <[email protected]>
---
drivers/firmware/iscsi_ibft_find.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
index 72d9ea18270b..85c656d04bb0 100644
--- a/drivers/firmware/iscsi_ibft_find.c
+++ b/drivers/firmware/iscsi_ibft_find.c
@@ -104,7 +104,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep)

if (ibft_addr) {
*sizep = PAGE_ALIGN(ibft_addr->header.length);
- return (u64)isa_virt_to_bus(ibft_addr);
+ return (u64)virt_to_phys(ibft_addr);
}

*sizep = 0;
--
2.20.1

2019-02-12 19:43:36

by Konrad Rzeszutek Wilk

Subject: Re: [PATCH] iscsi_ibft: use virt_to_phys instead of isa_virt_to_bus

On Mon, Feb 11, 2019 at 02:46:42PM +0100, Christoph Hellwig wrote:
> As far as I can tell IBFT is a firmware table and has nothing to do with
> the good old ISA bus. And even if it the two would be the same on x86
> anyway. So remove the isa_virt_to_bus call in preparation of eventually
> removing that API entirely.
>
> Signed-off-by: Christoph Hellwig <[email protected]>

Queued it up in https://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft.git

> ---
> drivers/firmware/iscsi_ibft_find.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c
> index 72d9ea18270b..85c656d04bb0 100644
> --- a/drivers/firmware/iscsi_ibft_find.c
> +++ b/drivers/firmware/iscsi_ibft_find.c
> @@ -104,7 +104,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep)
>
> if (ibft_addr) {
> *sizep = PAGE_ALIGN(ibft_addr->header.length);
> - return (u64)isa_virt_to_bus(ibft_addr);
> + return (u64)virt_to_phys(ibft_addr);
> }
>
> *sizep = 0;
> --
> 2.20.1
>