From patchwork Thu Mar 17 16:29:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8613031 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C34919F44D for ; Thu, 17 Mar 2016 16:26:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DCD02026F for ; Thu, 17 Mar 2016 16:26:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2090E20251 for ; Thu, 17 Mar 2016 16:26:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936253AbcCQQ0i (ORCPT ); Thu, 17 Mar 2016 12:26:38 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:33408 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936236AbcCQQ0d (ORCPT ); Thu, 17 Mar 2016 12:26:33 -0400 Received: by mail-pf0-f174.google.com with SMTP id 124so127577471pfg.0; Thu, 17 Mar 2016 09:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=kHayMI1AOEM/FyJ0CKhKIG9+zjEkONxrocsKg1P8okg=; b=O5TFTQlKxc5EDaAe1W+V/e2LjrsXik/L9S72i5E4LdBL/KBTmeqivU123regs1b9kM HnQIVKXNRbA25sFNeFVRmK7vr22tCnKd3F7BpUeaaI7i2TDI+W6HHNi8rht0UoQ+YQnh 4wRFzcQtlgrY5VN8JnZVf5P4lviem/xnCUHx45tMQEzWRxtO2vvLSqULzoBrNf58fCws dvsbCunS4CPVm//saXs7pF61qYMesi8ygl2ZJRW4NYpKed40SNnoEoz9ErCmPNlfuiID fmpToQWXx8LlP5NoGH6ko3fGbm9eEMvlI+g2F1XKtJw0ZPWD9wfQmCjLH2OxqNmo11Js H0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=kHayMI1AOEM/FyJ0CKhKIG9+zjEkONxrocsKg1P8okg=; b=ecc13jo9HhuqX1nIXASTkFwINlOhOSWjT184kofDsSmUY+1h2TtI50j+Bz+VAeTIor FbITDSM/nbZ/7tyG9Y+9lqBe2WGPJdObUwKX35Gslev9sfgaubLrCdR+f7TSB4RU8ETL npoWNfb8LmiHOBR+8OE5/tBmoS7LVV4UWQaZ8q1pF6f3nBJMJU1HWC+jiwsKmtIgwLW6 kMQnSL1/DvPKOg8wLY2g+cPDA8hYsoZKpV1FxAhiE5Yg+04uOE8Ko2z3mK4e86VXcSBp JtzhAFZ91mEej1oiIoU0w5CpcEA3iaAM9yG12XEgkqGHcZjkywZrjrr0o40BqaxdAavI G/WA== X-Gm-Message-State: AD7BkJL7/RP6GEr2OIOxq1lnm/MuwyaozRscinUmPN+LM+eMfl00eKNFeqaZJJXY4EFK1Q== X-Received: by 10.98.86.146 with SMTP id h18mr16302897pfj.9.1458231992903; Thu, 17 Mar 2016 09:26:32 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id z13sm14511300pfi.5.2016.03.17.09.26.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Mar 2016 09:26:31 -0700 (PDT) From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Fri, 18 Mar 2016 01:29:55 +0900 Message-Id: <20160317162955.24104.26177.sendpatchset@little-apple> In-Reply-To: <20160317162909.24104.31682.sendpatchset@little-apple> References: <20160317162909.24104.31682.sendpatchset@little-apple> Subject: [PATCH 05/10] iommu/ipmmu-vmsa: Introduce features, break out alias Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Introduce struct ipmmu_features to track various hardware and software implementation changes inside the driver for different kinds of IPMMU hardware. Add use_ns_alias_offset as a first example of a feature to control if the secure register bank offset should be used or not. Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) --- 0017/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-18 00:29:15.860513000 +0900 @@ -33,6 +33,10 @@ #define IPMMU_CTX_MAX 4 +struct ipmmu_features { + bool use_ns_alias_offset; +}; + struct ipmmu_vmsa_device { struct device *dev; void __iomem *base; @@ -45,6 +49,7 @@ struct ipmmu_vmsa_device { #if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) struct dma_iommu_mapping *mapping; #endif + const struct ipmmu_features *features; }; struct ipmmu_vmsa_domain { @@ -932,13 +937,33 @@ static void ipmmu_device_reset(struct ip ipmmu_write(mmu, i * IM_CTX_SIZE + IMCTR, 0); } +static const struct ipmmu_features ipmmu_features_default = { + .use_ns_alias_offset = true, +}; + +static const struct of_device_id ipmmu_of_ids[] = { + { + .compatible = "renesas,ipmmu-vmsa", + .data = &ipmmu_features_default, + }, { + /* Terminator */ + }, +}; + +MODULE_DEVICE_TABLE(of, ipmmu_of_ids); + static int ipmmu_probe(struct platform_device *pdev) { struct ipmmu_vmsa_device *mmu; + const struct of_device_id *match; struct resource *res; int irq; int ret; + match = of_match_node(ipmmu_of_ids, pdev->dev.of_node); + if (!match) + return -EINVAL; + mmu = devm_kzalloc(&pdev->dev, sizeof(*mmu), GFP_KERNEL); if (!mmu) { dev_err(&pdev->dev, "cannot allocate device data\n"); @@ -948,6 +973,7 @@ static int ipmmu_probe(struct platform_d mmu->dev = &pdev->dev; mmu->num_utlbs = 32; bitmap_zero(mmu->ctx, IPMMU_CTX_MAX); + mmu->features = match->data; dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); /* Map I/O memory and request IRQ. */ @@ -968,7 +994,8 @@ static int ipmmu_probe(struct platform_d * Offset the registers base unconditionally to point to the non-secure * alias space for now. */ - mmu->base += IM_NS_ALIAS_OFFSET; + if (mmu->features->use_ns_alias_offset) + mmu->base += IM_NS_ALIAS_OFFSET; irq = platform_get_irq(pdev, 0); if (irq < 0) { @@ -1015,11 +1042,6 @@ static int ipmmu_remove(struct platform_ return 0; } -static const struct of_device_id ipmmu_of_ids[] = { - { .compatible = "renesas,ipmmu-vmsa", }, - { } -}; - static struct platform_driver ipmmu_driver = { .driver = { .name = "ipmmu-vmsa",