From patchwork Thu Dec 26 22:17:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 182462 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp2236956ild; Thu, 26 Dec 2019 14:17:55 -0800 (PST) X-Google-Smtp-Source: APXvYqwM5+tgw+E6bHYu3FSRpFGo16jkyvdtFyinE1whYmprq88bGyDKLw+4kusLqFBwCsOpRjLG X-Received: by 2002:a05:6830:1141:: with SMTP id x1mr53939486otq.120.1577398675477; Thu, 26 Dec 2019 14:17:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577398675; cv=none; d=google.com; s=arc-20160816; b=ELbPFC21mHRkhECMiaZ5IyuJdxv4gk7h5EUwOvwJn3xKUs8UBSeCiZwz4O2kx18sWW klOt3Ljnb+DEjylPQRP/ndsoWY7C+7pW2F71uzu1csqQOxAFVpeRal3ouMC8LbmkuaQ+ 3wBTFsYjV72uQjfKxqLZlYbkSwutMo8vxOY6Sywvp3KEpEgyNLkklq/+de7l8690kq8n G403c/zkNKQ4FCswnpo3TJfE5Vl+uTMIVaYocL1sjtWPdeDi+T2Lnl0js2/p7bZdlLit tPtlNxQqjIiVBUtpwM9v8TZ1NuzrpYhWPq6iZhvXV4Gc2kI7Ntjy6uW+n13dyS9Qb4yF jYpw== 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=atr5dH9+58H0L1dBqDewFnWoCVnAfiU1TJyN0b3SOLw=; b=jgCGTd659ydWCwEmfpdSVAd5PrG0QRNMnJtGRCgD7CAxLcFenTqSW1++fGtGJ6WPhw 9gjPYp4uqswhnUyR0EjtuHEqTVW8cIEuhNhdWujQZV2GVeBUwXEm28D3Ewdd5EqZFj9k vE7opg4aw5YSDS0ERXgZtsUAn3kh1fCpDEEgsBuQWup4nZhKc4nxqA4vPPqBQChEfVDp m/aj5aL3JSyz+YP2xFxv+hfuaJ/oTz3+kQk4ONnIOhjSFQo0QHohrqBJGG3B40LVcqTq PxKR1XPtlGpDGlRe34B92cktq8Ld21v5H1AV7ocpctn8gvRRgzvqhD9MbBHQhIydlrz6 usVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PovNYG/8"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 19si15798322oiq.128.2019.12.26.14.17.55; Thu, 26 Dec 2019 14:17:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PovNYG/8"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727083AbfLZWRv (ORCPT + 27 others); Thu, 26 Dec 2019 17:17:51 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:34027 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727005AbfLZWRr (ORCPT ); Thu, 26 Dec 2019 17:17:47 -0500 Received: by mail-pg1-f196.google.com with SMTP id r11so13513248pgf.1 for ; Thu, 26 Dec 2019 14:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=atr5dH9+58H0L1dBqDewFnWoCVnAfiU1TJyN0b3SOLw=; b=PovNYG/8yvcQkau2yxewsi61ZYVYH+xuJSm+1FfpbcX5Lrd0edTC29t1WUNmEMOldi qPeG9Jit/2cej0EQ3S5UwiPB/P81sRwx+kA8476XgyLM5vPpDYODNowEb4qZFqL370i1 nXB/3af9sVFwcCfMTVDORSGSaNQlKr11e+WY4JkXYXKJP5VvY/aqksZoQw0qmCWg2S0s vqwUhMkHrVdcPw4NicoDOQLFcfvb9iF8bkTXnGXxMQHpPYnXN+5TlDya2LAmMPM+fAMa HvLK4DsOixPh0d9iJ2c1bstBsXyJ6sHGcqpJ+oJBaA1BiyxgKAFa91LP4IwOrSkettTv 4fJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=atr5dH9+58H0L1dBqDewFnWoCVnAfiU1TJyN0b3SOLw=; b=P/fY5R/SYvcL56UbaiEHvgI9QSdwdnZ6pfIAK10rWJgwFmyWnOjfFHDXoUfjVhMHaP MZ9yjdM7B4D4ylTsncgdDQa5q8ozTrYcBGMNn2MHhERcuiM+kv9fDQVgFU/Z7jNZISI8 M+HxToOAVivH8oZD91bMJSVwsedSbOG+YZcL48UmmNg0r5TEvEaDNMlSFhjTNu1Eoonh 07otVcWVqJxYNpwXGHbdPJO+siP6xE5R86dhpA7LbqFEJ2RdmyB4fdI4hbtDCXDtFEg8 349I5bWx6bwDc5gHbJg+1T3GHpyxJbwK/+MEe4MS9a//mgr+DVFGBy3ExdMc1uXVzn7x n4gQ== X-Gm-Message-State: APjAAAX4Itc7nLJVEbB8z8KpeeBp5A48Nh3hgHXc7ZbrPNSK0kpT8yqF TMMXt8Tjbugue64+YRswEG7jug== X-Received: by 2002:a62:3603:: with SMTP id d3mr49051073pfa.37.1577398667182; Thu, 26 Dec 2019 14:17:47 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id 2sm11779409pjh.19.2019.12.26.14.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 14:17:46 -0800 (PST) From: Bjorn Andersson To: Will Deacon , Robin Murphy , Joerg Roedel Cc: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Patrick Daly , Pratik Patel , Rob Clark Subject: [PATCH 2/3] iommu/arm-smmu: Expose s2cr and smr structs to impl Date: Thu, 26 Dec 2019 14:17:08 -0800 Message-Id: <20191226221709.3844244-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191226221709.3844244-1-bjorn.andersson@linaro.org> References: <20191226221709.3844244-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the arm_smmu_s2cr and arm_smmu_smr structs to the internal header file, in order to expose them to the platform specific arm-smmu implementations. Signed-off-by: Bjorn Andersson --- Changes since RFC: - New patch drivers/iommu/arm-smmu.c | 14 -------------- drivers/iommu/arm-smmu.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.24.0 diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 6ca6a4e072c8..9a9091b9dcc7 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -73,24 +73,10 @@ module_param(disable_bypass, bool, S_IRUGO); MODULE_PARM_DESC(disable_bypass, "Disable bypass streams such that incoming transactions from devices that are not attached to an iommu domain will report an abort back to the device and will not be allowed to pass through the SMMU."); -struct arm_smmu_s2cr { - struct iommu_group *group; - int count; - enum arm_smmu_s2cr_type type; - enum arm_smmu_s2cr_privcfg privcfg; - u8 cbndx; -}; - #define s2cr_init_val (struct arm_smmu_s2cr){ \ .type = disable_bypass ? S2CR_TYPE_FAULT : S2CR_TYPE_BYPASS, \ } -struct arm_smmu_smr { - u16 mask; - u16 id; - bool valid; -}; - struct arm_smmu_cb { u64 ttbr[2]; u32 tcr[2]; diff --git a/drivers/iommu/arm-smmu.h b/drivers/iommu/arm-smmu.h index 62b9f0cec49b..73f94579b926 100644 --- a/drivers/iommu/arm-smmu.h +++ b/drivers/iommu/arm-smmu.h @@ -224,6 +224,20 @@ enum arm_smmu_implementation { QCOM_SMMUV2, }; +struct arm_smmu_s2cr { + struct iommu_group *group; + int count; + enum arm_smmu_s2cr_type type; + enum arm_smmu_s2cr_privcfg privcfg; + u8 cbndx; +}; + +struct arm_smmu_smr { + u16 mask; + u16 id; + bool valid; +}; + struct arm_smmu_device { struct device *dev;