diff options
author | Jeremy Linton <jeremy.linton@arm.com> | 2015-10-28 18:50:46 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-06 19:29:21 -0500 |
commit | d764c21c7b1aa5ce982eaa8400517d8004d30267 (patch) | |
tree | c5ead5eb59210359bc29d8d308df3ac829644f80 | |
parent | 5293fea28c9355a12792c4a85c9daad612efc503 (diff) |
ACPI: Honor ACPI _CCA attribute setting
ACPI configurations can now mark devices as noncoherent,
support that choice.
NOTE: This is required to support USB on ARM Juno Development Board.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | include/acpi/acpi_bus.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index e234725eadc7..8df990520304 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -407,7 +407,7 @@ static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent) | |||
407 | * case 1. Do not support and disable DMA. | 407 | * case 1. Do not support and disable DMA. |
408 | * case 2. Support but rely on arch-specific cache maintenance for | 408 | * case 2. Support but rely on arch-specific cache maintenance for |
409 | * non-coherence DMA operations. | 409 | * non-coherence DMA operations. |
410 | * Currently, we implement case 1 above. | 410 | * Currently, we implement case 2 above. |
411 | * | 411 | * |
412 | * For the case when _CCA is missing (i.e. cca_seen=0) and | 412 | * For the case when _CCA is missing (i.e. cca_seen=0) and |
413 | * platform specifies ACPI_CCA_REQUIRED, we do not support DMA, | 413 | * platform specifies ACPI_CCA_REQUIRED, we do not support DMA, |
@@ -415,7 +415,8 @@ static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent) | |||
415 | * | 415 | * |
416 | * See acpi_init_coherency() for more info. | 416 | * See acpi_init_coherency() for more info. |
417 | */ | 417 | */ |
418 | if (adev->flags.coherent_dma) { | 418 | if (adev->flags.coherent_dma || |
419 | (adev->flags.cca_seen && IS_ENABLED(CONFIG_ARM64))) { | ||
419 | ret = true; | 420 | ret = true; |
420 | if (coherent) | 421 | if (coherent) |
421 | *coherent = adev->flags.coherent_dma; | 422 | *coherent = adev->flags.coherent_dma; |