From: Robin Murphy <robin.murphy@arm.com> To: hch@lst.de, m.szyprowski@samsung.com Cc: lorenzo.pieralisi@arm.com, gregkh@linuxfoundation.org, joro@8bytes.org, x86@kernel.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, robh+dt@kernel.org, hanjun.guo@linaro.org, sudeep.holla@arm.com, frowand.list@gmail.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/7] ACPI/IORT: Support address size limit for root complexes Date: Mon, 23 Jul 2018 23:16:06 +0100 [thread overview] Message-ID: <dc9e639bdd6bb365995e0337e3571c24a49305f1.1532382222.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1532382222.git.robin.murphy@arm.com> IORT revision D allows PCI root complex nodes to specify a memory address size limit equivalently to named components, to help describe straightforward integrations which don't really warrant a full-blown _DMA method. Now that our headers are up-to-date, plumb it in. If both _DMA and an address size limit are present, we would always expect the former to be a more specific subset of the latter (since it makes little sense for a _DMA range to involve bits which IORT says aren't wired up), thus we can save calculating an explicit intersection of the two effective masks and simply use short-circuit logic instead. Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/acpi/arm64/iort.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 7a3a541046ed..4a66896e2aa3 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -947,6 +947,24 @@ static int nc_dma_get_range(struct device *dev, u64 *size) return 0; } +static int rc_dma_get_range(struct device *dev, u64 *size) +{ + struct acpi_iort_node *node; + struct acpi_iort_root_complex *rc; + + node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX, + iort_match_node_callback, dev); + if (!node || node->revision < 1) + return -ENODEV; + + rc = (struct acpi_iort_root_complex *)node->node_data; + + *size = rc->memory_address_limit >= 64 ? U64_MAX : + 1ULL<<rc->memory_address_limit; + + return 0; +} + /** * iort_dma_setup() - Set-up device DMA parameters. * @@ -975,10 +993,13 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) size = max(dev->coherent_dma_mask, dev->coherent_dma_mask + 1); - if (dev_is_pci(dev)) + if (dev_is_pci(dev)) { ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size); - else + if (ret == -ENODEV) + ret = rc_dma_get_range(dev, &size); + } else { ret = nc_dma_get_range(dev, &size); + } if (!ret) { msb = fls64(dmaaddr + size - 1); -- 2.17.1.dirty
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/7] ACPI/IORT: Support address size limit for root complexes Date: Mon, 23 Jul 2018 23:16:06 +0100 [thread overview] Message-ID: <dc9e639bdd6bb365995e0337e3571c24a49305f1.1532382222.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1532382222.git.robin.murphy@arm.com> IORT revision D allows PCI root complex nodes to specify a memory address size limit equivalently to named components, to help describe straightforward integrations which don't really warrant a full-blown _DMA method. Now that our headers are up-to-date, plumb it in. If both _DMA and an address size limit are present, we would always expect the former to be a more specific subset of the latter (since it makes little sense for a _DMA range to involve bits which IORT says aren't wired up), thus we can save calculating an explicit intersection of the two effective masks and simply use short-circuit logic instead. Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/acpi/arm64/iort.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 7a3a541046ed..4a66896e2aa3 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -947,6 +947,24 @@ static int nc_dma_get_range(struct device *dev, u64 *size) return 0; } +static int rc_dma_get_range(struct device *dev, u64 *size) +{ + struct acpi_iort_node *node; + struct acpi_iort_root_complex *rc; + + node = iort_scan_node(ACPI_IORT_NODE_PCI_ROOT_COMPLEX, + iort_match_node_callback, dev); + if (!node || node->revision < 1) + return -ENODEV; + + rc = (struct acpi_iort_root_complex *)node->node_data; + + *size = rc->memory_address_limit >= 64 ? U64_MAX : + 1ULL<<rc->memory_address_limit; + + return 0; +} + /** * iort_dma_setup() - Set-up device DMA parameters. * @@ -975,10 +993,13 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) size = max(dev->coherent_dma_mask, dev->coherent_dma_mask + 1); - if (dev_is_pci(dev)) + if (dev_is_pci(dev)) { ret = acpi_dma_get_range(dev, &dmaaddr, &offset, &size); - else + if (ret == -ENODEV) + ret = rc_dma_get_range(dev, &size); + } else { ret = nc_dma_get_range(dev, &size); + } if (!ret) { msb = fls64(dmaaddr + size - 1); -- 2.17.1.dirty
next prev parent reply other threads:[~2018-07-23 22:16 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-23 22:16 [PATCH v2 0/7] Stop losing firmware-set DMA masks Robin Murphy 2018-07-23 22:16 ` Robin Murphy 2018-07-23 22:16 ` Robin Murphy [this message] 2018-07-23 22:16 ` [PATCH v2 1/7] ACPI/IORT: Support address size limit for root complexes Robin Murphy 2018-07-23 22:16 ` [PATCH v2 2/7] dma-mapping: Generalise dma_32bit_limit flag Robin Murphy 2018-07-23 22:16 ` Robin Murphy [not found] ` <c1720f0181b66f711e4097d85149757b16a7b0a7.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-25 11:29 ` Christoph Hellwig 2018-07-25 11:29 ` Christoph Hellwig 2018-07-27 17:45 ` Grygorii Strashko via iommu 2018-07-27 17:45 ` Grygorii Strashko [not found] ` <7872d914-8ea7-06e4-4a0c-489023e098d6-l0cyMroinI0@public.gmane.org> 2018-07-27 20:11 ` Robin Murphy 2018-07-27 20:11 ` Robin Murphy [not found] ` <5354ef69-c54e-170b-62d4-5110dc60aa8f-5wv7dgnIgG8@public.gmane.org> 2018-07-27 20:41 ` Grygorii Strashko via iommu 2018-07-27 20:41 ` Grygorii Strashko 2018-07-23 22:16 ` [PATCH v2 3/7] ACPI/IORT: Set bus DMA mask as appropriate Robin Murphy 2018-07-23 22:16 ` Robin Murphy [not found] ` <07cbf8f77fac552dca9b4c85a9d3bd8ed5a4cd29.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-25 11:29 ` Christoph Hellwig 2018-07-25 11:29 ` Christoph Hellwig 2018-07-25 13:16 ` Lorenzo Pieralisi 2018-07-25 13:16 ` Lorenzo Pieralisi 2018-07-23 22:16 ` [PATCH v2 4/7] of/device: " Robin Murphy 2018-07-23 22:16 ` Robin Murphy [not found] ` <cc56f074b8da7e03a187b2363b1f2c2955d62c1c.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-25 11:30 ` Christoph Hellwig 2018-07-25 11:30 ` Christoph Hellwig 2018-07-23 22:16 ` [PATCH v2 5/7] iommu/dma: Respect bus DMA limit for IOVAs Robin Murphy 2018-07-23 22:16 ` Robin Murphy [not found] ` <d370670edae9c9c537a5280c5e7c96bf3ec7ed8f.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-26 8:58 ` Christoph Hellwig 2018-07-26 8:58 ` Christoph Hellwig 2018-07-23 22:16 ` [PATCH v2 6/7] ACPI/IORT: Don't set default coherent DMA mask Robin Murphy 2018-07-23 22:16 ` Robin Murphy [not found] ` <3525869e8e7530128bf9718ae8af7d7564b3c684.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-25 15:27 ` Lorenzo Pieralisi 2018-07-25 15:27 ` Lorenzo Pieralisi 2018-07-25 15:43 ` Robin Murphy 2018-07-25 15:43 ` Robin Murphy 2018-07-23 22:16 ` [PATCH v2 7/7] OF: " Robin Murphy 2018-07-23 22:16 ` Robin Murphy [not found] ` <66c08e4df2032fde82a2f97544f41fd3a2f24a94.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-26 23:52 ` Grygorii Strashko via iommu 2018-07-26 23:52 ` Grygorii Strashko 2018-07-27 0:22 ` Grygorii Strashko 2018-07-27 0:22 ` Grygorii Strashko [not found] ` <92d6b010-b5c0-fc59-0668-5b455e26c912-l0cyMroinI0@public.gmane.org> 2018-07-27 11:36 ` Robin Murphy 2018-07-27 11:36 ` Robin Murphy 2018-07-27 17:34 ` Grygorii Strashko 2018-07-27 17:34 ` Grygorii Strashko [not found] ` <108a6254-1257-5daf-deaa-69bc4db2ec77-l0cyMroinI0@public.gmane.org> 2018-07-27 19:46 ` Robin Murphy 2018-07-27 19:46 ` Robin Murphy [not found] ` <c7a9c7ae-1f4a-af9d-df78-1f48bb5c28a5-5wv7dgnIgG8@public.gmane.org> 2018-07-27 18:13 ` Russell King - ARM Linux 2018-07-27 18:13 ` Russell King - ARM Linux [not found] ` <20180727181302.GC17271-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org> 2018-07-27 18:45 ` Grygorii Strashko via iommu 2018-07-27 18:45 ` Grygorii Strashko [not found] ` <affa2718-5f3a-7439-db25-ce171a99414a-l0cyMroinI0@public.gmane.org> 2018-07-27 20:42 ` Robin Murphy 2018-07-27 20:42 ` Robin Murphy 2018-07-27 19:29 ` Robin Murphy 2018-07-27 19:29 ` Robin Murphy 2018-07-26 23:45 ` [PATCH v2 0/7] Stop losing firmware-set DMA masks Grygorii Strashko 2018-07-26 23:45 ` Grygorii Strashko [not found] ` <c73bc8d2-b745-ff31-1949-7a59ab04ede6-l0cyMroinI0@public.gmane.org> 2018-07-27 10:55 ` Robin Murphy 2018-07-27 10:55 ` Robin Murphy [not found] ` <8b8ac841-5c4c-ae27-21d5-d7aaaf4c277c-5wv7dgnIgG8@public.gmane.org> 2018-07-27 17:22 ` Grygorii Strashko via iommu 2018-07-27 17:22 ` Grygorii Strashko [not found] ` <cover.1532382222.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2018-07-25 11:31 ` Christoph Hellwig 2018-07-25 11:31 ` Christoph Hellwig [not found] ` <20180725113122.GD24736-jcswGhMUV9g@public.gmane.org> 2018-07-25 12:11 ` Joerg Roedel 2018-07-25 12:11 ` Joerg Roedel 2018-07-25 12:12 ` Robin Murphy 2018-07-25 12:12 ` Robin Murphy [not found] ` <5e036ade-db0b-f628-a4a0-6d014d1d76c8-5wv7dgnIgG8@public.gmane.org> 2018-07-25 12:17 ` Will Deacon 2018-07-25 12:17 ` Will Deacon 2018-07-25 13:58 ` Ard Biesheuvel 2018-07-25 13:58 ` Ard Biesheuvel 2018-07-26 9:00 ` Christoph Hellwig 2018-07-26 9:00 ` Christoph Hellwig 2018-07-29 12:32 ` Arnd Bergmann 2018-07-29 12:32 ` Arnd Bergmann [not found] ` <CAK8P3a3HDJ6svNN_cwvegxu20yNv8+tvc0D1A6Ooeq8agawbFg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2018-07-31 11:24 ` Robin Murphy 2018-07-31 11:24 ` Robin Murphy [not found] ` <1ccccc4b-7d4c-a3ee-23a2-f108916705e9-5wv7dgnIgG8@public.gmane.org> 2018-08-06 10:01 ` Arnd Bergmann 2018-08-06 10:01 ` Arnd Bergmann [not found] ` <CAK8P3a3ZcOeHMR_qFnsBdXED+2X8_AEMKoS5MeAQhbapbGmm9w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2018-08-06 12:13 ` Christoph Hellwig 2018-08-06 12:13 ` Christoph Hellwig [not found] ` <20180806121334.GA5340-jcswGhMUV9g@public.gmane.org> 2018-08-06 12:13 ` Arnd Bergmann 2018-08-06 12:13 ` Arnd Bergmann
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=dc9e639bdd6bb365995e0337e3571c24a49305f1.1532382222.git.robin.murphy@arm.com \ --to=robin.murphy@arm.com \ --cc=frowand.list@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=hanjun.guo@linaro.org \ --cc=hch@lst.de \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=m.szyprowski@samsung.com \ --cc=robh+dt@kernel.org \ --cc=sudeep.holla@arm.com \ --cc=x86@kernel.org \ /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.