From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753171AbbJWKdf (ORCPT ); Fri, 23 Oct 2015 06:33:35 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:33387 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbbJWKdd (ORCPT ); Fri, 23 Oct 2015 06:33:33 -0400 Date: Fri, 23 Oct 2015 12:33:29 +0200 From: Ingo Molnar To: Ard Biesheuvel , Matt Fleming Cc: linux-efi@vger.kernel.org, izumi.taku@jp.fujitsu.com, matt.fleming@intel.com, linux-kernel@vger.kernel.org, kamezawa.hiroyu@jp.fujitsu.com Subject: Re: [PATCH 2/2] efi: Fix warning of int-to-pointer-cast on x86 32-bit builds Message-ID: <20151023103328.GA3486@gmail.com> References: <20151023085011.GB21631@gmail.com> <1445593697-1342-1-git-send-email-ard.biesheuvel@linaro.org> <1445593697-1342-2-git-send-email-ard.biesheuvel@linaro.org> <20151023102728.GA1974@gmail.com> <20151023103022.GA2297@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151023103022.GA2297@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar wrote: > > * Ingo Molnar wrote: > > > > > * Ard Biesheuvel wrote: > > > > > From: Taku Izumi > > > > > > Commit 0f96a99dab36 ("efi: Add "efi_fake_mem" boot option") > > > introduces the following warning message: > > > > > > drivers/firmware/efi/fake_mem.c:186:20: warning: cast to pointer > > > from integer of different size [-Wint-to-pointer-cast] > > > > > > new_memmap_phy was defined as a u64 value and cast to void*, causing > > > a int-to-pointer-cast warning on x86 32-bit builds. > > > However, since the void* type is inappropriate for a physical > > > address, the definition of struct efi_memory_map::phys_map has been > > > changed to phys_addr_t in the previous patch, and so the cast can be > > > dropped entirely. > > > > > > This patch also changes the type of the "new_memmap_phy" variable > > > from "u64" to "phys_addr_t" to align with the types of > > > memblock_alloc() and struct efi_memory_map::phys_map. > > > > > > Reported-by: Ingo Molnar > > > Signed-off-by: Taku Izumi > > > [ard.biesheuvel: removed void* cast, updated commit log] > > > Signed-off-by: Ard Biesheuvel > > > --- > > > drivers/firmware/efi/fake_mem.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c > > > index 32bcb14df2c8..ed3a854950cc 100644 > > > --- a/drivers/firmware/efi/fake_mem.c > > > +++ b/drivers/firmware/efi/fake_mem.c > > > @@ -59,7 +59,7 @@ void __init efi_fake_memmap(void) > > > u64 start, end, m_start, m_end, m_attr; > > > int new_nr_map = memmap.nr_map; > > > efi_memory_desc_t *md; > > > - u64 new_memmap_phy; > > > + phys_addr_t new_memmap_phy; > > > void *new_memmap; > > > void *old, *new; > > > int i; > > > @@ -183,7 +183,7 @@ void __init efi_fake_memmap(void) > > > /* swap into new EFI memmap */ > > > efi_unmap_memmap(); > > > memmap.map = new_memmap; > > > - memmap.phys_map = (void *)new_memmap_phy; > > > + memmap.phys_map = new_memmap_phy; > > > memmap.nr_map = new_nr_map; > > > memmap.map_end = memmap.map + memmap.nr_map * memmap.desc_size; > > > > Please guys, think for a change! > > > > How is this supposed to work with: > > > > include/linux/efi.h: void *phys_map; > > > > ? > > Ah, I take that back, now I see your patch 1/2 that changes it to phys_addr_t. > > That's the right solution, and it also cleans up the code: > > Reviewed-by: Ingo Molnar Matt, do you want to take these fixes, or should I apply them directly? Thanks, Ingo From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: [PATCH 2/2] efi: Fix warning of int-to-pointer-cast on x86 32-bit builds Date: Fri, 23 Oct 2015 12:33:29 +0200 Message-ID: <20151023103328.GA3486@gmail.com> References: <20151023085011.GB21631@gmail.com> <1445593697-1342-1-git-send-email-ard.biesheuvel@linaro.org> <1445593697-1342-2-git-send-email-ard.biesheuvel@linaro.org> <20151023102728.GA1974@gmail.com> <20151023103022.GA2297@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20151023103022.GA2297-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Ard Biesheuvel Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, izumi.taku-+CUm20s59erQFUHtdCDX3A@public.gmane.org, matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org List-Id: linux-efi@vger.kernel.org * Ingo Molnar wrote: > > * Ingo Molnar wrote: > > > > > * Ard Biesheuvel wrote: > > > > > From: Taku Izumi > > > > > > Commit 0f96a99dab36 ("efi: Add "efi_fake_mem" boot option") > > > introduces the following warning message: > > > > > > drivers/firmware/efi/fake_mem.c:186:20: warning: cast to pointer > > > from integer of different size [-Wint-to-pointer-cast] > > > > > > new_memmap_phy was defined as a u64 value and cast to void*, causing > > > a int-to-pointer-cast warning on x86 32-bit builds. > > > However, since the void* type is inappropriate for a physical > > > address, the definition of struct efi_memory_map::phys_map has been > > > changed to phys_addr_t in the previous patch, and so the cast can be > > > dropped entirely. > > > > > > This patch also changes the type of the "new_memmap_phy" variable > > > from "u64" to "phys_addr_t" to align with the types of > > > memblock_alloc() and struct efi_memory_map::phys_map. > > > > > > Reported-by: Ingo Molnar > > > Signed-off-by: Taku Izumi > > > [ard.biesheuvel: removed void* cast, updated commit log] > > > Signed-off-by: Ard Biesheuvel > > > --- > > > drivers/firmware/efi/fake_mem.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c > > > index 32bcb14df2c8..ed3a854950cc 100644 > > > --- a/drivers/firmware/efi/fake_mem.c > > > +++ b/drivers/firmware/efi/fake_mem.c > > > @@ -59,7 +59,7 @@ void __init efi_fake_memmap(void) > > > u64 start, end, m_start, m_end, m_attr; > > > int new_nr_map = memmap.nr_map; > > > efi_memory_desc_t *md; > > > - u64 new_memmap_phy; > > > + phys_addr_t new_memmap_phy; > > > void *new_memmap; > > > void *old, *new; > > > int i; > > > @@ -183,7 +183,7 @@ void __init efi_fake_memmap(void) > > > /* swap into new EFI memmap */ > > > efi_unmap_memmap(); > > > memmap.map = new_memmap; > > > - memmap.phys_map = (void *)new_memmap_phy; > > > + memmap.phys_map = new_memmap_phy; > > > memmap.nr_map = new_nr_map; > > > memmap.map_end = memmap.map + memmap.nr_map * memmap.desc_size; > > > > Please guys, think for a change! > > > > How is this supposed to work with: > > > > include/linux/efi.h: void *phys_map; > > > > ? > > Ah, I take that back, now I see your patch 1/2 that changes it to phys_addr_t. > > That's the right solution, and it also cleans up the code: > > Reviewed-by: Ingo Molnar Matt, do you want to take these fixes, or should I apply them directly? Thanks, Ingo