From patchwork Wed Mar 13 14:08:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea della Porta X-Patchwork-Id: 13591452 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 A7313C54791 for ; Wed, 13 Mar 2024 14:09:34 +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:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6mHePudBSJdm4G9q9lruQ0Q5fBOnT6bSWQnXDfjzMLE=; b=yWYcnm35e68I95 JwDmQUfM+te6Gj8DQYkFL6YWDhu9moKg/1EV2eFJs+C0IzIEIsWfL+1xn9AK3ByevXmePGw9X1q+5 8dOFbrMQv0lQbrHN9Ab7DDeqCVh9uAuMk3Y1GZHu6R4Gx74I3VOet3mTPKP80ffQFEysR1poy1OFu qQQkMDd4yMzehDiCOrrYxKrp36K0SZAW+r6gZnQ7mRQlUNtwblAV7yzH3loLrak/9gPAUbBvbgMuA za5UWvpcXfW0q357Cn3ghoNhXhHZeCmGVYO+xZm+7w6ieYUti5c+AJ7LfQBEt1gVDPtUztleVBoyO iXgQuROSSA5K91HTtyHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkPIG-0000000AMRG-3QA3; Wed, 13 Mar 2024 14:09:20 +0000 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkPHo-0000000AM80-47tS for linux-arm-kernel@lists.infradead.org; Wed, 13 Mar 2024 14:08:58 +0000 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a4663b29334so61946566b.0 for ; Wed, 13 Mar 2024 07:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1710338928; x=1710943728; darn=lists.infradead.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; bh=DCjY7yma+RGAhMTh4u8gj7GTqPRw3rlJG0cUBmglS1Q=; b=BhAzIYO7PFTvJs10/BYrXBoma63yZAd7TG+EYdxI/Bm7MddSbfeuBbCaUSC9z/LRXH yIoVlcPEuroNB/yxW/O+5KMCjHR8SmkkUp1ZU+CnY8XAQm2TjA0nq7Fnq+8LJylN2Zi+ pzkQe86QyTjpF8BwZDQySNLraOYchMhMT5d6YioJBQC9Fn9UNCKTP+nit5btoTJL/jhz IcUALaQPvwnzoiGH4MRjubsv00Xfb7fXwGcUukyEbgmZ09kGdrUX4Z3XqwnUQzyscmM7 JmprQgfsu+5WKmL58L5FNXv8LqqpRlq0CoQvOI93JlxTTlyKeyQVxkdcYRE1sKL81EwB YpnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710338928; x=1710943728; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DCjY7yma+RGAhMTh4u8gj7GTqPRw3rlJG0cUBmglS1Q=; b=UrLmqhHP5O6b2eXp6Pqz7CwNyXfvTEdeuyk8pLJxPZKubzW1vyGkjXO2w1PJABZxIo GvLbOu4aCWkJ18SN/gkaY8w5O3XJ0j3+lfoBWmDcM65FhX6i+OmEMq3q1l0aVYpG+kYO Dqc7XA7NHw6BCnbtGe7K9Lp+GhONH2UZv8CuZaPe2mFoN2AxIhf+alWQmXRF1PmuqoER DM2PSR5Rzqg1xI3decWl3LHFrgfkWrlRwx1BbzdDljKVK5bRp0RZFnOj7epEoUXYRwYz eopIhu0m9422sJpBEF9kOf2v6uxboIUuTjDXoOO8Q3QNdP9KlWlxV+1ObM4FPt2Qa8J1 pu0g== X-Forwarded-Encrypted: i=1; AJvYcCVbeaegJ3q5DKUE0UyTBmadLUvhF/WO9NcutMjKYX/LaLoF79mne9ehA21KuvbUpaXePDoOshMymacfD+rnRSdIIf8p4srR1I7fjezMXcrgsGJ7lrM= X-Gm-Message-State: AOJu0YxrvgrTg12vmEqWcpibeito4NKkO3obh5G7yOkC+at0PbXf0qFO IosrJ2d/l5RHpxR36/kPrfVqrWI9jQe4kUonAP6qGmpQx7XCkrQZWRJsH/F4va4= X-Google-Smtp-Source: AGHT+IFJLbfeGtbha0JVbIZTeiai8FTB/X6n+UdCuNQI1XT7w/ymHZH+kptfqSeAe/qiMeK3y/y/zQ== X-Received: by 2002:a17:906:b153:b0:a43:dae8:d43c with SMTP id bt19-20020a170906b15300b00a43dae8d43cmr8570426ejb.32.1710338927934; Wed, 13 Mar 2024 07:08:47 -0700 (PDT) Received: from localhost (host-82-56-173-172.retail.telecomitalia.it. [82.56.173.172]) by smtp.gmail.com with ESMTPSA id 1-20020a170906308100b00a458d52a5f7sm4848776ejv.28.2024.03.13.07.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 07:08:47 -0700 (PDT) From: Andrea della Porta To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Saenz Julienne , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dave.stevenson@raspberrypi.com Cc: Phil Elwell , Maxime Ripard , Stefan Wahren , Dom Cobley , Andrea della Porta Subject: [PATCH v2 01/15] dmaengine: bcm2835: Fix several spellos Date: Wed, 13 Mar 2024 15:08:26 +0100 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240313_070853_105131_91292FF0 X-CRM114-Status: GOOD ( 23.79 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fixed Codespell reported warnings about spelling and coding convention violations, among which there are also a couple potential operator precedence issue in macroes. Signed-off-by: Andrea della Porta --- drivers/dma/bcm2835-dma.c | 96 +++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 9d74fe97452e..428253b468ac 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -51,13 +51,13 @@ struct bcm2835_dmadev { }; struct bcm2835_dma_cb { - uint32_t info; - uint32_t src; - uint32_t dst; - uint32_t length; - uint32_t stride; - uint32_t next; - uint32_t pad[2]; + u32 info; + u32 src; + u32 dst; + u32 length; + u32 stride; + u32 next; + u32 pad[2]; }; struct bcm2835_cb_entry { @@ -116,8 +116,8 @@ struct bcm2835_desc { * AXI-write to ack */ #define BCM2835_DMA_ERR BIT(8) -#define BCM2835_DMA_PRIORITY(x) ((x & 15) << 16) /* AXI priority */ -#define BCM2835_DMA_PANIC_PRIORITY(x) ((x & 15) << 20) /* panic priority */ +#define BCM2835_DMA_PRIORITY(x) (((x) & 15) << 16) /* AXI priority */ +#define BCM2835_DMA_PANIC_PRIORITY(x) (((x) & 15) << 20) /* panic priority */ /* current value of TI.BCM2835_DMA_WAIT_RESP */ #define BCM2835_DMA_WAIT_FOR_WRITES BIT(28) #define BCM2835_DMA_DIS_DEBUG BIT(29) /* disable debug pause signal */ @@ -136,9 +136,9 @@ struct bcm2835_desc { #define BCM2835_DMA_S_WIDTH BIT(9) /* 128bit writes if set */ #define BCM2835_DMA_S_DREQ BIT(10) /* enable SREQ for source */ #define BCM2835_DMA_S_IGNORE BIT(11) /* ignore source reads - read 0 */ -#define BCM2835_DMA_BURST_LENGTH(x) ((x & 15) << 12) -#define BCM2835_DMA_PER_MAP(x) ((x & 31) << 16) /* REQ source */ -#define BCM2835_DMA_WAIT(x) ((x & 31) << 21) /* add DMA-wait cycles */ +#define BCM2835_DMA_BURST_LENGTH(x) (((x) & 15) << 12) +#define BCM2835_DMA_PER_MAP(x) (((x) & 31) << 16) /* REQ source */ +#define BCM2835_DMA_WAIT(x) (((x) & 31) << 21) /* add DMA-wait cycles */ #define BCM2835_DMA_NO_WIDE_BURSTS BIT(26) /* no 2 beat write bursts */ /* debug register bits */ @@ -214,17 +214,15 @@ static void bcm2835_dma_free_cb_chain(struct bcm2835_desc *desc) static void bcm2835_dma_desc_free(struct virt_dma_desc *vd) { - bcm2835_dma_free_cb_chain( - container_of(vd, struct bcm2835_desc, vd)); + bcm2835_dma_free_cb_chain(container_of(vd, struct bcm2835_desc, vd)); } -static void bcm2835_dma_create_cb_set_length( - struct bcm2835_chan *chan, - struct bcm2835_dma_cb *control_block, - size_t len, - size_t period_len, - size_t *total_len, - u32 finalextrainfo) +static void bcm2835_dma_create_cb_set_length(struct bcm2835_chan *chan, + struct bcm2835_dma_cb *control_block, + size_t len, + size_t period_len, + size_t *total_len, + u32 finalextrainfo) { size_t max_len = bcm2835_dma_max_frame_length(chan); @@ -260,10 +258,9 @@ static void bcm2835_dma_create_cb_set_length( control_block->info |= finalextrainfo; } -static inline size_t bcm2835_dma_count_frames_for_sg( - struct bcm2835_chan *c, - struct scatterlist *sgl, - unsigned int sg_len) +static inline size_t bcm2835_dma_count_frames_for_sg(struct bcm2835_chan *c, + struct scatterlist *sgl, + unsigned int sg_len) { size_t frames = 0; struct scatterlist *sgent; @@ -271,8 +268,8 @@ static inline size_t bcm2835_dma_count_frames_for_sg( size_t plength = bcm2835_dma_max_frame_length(c); for_each_sg(sgl, sgent, sg_len, i) - frames += bcm2835_dma_frames_for_length( - sg_dma_len(sgent), plength); + frames += bcm2835_dma_frames_for_length(sg_dma_len(sgent), + plength); return frames; } @@ -298,10 +295,13 @@ static inline size_t bcm2835_dma_count_frames_for_sg( * @gfp: the GFP flag to use for allocation */ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( - struct dma_chan *chan, enum dma_transfer_direction direction, - bool cyclic, u32 info, u32 finalextrainfo, size_t frames, - dma_addr_t src, dma_addr_t dst, size_t buf_len, - size_t period_len, gfp_t gfp) + struct dma_chan *chan, + enum dma_transfer_direction direction, + bool cyclic, u32 info, + u32 finalextrainfo, + size_t frames, dma_addr_t src, + dma_addr_t dst, size_t buf_len, + size_t period_len, gfp_t gfp) { struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); size_t len = buf_len, total_len; @@ -343,10 +343,10 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( /* set up length in control_block if requested */ if (buf_len) { /* calculate length honoring period_length */ - bcm2835_dma_create_cb_set_length( - c, control_block, - len, period_len, &total_len, - cyclic ? finalextrainfo : 0); + bcm2835_dma_create_cb_set_length(c, control_block, + len, period_len, + &total_len, + cyclic ? finalextrainfo : 0); /* calculate new remaining length */ len -= control_block->length; @@ -369,8 +369,8 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain( /* the last frame requires extra flags */ d->cb_list[d->frames - 1].cb->info |= finalextrainfo; - /* detect a size missmatch */ - if (buf_len && (d->size != buf_len)) + /* detect a size mismatch */ + if (buf_len && d->size != buf_len) goto error_cb; return d; @@ -410,7 +410,7 @@ static void bcm2835_dma_fill_cb_chain_with_sg( static void bcm2835_dma_abort(struct bcm2835_chan *c) { void __iomem *chan_base = c->chan_base; - long int timeout = 10000; + long timeout = 10000; /* * A zero control block address means the channel is idle. @@ -438,7 +438,6 @@ static void bcm2835_dma_abort(struct bcm2835_chan *c) static void bcm2835_dma_start_desc(struct bcm2835_chan *c) { struct virt_dma_desc *vd = vchan_next_desc(&c->vc); - struct bcm2835_desc *d; if (!vd) { c->desc = NULL; @@ -447,9 +446,9 @@ static void bcm2835_dma_start_desc(struct bcm2835_chan *c) list_del(&vd->node); - c->desc = d = to_bcm2835_dma_desc(&vd->tx); + c->desc = to_bcm2835_dma_desc(&vd->tx); - writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR); + writel(c->desc->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR); writel(BCM2835_DMA_ACTIVE, c->chan_base + BCM2835_DMA_CS); } @@ -560,7 +559,8 @@ static size_t bcm2835_dma_desc_size_pos(struct bcm2835_desc *d, dma_addr_t addr) } static enum dma_status bcm2835_dma_tx_status(struct dma_chan *chan, - dma_cookie_t cookie, struct dma_tx_state *txstate) + dma_cookie_t cookie, + struct dma_tx_state *txstate) { struct bcm2835_chan *c = to_bcm2835_dma_chan(chan); struct virt_dma_desc *vd; @@ -860,7 +860,7 @@ static const struct of_device_id bcm2835_dma_of_match[] = { MODULE_DEVICE_TABLE(of, bcm2835_dma_of_match); static struct dma_chan *bcm2835_dma_xlate(struct of_phandle_args *spec, - struct of_dma *ofdma) + struct of_dma *ofdma) { struct bcm2835_dmadev *d = ofdma->of_dma_data; struct dma_chan *chan; @@ -883,7 +883,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev) int i, j; int irq[BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED + 1]; int irq_flags; - uint32_t chans_available; + u32 chans_available; char chan_name[BCM2835_DMA_CHAN_NAME_SIZE]; if (!pdev->dev.dma_mask) @@ -942,8 +942,8 @@ static int bcm2835_dma_probe(struct platform_device *pdev) /* Request DMA channel mask from device tree */ if (of_property_read_u32(pdev->dev.of_node, - "brcm,dma-channel-mask", - &chans_available)) { + "brcm,dma-channel-mask", + &chans_available)) { dev_err(&pdev->dev, "Failed to get channel mask\n"); rc = -EINVAL; goto err_no_dma; @@ -982,7 +982,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev) /* check if there are other channels that also use this irq */ irq_flags = 0; for (j = 0; j <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; j++) - if ((i != j) && (irq[j] == irq[i])) { + if (i != j && irq[j] == irq[i]) { irq_flags = IRQF_SHARED; break; } @@ -997,7 +997,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev) /* Device-tree DMA controller registration */ rc = of_dma_controller_register(pdev->dev.of_node, - bcm2835_dma_xlate, od); + bcm2835_dma_xlate, od); if (rc) { dev_err(&pdev->dev, "Failed to register DMA controller\n"); goto err_no_dma;