From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from chaosmail.tech (chaosmail.tech [77.81.229.115]) (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 548E739D6EC; Sat, 15 Aug 2026 10:41:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.81.229.115 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786790517; cv=none; b=isbwLxJyeq/eP4k49UCaxHgT2qEho2oPVYW836ymCuEGBs8bwLwC+gbPRMJ0p/Z93jM5gSTsEQ3GwQ1FnwLRUaCHXdsbs6AMz5OtNxWJ2FFVe60sb76dz9urCK+rLX9PdbUNY0sBhWNWK2oWR480CFMc0AdgzD8CTeUExD9+x4E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786790517; c=relaxed/simple; bh=6o2SmQ7oKeKKGo+Lr0gJTUIospqUw8y5xkGfdrNx5Ms=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=j2yZqdkYiTG+VV6MkNqkDe1vVnLDQQlmeE0xUad/ajvTnyZdRIA+IX5e0sDSI1xwe0bqXrkhWZaH3PN9MWZtyT8v2AtREjlFYB7MGUy49QedsN/ZBafcklI6Y2Ye22r7CkYgdwJlcnD+Lmi3/A9cbuXTp42fEJP7LE79fvlF83E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech; spf=pass smtp.mailfrom=chaosmail.tech; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b=g/NBGHmn; arc=none smtp.client-ip=77.81.229.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chaosmail.tech Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chaosmail.tech header.i=@chaosmail.tech header.b="g/NBGHmn" Received: by chaosmail.tech (Postfix) id 27B8F1C9866; Sat, 15 Aug 2026 10:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chaosmail.tech; s=mail; t=1786790512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0OgYR5cG7RLSaxiqpMZoRB+CAStVXsS8fZioSnlSgzg=; b=g/NBGHmnzwZVgfjiJ1k8rovpGanAjlkOQiYmsco+as1lG/G51U8uSnzXWCXASlS/CI404i AGaQAh3X/p+Vr6eas1HZbmoeBcj57pVv0Hl8y/rHm3KMcu7EHZuD1hp6ZGFsaMcrXOSsHV bQ5LGQLlsmZG5BmgCS93DI8czYL9hxE= From: Sasha Finkelstein Date: Sat, 15 Aug 2026 12:41:39 +0200 Subject: [PATCH v4 2/2] dmaengine: apple-admac: Add M3 generation ADMACs Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260815-t603x-admac-v4-2-1149e342dcb0@chaosmail.tech> References: <20260815-t603x-admac-v4-0-1149e342dcb0@chaosmail.tech> In-Reply-To: <20260815-t603x-admac-v4-0-1149e342dcb0@chaosmail.tech> To: Sven Peter , Janne Grunau , Vinod Koul , Frank Li , Rob Herring , Krzysztof Kozlowski , Conor Dooley , =?utf-8?q?Martin_Povi=C5=A1er?= Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Finkelstein X-Developer-Signature: v=1; a=ed25519-sha256; t=1786790508; l=2802; i=k@chaosmail.tech; s=20241124; h=from:subject:message-id; bh=6o2SmQ7oKeKKGo+Lr0gJTUIospqUw8y5xkGfdrNx5Ms=; b=89yI0A4qNo+x/fuUfTR6XYKzUK9iB42AIpO5joowlOWPM3xLQr6jeuT+bPQJRlVt0fuB1/eE5 D5iEC64VRP3Cx4O0q5SCRJm03b0musrcktSb0SeySEw/c87Posf7LUI X-Developer-Key: i=k@chaosmail.tech; a=ed25519; pk=aSkp1PdZ+eF4jpMO6oLvz/YfT5XkBUneWwyhQrOgmsU= The admacs present on t8122 and t603x SoCs need additional writes in order to operate correctly. The exact purpose of this register is unknown Signed-off-by: Sasha Finkelstein --- drivers/dma/apple-admac.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index 14a5ee14a481..9a1c79c12268 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -39,10 +39,14 @@ #define FLAG_DESC_NOTIFY BIT(16) +#define T8122_UNK_28_VAL 0x200000 + #define REG_TX_START 0x0000 #define REG_TX_STOP 0x0004 #define REG_RX_START 0x0008 #define REG_RX_STOP 0x000c +#define REG_UNK_28 0x0028 +#define REG_UNK_2C 0x002c #define REG_IMPRINT 0x0090 #define REG_TX_SRAM_SIZE 0x0094 #define REG_RX_SRAM_SIZE 0x0098 @@ -85,6 +89,10 @@ struct admac_data; struct admac_tx; +struct admac_hw { + bool set_unk28; +}; + struct admac_chan { unsigned int no; struct admac_data *host; @@ -127,6 +135,7 @@ struct admac_data { struct mutex cache_alloc_lock; struct admac_sram txcache, rxcache; + const struct admac_hw *hw; int irq; int irq_index; int nchannels; @@ -747,6 +756,11 @@ static int admac_device_config(struct dma_chan *chan, u32 bus_width = readl_relaxed(ad->base + REG_BUS_WIDTH(adchan->no)) & ~(BUS_WIDTH_WORD_SIZE | BUS_WIDTH_FRAME_SIZE); + if (ad->hw->set_unk28) { + writel_relaxed(T8122_UNK_28_VAL, ad->base + REG_UNK_28); + writel_relaxed(T8122_UNK_28_VAL, ad->base + REG_UNK_2C); + } + switch (is_tx ? config->dst_addr_width : config->src_addr_width) { case DMA_SLAVE_BUSWIDTH_1_BYTE: wordsize = 1; @@ -800,11 +814,18 @@ static int admac_device_config(struct dma_chan *chan, return 0; } +static const struct admac_hw admac_base_hw = {}; + +static const struct admac_hw admac_t8122_hw = { + .set_unk28 = true, +}; + static int admac_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct admac_data *ad; struct dma_device *dma; + const struct admac_hw *hw; int nchannels; int err, irq, i; @@ -822,6 +843,8 @@ static int admac_probe(struct platform_device *pdev) ad->dev = &pdev->dev; ad->nchannels = nchannels; mutex_init(&ad->cache_alloc_lock); + hw = of_device_get_match_data(&pdev->dev); + ad->hw = hw ? hw : &admac_base_hw; /* * The controller has 4 IRQ outputs. Try them all until @@ -936,6 +959,7 @@ static void admac_remove(struct platform_device *pdev) } static const struct of_device_id admac_of_match[] = { + { .compatible = "apple,t8122-admac", .data = &admac_t8122_hw }, { .compatible = "apple,t8103-admac", }, { .compatible = "apple,admac", }, { } -- 2.55.0