lkml.org 
[lkml]   [2023]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [RFC PATCH v1 03/21] RISC-V: ACPI: Fix acpi_os_ioremap to return iomem address
    On Thu, Aug 03, 2023 at 11:28:58PM +0530, Sunil V L wrote:
    > acpi_os_ioremap() currently is a wrapper to memremap() on
    > RISC-V. But the callers of acpi_os_ioremap() expect it to
    > return __iomem address and hence sparse tool reports a new
    > warning. Fix this issue by type casting to __iomem type.
    >
    > Reported-by: kernel test robot <lkp@intel.com>
    > Closes: https://lore.kernel.org/oe-kbuild-all/202307230357.egcTAefj-lkp@intel.com/
    > Fixes: a91a9ffbd3a5 ("RISC-V: Add support to build the ACPI core")
    > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
    > ---
    > arch/riscv/include/asm/acpi.h | 2 +-
    > arch/riscv/kernel/acpi.c | 4 ++--
    > 2 files changed, 3 insertions(+), 3 deletions(-)
    >
    > diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h
    > index f71ce21ff684..d5604d2073bc 100644
    > --- a/arch/riscv/include/asm/acpi.h
    > +++ b/arch/riscv/include/asm/acpi.h
    > @@ -19,7 +19,7 @@ typedef u64 phys_cpuid_t;
    > #define PHYS_CPUID_INVALID INVALID_HARTID
    >
    > /* ACPI table mapping after acpi_permanent_mmap is set */
    > -void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size);
    > +void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size);
    > #define acpi_os_ioremap acpi_os_ioremap
    >
    > #define acpi_strict 1 /* No out-of-spec workarounds on RISC-V */
    > diff --git a/arch/riscv/kernel/acpi.c b/arch/riscv/kernel/acpi.c
    > index 5ee03ebab80e..56cb2c986c48 100644
    > --- a/arch/riscv/kernel/acpi.c
    > +++ b/arch/riscv/kernel/acpi.c
    > @@ -215,9 +215,9 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size)
    > early_iounmap(map, size);
    > }
    >
    > -void *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
    > +void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
    > {
    > - return memremap(phys, size, MEMREMAP_WB);
    > + return (void __iomem *)memremap(phys, size, MEMREMAP_WB);
    > }
    >
    > #ifdef CONFIG_PCI
    > --
    > 2.39.2
    >

    Reviewed-by: Andrew Jones <ajones@ventanamicro.com>

    \
     
     \ /
      Last update: 2023-08-07 10:21    [W:2.175 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site