From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 412FAC3A59C for ; Fri, 16 Aug 2019 13:38:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 150CB2064A for ; Fri, 16 Aug 2019 13:38:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="O7UKpzhj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 150CB2064A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=m7GBigKpTRx1bg98CDxjYe4TtJXOZs3WeOhaWCkBXhI=; b=O7UKpzhjoljs5KOOqIY62rwpY JALd/CHhPINNj1+EJOY+esUHBsSBuPlXhayU4obByYyqibKG3p6fVvZONtpghINxdptaeU5U/HDoK w5lNcpBKsrBejrI8+/Zyl4jgv3JFBgZWSVlETITvTSzRMnX/RWJ1nislUDNDiH/oMv8mHd8d3xEFg hozkuzuPWKSxM/7yqhpKayD8MjVgpoAXwwU9q10Z33QogzM2+i1VOWs6taxgou9l59KB4n4i95xyO B+e1kv1XdnriKVlhMln+CG5hLPsB64SQhRIR1ktHogZ0B5NTCeuqRQqSTV8nUfYhld/aDrAH8STQ3 Hs7NlcWgg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hycQh-0006H6-0A; Fri, 16 Aug 2019 13:38:07 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hycQc-0006GP-73 for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2019 13:38:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E95ED344; Fri, 16 Aug 2019 06:38:00 -0700 (PDT) Received: from [10.1.197.57] (e110467-lin.cambridge.arm.com [10.1.197.57]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DEF273F694; Fri, 16 Aug 2019 06:37:59 -0700 (PDT) Subject: Re: [PATCH 03/11] xen/arm: pass one less argument to dma_cache_maint To: Christoph Hellwig , Stefano Stabellini , Konrad Rzeszutek Wilk References: <20190816130013.31154-1-hch@lst.de> <20190816130013.31154-4-hch@lst.de> From: Robin Murphy Message-ID: <8585fb27-14e0-888c-6749-6862b4e16418@arm.com> Date: Fri, 16 Aug 2019 14:37:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190816130013.31154-4-hch@lst.de> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190816_063802_298282_EFF827C8 X-CRM114-Status: GOOD ( 18.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 16/08/2019 14:00, Christoph Hellwig wrote: > Instead of taking apart the dma address in both callers do it inside > dma_cache_maint itself. > > Signed-off-by: Christoph Hellwig > --- > arch/arm/xen/mm.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c > index 90574d89d0d4..d9da24fda2f7 100644 > --- a/arch/arm/xen/mm.c > +++ b/arch/arm/xen/mm.c > @@ -43,13 +43,15 @@ static bool hypercall_cflush = false; > > /* functions called by SWIOTLB */ > > -static void dma_cache_maint(dma_addr_t handle, unsigned long offset, > - size_t size, enum dma_data_direction dir, enum dma_cache_op op) > +static void dma_cache_maint(dma_addr_t handle, size_t size, > + enum dma_data_direction dir, enum dma_cache_op op) > { > struct gnttab_cache_flush cflush; > unsigned long xen_pfn; > + unsigned long offset = handle & ~PAGE_MASK; > size_t left = size; > > + offset &= PAGE_MASK; Ahem... presumably that should be handle, not offset. Robin. > xen_pfn = (handle >> XEN_PAGE_SHIFT) + offset / XEN_PAGE_SIZE; > offset %= XEN_PAGE_SIZE; > > @@ -86,13 +88,13 @@ static void dma_cache_maint(dma_addr_t handle, unsigned long offset, > static void __xen_dma_page_dev_to_cpu(struct device *hwdev, dma_addr_t handle, > size_t size, enum dma_data_direction dir) > { > - dma_cache_maint(handle & PAGE_MASK, handle & ~PAGE_MASK, size, dir, DMA_UNMAP); > + dma_cache_maint(handle, size, dir, DMA_UNMAP); > } > > static void __xen_dma_page_cpu_to_dev(struct device *hwdev, dma_addr_t handle, > size_t size, enum dma_data_direction dir) > { > - dma_cache_maint(handle & PAGE_MASK, handle & ~PAGE_MASK, size, dir, DMA_MAP); > + dma_cache_maint(handle, size, dir, DMA_MAP); > } > > void __xen_dma_map_page(struct device *hwdev, struct page *page, > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel