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: <hanjun.guo@linaro.org>, <linux-acpi@vger.kernel.org>,
        <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>,
        Jeremy Linton <jeremy.linton@arm.com>,
        Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
        Rob Herring <robh+dt@kernel.org>
Subject: [PATCH V2 1/4] Honor ACPI _CCA attribute setting
Date: Wed, 26 Aug 2015 00:33:26 +0700
Message-ID: <1440524009-5359-2-git-send-email-Suravee.Suthikulpanit@amd.com>
In-Reply-To: <1440524009-5359-1-git-send-email-Suravee.Suthikulpanit@amd.com>
References: <1440524009-5359-1-git-send-email-Suravee.Suthikulpanit@amd.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2015 17:33:47.7403
 (UTC)
X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.222];Helo=[atltwp02.amd.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0201MB1490
X-Microsoft-Exchange-Diagnostics: 1;BLUPR0201MB1539;2:E7OQERu++YofQ6z/oR+spjQGeqgp0m7+OHowSrkb4BGY1klkV0Cc6yoIiGAj9KhRYQiiNrdX9bZMM5agZRmQXJZBjqh/CJtOShJZTFPCACcEfghtMLQX2Hvj6jqwqqyW0YX6l+9CKvaC/H14iXWVZMS31F7C0GxayJyDwj73/QM=;3:rEy9tLtddccfS30K+DRCMZRDtr6dqqELtoUe2tlQDleR1sqFvbvozBdGm6tN16uL0eGRqVxssLffy7MGRZBOge9L9kE00I4Q86sJqtaDUHWOofRU8gFdYgq9u8BzLvAesg0ys2qUHqDdlm4MIFaq++JKoWvYj+Fhxgtonf/61NirpL4bLZDZ7B4guU5HhIY0YH33M+aPN1bx+SNBpkg66aqW/azInwLj+Z2vZhHD79NYRqRG07YZ3f27nlvysKy8;25:fD8OE7Hfn/k/NTgmDcZzEmg7o/ZeRJ6AkBELNGVK9DqdTDNX0GJ9ws6Welb87wDIKZkjdhR+pBvL52cKR7ZWUqIupejOtK/lirPJBRoBqg9n/2wgIlbue/NcMdNxFjT3SS1tdKObtKHXY55YYvRt7KIGAqZJpBhn+C7Sbyfn0RfKHW1HWjAjqF/U70T8KnYRAHYN1vsJZD5ftgUovOB/7N8CBjZeQR6uLvQQH4dhwZ48u0avrQZn6cWqu7hwGNZYEfqzFv+HqLhlrPGxoKEb1g==;23:7DtZJjtnPFjBIRD8nyjVrx/dc+RHG6DLfif9KJ/M79vCXaobSK4r/1vNT48nZdbrgZXOtnYMkg49SdiSlXd6nXvyX/yL7x1wNbG0a11CzLo45uI+Nl4tqwvqtidiJUfePwGbo5HlbwtxRvK23D4mwjBY9W744OrbAhJm8WOufgWS+bOI2qFcO6lqpuSipc0q
X-OriginatorOrg: amd.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1843
Lines: 49

From: Jeremy Linton <jeremy.linton@arm.com>

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>
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Catalin Marinas <catalin.marinas@arm.com>
CC: Rob Herring <robh+dt@kernel.org>
CC: Will Deacon <will.deacon@arm.com>
CC: Rafael J. Wysocki <rjw@rjwysocki.net>
---
 include/acpi/acpi_bus.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 83061ca..7ecb8e4 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -399,7 +399,7 @@ static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent)
 	 * case 1. Do not support and disable DMA.
 	 * case 2. Support but rely on arch-specific cache maintenance for
 	 *         non-coherence DMA operations.
-	 * Currently, we implement case 1 above.
+	 * Currently, we implement case 2 above.
 	 *
 	 * For the case when _CCA is missing (i.e. cca_seen=0) and
 	 * platform specifies ACPI_CCA_REQUIRED, we do not support DMA,
@@ -407,7 +407,8 @@ static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent)
 	 *
 	 * See acpi_init_coherency() for more info.
 	 */
-	if (adev->flags.coherent_dma) {
+	if (adev->flags.coherent_dma ||
+	    (adev->flags.cca_seen && IS_ENABLED(CONFIG_ARM64))) {
 		ret = true;
 		if (coherent)
 			*coherent = adev->flags.coherent_dma;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/