From patchwork Fri Jun 16 18:10:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9792751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D526260326 for ; Fri, 16 Jun 2017 18:14:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0C1C2625B for ; Fri, 16 Jun 2017 18:14:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C417A2866B; Fri, 16 Jun 2017 18:14:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 86F962625B for ; Fri, 16 Jun 2017 18:14:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvkO-0001rc-50; Fri, 16 Jun 2017 18:13:28 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvkN-0001p1-0l for xen-devel@lists.xenproject.org; Fri, 16 Jun 2017 18:13:27 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id EE/78-03058-6CF14495; Fri, 16 Jun 2017 18:13:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsXiaHS5VfeovEu kwceTahbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aq5g+sBe+5Kxpb37I1MO7h6mLk4mAROMEm 8X9bKzOIIyRwglGia9sJxi5GTg42ARWJN8972EESIgKHWCROvjnKBJJgFlCQ+HVvE2sXIweHs EC0xIbNuiBhFgFVie3znoP18goYSPw7+YIdxJYQkJfY1XaRFcTmBIr/PLINrEZIQF9iys27jC DzJQRaGCXaLq5gmcDIs4CRYRWjenFqUVlqka6RXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlK xXnJ+7iZGoOcZgGAH47K/TocYJTmYlER53z9xjhTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwTtZ ziVSSLAoNT21Ii0zBxiCMGkJDh4lEd79fEBp3uKCxNzizHSI1ClGRSlx3q0gfQIgiYzSPLg2W NhfYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvU5ApPJl5JXDTXwEtZgJaHHTBAWRxSSJCSq qBkathd2p5S+Lt2bFm1Zwea9Yknny/yp7deNYUzaDiM4KpU/u5JdVF+eRln8frfTPSzFzHPV3 T7O3Db1tVupcdj7u2RCd8dsbH9H+Hzu6+lCaVO+ttcxNj2bc2pqdiwUs+bxHYVRExPzrciXWq XwqvL8Pe9WyynBOcA6rrvs5RCg6ouRrSIhugxFKckWioxVxUnAgAYYqeVHYCAAA= X-Env-Sender: BATV+48ca1ab4adaecdf09dc3+5045+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1497636804!74318398!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5026 invoked from network); 16 Jun 2017 18:13:25 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-7.tower-21.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 16 Jun 2017 18:13:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=b32hSH5IEVBjlCN7NVj+ixF9++g48vrma/m3FufguJ8=; b=ckSPX+ws8hnvYEYv3rFnu3vLV BgqPfMiqTUZw4zxrjp1uGNJFyhVaDxWy5accJmNOw+ILeJtBapR4lGJylFhk2scq0VI86tmP1ial4 zHY2YGTh1KCV+zjdc1cN/ueiX6kh6wKVnNvligjRCztnfN31FlZ8fl1p5jgNX98d+jeYgOkWoc0mE L57cTWEt9UxDjxS23QJTXktVH2VTnrVQ8dapQkLcv4U3sXOgx+aoLI4Q7qy33niNXf8rZPB3aRGKi 6sSwyLEvYJFAufBKTWbqqUYFUYT0NodiukNamlG2zLQNI9hUYWZWXBdV7lL/XGpii/dOY7CmT1frN x+uY4p/8g==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dLvkG-0006se-Ji; Fri, 16 Jun 2017 18:13:21 +0000 From: Christoph Hellwig To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, openrisc@lists.librecores.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, iommu@lists.linux-foundation.org, netdev@vger.kernel.org Date: Fri, 16 Jun 2017 20:10:52 +0200 Message-Id: <20170616181059.19206-38-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616181059.19206-1-hch@lst.de> References: <20170616181059.19206-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Cc: linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH 37/44] mips/loongson64: implement ->dma_supported instead of ->set_dma_mask X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Same behavior, less code duplication. Signed-off-by: Christoph Hellwig --- arch/mips/loongson64/common/dma-swiotlb.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/arch/mips/loongson64/common/dma-swiotlb.c b/arch/mips/loongson64/common/dma-swiotlb.c index 178ca17a5667..34486c138206 100644 --- a/arch/mips/loongson64/common/dma-swiotlb.c +++ b/arch/mips/loongson64/common/dma-swiotlb.c @@ -75,19 +75,11 @@ static void loongson_dma_sync_sg_for_device(struct device *dev, mb(); } -static int loongson_dma_set_mask(struct device *dev, u64 mask) +static int loongson_dma_supported(struct device *dev, u64 mask) { - if (!dev->dma_mask || !dma_supported(dev, mask)) - return -EIO; - - if (mask > DMA_BIT_MASK(loongson_sysconf.dma_mask_bits)) { - *dev->dma_mask = DMA_BIT_MASK(loongson_sysconf.dma_mask_bits); - return -EIO; - } - - *dev->dma_mask = mask; - - return 0; + if (mask > DMA_BIT_MASK(loongson_sysconf.dma_mask_bits)) + return 0; + return swiotlb_dma_supported(dev, mask); } dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) @@ -126,8 +118,7 @@ static const struct dma_map_ops loongson_dma_map_ops = { .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu, .sync_sg_for_device = loongson_dma_sync_sg_for_device, .mapping_error = swiotlb_dma_mapping_error, - .dma_supported = swiotlb_dma_supported, - .set_dma_mask = loongson_dma_set_mask + .dma_supported = loongson_dma_supported, }; void __init plat_swiotlb_setup(void)