From: Hanjun Guo <hanjun.guo@linaro.org> To: Marc Zyngier <marc.zyngier@arm.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com, Thomas Gleixner <tglx@linutronix.de>, Greg KH <gregkh@linuxfoundation.org>, Tomasz Nowicki <tn@semihalf.com>, Ma Jun <majun258@huawei.com>, Kefeng Wang <wangkefeng.wang@huawei.com>, Agustin Vega-Frias <agustinv@codeaurora.org>, Sinan Kaya <okaya@codeaurora.org>, charles.garcia-tobin@arm.com, huxinwei@huawei.com, yimin@huawei.com, Jon Masters <jcm@redhat.com>, Hanjun Guo <hanjun.guo@linaro.org> Subject: [PATCH v6 05/14] ACPI: platform-msi: retrieve dev id from IORT Date: Mon, 2 Jan 2017 21:31:36 +0800 [thread overview] Message-ID: <1483363905-2806-6-git-send-email-hanjun.guo@linaro.org> (raw) In-Reply-To: <1483363905-2806-1-git-send-email-hanjun.guo@linaro.org> 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 <hanjun.guo@linaro.org> Tested-by: Sinan Kaya <okaya@codeaurora.org> Tested-by: Majun <majun258@huawei.com> Tested-by: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Tomasz Nowicki <tn@semihalf.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- 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; +} + +/** * iort_dev_find_its_id() - Find the ITS identifier for a device * @dev: The device. * @req_id: Device's Requster ID diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c index 3c94278..16587a9 100644 --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c @@ -15,6 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> #include <linux/msi.h> #include <linux/of.h> @@ -56,7 +57,8 @@ static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, msi_info = msi_get_domain_info(domain->parent); - ret = of_pmsi_get_dev_id(domain, dev, &dev_id); + ret = dev->of_node ? of_pmsi_get_dev_id(domain, dev, &dev_id) : + iort_pmsi_get_dev_id(dev, &dev_id); if (ret) return ret; diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h index 77e0809..ef99fd52 100644 --- a/include/linux/acpi_iort.h +++ b/include/linux/acpi_iort.h @@ -33,6 +33,7 @@ void acpi_iort_init(void); bool iort_node_match(u8 type); u32 iort_msi_map_rid(struct device *dev, u32 req_id); +int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id); struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id); /* IOMMU interface */ void iort_set_dma_mask(struct device *dev); @@ -42,9 +43,16 @@ static inline void acpi_iort_init(void) { } static inline bool iort_node_match(u8 type) { return false; } static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id) { return req_id; } + static inline struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) { return NULL; } + +static inline int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) +{ + return -ENODEV; +} + /* IOMMU interface */ static inline void iort_set_dma_mask(struct device *dev) { } static inline -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: hanjun.guo@linaro.org (Hanjun Guo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 05/14] ACPI: platform-msi: retrieve dev id from IORT Date: Mon, 2 Jan 2017 21:31:36 +0800 [thread overview] Message-ID: <1483363905-2806-6-git-send-email-hanjun.guo@linaro.org> (raw) In-Reply-To: <1483363905-2806-1-git-send-email-hanjun.guo@linaro.org> 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 <hanjun.guo@linaro.org> Tested-by: Sinan Kaya <okaya@codeaurora.org> Tested-by: Majun <majun258@huawei.com> Tested-by: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Tomasz Nowicki <tn@semihalf.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- 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; +} + +/** * iort_dev_find_its_id() - Find the ITS identifier for a device * @dev: The device. * @req_id: Device's Requster ID diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c index 3c94278..16587a9 100644 --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c @@ -15,6 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi_iort.h> #include <linux/device.h> #include <linux/msi.h> #include <linux/of.h> @@ -56,7 +57,8 @@ static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, msi_info = msi_get_domain_info(domain->parent); - ret = of_pmsi_get_dev_id(domain, dev, &dev_id); + ret = dev->of_node ? of_pmsi_get_dev_id(domain, dev, &dev_id) : + iort_pmsi_get_dev_id(dev, &dev_id); if (ret) return ret; diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h index 77e0809..ef99fd52 100644 --- a/include/linux/acpi_iort.h +++ b/include/linux/acpi_iort.h @@ -33,6 +33,7 @@ void acpi_iort_init(void); bool iort_node_match(u8 type); u32 iort_msi_map_rid(struct device *dev, u32 req_id); +int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id); struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id); /* IOMMU interface */ void iort_set_dma_mask(struct device *dev); @@ -42,9 +43,16 @@ static inline void acpi_iort_init(void) { } static inline bool iort_node_match(u8 type) { return false; } static inline u32 iort_msi_map_rid(struct device *dev, u32 req_id) { return req_id; } + static inline struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id) { return NULL; } + +static inline int iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) +{ + return -ENODEV; +} + /* IOMMU interface */ static inline void iort_set_dma_mask(struct device *dev) { } static inline -- 1.9.1
next prev parent reply other threads:[~2017-01-02 13:31 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-02 13:31 [PATCH v6 00/14] ACPI platform MSI support and its example mbigen Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 01/14] ACPI: ARM64: IORT: minor cleanup for iort_match_node_callback() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-03 14:08 ` Lorenzo Pieralisi 2017-01-03 14:08 ` Lorenzo Pieralisi 2017-01-03 14:08 ` Lorenzo Pieralisi 2017-01-04 7:56 ` Hanjun Guo 2017-01-04 7:56 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 02/14] irqchip: gic-v3-its: keep the head file include in alphabetic order Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 14:16 ` Hanjun Guo 2017-01-11 14:16 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 03/14] ACPI: ARM64: IORT: add missing comment for iort_dev_find_its_id() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-04 14:34 ` Lorenzo Pieralisi 2017-01-04 14:34 ` Lorenzo Pieralisi 2017-01-05 6:05 ` Hanjun Guo 2017-01-05 6:05 ` Hanjun Guo 2017-01-05 6:05 ` Hanjun Guo 2017-01-05 9:53 ` Lorenzo Pieralisi 2017-01-05 9:53 ` Lorenzo Pieralisi 2017-01-05 9:53 ` Lorenzo Pieralisi 2017-01-02 13:31 ` [PATCH v6 04/14] irqchip: gicv3-its: platform-msi: refactor its_pmsi_prepare() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-11 10:31 ` Matthias Brugger 2017-01-11 10:31 ` Matthias Brugger 2017-01-02 13:31 ` Hanjun Guo [this message] 2017-01-02 13:31 ` [PATCH v6 05/14] ACPI: platform-msi: retrieve dev id from IORT Hanjun Guo 2017-01-03 8:43 ` Tomasz Nowicki 2017-01-03 8:43 ` Tomasz Nowicki 2017-01-03 9:37 ` Tomasz Nowicki 2017-01-03 9:37 ` Tomasz Nowicki 2017-01-03 11:24 ` Tomasz Nowicki 2017-01-03 11:24 ` Tomasz Nowicki 2017-01-04 19:18 ` Lorenzo Pieralisi 2017-01-04 19:18 ` Lorenzo Pieralisi 2017-01-05 12:45 ` Hanjun Guo 2017-01-05 12:45 ` Hanjun Guo 2017-01-05 15:15 ` Lorenzo Pieralisi 2017-01-05 15:15 ` Lorenzo Pieralisi 2017-01-10 13:39 ` Hanjun Guo 2017-01-10 13:39 ` Hanjun Guo 2017-01-10 13:39 ` Hanjun Guo 2017-01-10 14:57 ` Lorenzo Pieralisi 2017-01-10 14:57 ` Lorenzo Pieralisi 2017-01-11 14:15 ` Hanjun Guo 2017-01-11 14:15 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 06/14] irqchip: gicv3-its: platform-msi: refactor its_pmsi_init() to prepare for ACPI Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-03 7:41 ` Tomasz Nowicki 2017-01-03 7:41 ` Tomasz Nowicki 2017-01-04 7:02 ` Hanjun Guo 2017-01-04 7:02 ` Hanjun Guo 2017-01-04 7:29 ` Tomasz Nowicki 2017-01-04 7:29 ` Tomasz Nowicki 2017-01-04 8:25 ` Hanjun Guo 2017-01-04 8:25 ` Hanjun Guo 2017-01-04 9:02 ` Marc Zyngier 2017-01-04 9:02 ` Marc Zyngier 2017-01-04 10:19 ` Hanjun Guo 2017-01-04 10:19 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 07/14] irqchip: gicv3-its: platform-msi: scan MADT to create platform msi domain Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 08/14] ACPI: ARM64: IORT: rework iort_node_get_id() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-04 17:58 ` Lorenzo Pieralisi 2017-01-04 17:58 ` Lorenzo Pieralisi 2017-01-05 8:19 ` Hanjun Guo 2017-01-05 8:19 ` Hanjun Guo 2017-01-05 8:19 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 09/14] ACPI: platform: setup MSI domain for ACPI based platform device Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 21:17 ` Rafael J. Wysocki 2017-01-02 21:17 ` Rafael J. Wysocki 2017-01-02 21:17 ` Rafael J. Wysocki 2017-01-02 13:31 ` [PATCH v6 10/14] ACPI: ARM64: IORT: rework iort_node_get_id() for NC->SMMU->ITS case Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 22:30 ` Sinan Kaya 2017-01-02 22:30 ` Sinan Kaya 2017-01-02 22:30 ` Sinan Kaya 2017-01-03 0:08 ` Hanjun Guo 2017-01-03 0:08 ` Hanjun Guo 2017-01-03 0:08 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 11/14] msi: platform: make platform_msi_create_device_domain() ACPI aware Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-04 16:49 ` Lorenzo Pieralisi 2017-01-04 16:49 ` Lorenzo Pieralisi 2017-01-02 13:31 ` [PATCH v6 12/14] irqchip: mbigen: drop module owner Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 13/14] irqchip: mbigen: introduce mbigen_of_create_domain() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 14/14] irqchip: mbigen: Add ACPI support Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1483363905-2806-6-git-send-email-hanjun.guo@linaro.org \ --to=hanjun.guo@linaro.org \ --cc=agustinv@codeaurora.org \ --cc=charles.garcia-tobin@arm.com \ --cc=gregkh@linuxfoundation.org \ --cc=huxinwei@huawei.com \ --cc=jcm@redhat.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=lorenzo.pieralisi@arm.com \ --cc=majun258@huawei.com \ --cc=marc.zyngier@arm.com \ --cc=okaya@codeaurora.org \ --cc=rjw@rjwysocki.net \ --cc=tglx@linutronix.de \ --cc=tn@semihalf.com \ --cc=wangkefeng.wang@huawei.com \ --cc=yimin@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.