From patchwork Tue Jan 3 01:09:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 38219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4381093wrt; Mon, 2 Jan 2023 17:11:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXtqW7Eyo8n7UWTbjXP9KET/GT7mORKXT+OpXbGr5cAtZTHVRIZK4p1ctQLcYCjgWbs8H061 X-Received: by 2002:a17:906:9688:b0:7c1:1c7:3bad with SMTP id w8-20020a170906968800b007c101c73badmr34858323ejx.36.1672708304133; Mon, 02 Jan 2023 17:11:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672708304; cv=none; d=google.com; s=arc-20160816; b=RiNU0X8BX0fT4WyMLAAhkaKfxjEUID1E3B2hB1cfqK9NRnQy8DPCkInO/x1b3Xw5+p MlhKcKeUinKJ95w12PO0/FMfMLUnGQZtBH783EIzfxY48LxIl3i4iMk9D715yKeMvpZp QYypoFFfRKiMzIAxjW/vd6bEDEnQaw/1qqOMg3NVgkL9f05IVqL7CfFpQjH26aq5SSRy pAVyPvLFlaBcoVo81RnaM1ZAz6vMRBBLy8IhVxyk5DvG42umKiLk2p5l5yO375ZgnSWO IGquihSRJRZ9iMq2yW0L7k2kccUxyVhcU4sBjvX2wZ4RQUwYq3ktG8G2HqF+7f3z3MnM B/ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=kHE08T4gTPodlZPGVapmZ0HQSfgCMhmZCAbX+vErrtM=; b=0UoOANXMH7n09///0+dfePgj3AuDVWV0vgP1V2bcXN/Qt24RTOL7uJy6qYvDHPS+Ea gMlJADaMFQgd+UAJLQsTUk0WCSd2OEcTvlI2RiSJwqz7qaawNMf4zcljwjzHl5V81D5W BU6TCKj97ZnLI1IiOJHUh4ylm5Smv+kSPqValkJjR36pC01m8FR27g7ChaS+k2zr/W+o HMxrLMu7PogB7sFnIl0cQYULtztuby8/iLjwAb6hC8xUEk/iy6sPDq8ody6qo2rBHIt3 kWbiOIWWGAj67dukcL8N4c65s7Q2IK2gZ1VTXn6MnzGmPpmgrTUt2kWvx5mUeRgiTGgI gBrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm3 header.b=UyYQ7Ilw; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=EdxZN0ap; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dm22-20020a170907949600b007c1600359d9si28158165ejc.451.2023.01.02.17.11.20; Mon, 02 Jan 2023 17:11:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm3 header.b=UyYQ7Ilw; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=EdxZN0ap; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236697AbjACBKR (ORCPT + 99 others); Mon, 2 Jan 2023 20:10:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236510AbjACBJY (ORCPT ); Mon, 2 Jan 2023 20:09:24 -0500 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4009596; Mon, 2 Jan 2023 17:09:22 -0800 (PST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id CC9773200919; Mon, 2 Jan 2023 20:09:20 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 02 Jan 2023 20:09:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1672708160; x=1672794560; bh=kH E08T4gTPodlZPGVapmZ0HQSfgCMhmZCAbX+vErrtM=; b=UyYQ7IlwpwAkOuo1HN QDKkchKl0wnktPq2cNwHZDz/BhriE4CQUKnW4f9locHk+hPipNeJieJhsnxP57be ZmQgMnnGleRgrVMPSkYDeLqrSdwV99GA3KD0A9ASuCnXHEkE/Hnds9WqfZv+d4hz cq/lCK28mpL8wesFvohvkC7I1F9rw77Ttt0pxN2yz154eZjAC77+V88d5Vx8wcJX kVtmIXQO6wx9DKmGn15Yg/WHkv+2SeImCsrq5lJV+iruBh6AasrFRCM2vLsq6QHZ PGvC/3W/7ZsxfZQ3q+LrKMBH0KIx5+69LSTRPOzB2MUPwbI1ujNAxuW3vAPUjXaH YA4Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1672708160; x=1672794560; bh=kHE08T4gTPodl ZPGVapmZ0HQSfgCMhmZCAbX+vErrtM=; b=EdxZN0apqAanSNtdkixjNQzRPslC8 IveKKh2SOhsJmhEnCcah95XZf55+fEphZb101Yf09BDfRB0Noqssfgcwl0tmDcHW /LO2op7yyEoHIlRWs8b9wdc5ceSH1qCkZzs9eyF5DEO51lBJPn0y371QVkQYeeQN eiMY91EpgtcWLUX9sz2aqzNQ7AokNAHlEmudb+M+KQbxFSchLsuQU7IdSCjGRM6z ATx5o4ccxIJocWWP4MQGusuzbKwoB8zkmReHw03AyYoVd1qtbKCV28jVmS9R1RFt g9GQ0y/BhlUffGtWYKlEhSg+8fCAsRLQDT666sm/wnoTRIgCU2iRwGLGQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrjeefgdeffecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 2 Jan 2023 20:09:19 -0500 (EST) From: Samuel Holland To: Joerg Roedel , Will Deacon , Robin Murphy , Chen-Yu Tsai , Jernej Skrabec , Krzysztof Kozlowski , Rob Herring Cc: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Maxime Ripard , Samuel Holland Subject: [PATCH v2 5/6] iommu/sun50i: Add support for the D1 variant Date: Mon, 2 Jan 2023 19:09:02 -0600 Message-Id: <20230103010903.11181-6-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230103010903.11181-1-samuel@sholland.org> References: <20230103010903.11181-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753961782634390906?= X-GMAIL-MSGID: =?utf-8?q?1753961782634390906?= D1 contains an IOMMU similar to the one in the H6 SoC, but the D1 variant has no external reset signal. It also has some register definition changes, but none that affect the current driver. Reviewed-by: Jernej Skrabec Signed-off-by: Samuel Holland --- (no changes since v1) drivers/iommu/sun50i-iommu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c index d19f6ce25f76..8652559a2ca3 100644 --- a/drivers/iommu/sun50i-iommu.c +++ b/drivers/iommu/sun50i-iommu.c @@ -1085,11 +1085,15 @@ static int sun50i_iommu_probe(struct platform_device *pdev) return ret; } +static const struct sun50i_iommu_variant sun20i_d1_iommu = { +}; + static const struct sun50i_iommu_variant sun50i_h6_iommu = { .has_reset = true, }; static const struct of_device_id sun50i_iommu_dt[] = { + { .compatible = "allwinner,sun20i-d1-iommu", .data = &sun20i_d1_iommu }, { .compatible = "allwinner,sun50i-h6-iommu", .data = &sun50i_h6_iommu }, { /* sentinel */ }, };