Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2118313pxa; Mon, 17 Aug 2020 00:53:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcRPM8mzA/6eCIK8VaRvdCv9irGTtfTNLGf2z6JLer9CzOK2VVrYI+do4WY5Fw1QQBXraL X-Received: by 2002:a17:906:344a:: with SMTP id d10mr14639753ejb.244.1597650814909; Mon, 17 Aug 2020 00:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597650814; cv=none; d=google.com; s=arc-20160816; b=eLlrisswe06wObbwspdqp5xRuZNGl7eiAwBNDuGePaaVyLvxT7Ky9A9M3pn5XZk7vc nlipmRJIkJPYYN4Y2/sGjAsvx+r/K5qobduuuH7/p2g96wpt53hoy4chqNdsP1ZtX/gS 3CCKuRAgXGwr8Fbl6LfZW5jDbxEh/TBfW5Y3FqHqylFculkclVbfvwcdqIN+Gizf4zwn LXti+Tiup+3givgA6pIH01Ufaxy1hfUdcYjYg/CbSFiBqKQ/uV9HMz3VPFZ2fb9ZOL82 Sanj+VGz1Tnk3W7j4ALQiWkSUEJW6YC0uUd2OQm/HcyBx0UF+Ee8FBu/8cAl76QPSg/E uJhA== 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=3oa1Q9jLEY8Gh+SOA3YAzCmqQFoIsNG7goL0wtzODMM=; b=iISf/NfWrlhPV36lk2R1sFPETa0GqgZ7Q5oRlxYuUQMlBwBNZO7viABVqud7eIBXI7 i+2GaCe4O1lFJQ3s4tFIvZd6UXsb3AbMWFkiUsxKn2h7JEcPYndS4bt1j2mkZ6LpXokR vXTgnTSWQwz5XhvkEHrjR1+9Pw54A9wQll0nUvx6/rtQXfyZ6x3Oda49yso+heO4Axkm g/tciHIoHuUxS6EWD0ga6j6m2Ie7zC6BGjODs/kzlXi+REkJ9ewF4/uWeGooSi6jttfo YUjWV9aIhnMpMFhKDIll9InBUKaR0pPbUVCz4j15WQbLQxXWzQsrzSjjv7RZTmup1uZa 0X8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vKpfMasX; 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 y26si10501853edr.390.2020.08.17.00.53.11; Mon, 17 Aug 2020 00:53: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=vKpfMasX; 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 S1727882AbgHQHva (ORCPT + 99 others); Mon, 17 Aug 2020 03:51:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:45292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726705AbgHQHuU (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 E08F42080D; 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=VpSbfYXzRPSnQuOLCl0Ddt6PoN45I0ZQPp4ER+hVYAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vKpfMasXULPraU9glsF6Bh1l0Lvl34RJFqxbeX18OVcBF2Y91SCssso8xKwEXHcmt 6xPj9cTDP8W8zLwJNKPRubam1s4Ffu+zzNOnhLIJVTkm4yL8kYNmcBuXInTDZOwLFB GGhYKZ8xcPG/3tsymrb1riX8tih75+ugYona0eQU= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1k7ZuM-00Bfc2-15; Mon, 17 Aug 2020 09:50:18 +0200 From: Mauro Carvalho Chehab To: Greg Kroah-Hartman Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , John Stultz , Manivannan Sadhasivam , Chenfeng , Suzhuangluan , linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 05/16] iommu: hisi_smmu: remove linux/hisi/hisi-iommu.h Date: Mon, 17 Aug 2020 09:50:04 +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 Just move its contents into drivers/iommu/hisi_smmu.h. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/hikey9xx/hisi_smmu.h | 8 ++++++++ drivers/staging/hikey9xx/hisi_smmu_lpae.c | 1 - include/linux/hisi/hisi-iommu.h | 13 ------------- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 include/linux/hisi/hisi-iommu.h diff --git a/drivers/staging/hikey9xx/hisi_smmu.h b/drivers/staging/hikey9xx/hisi_smmu.h index bd3ee53735bd..c84f854bf39f 100644 --- a/drivers/staging/hikey9xx/hisi_smmu.h +++ b/drivers/staging/hikey9xx/hisi_smmu.h @@ -93,6 +93,14 @@ struct hisi_smmu_device_lpae { struct iommu_device iommu; }; +struct iommu_domain_data { + unsigned int iova_start; + unsigned int iova_size; + phys_addr_t phy_pgd_base; + unsigned long iova_align; + struct list_head list; +}; + struct hisi_map_tile_position_lpae { struct scatterlist *sg ; unsigned long offset; diff --git a/drivers/staging/hikey9xx/hisi_smmu_lpae.c b/drivers/staging/hikey9xx/hisi_smmu_lpae.c index 5acde3ddbd99..fcaf97f92e7f 100644 --- a/drivers/staging/hikey9xx/hisi_smmu_lpae.c +++ b/drivers/staging/hikey9xx/hisi_smmu_lpae.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include "hisi_smmu.h" diff --git a/include/linux/hisi/hisi-iommu.h b/include/linux/hisi/hisi-iommu.h deleted file mode 100644 index 00dd5e97db59..000000000000 --- a/include/linux/hisi/hisi-iommu.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _HI36XX_SMMU_H -#define _HI36XX_SMMU_H - -#include -struct iommu_domain_data { - unsigned int iova_start; - unsigned int iova_size; - phys_addr_t phy_pgd_base; - unsigned long iova_align; - struct list_head list; -}; - -#endif -- 2.26.2