From: Robin Murphy <robin.murphy@arm.com> To: Joerg Roedel <joro@8bytes.org>, Christoph Hellwig <hch@lst.de> Cc: Vineet Gupta <vgupta@kernel.org>, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Huacai Chen <chenhuacai@kernel.org>, WANG Xuerui <kernel@xen0n.name>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Hanjun Guo <guohanjun@huawei.com>, Sudeep Holla <sudeep.holla@arm.com>, "K. Y. Srinivasan" <kys@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, David Woodhouse <dwmw2@infradead.org>, Lu Baolu <baolu.lu@linux.intel.com>, Niklas Schnelle <schnelle@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Gerald Schaefer <gerald.schaefer@linux.ibm.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Jason Gunthorpe <jgg@ziepe.ca>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Rob Herring <robh@kernel.org> Subject: [PATCH v4 1/7] OF: Retire dma-ranges mask workaround Date: Fri, 19 Apr 2024 17:54:40 +0100 [thread overview] Message-ID: <26620039901fdae52079ec1c8a4b2b324964a13e.1713523152.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1713523152.git.robin.murphy@arm.com> The fixup adding 1 to the dma-ranges size may have been for the benefit of some early AMD Seattle DTs, or may have merely been a just-in-case, but either way anyone who might have deserved to get the message has hopefully seen the warning in the 9 years we've had it there. The modern dma_range_map mechanism should happily handle odd-sized ranges with no ill effect, so there's little need to care anyway now. Clean it up. Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v2: Tweak commit message --- drivers/of/device.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/of/device.c b/drivers/of/device.c index de89f9906375..a988bee2ee5a 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -129,22 +129,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np, dma_end = r->dma_start + r->size; } size = dma_end - dma_start; - - /* - * Add a work around to treat the size as mask + 1 in case - * it is defined in DT as a mask. - */ - if (size & 1) { - dev_warn(dev, "Invalid size 0x%llx for dma-range(s)\n", - size); - size = size + 1; - } - - if (!size) { - dev_err(dev, "Adjusted size 0x%llx invalid\n", size); - kfree(map); - return -EINVAL; - } } /* -- 2.39.2.101.g768bb238c484.dirty
WARNING: multiple messages have this Message-ID (diff)
From: Robin Murphy <robin.murphy@arm.com> To: Joerg Roedel <joro@8bytes.org>, Christoph Hellwig <hch@lst.de> Cc: Vineet Gupta <vgupta@kernel.org>, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Huacai Chen <chenhuacai@kernel.org>, WANG Xuerui <kernel@xen0n.name>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Lorenzo Pieralisi <lpieralisi@kernel.org>, Hanjun Guo <guohanjun@huawei.com>, Sudeep Holla <sudeep.holla@arm.com>, "K. Y. Srinivasan" <kys@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, David Woodhouse <dwmw2@infradead.org>, Lu Baolu <baolu.lu@linux.intel.com>, Niklas Schnelle <schnelle@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Gerald Schaefer <gerald.schaefer@linux.ibm.com>, Jean-Philippe Brucker <jean-philippe@linaro.org>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Jason Gunthorpe <jgg@ziepe.ca>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Rob Herring <robh@kernel.org> Subject: [PATCH v4 1/7] OF: Retire dma-ranges mask workaround Date: Fri, 19 Apr 2024 17:54:40 +0100 [thread overview] Message-ID: <26620039901fdae52079ec1c8a4b2b324964a13e.1713523152.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1713523152.git.robin.murphy@arm.com> The fixup adding 1 to the dma-ranges size may have been for the benefit of some early AMD Seattle DTs, or may have merely been a just-in-case, but either way anyone who might have deserved to get the message has hopefully seen the warning in the 9 years we've had it there. The modern dma_range_map mechanism should happily handle odd-sized ranges with no ill effect, so there's little need to care anyway now. Clean it up. Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v2: Tweak commit message --- drivers/of/device.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/of/device.c b/drivers/of/device.c index de89f9906375..a988bee2ee5a 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -129,22 +129,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np, dma_end = r->dma_start + r->size; } size = dma_end - dma_start; - - /* - * Add a work around to treat the size as mask + 1 in case - * it is defined in DT as a mask. - */ - if (size & 1) { - dev_warn(dev, "Invalid size 0x%llx for dma-range(s)\n", - size); - size = size + 1; - } - - if (!size) { - dev_err(dev, "Adjusted size 0x%llx invalid\n", size); - kfree(map); - return -EINVAL; - } } /* -- 2.39.2.101.g768bb238c484.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-19 16:55 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-19 16:54 [PATCH v4 0/7] iommu, dma-mapping: Simplify arch_setup_dma_ops() Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-04-19 16:54 ` Robin Murphy [this message] 2024-04-19 16:54 ` [PATCH v4 1/7] OF: Retire dma-ranges mask workaround Robin Murphy 2024-04-19 16:54 ` [PATCH v4 2/7] OF: Simplify DMA range calculations Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-04-19 16:54 ` [PATCH v4 3/7] ACPI/IORT: Handle memory address size limits as limits Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-04-19 16:54 ` [PATCH v4 4/7] dma-mapping: Add helpers for dma_range_map bounds Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-04-19 16:54 ` [PATCH v4 5/7] iommu/dma: Make limit checks self-contained Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-05-14 13:27 ` Jon Hunter 2024-05-14 13:27 ` Jon Hunter 2024-05-15 14:59 ` Robin Murphy 2024-05-15 14:59 ` Robin Murphy 2024-04-19 16:54 ` [PATCH v4 6/7] iommu/dma: Centralise iommu_setup_dma_ops() Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-04-23 9:57 ` Catalin Marinas 2024-04-23 9:57 ` Catalin Marinas 2024-04-29 16:31 ` Dmitry Baryshkov 2024-04-29 16:31 ` Dmitry Baryshkov 2024-04-29 21:26 ` Dmitry Baryshkov 2024-04-29 21:26 ` Dmitry Baryshkov 2024-04-30 12:23 ` Konrad Dybcio 2024-04-30 12:23 ` Konrad Dybcio 2024-04-30 12:33 ` Robin Murphy 2024-04-30 12:33 ` Robin Murphy 2024-04-29 22:26 ` Robin Murphy 2024-04-29 22:26 ` Robin Murphy 2024-04-30 0:41 ` Dmitry Baryshkov 2024-04-30 0:41 ` Dmitry Baryshkov 2024-04-30 10:20 ` Robin Murphy 2024-04-30 10:20 ` Robin Murphy 2024-04-30 10:56 ` Dmitry Baryshkov 2024-04-30 10:56 ` Dmitry Baryshkov 2024-04-30 14:39 ` Niklas Schnelle 2024-04-30 14:39 ` Niklas Schnelle 2024-04-19 16:54 ` [PATCH v4 7/7] dma-mapping: Simplify arch_setup_dma_ops() Robin Murphy 2024-04-19 16:54 ` Robin Murphy 2024-04-23 9:59 ` Catalin Marinas 2024-04-23 9:59 ` Catalin Marinas 2024-04-22 6:37 ` [PATCH v4 0/7] iommu, " Christoph Hellwig 2024-04-22 6:37 ` Christoph Hellwig 2024-04-26 10:07 ` Joerg Roedel 2024-04-26 10:07 ` Joerg Roedel
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=26620039901fdae52079ec1c8a4b2b324964a13e.1713523152.git.robin.murphy@arm.com \ --to=robin.murphy@arm.com \ --cc=aou@eecs.berkeley.edu \ --cc=baolu.lu@linux.intel.com \ --cc=catalin.marinas@arm.com \ --cc=chenhuacai@kernel.org \ --cc=decui@microsoft.com \ --cc=devicetree@vger.kernel.org \ --cc=dwmw2@infradead.org \ --cc=frowand.list@gmail.com \ --cc=gerald.schaefer@linux.ibm.com \ --cc=guohanjun@huawei.com \ --cc=haiyangz@microsoft.com \ --cc=hch@lst.de \ --cc=iommu@lists.linux.dev \ --cc=jean-philippe@linaro.org \ --cc=jgg@ziepe.ca \ --cc=joro@8bytes.org \ --cc=kernel@xen0n.name \ --cc=kys@microsoft.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=lpieralisi@kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=mjrosato@linux.ibm.com \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=robh+dt@kernel.org \ --cc=robh@kernel.org \ --cc=schnelle@linux.ibm.com \ --cc=sudeep.holla@arm.com \ --cc=suravee.suthikulpanit@amd.com \ --cc=tsbogend@alpha.franken.de \ --cc=vgupta@kernel.org \ --cc=wei.liu@kernel.org \ --cc=will@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.