From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C54EE3232; Sat, 28 Jan 2023 11:46:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id 15783424D0; Sat, 28 Jan 2023 11:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1674906405; bh=XF6Idsk35kfCAPNyhQs/PAXkcVnV95QoxC92DpEL/c4=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=V15IkajZn+WdS3awUit4i1s1e3s8SG6WSJhHCNzwEvZ+LMmI8i5FtRGBxGcg4gXKv nHjjWFSmwbhZWFr1QCxhPFg1VY0jdaFcR+3ut3wjICWQWTqEAqiEq42o/45Wabbn2X 12v/BFUOjBa+/a7+kH4kEuMEXnAKXsF5Kettw0MBR1KrsaRzzMDLS+xfZ9w4os4R+v uOrdlUVPPN/NCagInIoX/gVqVi8/oVfslaG/XCNPdNS1qAKSikXjPpkNT5/304XLNb amvj17OQeghu5PZgZ0iA8AOEZ+UIfmLv+ySQ/v9NOd8d9Z6WO7fOqGTeKSCgkvqNgo rQGn08gnUW4tQ== Message-ID: <3b796124-5edf-aff1-15e9-4ee94da5177b@marcan.st> Date: Sat, 28 Jan 2023 20:46:40 +0900 Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH 4/4] iommu: dart: Add support for M1 USB4 PCIe DART Content-Language: en-US To: Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy Cc: Rob Herring , Krzysztof Kozlowski , Alyssa Rosenzweig , linux-arm-kernel@lists.infradead.org, asahi@lists.linux.dev, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230128111114.4049-1-sven@svenpeter.dev> <20230128111114.4049-5-sven@svenpeter.dev> From: Hector Martin In-Reply-To: <20230128111114.4049-5-sven@svenpeter.dev> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 28/01/2023 20.11, Sven Peter wrote: > This variant of the regular t8103 DART is used for the two > USB4/Thunderbolt PCIe controllers. It supports 64 instead of 16 streams > which requires a slightly different MMIO layout. We also disallow bypass > support since these DARTs will only ever be used for externally facing > devices on the USB4 ports. > > Signed-off-by: Sven Peter > --- > drivers/iommu/apple-dart.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c > index 7579c97a9062..a1304ba3639b 100644 > --- a/drivers/iommu/apple-dart.c > +++ b/drivers/iommu/apple-dart.c > @@ -81,6 +81,7 @@ > #define DART_T8020_TCR_BYPASS_DAPF BIT(12) > > #define DART_T8020_TTBR 0x200 > +#define DART_T8020_USB4_TTBR 0x400 > #define DART_T8020_TTBR_VALID BIT(31) > #define DART_T8020_TTBR_ADDR_FIELD_SHIFT 0 > #define DART_T8020_TTBR_SHIFT 12 > @@ -1184,6 +1185,35 @@ static const struct apple_dart_hw apple_dart_hw_t8103 = { > .ttbr_shift = DART_T8020_TTBR_SHIFT, > .ttbr_count = 4, > }; > + > +static const struct apple_dart_hw apple_dart_hw_t8103_usb4 = { > + .type = DART_T8020, > + .irq_handler = apple_dart_t8020_irq, > + .invalidate_tlb = apple_dart_t8020_hw_invalidate_tlb, > + .oas = 36, > + .fmt = APPLE_DART, > + .max_sid_count = 64, > + > + .enable_streams = DART_T8020_STREAMS_ENABLE, > + .lock = DART_T8020_CONFIG, > + .lock_bit = DART_T8020_CONFIG_LOCK, > + > + .error = DART_T8020_ERROR, > + > + .tcr = DART_T8020_TCR, > + .tcr_enabled = DART_T8020_TCR_TRANSLATE_ENABLE, > + .tcr_disabled = 0, > + .tcr_bypass = 0, > + > + .ttbr = DART_T8020_USB4_TTBR, > + .ttbr_valid = DART_T8020_TTBR_VALID, > + .ttbr_addr_field_shift = DART_T8020_TTBR_ADDR_FIELD_SHIFT, > + .ttbr_shift = DART_T8020_TTBR_SHIFT, > + .ttbr_count = 4, > + > + .disable_bypass = true, > +}; > + > static const struct apple_dart_hw apple_dart_hw_t6000 = { > .type = DART_T6000, > .irq_handler = apple_dart_t8020_irq, > @@ -1276,6 +1306,7 @@ DEFINE_SIMPLE_DEV_PM_OPS(apple_dart_pm_ops, apple_dart_suspend, apple_dart_resum > > static const struct of_device_id apple_dart_of_match[] = { > { .compatible = "apple,t8103-dart", .data = &apple_dart_hw_t8103 }, > + { .compatible = "apple,t8103-dart-usb4", .data = &apple_dart_hw_t8103_usb4 }, > { .compatible = "apple,t8110-dart", .data = &apple_dart_hw_t8110 }, > { .compatible = "apple,t6000-dart", .data = &apple_dart_hw_t6000 }, > {}, Other than the compatible as per patch #1, Acked-by: Hector Martin - Hector From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3285FC38142 for ; Sat, 28 Jan 2023 11:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NebNmEeuj72spOQWM6II5U97KJVZ4l7UeXlWd2uUYl8=; b=k8eSFLUDesPQwM Dr9w5V8UNWT7kCxnR/8H8XcaWmbEgQ3JUH/IcJqDfEPfoo1JxrDBsxz+Y6YnmN89pw5JeXD3cZlmV 8kvwWJ27wu+8sZ5nbQBWwHl5zpALwBXIkQZvKYfHzJ9l9hkDoTTRMV7wB3kF9QBBvQ0/MhId9lGQf Hj9F1Jnd8qFy5eV31LyxSPsKxN5JPhXL0+6TkNkeS3V77SHBBBcJkv9tpKbsNP+QgKgPYy5pg/4TD XugAIXwblWp9j2AmmeMbGFdgAzPtbdRq3U7aJCu8VjY2LNnXyOj+p+UNB/sGhT1D8yhb79DX2nh3M OXKSMgSUBgz9Ih+G3S8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLjfV-000807-Hn; Sat, 28 Jan 2023 11:46:49 +0000 Received: from marcansoft.com ([212.63.210.85] helo=mail.marcansoft.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLjfS-0007zB-Os for linux-arm-kernel@lists.infradead.org; Sat, 28 Jan 2023 11:46:48 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id 15783424D0; Sat, 28 Jan 2023 11:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1674906405; bh=XF6Idsk35kfCAPNyhQs/PAXkcVnV95QoxC92DpEL/c4=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=V15IkajZn+WdS3awUit4i1s1e3s8SG6WSJhHCNzwEvZ+LMmI8i5FtRGBxGcg4gXKv nHjjWFSmwbhZWFr1QCxhPFg1VY0jdaFcR+3ut3wjICWQWTqEAqiEq42o/45Wabbn2X 12v/BFUOjBa+/a7+kH4kEuMEXnAKXsF5Kettw0MBR1KrsaRzzMDLS+xfZ9w4os4R+v uOrdlUVPPN/NCagInIoX/gVqVi8/oVfslaG/XCNPdNS1qAKSikXjPpkNT5/304XLNb amvj17OQeghu5PZgZ0iA8AOEZ+UIfmLv+ySQ/v9NOd8d9Z6WO7fOqGTeKSCgkvqNgo rQGn08gnUW4tQ== Message-ID: <3b796124-5edf-aff1-15e9-4ee94da5177b@marcan.st> Date: Sat, 28 Jan 2023 20:46:40 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH 4/4] iommu: dart: Add support for M1 USB4 PCIe DART Content-Language: en-US To: Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy Cc: Rob Herring , Krzysztof Kozlowski , Alyssa Rosenzweig , linux-arm-kernel@lists.infradead.org, asahi@lists.linux.dev, iommu@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230128111114.4049-1-sven@svenpeter.dev> <20230128111114.4049-5-sven@svenpeter.dev> From: Hector Martin In-Reply-To: <20230128111114.4049-5-sven@svenpeter.dev> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230128_034646_985374_3765DC21 X-CRM114-Status: GOOD ( 17.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 28/01/2023 20.11, Sven Peter wrote: > This variant of the regular t8103 DART is used for the two > USB4/Thunderbolt PCIe controllers. It supports 64 instead of 16 streams > which requires a slightly different MMIO layout. We also disallow bypass > support since these DARTs will only ever be used for externally facing > devices on the USB4 ports. > > Signed-off-by: Sven Peter > --- > drivers/iommu/apple-dart.c | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c > index 7579c97a9062..a1304ba3639b 100644 > --- a/drivers/iommu/apple-dart.c > +++ b/drivers/iommu/apple-dart.c > @@ -81,6 +81,7 @@ > #define DART_T8020_TCR_BYPASS_DAPF BIT(12) > > #define DART_T8020_TTBR 0x200 > +#define DART_T8020_USB4_TTBR 0x400 > #define DART_T8020_TTBR_VALID BIT(31) > #define DART_T8020_TTBR_ADDR_FIELD_SHIFT 0 > #define DART_T8020_TTBR_SHIFT 12 > @@ -1184,6 +1185,35 @@ static const struct apple_dart_hw apple_dart_hw_t8103 = { > .ttbr_shift = DART_T8020_TTBR_SHIFT, > .ttbr_count = 4, > }; > + > +static const struct apple_dart_hw apple_dart_hw_t8103_usb4 = { > + .type = DART_T8020, > + .irq_handler = apple_dart_t8020_irq, > + .invalidate_tlb = apple_dart_t8020_hw_invalidate_tlb, > + .oas = 36, > + .fmt = APPLE_DART, > + .max_sid_count = 64, > + > + .enable_streams = DART_T8020_STREAMS_ENABLE, > + .lock = DART_T8020_CONFIG, > + .lock_bit = DART_T8020_CONFIG_LOCK, > + > + .error = DART_T8020_ERROR, > + > + .tcr = DART_T8020_TCR, > + .tcr_enabled = DART_T8020_TCR_TRANSLATE_ENABLE, > + .tcr_disabled = 0, > + .tcr_bypass = 0, > + > + .ttbr = DART_T8020_USB4_TTBR, > + .ttbr_valid = DART_T8020_TTBR_VALID, > + .ttbr_addr_field_shift = DART_T8020_TTBR_ADDR_FIELD_SHIFT, > + .ttbr_shift = DART_T8020_TTBR_SHIFT, > + .ttbr_count = 4, > + > + .disable_bypass = true, > +}; > + > static const struct apple_dart_hw apple_dart_hw_t6000 = { > .type = DART_T6000, > .irq_handler = apple_dart_t8020_irq, > @@ -1276,6 +1306,7 @@ DEFINE_SIMPLE_DEV_PM_OPS(apple_dart_pm_ops, apple_dart_suspend, apple_dart_resum > > static const struct of_device_id apple_dart_of_match[] = { > { .compatible = "apple,t8103-dart", .data = &apple_dart_hw_t8103 }, > + { .compatible = "apple,t8103-dart-usb4", .data = &apple_dart_hw_t8103_usb4 }, > { .compatible = "apple,t8110-dart", .data = &apple_dart_hw_t8110 }, > { .compatible = "apple,t6000-dart", .data = &apple_dart_hw_t6000 }, > {}, Other than the compatible as per patch #1, Acked-by: Hector Martin - Hector _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel