From nobody Sat Jul 25 22:32:22 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D28037A835 for ; Sun, 12 Jul 2026 22:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783893644; cv=none; b=gpVyL6Ul9/LAuAwscfgQkj1rZrLdLJx868EmxWxeRRdnYNa7/gUb0vrhGYJe7CQxsZm6kmpqBB6FViUWWVpVqtDX8/wq1VpOA3q7jWc2hUmsiLdsLlQXLssfU+pCF4IZSmFaJvfNRMRYqEJc/4x5fw+I1BSW4xgkTG/gCN31gJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783893644; c=relaxed/simple; bh=XB/FXyBc5Jaregb9hd8KLGeQNU5RAms9ksjPvVxmUe8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tBlgQcosKbIfKvzbJtmBoOYLrJoJh06YkTzGgf7DOai8wKa/5NvbisUWcz9szPKhWhTvE57t2/GxdZjbeGO4xQLYwYbe2WjKGclI4e5Puphwphhp+Gpex8ZZDHSIvQiszUZlPXlokotSdJQbg09xxferwXBgt5eOemMpMMKt5KI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g68vZbOW; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g68vZbOW" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso22684655ad.2 for ; Sun, 12 Jul 2026 15:00:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783893643; x=1784498443; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RIRKxzKpxKWrf9QwtK6Xlt/4yAtQNiP0hgI5FE3Urag=; b=g68vZbOWHuExJvNrqF7s8VcamZ1I01pKUZTiwYVI2CoqoxJuTVNGxgpngwq8NMWBw8 xoIxA2Zij8YDYCR8I8Ge2ID8JOH8NN0VVpcG/45uaC167DzalqNcNIAoT80SXRph+Ibj smcUIxAYBqbqk21pxF8VHnm//z8Mq1gx0O61lGTpOcxGchQOC6WVjrcIYTt57bgNzHIS 1WUuxczZUjG3GlYV2UFbWf0AMMU7ZHM2kgYCSnvUMd5Lsm2vypn0ZrsejdbO8RoMmPOO tTQecUB0naKAE1l7K4cAu2OK0MkXwUcW+kTdtuEU8ydgx/3gdR0IFqETkSd0l/Bmr2eH dwsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783893643; x=1784498443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=RIRKxzKpxKWrf9QwtK6Xlt/4yAtQNiP0hgI5FE3Urag=; b=on5RInbIQ5rFWjpU5chy1KymvGnHSZnvU37mZS/EhfocgAqZtCp3HqqX7C2rJZWbTV 2C+y8fY6cYJyxUTy6nT6uj2tVc8cQla5Xfo5oCFLrW7BqZRpW5JjsZ1jLpkckNf0yryR aCZcU2MsdCqdCGqoTTLPP8Kq4KsVujF1VL1ftWNnGkKQENBju7xWBdsNkP25AbqeCliB ZZ5+bETU2Fp9v6lX85m4YDtJDh+5U/mGLpdtKlbFO/niruDyQqy38Y/WvuvrWeSx0ZEW vMCKsZSKdwzVktQSBspHBZnpl0xPux3bF4Lu5hgkmEndZAPqXFvjxwVPqXK6IszM5CIk E7cQ== X-Forwarded-Encrypted: i=1; AHgh+RrT8TrueesbQouOpQ/+tlls8EUNY3VqcUdq9DUJwdwISK7jjf6Rt7BtX+N1UP9Q754Fd5TgBwfZYXirVgY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8xWfeAaAeEVuPgSdMv8ZZXbuM4inEbipTnNbUPRBcv1cn74bp STV9YnRm/cPUtJSoYVMttk+W+wvvH7IiWC0lHlBt0qLcClTHOGGuGOdb X-Gm-Gg: AfdE7ckH41cRGPzV7vjEBha+8OJEGr4E4blAe9Oit6c8yyrs60GwYan/oWDu4S4Xyjs zLlss/csSDwxPGPlz5zhBUZv6Q2VLJ3OS/ZE07SwTvq/dfNLWXXob3X5DKHBpDWUQeuD5vKz7Jg 1LIEYPkug8uEiliWT9OsTqRy0SPdAvhJyd9DW56j2T3Wrzk2/fr9oHouP64qb4oOvjfexpJtBvD P/yG8/1bX78GUxKdJvOleqWNe2oCZorpJZlDmzh29euJ1Tc1duQ3blvfh72tI+QZzWQeqCTvZQs HKIDIxf0HQhoefb1VI06gMb5RhijJlsTgH1LNnz+HYrQtQhNDVWAyTGGMLRzjLZsjgw6/CdOHBu dBqfJ0gte1ddcOK43EXn+TQ9BJGmGZQ9H3rjCFXf6n9n5xiaZZCEj1XiMX8V/NabtI2bkI/cqLI wZPTRLx7pNKJOpx0/dKOEbqU9tVD5SNqXyfCX1Snmz3RnUOopHf5GVDcmlfWE/07SqxPdWmsQhQ 2K85B5Yw+qB4K0nfYcrrVHSBuXLkmcnQLCxbk7l6eqGPJYa74dGieHdhfFuhqM8pr/B79IQ4p1b X-Received: by 2002:a17:90b:2884:b0:387:e0db:bc22 with SMTP id 98e67ed59e1d1-38dc77b3846mr7049245a91.34.1783893642805; Sun, 12 Jul 2026 15:00:42 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-313cb804197sm14856305eec.13.2026.07.12.15.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 15:00:42 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Andy Shevchenko , Vinod Koul , Frank Li , Kees Cook , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be|_ptr)?\b) Subject: [PATCHv2 1/2] dmaengine: idma64: use kzalloc_flex Date: Sun, 12 Jul 2026 15:00:38 -0700 Message-ID: <20260712220039.924958-2-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260712220039.924958-1-rosenp@gmail.com> References: <20260712220039.924958-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplifies allocations by using a flexible array member in this struct. Remove idma64_alloc_desc. It now offers no readability advantages in this single usage. Add __counted_by to get extra runtime analysis. Apply the exact same treatment to struct idma64_dma and devm_kzalloc. Signed-off-by: Rosen Penev Reviewed-by: Frank Li --- drivers/dma/idma64.c | 30 ++++-------------------------- drivers/dma/idma64.h | 4 ++-- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index 5fcd1befc92d..d914f50ec309 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c @@ -192,23 +192,6 @@ static irqreturn_t idma64_irq(int irq, void *dev) =20 /* ---------------------------------------------------------------------- = */ =20 -static struct idma64_desc *idma64_alloc_desc(unsigned int ndesc) -{ - struct idma64_desc *desc; - - desc =3D kzalloc_obj(*desc, GFP_NOWAIT); - if (!desc) - return NULL; - - desc->hw =3D kzalloc_objs(*desc->hw, ndesc, GFP_NOWAIT); - if (!desc->hw) { - kfree(desc); - return NULL; - } - - return desc; -} - static void idma64_desc_free(struct idma64_chan *idma64c, struct idma64_desc *desc) { @@ -223,7 +206,6 @@ static void idma64_desc_free(struct idma64_chan *idma64= c, } while (i); } =20 - kfree(desc->hw); kfree(desc); } =20 @@ -307,10 +289,12 @@ static struct dma_async_tx_descriptor *idma64_prep_sl= ave_sg( struct scatterlist *sg; unsigned int i; =20 - desc =3D idma64_alloc_desc(sg_len); + desc =3D kzalloc_flex(*desc, hw, sg_len, GFP_NOWAIT); if (!desc) return NULL; =20 + desc->ndesc =3D sg_len; + for_each_sg(sgl, sg, sg_len, i) { struct idma64_hw_desc *hw =3D &desc->hw[i]; =20 @@ -326,7 +310,6 @@ static struct dma_async_tx_descriptor *idma64_prep_slav= e_sg( hw->len =3D sg_dma_len(sg); } =20 - desc->ndesc =3D sg_len; desc->direction =3D direction; desc->status =3D DMA_IN_PROGRESS; =20 @@ -541,18 +524,13 @@ static int idma64_probe(struct idma64_chip *chip) unsigned short i; int ret; =20 - idma64 =3D devm_kzalloc(chip->dev, sizeof(*idma64), GFP_KERNEL); + idma64 =3D devm_kzalloc(chip->dev, struct_size(idma64, chan, nr_chan), GF= P_KERNEL); if (!idma64) return -ENOMEM; =20 idma64->regs =3D chip->regs; chip->idma64 =3D idma64; =20 - idma64->chan =3D devm_kcalloc(chip->dev, nr_chan, sizeof(*idma64->chan), - GFP_KERNEL); - if (!idma64->chan) - return -ENOMEM; - idma64->all_chan_mask =3D (1 << nr_chan) - 1; =20 /* Turn off iDMA controller */ diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h index d013b54356aa..1a67dbb24db5 100644 --- a/drivers/dma/idma64.h +++ b/drivers/dma/idma64.h @@ -113,10 +113,10 @@ struct idma64_hw_desc { struct idma64_desc { struct virt_dma_desc vdesc; enum dma_transfer_direction direction; - struct idma64_hw_desc *hw; unsigned int ndesc; size_t length; enum dma_status status; + struct idma64_hw_desc hw[] __counted_by(ndesc); }; =20 static inline struct idma64_desc *to_idma64_desc(struct virt_dma_desc *vde= sc) @@ -187,7 +187,7 @@ struct idma64 { =20 /* channels */ unsigned short all_chan_mask; - struct idma64_chan *chan; + struct idma64_chan chan[]; }; =20 static inline struct idma64 *to_idma64(struct dma_device *ddev) --=20 2.55.0 From nobody Sat Jul 25 22:32:22 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE9B637BE98 for ; Sun, 12 Jul 2026 22:00:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783893646; cv=none; b=cj2Ebo1n6Uzy9u7EQDvldP78UeJNFN7DDeJn3GyrbdAMcFvjTojmsSnfuc5aY5Em17i1rTx5fNcXhSm9uP296pEY+qvrNlO8fN77timV+YryzTQpTDhd/1M+yhgBd/Lbmus9z8kgG23hAq+BXawTqxSrOgCFxcegSyre05oaYdA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783893646; c=relaxed/simple; bh=Gx3dxzU1ikPSsJPBUGCijZOLWZz13mRAOiy71j67q18=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fflg0MATKzEr8gDyq9ZmeKA8fZXrYgFN/GRb5Pv2M9aSRw9TqqczOREy/3Oegntc7Dsfue2/D9mbl0IrXk+HmkLuZajGbBlllOxd0F7gx7vs6kjb/UQBWWhCT1TSH0IBBVtmZJ+8dbQ0mK0feiGNNBHTAxuxpwfTV2rx7XU6SqE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YXXxbKdo; arc=none smtp.client-ip=209.85.215.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YXXxbKdo" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c9e607d81fcso1422784a12.2 for ; Sun, 12 Jul 2026 15:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783893644; x=1784498444; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=SvXQuEtFeagFiyEBtM6YkLZtwS+Bnd8V2JTSeJNcHAg=; b=YXXxbKdo0RqwQllr3uOKdgmBGyT2A201J+hNu244zf8Z1JihKGvA1YZ+UWzMpYTe8s gDetAsNQbrWRx/2i9K3Bf8Omxylz65GizhNJy3YlmkzMO53tGEm3HQqee1y7mKibnl9c T49JA+hWiu6EJw/HRk/iUvw3mNgXGy7h+U/ecdHKEb2p1F/ScEW+nlnc2SMXrIYVfrYM r4jKBaTaW8BMYetW77vGQAo1hs5HNd8lo7uYL3MjJoKvKBhX+4fd3aOnxYP98+9okNun h44QJZ5PmPDNqApP98qD62rXcYHRuZTcVJL376EQ5+6Khr+hSRmnYAXZNlGGEi039VXS ZfEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783893644; x=1784498444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=SvXQuEtFeagFiyEBtM6YkLZtwS+Bnd8V2JTSeJNcHAg=; b=AvwR1cghHMeLCJqMZ+Lt/yXL0IRO52ypd0Si1CRnCPrKwlBRwds66na058eVRz7mtv vObWxP7InBusn2usALqxBrZ97GtUvA6xfw5fhbaWirGj9mcq5BYZhD8AgeJRSsAnA5Gs DnaJ6QzGl6FtVFpDaIh++s+q4cpZLWeYaCKflO+v9qPVR8vYe1yixKKk9MbxN9X31ii5 k4LPD02IfwOFPuYUzyxN2ZkvXMOM4dMwpiaKvqOPFnBIeZ6HAPEBaTEzV1/l+srxtpNY RlZD7OLi1z2CpuPH6rS9QxvztP2LtVyp/QKQlUvDcBYOIn9DDgIUSVBm6ZcgTWVoxTie j89A== X-Forwarded-Encrypted: i=1; AHgh+RrvpyoJ3vQMvsE/hjDak+mhyKfVrAYJE9R3ehXBpyRJjIvSOZqNK01BTrn+/y4lPdQLvICTzcpLD/BTtJE=@vger.kernel.org X-Gm-Message-State: AOJu0YyfXolJf33PABSZLEGlP+HxuGs4a/bqzkjkomjZvIhj+wIqOScn rapNbYRnOG35zMcbNAn172ol9Q5S6daK9IHgIiuF3zR08EP4Fma8J3/w X-Gm-Gg: AfdE7cm4oCjbfPnY5Iy+KXVGXBaCtM/algBUNJVPQalMdusk4MOz7dz4NlyguEx5qRz qWwBsyWxJSW+pzf+YBOJbDHe5xJGz7KvFdullIka2KVQjsZgl1nSmb/kitfBN4yzpiMz78b7EJ9 cEQ2wCvL16utIcMSu9VEtxIKM7zI32sJz2jCLshBto4za1+3BNZsSyQSewgSB9DWccYQEj/tAUW vWxwmOcDHy+jQAXaJEJ54LRUFQMVz4qSoxhQmuufYz0ie+fM98H4/GcthALjQFGe0w6pFOwqR9a iX6d17hQY0i0Nm7Hr4vK+px458OnnFeA6k7gb6O/W44Edvhtc0L4ezEyLDvLB1S1QgZos2kJ0Yb dl3bK4MqXHfW0johl7ClgSAqDM21feogN9+DkrJBiNT6R/Cp+H82ysH0nwSMrsgjt7p+LkVc4oW hCm+ho7ZgpgY6wVSVFC8BQaTCHNvctWyATZTCPVLJ3XA3z8lqaLLfQpsX4s+AhF+DCfxOUL8yNt DSfSuWBnCwSI7qqnDs/TCU5Wh8/9CWzwMrfHFRHDiVhO38GOra77SKXmPz9DfT/Cw== X-Received: by 2002:a05:6a21:4cca:b0:3b4:8a40:85ed with SMTP id adf61e73a8af0-3c11077686bmr6798012637.7.1783893644125; Sun, 12 Jul 2026 15:00:44 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e35]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-313cb804197sm14856305eec.13.2026.07.12.15.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 15:00:43 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Andy Shevchenko , Vinod Koul , Frank Li , Kees Cook , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be|_ptr)?\b) Subject: [PATCHv2 2/2] dmaengine: idma64: use sg_nents_for_dma to respect hardware descriptor length limit Date: Sun, 12 Jul 2026 15:00:39 -0700 Message-ID: <20260712220039.924958-3-rosenp@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260712220039.924958-1-rosenp@gmail.com> References: <20260712220039.924958-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The iDMA 64-bit hardware has a 17-bit block transfer size field in the CTL_HI register (IDMA64C_CTLH_BLOCK_TS_MASK =3D 0x1ffff). When a scatterlist entry exceeds this limit, the driver would silently truncate the length, transferring fewer bytes than intended. Use sg_nents_for_dma() to compute the number of hardware descriptors needed after splitting large SG entries into chunks that fit within the hardware limit. Split the loop to iterate over each chunk. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/dma/idma64.c | 44 ++++++++++++++++++++++++++++++-------------- drivers/dma/idma64.h | 3 ++- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index d914f50ec309..6954ec2cdeae 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c @@ -287,27 +287,43 @@ static struct dma_async_tx_descriptor *idma64_prep_sl= ave_sg( struct idma64_chan *idma64c =3D to_idma64_chan(chan); struct idma64_desc *desc; struct scatterlist *sg; - unsigned int i; + unsigned int i, nents; + int ndesc; =20 - desc =3D kzalloc_flex(*desc, hw, sg_len, GFP_NOWAIT); + ndesc =3D sg_nents_for_dma(sgl, sg_len, IDMA64C_CTLH_BLOCK_TS_MASK); + if (ndesc <=3D 0) + return NULL; + + desc =3D kzalloc_flex(*desc, hw, ndesc, GFP_NOWAIT); if (!desc) return NULL; =20 - desc->ndesc =3D sg_len; + desc->ndesc =3D ndesc; =20 + nents =3D 0; for_each_sg(sgl, sg, sg_len, i) { - struct idma64_hw_desc *hw =3D &desc->hw[i]; - - /* Allocate DMA capable memory for hardware descriptor */ - hw->lli =3D dma_pool_alloc(idma64c->pool, GFP_NOWAIT, &hw->llp); - if (!hw->lli) { - desc->ndesc =3D i; - idma64_desc_free(idma64c, desc); - return NULL; + dma_addr_t addr =3D sg_dma_address(sg); + unsigned int len =3D sg_dma_len(sg); + + while (len) { + struct idma64_hw_desc *hwdesc =3D &desc->hw[nents++]; + unsigned int chunk =3D min(len, IDMA64C_CTLH_BLOCK_TS_MASK); + + hwdesc->lli =3D dma_pool_alloc(idma64c->pool, GFP_NOWAIT, + &hwdesc->llp); + if (!hwdesc->lli) { + /* nents was already incremented by ++ above */ + desc->ndesc =3D nents - 1; + idma64_desc_free(idma64c, desc); + return NULL; + } + + hwdesc->phys =3D addr; + hwdesc->len =3D chunk; + + addr +=3D chunk; + len -=3D chunk; } - - hw->phys =3D sg_dma_address(sg); - hw->len =3D sg_dma_len(sg); } =20 desc->direction =3D direction; diff --git a/drivers/dma/idma64.h b/drivers/dma/idma64.h index 1a67dbb24db5..297a91594b31 100644 --- a/drivers/dma/idma64.h +++ b/drivers/dma/idma64.h @@ -8,6 +8,7 @@ #ifndef __DMA_IDMA64_H__ #define __DMA_IDMA64_H__ =20 +#include #include #include #include @@ -51,7 +52,7 @@ #define IDMA64C_CTLL_LLP_S_EN (1 << 28) /* src block chain */ =20 /* Bitfields in CTL_HI */ -#define IDMA64C_CTLH_BLOCK_TS_MASK ((1 << 17) - 1) +#define IDMA64C_CTLH_BLOCK_TS_MASK GENMASK_U32(16, 0) #define IDMA64C_CTLH_BLOCK_TS(x) ((x) & IDMA64C_CTLH_BLOCK_TS_MASK) #define IDMA64C_CTLH_DONE (1 << 17) =20 --=20 2.55.0