lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 039/261] ACPI/IORT: Fix PMCG node single ID mapping handling
    Date
    From: Tuan Phan <tuanphan@os.amperecomputing.com>

    [ Upstream commit 50c8ab8d9fbf5b18d5162a797ca26568afc0af1a ]

    An IORT PMCG node can have no ID mapping if its overflow interrupt is
    wire based therefore the code that parses the PMCG node can not assume
    the node will always have a single mapping present at index 0.

    Fix iort_get_id_mapping_index() by checking for an overflow interrupt
    and mapping count.

    Fixes: 24e516049360 ("ACPI/IORT: Add support for PMCG")

    Signed-off-by: Tuan Phan <tuanphan@os.amperecomputing.com>
    Reviewed-by: Hanjun Guo <guoahanjun@huawei.com>
    Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Link: https://lore.kernel.org/r/1589994787-28637-1-git-send-email-tuanphan@os.amperecomputing.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/acpi/arm64/iort.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
    index 5a7551d060f2..bc95a5eebd13 100644
    --- a/drivers/acpi/arm64/iort.c
    +++ b/drivers/acpi/arm64/iort.c
    @@ -361,6 +361,7 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
    static int iort_get_id_mapping_index(struct acpi_iort_node *node)
    {
    struct acpi_iort_smmu_v3 *smmu;
    + struct acpi_iort_pmcg *pmcg;

    switch (node->type) {
    case ACPI_IORT_NODE_SMMU_V3:
    @@ -388,6 +389,10 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node)

    return smmu->id_mapping_index;
    case ACPI_IORT_NODE_PMCG:
    + pmcg = (struct acpi_iort_pmcg *)node->node_data;
    + if (pmcg->overflow_gsiv || node->mapping_count == 0)
    + return -EINVAL;
    +
    return 0;
    default:
    return -EINVAL;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 18:11    [W:2.492 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site