From patchwork Fri Jul 15 09:04:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 9231405 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 F40D760865 for ; Fri, 15 Jul 2016 09:08:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1FB325E13 for ; Fri, 15 Jul 2016 09:08:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D694F28319; Fri, 15 Jul 2016 09:08:59 +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=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7882B25E13 for ; Fri, 15 Jul 2016 09:08:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bNz5q-0004fM-Rd; Fri, 15 Jul 2016 09:07:34 +0000 Received: from mail-pf0-x22b.google.com ([2607:f8b0:400e:c00::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bNz3o-0001q1-M9 for linux-arm-kernel@lists.infradead.org; Fri, 15 Jul 2016 09:05:30 +0000 Received: by mail-pf0-x22b.google.com with SMTP id t190so39402660pfb.3 for ; Fri, 15 Jul 2016 02:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5AxypCnhrckZykmJlm5JqiScEPz2jtRVLnfSjJClOMs=; b=LAgQf8n2YkrMVQKu3Mj481mBlgXLcCNwSLHLo/zQNTPgsYt8jtCIEtJ2c2jHLMQk89 TAZMpVtzPXhAQHzjxBJpserhanmUiZ1FlF0RAzqM9WODefiXGCnEyL80+iwYE/V36TOF 10TOU9MkrBPmmVqW/q2xYsn7F9orfHYX0MJHI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5AxypCnhrckZykmJlm5JqiScEPz2jtRVLnfSjJClOMs=; b=M3V/WttJu86HtQ/CFdVJd22QSTY1G2cvzP18gif2hCyTXcH/+QzEQd7EN3zLpNH6VM u6GpGB/1ucWU9zxWrSo8Wy3UpJd+fTJRj2TZ/at6VSeN1CaLaOOSRWY0mdyhDZ76yufG +/o2KKS6l7ACqOYNGwfbf9NNIomRW7ZqAOT/7ftZsY7hzeU+CoYHaIxTd5I/hyAweTgy n6ePOsmBFFmwJPVJ9hpvI/cazqdQWtx/AiR33DXBPX0LtXatSHiSQ208OIYo51w0Ypi3 DIvUsEkRu4sR+VGcvTVVzQFCH1uJ5wSEym0ApMxKCBx/5u42Yhg7Y1rjQKatk9ce4Csz 4w5A== X-Gm-Message-State: ALyK8tIbeLKWz7fI2liE/Ld4TM98uP42Y9hRs7oghMoNLpPgmsAblhmlvy/KCr9g45U4lyiW X-Received: by 10.98.32.81 with SMTP id g78mr19936663pfg.20.1468573507216; Fri, 15 Jul 2016 02:05:07 -0700 (PDT) Received: from anup-HP-Compaq-8100-Elite-CMT-PC.ban.broadcom.com ([202.140.56.34]) by smtp.gmail.com with ESMTPSA id m78sm6811923pfj.66.2016.07.15.02.05.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 02:05:06 -0700 (PDT) From: Anup Patel To: "Hans J. Koch" , Greg Kroah-Hartman , Jonathan Corbet Subject: [PATCH 8/8] uio: Use new memtypes in uio_dmem_genirq Date: Fri, 15 Jul 2016 14:34:03 +0530 Message-Id: <1468573443-4670-9-git-send-email-anup.patel@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468573443-4670-1-git-send-email-anup.patel@broadcom.com> References: <1468573443-4670-1-git-send-email-anup.patel@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160715_020528_834741_8387A475 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Scott Branden , linux-doc@vger.kernel.org, Ray Jui , linux-kernel@vger.kernel.org, Rob Herring , bcm-kernel-feedback-list@broadcom.com, Ankit Jindal , linux-arm-kernel@lists.infradead.org, Jan Viktorin MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch extends uio_dmem_genirq driver to use recently added memtypes as follows: 1. Use UIO_MEM_DEVICE memtype for MEM resources 2. Use UIO_MEM_PHYS_CACHE memtype for dynamic regions when UIO DT node is marked as DMA coherent. Signed-off-by: Anup Patel --- drivers/uio/uio_dmem_genirq.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c index 0a0cc19..4bd6f31 100644 --- a/drivers/uio/uio_dmem_genirq.c +++ b/drivers/uio/uio_dmem_genirq.c @@ -279,7 +279,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) break; } - uiomem->memtype = UIO_MEM_PHYS; + uiomem->memtype = UIO_MEM_DEVICE; uiomem->addr = r->start; uiomem->size = resource_size(r); ++uiomem; @@ -295,7 +295,12 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) " dynamic and fixed memory regions.\n"); break; } - uiomem->memtype = UIO_MEM_PHYS; + + if (pdev->dev.of_node && + of_dma_is_coherent(pdev->dev.of_node)) + uiomem->memtype = UIO_MEM_PHYS_CACHE; + else + uiomem->memtype = UIO_MEM_PHYS; uiomem->addr = DMEM_MAP_ERROR; uiomem->size = pdata->dynamic_region_sizes[i]; ++uiomem;