Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1688856 > unrolled thread

[PATCH v2 2/5] ACPI / boot: Correct address space of __acpi_map_table()

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v2 2/5] ACPI / boot: Correct address space of __acpi_map_table() Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-07-17 12:30 +0200
    Re: [PATCH v2 2/5] ACPI / boot: Correct address space of __acpi_map_table() Geert Uytterhoeven <geert@linux-m68k.org> - 2017-07-18 11:10 +0200
      Re: [PATCH v2 2/5] ACPI / boot: Correct address space of  __acpi_map_table() Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2017-07-18 11:30 +0200
        Re: [PATCH v2 2/5] ACPI / boot: Correct address space of  __acpi_map_table() Hanjun Guo <guohanjun@huawei.com> - 2017-07-18 12:00 +0200

#1688856 — [PATCH v2 2/5] ACPI / boot: Correct address space of __acpi_map_table()

Sparse complains about wrong address space used in __acpi_map_table()
and in __acpi_unmap_table().

arch/x86/kernel/acpi/boot.c:127:29: warning: incorrect type in return expression (different address spaces)
arch/x86/kernel/acpi/boot.c:127:29:    expected char *
arch/x86/kernel/acpi/boot.c:127:29:    got void [noderef] <asn:2>*
arch/x86/kernel/acpi/boot.c:135:23: warning: incorrect type in argument 1 (different address spaces)
arch/x86/kernel/acpi/boot.c:135:23:    expected void [noderef] <asn:2>*addr
arch/x86/kernel/acpi/boot.c:135:23:    got char *map

Correct address space to be in align of type of returned and passed
parameter.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/arm64/kernel/acpi.c    | 4 ++--
 arch/ia64/kernel/acpi.c     | 4 ++--
 arch/x86/kernel/acpi/boot.c | 4 ++--
 include/linux/acpi.h        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index e25c11e727fe..b3162715ed78 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -95,7 +95,7 @@ static int __init dt_scan_depth1_nodes(unsigned long node,
  * __acpi_map_table() will be called before page_init(), so early_ioremap()
  * or early_memremap() should be called here to for ACPI table mapping.
  */
-char *__init __acpi_map_table(unsigned long phys, unsigned long size)
+void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)
 {
 	if (!size)
 		return NULL;
@@ -103,7 +103,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 	return early_memremap(phys, size);
 }
 
-void __init __acpi_unmap_table(char *map, unsigned long size)
+void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
 {
 	if (!map || !size)
 		return;
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 7508c306aa9e..b9388cc283bc 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -159,12 +159,12 @@ int acpi_request_vector(u32 int_type)
 	return vector;
 }
 
-char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
+void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)
 {
 	return __va(phys_addr);
 }
 
-void __init __acpi_unmap_table(char *map, unsigned long size)
+void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
 {
 }
 
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 09ddb3cd627a..6d5b1346268a 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -118,7 +118,7 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = {
  * This is just a simple wrapper around early_ioremap(),
  * with sanity checks for phys == 0 and size == 0.
  */
-char *__init __acpi_map_table(unsigned long phys, unsigned long size)
+void __init __iomem *__acpi_map_table(unsigned long phys, unsigned long size)
 {
 
 	if (!phys || !size)
@@ -127,7 +127,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 	return early_ioremap(phys, size);
 }
 
-void __init __acpi_unmap_table(char *map, unsigned long size)
+void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
 {
 	if (!map || !size)
 		return;
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index c749eef1daa1..3848b56fcd83 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -228,8 +228,8 @@ struct acpi_subtable_proc {
 	int count;
 };
 
-char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
-void __acpi_unmap_table(char *map, unsigned long size);
+void __iomem *__acpi_map_table(unsigned long phys_addr, unsigned long size);
+void __acpi_unmap_table(void __iomem *map, unsigned long size);
 int early_acpi_boot_init(void);
 int acpi_boot_init (void);
 void acpi_boot_table_init (void);
-- 
2.11.0

[toc] | [next] | [standalone]

#1689903

Hi Andy,

On Mon, Jul 17, 2017 at 12:24 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Sparse complains about wrong address space used in __acpi_map_table()
> and in __acpi_unmap_table().
>
> arch/x86/kernel/acpi/boot.c:127:29: warning: incorrect type in return expression (different address spaces)
> arch/x86/kernel/acpi/boot.c:127:29:    expected char *
> arch/x86/kernel/acpi/boot.c:127:29:    got void [noderef] <asn:2>*
> arch/x86/kernel/acpi/boot.c:135:23: warning: incorrect type in argument 1 (different address spaces)
> arch/x86/kernel/acpi/boot.c:135:23:    expected void [noderef] <asn:2>*addr
> arch/x86/kernel/acpi/boot.c:135:23:    got char *map
>
> Correct address space to be in align of type of returned and passed
> parameter.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  arch/arm64/kernel/acpi.c    | 4 ++--

Thanks for the update!
I can confirm this fixes the arm64 build for me.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[toc] | [prev] | [next] | [standalone]

#1689919 — Re: [PATCH v2 2/5] ACPI / boot: Correct address space of __acpi_map_table()

On Tue, 2017-07-18 at 11:03 +0200, Geert Uytterhoeven wrote:
> Hi Andy,
> 
> On Mon, Jul 17, 2017 at 12:24 PM, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> > Sparse complains about wrong address space used in
> > __acpi_map_table()
> > and in __acpi_unmap_table().
> > 
> > arch/x86/kernel/acpi/boot.c:127:29: warning: incorrect type in
> > return expression (different address spaces)
> > arch/x86/kernel/acpi/boot.c:127:29:    expected char *
> > arch/x86/kernel/acpi/boot.c:127:29:    got void [noderef] <asn:2>*
> > arch/x86/kernel/acpi/boot.c:135:23: warning: incorrect type in
> > argument 1 (different address spaces)
> > arch/x86/kernel/acpi/boot.c:135:23:    expected void [noderef]
> > <asn:2>*addr
> > arch/x86/kernel/acpi/boot.c:135:23:    got char *map
> > 
> > Correct address space to be in align of type of returned and passed
> > parameter.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > ---
> >  arch/arm64/kernel/acpi.c    | 4 ++--
> 
> Thanks for the update!
> I can confirm this fixes the arm64 build for me.

Thanks to you and thanks to kbuild bot to check for ia64!

I will send v3 soon with fixed this part and extended patch 5.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

[toc] | [prev] | [next] | [standalone]

#1689988 — Re: [PATCH v2 2/5] ACPI / boot: Correct address space of __acpi_map_table()

On 2017/7/18 17:23, Andy Shevchenko wrote:
> On Tue, 2017-07-18 at 11:03 +0200, Geert Uytterhoeven wrote:
>> Hi Andy,
>>
>> On Mon, Jul 17, 2017 at 12:24 PM, Andy Shevchenko
>> <andriy.shevchenko@linux.intel.com> wrote:
>>> Sparse complains about wrong address space used in
>>> __acpi_map_table()
>>> and in __acpi_unmap_table().
>>>
>>> arch/x86/kernel/acpi/boot.c:127:29: warning: incorrect type in
>>> return expression (different address spaces)
>>> arch/x86/kernel/acpi/boot.c:127:29:    expected char *
>>> arch/x86/kernel/acpi/boot.c:127:29:    got void [noderef] <asn:2>*
>>> arch/x86/kernel/acpi/boot.c:135:23: warning: incorrect type in
>>> argument 1 (different address spaces)
>>> arch/x86/kernel/acpi/boot.c:135:23:    expected void [noderef]
>>> <asn:2>*addr
>>> arch/x86/kernel/acpi/boot.c:135:23:    got char *map
>>>
>>> Correct address space to be in align of type of returned and passed
>>> parameter.
>>>
>>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>>> ---
>>>  arch/arm64/kernel/acpi.c    | 4 ++--
>> Thanks for the update!
>> I can confirm this fixes the arm64 build for me.
> Thanks to you and thanks to kbuild bot to check for ia64!
>
> I will send v3 soon with fixed this part and extended patch 5.

Ah, sorry, there are some delays when I got this email...,
forget about my comments on patch 5.

Thanks
Hanjun

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web