From patchwork Mon Dec 9 18:05:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 181076 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4693701ile; Mon, 9 Dec 2019 10:12:06 -0800 (PST) X-Google-Smtp-Source: APXvYqxSJO56xv4B4ECqhkr3vDQGa1XuXMIVcKGA0v4zZlL8AHxi3lEFOhCZlWnGcnItI4HcAaiR X-Received: by 2002:aca:f584:: with SMTP id t126mr318154oih.76.1575915126756; Mon, 09 Dec 2019 10:12:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575915126; cv=none; d=google.com; s=arc-20160816; b=lCtcOBw1179UDX0ql+xogRTjjJbOdDNkkBX9TnTCIMIjtgXac3jlaUJ0SaJVafpEIP eIKar+n6+7c6JD8jvLQuoGHnDSxOYJtHb27r1pWatSTpo4RPwC+5UhbgPy1jGCjldCK2 jZvNtB5XRyYdULi8MjcIt+wmTLASClBwDFzWcqyuDylsdmUa5AFMa+EH0ZU2+zCETCr6 ZczZKuNVHPflRvfz7yadn0z/FkOGLR27HGXR5zwhgfnr70/2c9kxbxebGcAO1zoGxp0v TQwHkehA9YnyGtJA4X/l+85qtvfrzFalfO/ol5Ostf1WGaxv8mzf8P6SHEjeUsOfUIIO thHA== 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=jdXrySEgrRfn+Z3Yzn3toiuPjUb15DophWycH8Ax2iM=; b=umlpXkxHHT5tjyaHTW6ykWbEeCP0iDYm+qZB2/Odm9/h4Zkr6APZpuOS3+yOWIICYh ZZr0eLy4chPVGvC519E/ZvjiyDiMsU+ZWZ8a0nYo+yC2zM4aUENcWnss4D/xec3hf7EA wrAEfeOZTvXIockSYfmx73EqTsMre+tVUtLoxmVU1uXfXq3A6UGLD/VhWRbSDPZ4+/iB FNQ+GGZx/09i51H5jGSnEwq5KtXyL8W/RIxUUTOvbvimv0LntUqrErjU0CLJHKYU+YLI iGdKzlp1m5Pmsgn2qBbdhxWpFf3rt4RwOvF7xwIFZPbcFQTdF/bdV9YPktTHKU97I4VL zOhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VibxK8E6; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 j23si266311otr.48.2019.12.09.10.12.06; Mon, 09 Dec 2019 10:12:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-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=VibxK8E6; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1726718AbfLISMF (ORCPT + 8 others); Mon, 9 Dec 2019 13:12:05 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55747 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726741AbfLISME (ORCPT ); Mon, 9 Dec 2019 13:12:04 -0500 Received: by mail-wm1-f67.google.com with SMTP id q9so314414wmj.5 for ; Mon, 09 Dec 2019 10:12:03 -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=jdXrySEgrRfn+Z3Yzn3toiuPjUb15DophWycH8Ax2iM=; b=VibxK8E6UtBa3mBQgrNRNTK2Uy5EViAeROXBoZPkWAJV4yfISCkGICxBo48eLIOqXs bGV2zZUhEmFM/xw54TAEvQ/cskYCHlSWqlGKC5caVxRSN2qs3f9kL3LSE0UCpe8xd1mC 6aCOO+L1vYRFsAm+kApqFs2gSfu5v9IQbfaLlokVl9cFoHtjtp7uwACvN65EJwkGDjuk lC1yJl11t5IdjXlA/MdgR461khqpf5lcssK2MIuKnK/YnUetoZ6d55ICNswmZ1Pam3eo M5BeNC5VwypX2kYYPk4/2g4I3/75MRHusrqAaPbSLILVqeozuANvUyAurMyuQk6BGOd1 1QUw== 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=jdXrySEgrRfn+Z3Yzn3toiuPjUb15DophWycH8Ax2iM=; b=uFOLYilNPO0g7rvkar7s5th5dYcSJv4YAqus++W70dWnYMl0DtI+Gr6xmqKu2ruG4T y8J4kr4HdrKeLX3FtFDJzjktbpwyAiQm9prRueshljxfyQ/TJfo0EePeGTrb2YEvcsOT Oz6CGQ78yryEi1pA+I3Yflr+21CTZzj7dZp4xGdfZ4Nu69kt2usWVD0EB2/uvS2Ssxgw hjqiIGiOigaTvz0vD/5MUyaPf4sgEtYMsieWt08nU9uc46IoZceYicsgku1P7bnCh0ba r9q5RUkhqtYXwvqcJYTnjxvu2o2ap6zFfrMNXw1y6PTqgbkAdF+TGOurYgEb3L0LZHGQ AxlA== X-Gm-Message-State: APjAAAVjtmva7LKufMR0v7GkcLYBR5WWH8Dgj3JELJTgkp4qHrkwhpq/ f84kN+EuIh9lD/DSfZTt2aGo2g== X-Received: by 2002:a7b:c956:: with SMTP id i22mr327209wml.65.1575915122599; Mon, 09 Dec 2019 10:12:02 -0800 (PST) Received: from localhost.localdomain (adsl-62-167-101-88.adslplus.ch. [62.167.101.88]) by smtp.gmail.com with ESMTPSA id h2sm309838wrv.66.2019.12.09.10.12.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 10:12:02 -0800 (PST) From: Jean-Philippe Brucker To: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, iommu@lists.linux-foundation.org Cc: joro@8bytes.org, robh+dt@kernel.org, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, guohanjun@huawei.com, sudeep.holla@arm.com, rjw@rjwysocki.net, lenb@kernel.org, will@kernel.org, robin.murphy@arm.com, bhelgaas@google.com, eric.auger@redhat.com, jonathan.cameron@huawei.com, zhangfei.gao@linaro.org Subject: [PATCH v3 06/13] iommu/arm-smmu-v3: Add context descriptor tables allocators Date: Mon, 9 Dec 2019 19:05:07 +0100 Message-Id: <20191209180514.272727-7-jean-philippe@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191209180514.272727-1-jean-philippe@linaro.org> References: <20191209180514.272727-1-jean-philippe@linaro.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Support for SSID will require allocating context descriptor tables. Move the context descriptor allocation to separate functions. Signed-off-by: Jean-Philippe Brucker --- drivers/iommu/arm-smmu-v3.c | 57 ++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 11 deletions(-) -- 2.24.0 Reviewed-by: Eric Auger diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index b287e303b1d7..43d6a7ded6e4 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -568,6 +568,7 @@ struct arm_smmu_cd_table { struct arm_smmu_s1_cfg { struct arm_smmu_cd_table table; struct arm_smmu_ctx_desc cd; + u8 s1cdmax; }; struct arm_smmu_s2_cfg { @@ -1455,6 +1456,31 @@ static int arm_smmu_cmdq_issue_sync(struct arm_smmu_device *smmu) } /* Context descriptor manipulation functions */ +static int arm_smmu_alloc_cd_leaf_table(struct arm_smmu_device *smmu, + struct arm_smmu_cd_table *table, + size_t num_entries) +{ + size_t size = num_entries * (CTXDESC_CD_DWORDS << 3); + + table->ptr = dmam_alloc_coherent(smmu->dev, size, &table->ptr_dma, + GFP_KERNEL); + if (!table->ptr) { + dev_warn(smmu->dev, + "failed to allocate context descriptor table\n"); + return -ENOMEM; + } + return 0; +} + +static void arm_smmu_free_cd_leaf_table(struct arm_smmu_device *smmu, + struct arm_smmu_cd_table *table, + size_t num_entries) +{ + size_t size = num_entries * (CTXDESC_CD_DWORDS << 3); + + dmam_free_coherent(smmu->dev, size, table->ptr, table->ptr_dma); +} + static u64 arm_smmu_cpu_tcr_to_cd(u64 tcr) { u64 val = 0; @@ -1502,6 +1528,23 @@ static void arm_smmu_write_ctx_desc(struct arm_smmu_device *smmu, cdptr[3] = cpu_to_le64(cfg->cd.mair); } +static int arm_smmu_alloc_cd_tables(struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; + + return arm_smmu_alloc_cd_leaf_table(smmu, &cfg->table, + 1 << cfg->s1cdmax); +} + +static void arm_smmu_free_cd_tables(struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; + + arm_smmu_free_cd_leaf_table(smmu, &cfg->table, 1 << cfg->s1cdmax); +} + /* Stream table manipulation functions */ static void arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc) @@ -2145,11 +2188,7 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg; if (cfg->table.ptr) { - dmam_free_coherent(smmu_domain->smmu->dev, - CTXDESC_CD_DWORDS << 3, - cfg->table.ptr, - cfg->table.ptr_dma); - + arm_smmu_free_cd_tables(smmu_domain); arm_smmu_bitmap_free(smmu->asid_map, cfg->cd.asid); } } else { @@ -2173,13 +2212,9 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain, if (asid < 0) return asid; - cfg->table.ptr = dmam_alloc_coherent(smmu->dev, CTXDESC_CD_DWORDS << 3, - &cfg->table.ptr_dma, GFP_KERNEL); - if (!cfg->table.ptr) { - dev_warn(smmu->dev, "failed to allocate context descriptor\n"); - ret = -ENOMEM; + ret = arm_smmu_alloc_cd_tables(smmu_domain); + if (ret) goto out_free_asid; - } cfg->cd.asid = (u16)asid; cfg->cd.ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr[0];