Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2117552pxa; Mon, 17 Aug 2020 00:51:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAGG4cYtZPQbcXMPGbYeCGWMvhkTeN2qlvWVvaXC9r0VJ2oYGUq2o7gRg1jLrJvfnv/k2O X-Received: by 2002:a17:906:b213:: with SMTP id p19mr13680091ejz.39.1597650694279; Mon, 17 Aug 2020 00:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597650694; cv=none; d=google.com; s=arc-20160816; b=uWVf1lQbORnGmWL6F0CfjRlF0zSAbEPeBMLmzBqcRTp0rv5FEDaVj7M+fBL3MabMHX bijEBEbDLuVyCT+8kCgprW4rvbpYDZoIHcCB+iYuZhivfxvczl9yWzkJUH3Vdgxm13yT tVMzzCLNhQY7jYkqWwWuLzFY4F+0iloW3DvWGz/3UE+Iqq8GA5CCdUd+p7Jcyp9xCXKc VndxiAvc7Fy9JjbHB3c4ik2GD989XRpqT8zmG0BIH/AAN3imXEjK6oXY5irWz0S0Yms1 sbZj6k2tRpTQusk0wa5MRyndYfubn1C+vYGvpCb/MCKz9bSi1OeDq8eDmUJYw5ZHYrwd BCdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XqAQVqxpNACKZaaIVDbQDlGgm8Jh3zcr3BltT9egdCM=; b=WgPZkZaXTrIMKtkEaTpS45W45jNrklAdQDQ4WEmKaEx2ZTraHnD8QWGX6FwVN4pyJq 8eP8Z/Tm5OHc6gUxi5E70tpu4PSPF9C5lljrg5TmjhiCZQKRAXfWQJbIi8iwBBUJ+9O6 qlETVKVfcR/mnGwZYTqiR+nS+bMyJhD2N0XQ0txcFeq3mW8xXq/ZXt1LrKAe7EqfrvH+ XrOk3hCUZfNB3HQ6VkK60CH4gkQbW/gqsg04kmQY58W7PtcTqZZjKTpeeCBpf+P7N7Jy 9jE1Qjt6jSBTrpc2/jXxwIXWHEInJalwiRStJlBeWYvPRpmikU6VzficX14hoJJH+fsN jBOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KUPFccOD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dm22si13023197ejc.191.2020.08.17.00.51.11; Mon, 17 Aug 2020 00:51:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KUPFccOD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbgHQHub (ORCPT + 99 others); Mon, 17 Aug 2020 03:50:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:45272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726640AbgHQHuU (ORCPT ); Mon, 17 Aug 2020 03:50:20 -0400 Received: from mail.kernel.org (ip5f5ad5a3.dynamic.kabel-deutschland.de [95.90.213.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D242E207FB; Mon, 17 Aug 2020 07:50:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597650620; bh=5eopSBJ3EqYWC3PVo/2+SzawN6Ik93iYnKxJjLgDgxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KUPFccODSE3t9n6VgxUeKaXbgKmBbntE8HLJXor6Ld59r2ZU1J/lwkIFsvsh+oHd/ ynDTri00w8skW8gqziKfXOq/9+NF7/uSgMwqrluoNIRgCohhI4pnuUfzr3ZrXUo0YS T88NbZLm8gHUAHAk5rg3oGjm9Uu5/r99Wvv6wAKo= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1k7ZuL-00Bfby-VC; Mon, 17 Aug 2020 09:50:17 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , John Stultz , Manivannan Sadhasivam , linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 03/16] iommu: hisilicon: map and unmap ops gained new arguments Date: Mon, 17 Aug 2020 09:50:02 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As both map() and unmap() ops gained new arguments upstream, update their headers accordingly. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/hikey9xx/hisi_smmu_lpae.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/hikey9xx/hisi_smmu_lpae.c b/drivers/staging/hikey9xx/hisi_smmu_lpae.c index c5c266fb1c0b..b411ca97f2c2 100644 --- a/drivers/staging/hikey9xx/hisi_smmu_lpae.c +++ b/drivers/staging/hikey9xx/hisi_smmu_lpae.c @@ -346,7 +346,8 @@ int hisi_smmu_handle_mapping_lpae(struct iommu_domain *domain, static int hisi_smmu_map_lpae(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t size, - int prot) + int prot, + gfp_t gfp) { unsigned long max_iova; struct iommu_domain_data *data; @@ -437,7 +438,8 @@ unsigned int hisi_smmu_handle_unmapping_lpae(struct iommu_domain *domain, } static size_t hisi_smmu_unmap_lpae(struct iommu_domain *domain, - unsigned long iova, size_t size) + unsigned long iova, size_t size, + struct iommu_iotlb_gather *iotlb_gather) { unsigned long max_iova; unsigned int ret; @@ -593,7 +595,7 @@ static size_t hisi_map_tile_row_lpae(struct iommu_domain *domain, unsigned long /*get the start physical address*/ phys_addr = (unsigned long)get_phys_addr_lpae(sg) + sg_offset; ret = hisi_smmu_map_lpae(domain, - iova + mapped_size, phys_addr, map_size, prot); + iova + mapped_size, phys_addr, map_size, prot, GFP_KERNEL); if (ret) { dbg("[%s] hisi_smmu_map failed!\n", __func__); break; @@ -719,8 +721,7 @@ static int hisi_smmu_map_tile_lpae(struct iommu_domain *domain, static size_t hisi_smmu_unmap_tile_lpae(struct iommu_domain *domain, unsigned long iova, size_t size) { - return hisi_smmu_unmap_lpae(domain, iova, size); - + return hisi_smmu_unmap_lpae(domain, iova, size, NULL); } static struct iommu_ops hisi_smmu_ops = { -- 2.26.2