| Message ID | 1416589220-7720-2-git-send-email-stefano.stabellini@eu.citrix.com |
|---|---|
| State | Accepted |
| Commit | 2c3fc8d26dd09b9d7069687eead849ee81c78e46 |
| Headers | show
Return-Path: <patchwork-forward+bncBDWMDO7X3ICBBRG7XWRQKGQEWD4XY7Q@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9413F23C27 for <linaro@patches.linaro.org>; Fri, 21 Nov 2014 17:08:16 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf3290103wgg.3 for <linaro@patches.linaro.org>; Fri, 21 Nov 2014 09:08:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=HHS1+KBaqv+LKegJwa1egqbbEcOpqT/d4FtN0uZkvek=; b=MZPx0E05NSwcvHBu7EyVGJV9N6yv590L1hUnu7czxVZJBZInJgb1JbA85ZHYj9Dz4j IQ7mSoQ2Wl1zbaEoSPsFcZNygchkpmzHZTCu5X9vEQryFyw2NrWu4/72xrb6WH8KB5fR LZi478uSRF1cJvTNwb218NukolvJrASsPyY1WR5u19UKqFIUbmqNpwnBQhXeAAOhBQ4I PhZseAlLSK0v1hQDncm3tL4PVTBCkMBn25r4jivjuAN/Lj9wCWlH5PQ7doEpW5fnvjrK VtcYzlqP2wooiQU27WbV9+TuyxekUyaxThvkCZwursgEkEXIqoZhrBPpcoW1+jHoB6/P F3MQ== X-Gm-Message-State: ALoCoQmHZ9kntmGZRGvxQ7I4P+tTE4824jpHKDbKQUqdEdkpnV6yedETECrq+qUB4fl1XJValqRF X-Received: by 10.194.178.163 with SMTP id cz3mr1906443wjc.1.1416589252292; Fri, 21 Nov 2014 09:00:52 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.67 with SMTP id o3ls212395laj.86.gmail; Fri, 21 Nov 2014 09:00:52 -0800 (PST) X-Received: by 10.112.150.71 with SMTP id ug7mr6217532lbb.73.1416589252001; Fri, 21 Nov 2014 09:00:52 -0800 (PST) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id sd7si6435081lbb.51.2014.11.21.09.00.51 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 09:00:51 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id gf13so4652319lab.0 for <patchwork-forward@linaro.org>; Fri, 21 Nov 2014 09:00:51 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr6137785laz.27.1416589251733; Fri, 21 Nov 2014 09:00:51 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp126902lbc; Fri, 21 Nov 2014 09:00:50 -0800 (PST) X-Received: by 10.70.138.104 with SMTP id qp8mr8663378pdb.99.1416589250049; Fri, 21 Nov 2014 09:00:50 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fn7si9754542pad.65.2014.11.21.09.00.49 for <multiple recipients>; Fri, 21 Nov 2014 09:00:50 -0800 (PST) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932413AbaKURAs (ORCPT <rfc822;patch@linaro.org> + 1 other); Fri, 21 Nov 2014 12:00:48 -0500 Received: from smtp.citrix.com ([66.165.176.89]:48230 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932288AbaKURAr (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 21 Nov 2014 12:00:47 -0500 X-IronPort-AV: E=Sophos;i="5.07,432,1413244800"; d="scan'208";a="193778965" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Fri, 21 Nov 2014 12:00:33 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from <stefano.stabellini@eu.citrix.com>) id 1XrrZM-0006qq-EY; Fri, 21 Nov 2014 17:00:28 +0000 From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> To: <xen-devel@lists.xensource.com> CC: <konrad.wilk@oracle.com>, <Stefano.Stabellini@eu.citrix.com>, <david.vrabel@citrix.com>, <linux-kernel@vger.kernel.org>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, <stable@vger.kernel.org> Subject: [PATCH 2/2] swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single Date: Fri, 21 Nov 2014 17:00:20 +0000 Message-ID: <1416589220-7720-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <alpine.DEB.2.02.1411211657430.2675@kaball.uk.xensource.com> References: <alpine.DEB.2.02.1411211657430.2675@kaball.uk.xensource.com> MIME-Version: 1.0 Content-Type: text/plain X-DLP: MIA2 Sender: stable-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 810ad41..5ea1e3c 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -451,7 +451,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr, /* NOTE: We use dev_addr here, not paddr! */ if (is_xen_swiotlb_buffer(dev_addr)) { - swiotlb_tbl_unmap_single(hwdev, paddr, size, dir); + swiotlb_tbl_unmap_single(hwdev, dev_addr, size, dir); return; }
Need to pass the pointer within the swiotlb internal buffer to the swiotlb library, that in the case of xen_unmap_single is dev_addr, not paddr. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> CC: konrad.wilk@oracle.com CC: stable@vger.kernel.org --- drivers/xen/swiotlb-xen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)