From patchwork Mon Oct 16 12:29:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 10008175 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A04CE60230 for ; Mon, 16 Oct 2017 12:31:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 970A92845E for ; Mon, 16 Oct 2017 12:31:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BB9D2855E; Mon, 16 Oct 2017 12:31:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B58A2845E for ; Mon, 16 Oct 2017 12:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752629AbdJPMb2 (ORCPT ); Mon, 16 Oct 2017 08:31:28 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:46865 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752601AbdJPMb0 (ORCPT ); Mon, 16 Oct 2017 08:31:26 -0400 Received: by mail-pg0-f66.google.com with SMTP id k7so6688294pga.3; Mon, 16 Oct 2017 05:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=20VAXYWp5JvgcmgDRVYfUBzyfNxM+yD7hHnbat8yxiM=; b=odm0o3YAgopsbUjzBvcfw3U11PqdayYCGIX4L/1CXPJPowrwxBHpyZ7j4glY2otoLY Y12b29rLYlqHc1FI+fCY3voWPDbaZZ+3ORHPi91Akfi6V84Gg4pfmga3k6oUUqR4HMti UMvzPD0e+pNfzXlN3q00AjW9X+NjapupS/lJMCvIuvYGKcHq0oYO5NF/sbehX8hezsLi VjeBA3uFgRtoqHw2RPsuVK1itPnObIVqNba+1saVknVw+BImJIpsIMBDFfomFrL+Gjix Xx3Q9qpOzfja87JriGoyHMmyVyTDLrhD8go8R0b5xcVdcYZ7GYBb1qj7SnHev0Auv6Az AoIg== 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:date:message-id:in-reply-to :references:subject; bh=20VAXYWp5JvgcmgDRVYfUBzyfNxM+yD7hHnbat8yxiM=; b=S9iSFSbFSuGwJ7DWxMQl4HuNSuMDPuigq6OKfQME2GpVEuiqGm0koFkNagFQfj2zEt bFqApvtaIeXAea0FdQLTWX+6RFpOkaxnsCnKD6KjmHqKcbhdqb1v2QSUDq1hzcf4mAbT vNfJpMf+8hAS0gwWAVtww3ZdG2tZ7PRZtNx2bd+TLYbCYEgK7jGnc/R8it5YONeBt3ps dHg+Hu+wHddyiP3xkNOBUx0NakAqUx5oSc8DJOrSX7p8QuLxxBvu1sMqE3fqLktKquil Q2J6F5jKJKyK21iyMMNVPWOXJKiH6yMHURTGp1HDtEYGaqGDKBi8eex/sD4ugwHzCkLc trAw== X-Gm-Message-State: AMCzsaXWP7Z1bsYIFbcjOZx181o0TVSWZ3bqydv/BuKWv1cFt5fVVPVM utWb5xj0Qs1CqU0J03DRCBY= X-Google-Smtp-Source: AOwi7QAU7WrAi1qv83ec9OxRxjdluLjHiFp0HKRqObw6Z2qZLHVB3ztyVJDAiK2xL3uXnt4okN0Drg== X-Received: by 10.84.211.79 with SMTP id b73mr8807600pli.214.1508157085630; Mon, 16 Oct 2017 05:31:25 -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 u74sm15788032pfk.125.2017.10.16.05.31.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 05:31:24 -0700 (PDT) From: Magnus Damm To: joro@8bytes.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, iommu@lists.linux-foundation.org, horms+renesas@verge.net.au, Magnus Damm , robin.murphy@arm.com, m.szyprowski@samsung.com Date: Mon, 16 Oct 2017 21:29:25 +0900 Message-Id: <150815696545.32763.9995173870577980534.sendpatchset@little-apple> In-Reply-To: <150815695455.32763.1660214306749693609.sendpatchset@little-apple> References: <150815695455.32763.1660214306749693609.sendpatchset@little-apple> Subject: [PATCH v5 01/09] 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-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 --- Changes since V4: - None Changes since V3: - Use of_device_get_match_data(), thanks Robin! Changes since V2: - None Changes since V1: - Moved patch to front of the series drivers/iommu/ipmmu-vmsa.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) --- 0001/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-10-12 15:16:43.510607110 +0900 @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -33,11 +34,15 @@ #define IPMMU_CTX_MAX 1 +struct ipmmu_features { + bool use_ns_alias_offset; +}; + struct ipmmu_vmsa_device { struct device *dev; void __iomem *base; struct iommu_device iommu; - + const struct ipmmu_features *features; unsigned int num_utlbs; spinlock_t lock; /* Protects ctx and domains[] */ DECLARE_BITMAP(ctx, IPMMU_CTX_MAX); @@ -910,6 +915,21 @@ 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; @@ -927,6 +947,7 @@ static int ipmmu_probe(struct platform_d mmu->num_utlbs = 32; spin_lock_init(&mmu->lock); bitmap_zero(mmu->ctx, IPMMU_CTX_MAX); + mmu->features = of_device_get_match_data(&pdev->dev); /* Map I/O memory and request IRQ. */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -946,7 +967,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) { @@ -1002,11 +1024,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",