From patchwork Tue Jan 3 11:24:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 9494775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 57CC960414 for ; Tue, 3 Jan 2017 11:27:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B615200F5 for ; Tue, 3 Jan 2017 11:27:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3004626CF9; Tue, 3 Jan 2017 11:27:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3E690200F5 for ; Tue, 3 Jan 2017 11:27:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cONDb-00005X-N0; Tue, 03 Jan 2017 11:25:27 +0000 Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cONDV-0007dg-UZ for linux-arm-kernel@lists.infradead.org; Tue, 03 Jan 2017 11:25:24 +0000 Received: by mail-lf0-x22f.google.com with SMTP id b14so283420573lfg.2 for ; Tue, 03 Jan 2017 03:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=W0+btlT0KFLz7MBAX5CbFVa2ItZq1WsyLzDzLNkPfoE=; b=O2ou2kL9pBlfd2rG5iC4FmHt4dNzEaYI5pZ5GT8PJVO4gi8OZMoRuxMFoAjCRhwkWH Y4q2ZKgX5CB1bU/rOPlSFZZZrWuUIyJlSbbEgqFV8aas5FppoVq2+fAxpObZcp7aoeXm fXfQk1ItOzRIFEksh7GKnFwfRmxtvs1xyTCxfpjoo0AJ+B3O6T5MKLnBlutvkL6TiB1k PdizgQ5RKImCWc1UFzfunnPJQrsXbYjkLAn9K0n1s0F/u9CSBdg004b1exN8wwkWTlFQ T43rU3QxFv+fQC1UgSQBWy/CZ0Gm0WgTzaRFW9rdPAOkZzi4OsDaXBFZ3jDj3vBKNvHv 5GgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=W0+btlT0KFLz7MBAX5CbFVa2ItZq1WsyLzDzLNkPfoE=; b=gdmd8s5GvIvRyuf2kUEft71LB7TuLSQCgVucWFFemwpZdd9M4TUnTzLNFW6JO3eHaN 0l+6LdL064zb6k7cMXZ76Fg+2skCQCy4ntYhDDOd75VRlg67nSMmPJO8FRyTwfPTFM4N q4zKHrpbvujz4ag3wlF3HyrVhZLZZVcYwgSGAi5aQwDL9CXXaJb6iSKXlCXyZeqtZyDx D2+PHLTOXwASPxH9tNxkzuU/I8SX2sAiR4X6bYzJzq2U2S9dueWYaAtg90rFLWRIBTPP 890hpZiZfIRtYe4XtNd0ILSj1uglWH3LvLZRhD5VbSdbuniDPer9PJiiompqUZGlVshp 1IHA== X-Gm-Message-State: AIkVDXK8wrDVc95WAVUMDyDVkihu1ne94ydD510Tpax8G8loNsShAPmc2/8+P2OCLXnFJA== X-Received: by 10.25.145.87 with SMTP id y23mr23042142lfj.80.1483442699685; Tue, 03 Jan 2017 03:24:59 -0800 (PST) Received: from [10.0.0.85] (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.googlemail.com with ESMTPSA id 18sm16740543ljj.7.2017.01.03.03.24.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 03:24:59 -0800 (PST) Subject: Re: [PATCH v6 05/14] ACPI: platform-msi: retrieve dev id from IORT To: Hanjun Guo , Marc Zyngier , "Rafael J. Wysocki" , Lorenzo Pieralisi References: <1483363905-2806-1-git-send-email-hanjun.guo@linaro.org> <1483363905-2806-6-git-send-email-hanjun.guo@linaro.org> <13cb0c87-e1c0-c4d6-4793-a3edd20944dc@semihalf.com> <4ab6a7e3-7aa3-367d-a333-effb24399fd5@semihalf.com> From: Tomasz Nowicki Message-ID: <168e53f0-1e56-7937-7dbb-bd5c6460437a@semihalf.com> Date: Tue, 3 Jan 2017 12:24:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <4ab6a7e3-7aa3-367d-a333-effb24399fd5@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170103_032522_437115_61D40F4B X-CRM114-Status: GOOD ( 20.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huxinwei@huawei.com, Kefeng Wang , charles.garcia-tobin@arm.com, yimin@huawei.com, Greg KH , linux-kernel@vger.kernel.org, linuxarm@huawei.com, Sinan Kaya , linux-acpi@vger.kernel.org, Jon Masters , Thomas Gleixner , Agustin Vega-Frias , linux-arm-kernel@lists.infradead.org, Ma Jun Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On 03.01.2017 10:37, Tomasz Nowicki wrote: > On 03.01.2017 09:43, Tomasz Nowicki wrote: >> On 02.01.2017 14:31, Hanjun Guo wrote: >>> For devices connecting to ITS, it needs dev id to identify >>> itself, and this dev id is represented in the IORT table in >>> named componant node [1] for platform devices, so in this >>> patch we will scan the IORT to retrieve device's dev id. >>> >>> Introduce iort_pmsi_get_dev_id() with pointer dev passed >>> in for that purpose. >>> >>> [1]: >>> https://static.docs.arm.com/den0049/b/DEN0049B_IO_Remapping_Table.pdf >>> >>> Signed-off-by: Hanjun Guo >>> Tested-by: Sinan Kaya >>> Tested-by: Majun >>> Tested-by: Xinwei Kong >>> Cc: Marc Zyngier >>> Cc: Lorenzo Pieralisi >>> Cc: Tomasz Nowicki >>> Cc: Thomas Gleixner >>> --- >>> drivers/acpi/arm64/iort.c | 26 >>> ++++++++++++++++++++++++++ >>> drivers/irqchip/irq-gic-v3-its-platform-msi.c | 4 +++- >>> include/linux/acpi_iort.h | 8 ++++++++ >>> 3 files changed, 37 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c >>> index 174e983..ab7bae7 100644 >>> --- a/drivers/acpi/arm64/iort.c >>> +++ b/drivers/acpi/arm64/iort.c >>> @@ -444,6 +444,32 @@ u32 iort_msi_map_rid(struct device *dev, u32 >>> req_id) >>> } >>> >>> /** >>> + * iort_pmsi_get_dev_id() - Get the device id for a device >>> + * @dev: The device for which the mapping is to be done. >>> + * @dev_id: The device ID found. >>> + * >>> + * Returns: 0 for successful find a dev id, errors otherwise >>> + */ >>> +int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) >>> +{ >>> + struct acpi_iort_node *node; >>> + >>> + if (!iort_table) >>> + return -ENODEV; >>> + >>> + node = iort_find_dev_node(dev); >>> + if (!node) { >>> + dev_err(dev, "can't find related IORT node\n"); >>> + return -ENODEV; >>> + } >>> + >>> + if(!iort_node_get_id(node, dev_id, IORT_MSI_TYPE, 0)) >>> + return -ENODEV; >>> + >>> + return 0; >>> +} >>> + >>> +/** >> Giving that you are extending this to NC-> >> SMMU->ITS case in later patch, we can use existing helpers from iort.c, >> like that: >> >> +/** >> + * iort_pmsi_get_dev_id() - Get the device id for a device >> + * @dev: The device for which the mapping is to be done. >> + * @dev_id: The device ID found. >> + * >> + * Returns: 0 for successful find a dev id, errors otherwise >> + */ >> +int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) >> +{ >> + struct acpi_iort_node *node; >> + >> + node = iort_find_dev_node(dev); >> + if (!node) >> + return -ENODEV; >> + >> + if (!iort_node_map_rid(node, 0, dev_id, IORT_MSI_TYPE)) >> + return -ENODEV; >> + >> + return 0; >> +} >> >> Correct me if I am wrong. >> > > "0" as rid_in for iort_node_map_rid() isn't good idea, sorry... > I refactored iort_node_map_rid() and added new iort_node_map_single_rid() which should works for you. Below patch bases on v4.10-rc2: if (map->flags & ACPI_IORT_ID_SINGLE_MAPPING) { if (type == ACPI_IORT_NODE_NAMED_COMPONENT || @@ -309,15 +318,9 @@ static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in, pr_warn(FW_BUG "[map %p] SINGLE MAPPING flag not allowed for node type %d, skipping ID map\n", map, type); - return -ENXIO; } - if (rid_in < map->input_base || - (rid_in >= map->input_base + map->id_count)) - return -ENXIO; - - *rid_out = map->output_base + (rid_in - map->input_base); - return 0; + return -ENXIO; } static @@ -359,6 +362,38 @@ struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node, return NULL; } +static struct acpi_iort_node *iort_node_map_rid_one(struct acpi_iort_node *node, + u32 *rid, bool single) +{ + struct acpi_iort_id_mapping *map; + struct acpi_iort_node *next; + int i; + + if (!node->mapping_offset || !node->mapping_count) + return NULL; + + map = ACPI_ADD_PTR(struct acpi_iort_id_mapping, node, + node->mapping_offset); + + /* Firmware bug! */ + if (!map->output_reference) { + pr_err(FW_BUG "[node %p type %d] ID map has NULL parent reference\n", + node, node->type); + return NULL; + } + + next = ACPI_ADD_PTR(struct acpi_iort_node, iort_table, + map->output_reference); + + /* Do the RID translation */ + for (i = 0; i < node->mapping_count; i++, map++) { + if (!iort_id_map(map, node->type, *rid, rid, single)) + return next; + } + + return NULL; +} + static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node, u32 rid_in, u32 *rid_out, u8 type_mask) @@ -367,42 +402,15 @@ static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node, /* Parse the ID mapping tree to find specified node type */ while (node) { - struct acpi_iort_id_mapping *map; - int i; - if (IORT_TYPE_MASK(node->type) & type_mask) { if (rid_out) *rid_out = rid; return node; } - if (!node->mapping_offset || !node->mapping_count) - goto fail_map; - - map = ACPI_ADD_PTR(struct acpi_iort_id_mapping, node, - node->mapping_offset); - - /* Firmware bug! */ - if (!map->output_reference) { - pr_err(FW_BUG "[node %p type %d] ID map has NULL parent reference\n", - node, node->type); - goto fail_map; - } - - /* Do the RID translation */ - for (i = 0; i < node->mapping_count; i++, map++) { - if (!iort_id_map(map, node->type, rid, &rid)) - break; - } - - if (i == node->mapping_count) - goto fail_map; - - node = ACPI_ADD_PTR(struct acpi_iort_node, iort_table, - map->output_reference); + node = iort_node_map_rid_one(node, &rid, false); } -fail_map: /* Map input RID to output RID unchanged on mapping failure*/ if (rid_out) *rid_out = rid_in; @@ -410,6 +418,20 @@ static struct acpi_iort_node *iort_node_map_rid(struct acpi_iort_node *node, return NULL; } +static struct acpi_iort_node *iort_node_map_single_rid( + struct acpi_iort_node *node, + u32 *rid_out, u8 type_mask) +{ + u32 rid; + + /* Get the initial rid */ + node = iort_node_map_rid_one(node, &rid, true); + if (!node) + return NULL; + + return iort_node_map_rid(node, rid, rid_out, type_mask); +} + static struct acpi_iort_node *iort_find_dev_node(struct device *dev) { struct pci_bus *pbus; diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index e0d2e6e..2526b89 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -297,8 +297,17 @@ static acpi_status iort_match_node_callback(struct acpi_iort_node *node, } static int iort_id_map(struct acpi_iort_id_mapping *map, u8 type, u32 rid_in, - u32 *rid_out) + u32 *rid_out, bool single) { + if (!single) { + if (rid_in < map->input_base || + (rid_in >= map->input_base + map->id_count)) + return -ENXIO; + + *rid_out = map->output_base + (rid_in - map->input_base); + return 0; + } + /* Single mapping does not care for input id */