From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
To: bhelgaas@google.com, rjw@rjwysocki.net, lenb@kernel.org,
catalin.marinas@arm.com, will.deacon@arm.com
Cc: thomas.lendacky@amd.com, herbert@gondor.apana.org.au,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, hanjun.guo@linaro.org,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
davem@davemloft.net, linux-arm-kernel@lists.infradead.org
Subject: [PATCH V4 3/8] acpi: Adding DMA Attribute APIs for ACPI Device
Date: Wed, 21 Oct 2015 08:52:06 -0700 [thread overview]
Message-ID: <1445442731-28819-4-git-send-email-Suravee.Suthikulpanit@amd.com> (raw)
In-Reply-To: <1445442731-28819-1-git-send-email-Suravee.Suthikulpanit@amd.com>
Adding acpi_get_dma_attr() to query DMA attributes of ACPI devices.
It returns the enum dev_dma_attr, which communicates DMA information
more clearly. This API replaces the acpi_check_dma(), which will be
removed in subsequent patch.
This patch also provides a convenient function, acpi_dma_supported(),
to check DMA support of the specified ACPI device.
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Rafael J. Wysocki <rjw@rjwysocki.net>
---
drivers/acpi/scan.c | 42 ++++++++++++++++++++++++++++++++++++++++++
include/acpi/acpi_bus.h | 3 +++
include/linux/acpi.h | 10 ++++++++++
3 files changed, 55 insertions(+)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 01136b8..3be213e 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1328,6 +1328,48 @@ void acpi_free_pnp_ids(struct acpi_device_pnp *pnp)
kfree(pnp->unique_id);
}
+/**
+ * acpi_dma_supported - Check DMA support for the specified device.
+ * @adev: The pointer to acpi device
+ *
+ * Return false if DMA is not supported. Otherwise, return true
+ */
+bool acpi_dma_supported(struct acpi_device *adev)
+{
+ if (!adev)
+ return false;
+
+ if (adev->flags.cca_seen)
+ return true;
+
+ /*
+ * Per ACPI 6.0 sec 6.2.17, assume devices can do cache-coherent
+ * DMA on "Intel platforms". Presumably that includes all x86 and
+ * ia64, and other arches will set CONFIG_ACPI_CCA_REQUIRED=y.
+ */
+ if (!IS_ENABLED(CONFIG_ACPI_CCA_REQUIRED))
+ return true;
+
+ return false;
+}
+
+/**
+ * acpi_get_dma_attr - Check the supported DMA attr for the specified device.
+ * @adev: The pointer to acpi device
+ *
+ * Return enum dev_dma_attr.
+ */
+enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)
+{
+ if (!acpi_dma_supported(adev))
+ return DEV_DMA_NOT_SUPPORTED;
+
+ if (adev->flags.coherent_dma)
+ return DEV_DMA_COHERENT;
+ else
+ return DEV_DMA_NON_COHERENT;
+}
+
static void acpi_init_coherency(struct acpi_device *adev)
{
unsigned long long cca = 0;
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 5a42204..13417d0 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -567,6 +567,9 @@ struct acpi_pci_root {
/* helper */
+bool acpi_dma_supported(struct acpi_device *adev);
+enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev);
+
struct acpi_device *acpi_find_child_device(struct acpi_device *parent,
u64 address, bool check_children);
int acpi_is_root_bridge(acpi_handle);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index dd39202..c47892c 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -569,6 +569,16 @@ static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent)
return false;
}
+static inline bool acpi_dma_supported(struct acpi_device *adev)
+{
+ return false;
+}
+
+static inline enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)
+{
+ return DEV_DMA_NOT_SUPPORTED;
+}
+
#define ACPI_PTR(_ptr) (NULL)
#endif /* !CONFIG_ACPI */
--
2.1.0
next prev parent reply other threads:[~2015-10-21 15:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-21 15:52 [PATCH V4 0/8] PCI: ACPI: Setting up DMA coherency for PCI device from _CCA attribute Suravee Suthikulpanit
2015-10-21 15:52 ` [PATCH V4 1/8] acpi: Honor ACPI _CCA attribute setting Suravee Suthikulpanit
2015-10-27 14:41 ` Bjorn Helgaas
2015-10-21 15:52 ` [PATCH V4 2/8] device property: Introducing enum dev_dma_attr Suravee Suthikulpanit
2015-10-21 15:52 ` Suravee Suthikulpanit [this message]
2015-10-21 15:52 ` [PATCH V4 4/8] device property: Adding DMA Attribute APIs for Generic Devices Suravee Suthikulpanit
2015-10-21 15:52 ` [PATCH V4 5/8] device property: acpi: Make use of the new DMA Attribute APIs Suravee Suthikulpanit
2015-10-21 15:52 ` [PATCH V4 6/8] device property: acpi: Remove unused DMA APIs Suravee Suthikulpanit
2015-10-21 15:52 ` [PATCH V4 7/8] PCI: OF: Move of_pci_dma_configure() to pci_dma_configure() Suravee Suthikulpanit
2015-10-24 7:44 ` Hanjun Guo
2015-10-28 18:12 ` Suravee Suthikulpanit
2015-10-27 14:38 ` Bjorn Helgaas
2015-10-21 15:52 ` [PATCH V4 8/8] PCI: ACPI: Add support for PCI device DMA coherency Suravee Suthikulpanit
2015-10-24 7:47 ` Hanjun Guo
2015-10-27 14:48 ` Bjorn Helgaas
2015-10-24 7:51 ` [PATCH V4 0/8] PCI: ACPI: Setting up DMA coherency for PCI device from _CCA attribute Hanjun Guo
2015-10-27 14:52 ` Bjorn Helgaas
2015-10-27 15:27 ` Rafael J. Wysocki
2015-10-28 13:54 ` Hanjun Guo
2015-10-28 16:00 ` Rafael J. Wysocki
2015-10-28 17:21 ` Suravee Suthikulpanit
2015-10-29 6:37 ` 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=1445442731-28819-4-git-send-email-Suravee.Suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=hanjun.guo@linaro.org \
--cc=herbert@gondor.apana.org.au \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=thomas.lendacky@amd.com \
--cc=will.deacon@arm.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).