lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 322/700] EDAC/aspeed: Use proper format string for printing resource
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit 2e2f16d5cdb33e5f6fc53b7ad66c9f456d5f2950 ]

    On ARMv7, resource_size_t can be 64-bit, which breaks printing
    it as %x:

    drivers/edac/aspeed_edac.c: In function 'init_csrows':
    drivers/edac/aspeed_edac.c:257:28: error: format '%x' expects argument of \
    type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long \
    long unsigned int'} [-Werror=format=]
    257 | dev_dbg(mci->pdev, "dt: /memory node resources: first page \
    r.start=0x%x, resource_size=0x%x, PAGE_SHIFT macro=0x%x\n",

    Use the special %pR format string to pretty-print the entire resource
    instead.

    Fixes: edfc2d73ca45 ("EDAC/aspeed: Add support for AST2400 and AST2600")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
    Link: https://lkml.kernel.org/r/20210421135500.3518661-1-arnd@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/edac/aspeed_edac.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/edac/aspeed_edac.c b/drivers/edac/aspeed_edac.c
    index a46da56d6d54..6bd5f8815919 100644
    --- a/drivers/edac/aspeed_edac.c
    +++ b/drivers/edac/aspeed_edac.c
    @@ -254,8 +254,8 @@ static int init_csrows(struct mem_ctl_info *mci)
    return rc;
    }

    - dev_dbg(mci->pdev, "dt: /memory node resources: first page r.start=0x%x, resource_size=0x%x, PAGE_SHIFT macro=0x%x\n",
    - r.start, resource_size(&r), PAGE_SHIFT);
    + dev_dbg(mci->pdev, "dt: /memory node resources: first page %pR, PAGE_SHIFT macro=0x%x\n",
    + &r, PAGE_SHIFT);

    csrow->first_page = r.start >> PAGE_SHIFT;
    nr_pages = resource_size(&r) >> PAGE_SHIFT;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:09    [W:2.731 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site