lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] iSCSI/iBFT: use proper address translation
On 10/01/2009 04:01 AM, Jan Beulich wrote:
> In virtual environments (namely, Xen Dom0) virt <-> phys and
> virt <-> isa-bus translations cannot be freely interchanged. When
> looking at memory below 1M, the latter translations should always
> be used.
>
> iscsi_ibft_find.c part from: Martin Wilck <martin.wilck@ts.fujitsu.com>.
>
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> Cc: Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com>

Looks good to me.

Signed-off-by: Peter Jones <pjones@redhat.com>

>
> ---
> drivers/firmware/iscsi_ibft.c | 2 +-
> drivers/firmware/iscsi_ibft_find.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> --- linux-2.6.32-rc1/drivers/firmware/iscsi_ibft.c 2009-06-10 05:05:27.000000000 +0200
> +++ 2.6.32-rc1-ibft-addr-xlat/drivers/firmware/iscsi_ibft.c 2009-09-24 12:14:48.000000000 +0200
> @@ -939,7 +939,7 @@ static int __init ibft_init(void)
>
> if (ibft_addr) {
> printk(KERN_INFO "iBFT detected at 0x%llx.\n",
> - (u64)virt_to_phys((void *)ibft_addr));
> + (u64)isa_virt_to_bus(ibft_addr));
>
> rc = ibft_check_device();
> if (rc)
> --- linux-2.6.32-rc1/drivers/firmware/iscsi_ibft_find.c 2008-10-10 00:13:53.000000000 +0200
> +++ 2.6.32-rc1-ibft-addr-xlat/drivers/firmware/iscsi_ibft_find.c 2009-09-24 09:52:18.000000000 +0200
> @@ -65,10 +65,10 @@ void __init reserve_ibft_region(void)
> * so skip that area */
> if (pos == VGA_MEM)
> pos += VGA_SIZE;
> - virt = phys_to_virt(pos);
> + virt = isa_bus_to_virt(pos);
> if (memcmp(virt, IBFT_SIGN, IBFT_SIGN_LEN) == 0) {
> unsigned long *addr =
> - (unsigned long *)phys_to_virt(pos + 4);
> + (unsigned long *)isa_bus_to_virt(pos + 4);
> len = *addr;
> /* if the length of the table extends past 1M,
> * the table cannot be valid. */
>
>
>


--
Peter

When privacy is outlawed only outlaws will have privacy.
-- Zimmermann


\
 
 \ /
  Last update: 2009-10-01 15:39    [W:0.559 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site