From patchwork Fri May 15 21:23:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suravee Suthikulpanit X-Patchwork-Id: 6416471 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 57A8AC0432 for ; Fri, 15 May 2015 21:24:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FC2A2054C for ; Fri, 15 May 2015 21:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0EFC20582 for ; Fri, 15 May 2015 21:24:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946218AbbEOVYM (ORCPT ); Fri, 15 May 2015 17:24:12 -0400 Received: from mail-by2on0143.outbound.protection.outlook.com ([207.46.100.143]:37088 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1946049AbbEOVX5 (ORCPT ); Fri, 15 May 2015 17:23:57 -0400 Received: from BY2PR02CA0074.namprd02.prod.outlook.com (10.242.32.32) by BY1PR02MB1114.namprd02.prod.outlook.com (25.162.108.140) with Microsoft SMTP Server (TLS) id 15.1.154.19; Fri, 15 May 2015 21:23:54 +0000 Received: from BL2FFO11FD031.protection.gbl (2a01:111:f400:7c09::198) by BY2PR02CA0074.outlook.office365.com (2a01:111:e400:2c2a::32) with Microsoft SMTP Server (TLS) id 15.1.160.19 via Frontend Transport; Fri, 15 May 2015 21:23:54 +0000 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; arm.com; dkim=none (message not signed) header.d=none; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from atltwp02.amd.com (165.204.84.222) by BL2FFO11FD031.mail.protection.outlook.com (10.173.160.71) with Microsoft SMTP Server id 15.1.160.8 via Frontend Transport; Fri, 15 May 2015 21:23:53 +0000 X-WSS-ID: 0NOEU3P-08-55R-02 X-M-MSG: Received: from satlvexedge01.amd.com (satlvexedge01.amd.com [10.177.96.28]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 2FFB1D22026; Fri, 15 May 2015 17:23:48 -0400 (EDT) Received: from SATLEXDAG04.amd.com (10.181.40.9) by satlvexedge01.amd.com (10.177.96.28) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 15 May 2015 16:23:57 -0500 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by satlexdag04.amd.com (10.181.40.9) with Microsoft SMTP Server id 14.3.195.1; Fri, 15 May 2015 17:23:50 -0400 From: Suravee Suthikulpanit To: , , , , , , , , CC: , , , , , , , , , , , "Suravee Suthikulpanit" Subject: [V4 PATCH 4/6] device property: Introduces device_dma_is_coherent() Date: Fri, 15 May 2015 16:23:12 -0500 Message-ID: <1431724994-21601-5-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431724994-21601-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1431724994-21601-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD031; 1:tyMxBXm36TcoQi4nmdYkypAk7jmXnMRyNQR7Zqe5JCR18t1BJAWl98/WvcY6LbIxhVBdE24be799KTEkgeO6DcDj3DPmWRrOfdStP6vQIualHLefoyca+kOovBH95T1PQ0LuSdkl/O4pIU6f5KzLvhRG76RAZz8M0wSA3mn7TPDFnZLmnlVoKcHbFq1VOIOKChLNvnW0+SRhmb0QmwULGs3ccqaEtXDqXjqHncMFbNWALEgdrBt7M2W/sM379p8GKdM2XyhO/AD4FHxd+y6zkrMAbSremTKMhZ+ETtpL9zR96JNgKYfsKJTaCN9opBwv X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(189002)(199003)(2201001)(86362001)(575784001)(106466001)(53416004)(50466002)(87936001)(46102003)(229853001)(48376002)(101416001)(189998001)(19580405001)(77096005)(5001770100001)(47776003)(2950100001)(19580395003)(50226001)(36756003)(105586002)(92566002)(77156002)(62966003)(76176999)(50986999); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR02MB1114; H:atltwp02.amd.com; FPR:; SPF:None; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR02MB1114; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY1PR02MB1114; BCL:0; PCL:0; RULEID:; SRVR:BY1PR02MB1114; X-Forefront-PRVS: 0577AD41D6 X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2015 21:23:53.5402 (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: BY1PR02MB1114 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, device drivers, which support both OF and ACPI, need to call two separate APIs, of_dma_is_coherent() and acpi_dma_is_coherent()) to determine device coherency attribute. This patch simplifies this process by introducing a new device property API, device_dma_is_coherent(), which calls the appropriate interface based on the booting architecture. Signed-off-by: Suravee Suthikulpanit CC: Rafael J. Wysocki --- drivers/base/property.c | 12 ++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 1d0b116..8123c6e 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -14,6 +14,7 @@ #include #include #include +#include #include /** @@ -519,3 +520,14 @@ unsigned int device_get_child_node_count(struct device *dev) return count; } EXPORT_SYMBOL_GPL(device_get_child_node_count); + +bool device_dma_is_coherent(struct device *dev) +{ + if (IS_ENABLED(CONFIG_OF) && dev->of_node) + return of_dma_is_coherent(dev->of_node); + else if (has_acpi_companion(dev)) + return acpi_dma_is_coherent(acpi_node(dev->fwnode)); + + return false; +} +EXPORT_SYMBOL_GPL(device_dma_is_coherent); diff --git a/include/linux/property.h b/include/linux/property.h index de8bdf4..76ebde9 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -164,4 +164,6 @@ struct property_set { void device_add_property_set(struct device *dev, struct property_set *pset); +bool device_dma_is_coherent(struct device *dev); + #endif /* _LINUX_PROPERTY_H_ */