lkml.org 
[lkml]   [2019]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 063/134] PCI: rpaphp: Fix up pointer to first drc-info entry
    Date
    From: Tyrel Datwyler <tyreld@linux.ibm.com>

    [ Upstream commit 9723c25f99aff0451cfe6392e1b9fdd99d0bf9f0 ]

    The first entry of the ibm,drc-info property is an int encoded count
    of the number of drc-info entries that follow. The "value" pointer
    returned by of_prop_next_u32() is still pointing at the this value
    when we call of_read_drc_info_cell(), but the helper function
    expects that value to be pointing at the first element of an entry.

    Fix up by incrementing the "value" pointer to point at the first
    element of the first drc-info entry prior.

    Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
    Acked-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/1573449697-5448-5-git-send-email-tyreld@linux.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/hotplug/rpaphp_core.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
    index 18627bb21e9ec..e3502644a45c3 100644
    --- a/drivers/pci/hotplug/rpaphp_core.c
    +++ b/drivers/pci/hotplug/rpaphp_core.c
    @@ -239,6 +239,8 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name,
    value = of_prop_next_u32(info, NULL, &entries);
    if (!value)
    return -EINVAL;
    + else
    + value++;

    for (j = 0; j < entries; j++) {
    of_read_drc_info_cell(&info, &value, &drc);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-11 17:04    [W:4.042 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site