* [PATCH 20/30] at_hdmac.c: Quite a few spello fixes
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/tranfers/transfers/
s/maxium/maximum/
s/previouly/previously/
s/broked/broken/
s/embedds/embeds/ .... three different places.
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/at_hdmac.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 30ae36124b1d..02c09532a9e4 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -374,11 +374,11 @@ static int atc_get_bytes_left(struct dma_chan *chan, dma_cookie_t cookie)
* a second time. If the two consecutive read values of the DSCR
* are the same then we assume both refers to the very same
* child descriptor as well as the CTRLA value read inbetween
- * does. For cyclic tranfers, the assumption is that a full loop
+ * does. For cyclic transfers, the assumption is that a full loop
* is "not so fast".
* If the two DSCR values are different, we read again the CTRLA
* then the DSCR till two consecutive read values from DSCR are
- * equal or till the maxium trials is reach.
+ * equal or till the maximum trials is reach.
* This algorithm is very unlikely not to find a stable value for
* DSCR.
*/
@@ -403,7 +403,7 @@ static int atc_get_bytes_left(struct dma_chan *chan, dma_cookie_t cookie)
/*
* DSCR has changed inside the DMA controller, so the
- * previouly read value of CTRLA may refer to an already
+ * previously read value of CTRLA may refer to an already
* processed descriptor hence could be outdated.
* We need to update ctrla to match the current
* descriptor.
@@ -564,7 +564,7 @@ static void atc_handle_error(struct at_dma_chan *atchan)
spin_lock_irqsave(&atchan->lock, flags);
/*
* The descriptor currently at the head of the active list is
- * broked. Since we don't have any way to report errors, we'll
+ * broken. Since we don't have any way to report errors, we'll
* just have to scream loudly and try to carry on.
*/
bad_desc = atc_first_active(atchan);
@@ -870,7 +870,7 @@ atc_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
atc_desc_chain(&first, &prev, desc);
}
- /* First descriptor of the chain embedds additional information */
+ /* First descriptor of the chain embeds additional information */
first->txd.cookie = -EBUSY;
first->total_len = len;
@@ -1199,7 +1199,7 @@ atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
/* set end-of-link to the last link descriptor of list*/
set_desc_eol(prev);
- /* First descriptor of the chain embedds additional information */
+ /* First descriptor of the chain embeds additional information */
first->txd.cookie = -EBUSY;
first->total_len = total_len;
@@ -1358,7 +1358,7 @@ atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
/* lets make a cyclic list */
prev->lli.dscr = first->txd.phys;
- /* First descriptor of the chain embedds additional information */
+ /* First descriptor of the chain embeds additional information */
first->txd.cookie = -EBUSY;
first->total_len = buf_len;
--
2.26.3
^ permalink raw reply related
* [PATCH 19/30] xgene-dma.c: Few spello fixes
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/definations/definitions/ ....two different places.
s/Configue/Configure/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/xgene-dma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c
index 3589b4ef50b8..9b0010b6e033 100644
--- a/drivers/dma/xgene-dma.c
+++ b/drivers/dma/xgene-dma.c
@@ -23,7 +23,7 @@
#include "dmaengine.h"
-/* X-Gene DMA ring csr registers and bit definations */
+/* X-Gene DMA ring csr registers and bit definitions */
#define XGENE_DMA_RING_CONFIG 0x04
#define XGENE_DMA_RING_ENABLE BIT(31)
#define XGENE_DMA_RING_ID 0x08
@@ -102,7 +102,7 @@
#define XGENE_DMA_BLK_MEM_RDY_VAL 0xFFFFFFFF
#define XGENE_DMA_RING_CMD_SM_OFFSET 0x8000
-/* X-Gene SoC EFUSE csr register and bit defination */
+/* X-Gene SoC EFUSE csr register and bit definition */
#define XGENE_SOC_JTAG1_SHADOW 0x18
#define XGENE_DMA_PQ_DISABLE_MASK BIT(13)
@@ -1741,7 +1741,7 @@ static int xgene_dma_probe(struct platform_device *pdev)
/* Initialize DMA channels software state */
xgene_dma_init_channels(pdma);
- /* Configue DMA rings */
+ /* Configure DMA rings */
ret = xgene_dma_init_rings(pdma);
if (ret)
goto err_clk_enable;
--
2.26.3
^ permalink raw reply related
* [PATCH 18/30] tegra20-apb-dma.c: Fixed a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/programing/programming/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/tegra20-apb-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 71827d9b0aa1..e64789432587 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -475,7 +475,7 @@ static void tegra_dma_configure_for_next(struct tegra_dma_channel *tdc,
/*
* If interrupt is pending then do nothing as the ISR will handle
- * the programing for new request.
+ * the programming for new request.
*/
if (status & TEGRA_APBDMA_STATUS_ISE_EOC) {
dev_err(tdc2dev(tdc),
--
2.26.3
^ permalink raw reply related
* [PATCH 17/30] ste_dma40_ll.h: Fix a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/directy/directly/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/ste_dma40_ll.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/ste_dma40_ll.h b/drivers/dma/ste_dma40_ll.h
index c504e855eb02..2e30e9a94a1e 100644
--- a/drivers/dma/ste_dma40_ll.h
+++ b/drivers/dma/ste_dma40_ll.h
@@ -369,7 +369,7 @@ struct d40_phy_lli_bidir {
* @lcsp02: Either maps to register lcsp0 if src or lcsp2 if dst.
* @lcsp13: Either maps to register lcsp1 if src or lcsp3 if dst.
*
- * This struct must be 8 bytes aligned since it will be accessed directy by
+ * This struct must be 8 bytes aligned since it will be accessed directly by
* the DMA. Never add any none hw mapped registers to this struct.
*/
--
2.26.3
^ permalink raw reply related
* [PATCH 16/30] st_fdma.h: Fix couple of typos
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/transfert/transfer/ ...two different places.
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/st_fdma.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/st_fdma.h b/drivers/dma/st_fdma.h
index fa15b97a3bab..702b21021124 100644
--- a/drivers/dma/st_fdma.h
+++ b/drivers/dma/st_fdma.h
@@ -41,8 +41,8 @@ struct st_fdma_generic_node {
* @saddr: Source address
* @daddr: Destination address
*
- * @generic: generic node for free running/paced transfert type
- * 2 others transfert type are possible, but not yet implemented
+ * @generic: generic node for free running/paced transfer type
+ * 2 others transfer type are possible, but not yet implemented
*
* The NODE structures must be aligned to a 32 byte boundary
*/
--
2.26.3
^ permalink raw reply related
* [PATCH 15/30] s3c24xx-dma.c: Few typos fixed
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/transfered/transferred/
s/desintation/destination/ ...two different places.
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/s3c24xx-dma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 8e14c72d03f0..045f2f531876 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -156,7 +156,7 @@ struct s3c24xx_sg {
* struct s3c24xx_txd - wrapper for struct dma_async_tx_descriptor
* @vd: virtual DMA descriptor
* @dsg_list: list of children sg's
- * @at: sg currently being transfered
+ * @at: sg currently being transferred
* @width: transfer width
* @disrcc: value for source control register
* @didstc: value for destination control register
@@ -920,7 +920,7 @@ static struct dma_async_tx_descriptor *s3c24xx_dma_prep_dma_cyclic(
}
/*
- * Always assume our peripheral desintation is a fixed
+ * Always assume our peripheral destination is a fixed
* address in memory.
*/
hwcfg |= S3C24XX_DISRCC_INC_FIXED;
@@ -1009,7 +1009,7 @@ static struct dma_async_tx_descriptor *s3c24xx_dma_prep_slave_sg(
}
/*
- * Always assume our peripheral desintation is a fixed
+ * Always assume our peripheral destination is a fixed
* address in memory.
*/
hwcfg |= S3C24XX_DISRCC_INC_FIXED;
--
2.26.3
^ permalink raw reply related
* [PATCH 14/30] Revert "s3c24xx-dma.c: Fix a typo"
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/transferred/transfered/
This reverts commit a2ddb8aea8106bd5552f8516ad7a8a26b9282a8f.
---
drivers/dma/s3c24xx-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index c98ae73cdcc3..8e14c72d03f0 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -156,7 +156,7 @@ struct s3c24xx_sg {
* struct s3c24xx_txd - wrapper for struct dma_async_tx_descriptor
* @vd: virtual DMA descriptor
* @dsg_list: list of children sg's
- * @at: sg currently being transferred
+ * @at: sg currently being transfered
* @width: transfer width
* @disrcc: value for source control register
* @didstc: value for destination control register
--
2.26.3
^ permalink raw reply related
* [PATCH 13/30] s3c24xx-dma.c: Fix a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/transfered/transferred/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/s3c24xx-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index 8e14c72d03f0..c98ae73cdcc3 100644
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -156,7 +156,7 @@ struct s3c24xx_sg {
* struct s3c24xx_txd - wrapper for struct dma_async_tx_descriptor
* @vd: virtual DMA descriptor
* @dsg_list: list of children sg's
- * @at: sg currently being transfered
+ * @at: sg currently being transferred
* @width: transfer width
* @disrcc: value for source control register
* @didstc: value for destination control register
--
2.26.3
^ permalink raw reply related
* [PATCH 12/30] of-dma.c: Fixed a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/propety/properly/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/of-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index ec00b20ae8e4..e028acff7fe8 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -337,7 +337,7 @@ EXPORT_SYMBOL_GPL(of_dma_simple_xlate);
*
* This function can be used as the of xlate callback for DMA driver which wants
* to match the channel based on the channel id. When using this xlate function
- * the #dma-cells propety of the DMA controller dt node needs to be set to 1.
+ * the #dma-cells properly of the DMA controller dt node needs to be set to 1.
* The data parameter of of_dma_controller_register must be a pointer to the
* dma_device struct the function should match upon.
*
--
2.26.3
^ permalink raw reply related
* [PATCH 11/30] nbpfaxi.c: Fixed a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/superflous/superfluous/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/nbpfaxi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
index 9c52c57919c6..9eacaa20ddb3 100644
--- a/drivers/dma/nbpfaxi.c
+++ b/drivers/dma/nbpfaxi.c
@@ -898,7 +898,7 @@ static int nbpf_config(struct dma_chan *dchan,
/*
* We could check config->slave_id to match chan->terminal here,
* but with DT they would be coming from the same source, so
- * such a check would be superflous
+ * such a check would be superfluous
*/
chan->slave_dst_addr = config->dst_addr;
--
2.26.3
^ permalink raw reply related
* [PATCH 10/30] mv_xor_v2.c: Fix a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/assosiated/associated/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/mv_xor_v2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c
index 9b0d463f89bb..8a45861299a0 100644
--- a/drivers/dma/mv_xor_v2.c
+++ b/drivers/dma/mv_xor_v2.c
@@ -175,7 +175,7 @@ struct mv_xor_v2_device {
* struct mv_xor_v2_sw_desc - implements a xor SW descriptor
* @idx: descriptor index
* @async_tx: support for the async_tx api
- * @hw_desc: assosiated HW descriptor
+ * @hw_desc: associated HW descriptor
* @free_list: node of the free SW descriprots list
*/
struct mv_xor_v2_sw_desc {
--
2.26.3
^ permalink raw reply related
* [PATCH 09/30] mv_xor.h: Fixed a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/writen/written/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/mv_xor.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/mv_xor.h b/drivers/dma/mv_xor.h
index d86086b05b0e..c87cefd38a07 100644
--- a/drivers/dma/mv_xor.h
+++ b/drivers/dma/mv_xor.h
@@ -99,7 +99,7 @@ struct mv_xor_device {
* @common: common dmaengine channel object members
* @slots_allocated: records the actual size of the descriptor slot pool
* @irq_tasklet: bottom half where mv_xor_slot_cleanup runs
- * @op_in_desc: new mode of driver, each op is writen to descriptor.
+ * @op_in_desc: new mode of driver, each op is written to descriptor.
*/
struct mv_xor_chan {
int pending;
--
2.26.3
^ permalink raw reply related
* [PATCH 08/30] mv_xor.c: Fix a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/capabilites/capabilities/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/mv_xor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 23b232b57518..a43388b6a30d 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1074,7 +1074,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
if (!mv_chan->dma_desc_pool_virt)
return ERR_PTR(-ENOMEM);
- /* discover transaction capabilites from the platform data */
+ /* discover transaction capabilities from the platform data */
dma_dev->cap_mask = cap_mask;
INIT_LIST_HEAD(&dma_dev->channels);
--
2.26.3
^ permalink raw reply related
* [PATCH 07/30] iop-adma.c: Few typos fixed
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/asynchrounous/asynchronous/
s/depedency/dependency/
s/capabilites/capabilities/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/iop-adma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 310b899d581f..81f32dc964e2 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -5,7 +5,7 @@
*/
/*
- * This driver supports the asynchrounous DMA copy and RAID engines available
+ * This driver supports the asynchronous DMA copy and RAID engines available
* on the Intel Xscale(R) family of I/O Processors (IOP 32x, 33x, 134x)
*/
@@ -243,7 +243,7 @@ static void iop_adma_tasklet(struct tasklet_struct *t)
struct iop_adma_chan *iop_chan = from_tasklet(iop_chan, t,
irq_tasklet);
- /* lockdep will flag depedency submissions as potentially
+ /* lockdep will flag dependency submissions as potentially
* recursive locking, this is not the case as a dependency
* submission will never recurse a channels submit routine.
* There are checks in async_tx.c to prevent this.
@@ -1302,7 +1302,7 @@ static int iop_adma_probe(struct platform_device *pdev)
adev->id = plat_data->hw_id;
- /* discover transaction capabilites from the platform data */
+ /* discover transaction capabilities from the platform data */
dma_dev->cap_mask = plat_data->cap_mask;
adev->pdev = pdev;
--
2.26.3
^ permalink raw reply related
* [PATCH 06/30] idma64.c: Fix couple of typos
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/transfered/transferred/ ...two different places
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/idma64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
index f4c07ad3be15..3d0d48b12e28 100644
--- a/drivers/dma/idma64.c
+++ b/drivers/dma/idma64.c
@@ -282,7 +282,7 @@ static void idma64_desc_fill(struct idma64_chan *idma64c,
desc->length += hw->len;
} while (i);
- /* Trigger an interrupt after the last block is transfered */
+ /* Trigger an interrupt after the last block is transferred */
lli->ctllo |= IDMA64C_CTLL_INT_EN;
/* Disable LLP transfer in the last block */
@@ -356,7 +356,7 @@ static size_t idma64_active_desc_size(struct idma64_chan *idma64c)
if (!i)
return bytes;
- /* The current chunk is not fully transfered yet */
+ /* The current chunk is not fully transferred yet */
bytes += desc->hw[--i].len;
return bytes - IDMA64C_CTLH_BLOCK_TS(ctlhi);
--
2.26.3
^ permalink raw reply related
* [PATCH 05/30] bcm2835-dma.c: Fix a typo
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/missmatch/mismatch/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/bcm2835-dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 630dfbb01a40..e6baf17b0434 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -369,7 +369,7 @@ 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 */
+ /* detect a size mismatch */
if (buf_len && (d->size != buf_len))
goto error_cb;
--
2.26.3
^ permalink raw reply related
* [PATCH 04/30] bcm-sba-raid.c: Few typos fixed
From: Bhaskar Chowdhury @ 2021-03-28 23:53 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/Maibox/Mailbox/
s/alloced/allocated/
s/atleast/"at least"/
s/parallely/parallel/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/bcm-sba-raid.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/bcm-sba-raid.c b/drivers/dma/bcm-sba-raid.c
index 64239da02e74..fba1585eb7ad 100644
--- a/drivers/dma/bcm-sba-raid.c
+++ b/drivers/dma/bcm-sba-raid.c
@@ -25,7 +25,7 @@
* number of hardware rings over one or more SBA hardware devices. By
* design, the internal buffer size of SBA hardware device is limited
* but all offload operations supported by SBA can be broken down into
- * multiple small size requests and executed parallely on multiple SBA
+ * multiple small size requests and executed parallel on multiple SBA
* hardware devices for achieving high through-put.
*
* The Broadcom SBA RAID driver does not require any register programming
@@ -143,7 +143,7 @@ struct sba_device {
u32 max_xor_srcs;
u32 max_resp_pool_size;
u32 max_cmds_pool_size;
- /* Maibox client and Mailbox channels */
+ /* Mailbox client and Mailbox channels */
struct mbox_client client;
struct mbox_chan *mchan;
struct device *mbox_dev;
@@ -328,7 +328,7 @@ static void sba_cleanup_nonpending_requests(struct sba_device *sba)
spin_lock_irqsave(&sba->reqs_lock, flags);
- /* Freeup all alloced request */
+ /* Freeup all allocated request */
list_for_each_entry_safe(req, req1, &sba->reqs_alloc_list, node)
_sba_free_request(sba, req);
@@ -1633,7 +1633,7 @@ static int sba_probe(struct platform_device *pdev)
sba->dev = &pdev->dev;
platform_set_drvdata(pdev, sba);
- /* Number of mailbox channels should be atleast 1 */
+ /* Number of mailbox channels should be at least 1 */
ret = of_count_phandle_with_args(pdev->dev.of_node,
"mboxes", "#mbox-cells");
if (ret <= 0)
--
2.26.3
^ permalink raw reply related
* [PATCH 03/30] amba-pl08x.c: Fixed couple of typos
From: Bhaskar Chowdhury @ 2021-03-28 23:52 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/busses/buses/
s/accound/account/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/amba-pl08x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index a24882ba3764..d15182634789 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -121,7 +121,7 @@ struct vendor_data {
/**
* struct pl08x_bus_data - information of source or destination
- * busses for a transfer
+ * buses for a transfer
* @addr: current address
* @maxwidth: the maximum width of a transfer on this bus
* @buswidth: the width of this bus in bytes: 1, 2 or 4
@@ -1010,7 +1010,7 @@ static inline u32 pl08x_lli_control_bits(struct pl08x_driver_data *pl08x,
/*
* Remove all src, dst and transfer size bits, then set the
* width and size according to the parameters. The bit offsets
- * are different in the FTDMAC020 so we need to accound for this.
+ * are different in the FTDMAC020 so we need to account for this.
*/
if (pl08x->vd->ftdmac020) {
retbits &= ~FTDMAC020_LLI_DST_WIDTH_MSK;
--
2.26.3
^ permalink raw reply related
* [PATCH 02/30] altera-msgdma.c: Couple of typos fixed
From: Bhaskar Chowdhury @ 2021-03-28 23:52 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/assosiated/associated/
s/oder/order/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/altera-msgdma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/altera-msgdma.c b/drivers/dma/altera-msgdma.c
index 9a841ce5f0c5..c3483bf2aaa7 100644
--- a/drivers/dma/altera-msgdma.c
+++ b/drivers/dma/altera-msgdma.c
@@ -152,7 +152,7 @@ struct msgdma_extended_desc {
/**
* struct msgdma_sw_desc - implements a sw descriptor
* @async_tx: support for the async_tx api
- * @hw_desc: assosiated HW descriptor
+ * @hw_desc: associated HW descriptor
* @node: node to move from the free list to the tx list
* @tx_list: transmit list node
*/
@@ -510,7 +510,7 @@ static void msgdma_copy_one(struct msgdma_device *mdev,
* of the DMA controller. The descriptor will get flushed to the
* FIFO, once the last word (control word) is written. Since we
* are not 100% sure that memcpy() writes all word in the "correct"
- * oder (address from low to high) on all architectures, we make
+ * order (address from low to high) on all architectures, we make
* sure this control word is written last by single coding it and
* adding some write-barriers here.
*/
--
2.26.3
^ permalink raw reply related
* [PATCH 01/30] acpi-dma.c: Fix couple of typos
From: Bhaskar Chowdhury @ 2021-03-28 23:52 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
In-Reply-To: <cover.1616971780.git.unixbhaskar@gmail.com>
s/exctract/extract/
s/avaiable/available/
Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
---
drivers/dma/acpi-dma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/acpi-dma.c b/drivers/dma/acpi-dma.c
index 235f1396f968..4b1d5183bf64 100644
--- a/drivers/dma/acpi-dma.c
+++ b/drivers/dma/acpi-dma.c
@@ -100,7 +100,7 @@ static int acpi_dma_parse_resource_group(const struct acpi_csrt_group *grp,
}
/**
- * acpi_dma_parse_csrt - parse CSRT to exctract additional DMA resources
+ * acpi_dma_parse_csrt - parse CSRT to extract additional DMA resources
* @adev: ACPI device to match with
* @adma: struct acpi_dma of the given DMA controller
*
@@ -293,7 +293,7 @@ EXPORT_SYMBOL_GPL(devm_acpi_dma_controller_free);
* found.
*
* Return:
- * 0, if no information is avaiable, -1 on mismatch, and 1 otherwise.
+ * 0, if no information is available, -1 on mismatch, and 1 otherwise.
*/
static int acpi_dma_update_dma_spec(struct acpi_dma *adma,
struct acpi_dma_spec *dma_spec)
--
2.26.3
^ permalink raw reply related
* [PATCH 00/30] DMA: Mundane typo fixes
From: Bhaskar Chowdhury @ 2021-03-28 23:52 UTC (permalink / raw)
To: dmaengine, dri-devel, hch, iommu, linuxppc-dev, dave.jiang,
dan.j.williams
Cc: rdunlap, Bhaskar Chowdhury, linux-kernel
This patch series fixes some trivial and rudimentary spellings in the COMMENT
sections.
Bhaskar Chowdhury (30):
acpi-dma.c: Fix couple of typos
altera-msgdma.c: Couple of typos fixed
amba-pl08x.c: Fixed couple of typos
bcm-sba-raid.c: Few typos fixed
bcm2835-dma.c: Fix a typo
idma64.c: Fix couple of typos
iop-adma.c: Few typos fixed
mv_xor.c: Fix a typo
mv_xor.h: Fixed a typo
mv_xor_v2.c: Fix a typo
nbpfaxi.c: Fixed a typo
of-dma.c: Fixed a typo
s3c24xx-dma.c: Fix a typo
Revert "s3c24xx-dma.c: Fix a typo"
s3c24xx-dma.c: Few typos fixed
st_fdma.h: Fix couple of typos
ste_dma40_ll.h: Fix a typo
tegra20-apb-dma.c: Fixed a typo
xgene-dma.c: Few spello fixes
at_hdmac.c: Quite a few spello fixes
owl-dma.c: Fix a typo
at_hdmac_regs.h: Couple of typo fixes
dma-jz4780.c: Fix a typo
Kconfig: Change Synopsys to Synopsis
ste_dma40.c: Few spello fixes
dw-axi-dmac-platform.c: Few typos fixed
dpaa2-qdma.c: Fix a typo
usb-dmac.c: Fix a typo
edma.c: Fix a typo
xilinx_dma.c: Fix a typo
drivers/dma/Kconfig | 8 ++++----
drivers/dma/acpi-dma.c | 4 ++--
drivers/dma/altera-msgdma.c | 4 ++--
drivers/dma/amba-pl08x.c | 4 ++--
drivers/dma/at_hdmac.c | 14 +++++++-------
drivers/dma/at_hdmac_regs.h | 4 ++--
drivers/dma/bcm-sba-raid.c | 8 ++++----
drivers/dma/bcm2835-dma.c | 2 +-
drivers/dma/dma-jz4780.c | 2 +-
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 ++++----
drivers/dma/idma64.c | 4 ++--
drivers/dma/iop-adma.c | 6 +++---
drivers/dma/mv_xor.c | 2 +-
drivers/dma/mv_xor.h | 2 +-
drivers/dma/mv_xor_v2.c | 2 +-
drivers/dma/nbpfaxi.c | 2 +-
drivers/dma/of-dma.c | 2 +-
drivers/dma/owl-dma.c | 2 +-
drivers/dma/s3c24xx-dma.c | 6 +++---
drivers/dma/sh/shdmac.c | 2 +-
drivers/dma/sh/usb-dmac.c | 2 +-
drivers/dma/st_fdma.h | 4 ++--
drivers/dma/ste_dma40.c | 10 +++++-----
drivers/dma/ste_dma40_ll.h | 2 +-
drivers/dma/tegra20-apb-dma.c | 2 +-
drivers/dma/ti/edma.c | 2 +-
drivers/dma/xgene-dma.c | 6 +++---
drivers/dma/xilinx/xilinx_dma.c | 2 +-
28 files changed, 59 insertions(+), 59 deletions(-)
--
2.26.3
^ permalink raw reply
* Re: [PATCH] powerpc/process: Enhance readability for trap types.
From: Xiongwei Song @ 2021-03-28 23:11 UTC (permalink / raw)
To: Christophe Leroy
Cc: ravi.bangoria, mikey, Xiongwei Song, haren, linux-kernel, npiggin,
paulus, aneesh.kumar, linuxppc-dev
In-Reply-To: <8de71b45-efea-b493-ee90-b89062e8e30f@csgroup.eu>
> On Mar 28, 2021, at 11:21 PM, Christophe Leroy <christophe.leroy@csgroup.eu> wrote:
>
>
>
> Le 28/03/2021 à 16:35, Xiongwei Song a écrit :
>> From: Xiongwei Song <sxwjean@gmail.com>
>> Define macros to enhance the code readability on ppc trap types.
>
> Good idea
>
>> Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
>> ---
>> arch/powerpc/kernel/process.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>> diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
>> index 3231c2df9e26..3bbd3cf353a7 100644
>> --- a/arch/powerpc/kernel/process.c
>> +++ b/arch/powerpc/kernel/process.c
>> @@ -1451,6 +1451,10 @@ static void print_msr_bits(unsigned long val)
>> #define LAST_VOLATILE 12
>> #endif
>> +#define TRAP_MC 0x200 /* Machine Check */
>
> I think usually we use MCE, so TRAP_MCE would be better
Ok.
>
>> +#define TRAP_DSI 0x300 /* DSI exception */
>> +#define TRAP_AM 0x600 /* Alignment exception */
>
> Don't know what AM means. TRAP_ALIGN would be more explicit.
No Problem.
>
>> +
>
> The defines should go in a header file, for instance asm/ptrace.h in order to be re-used in other files.
Agree.
>
> You should do more. You can find other places to improve with:
>
> git grep "trap ==" arch/powerpc/
> git grep "TRAP(regs) ==" arch/powerpc/
Just ran “git grep”, looks like the work is much bigger than what I imagined.
>
>> static void __show_regs(struct pt_regs *regs)
>> {
>> int i, trap;
>> @@ -1465,7 +1469,7 @@ static void __show_regs(struct pt_regs *regs)
>> trap = TRAP(regs);
>> if (!trap_is_syscall(regs) && cpu_has_feature(CPU_FTR_CFAR))
>> pr_cont("CFAR: "REG" ", regs->orig_gpr3);
>> - if (trap == 0x200 || trap == 0x300 || trap == 0x600) {
>> + if (trap == TRAP_MC || trap == TRAP_DSI || trap == TRAP_AM) {
>> if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE))
>> pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
>> else
Thanks for the response. I will send v2.
Regards,
Xiongwei
^ permalink raw reply
* [PATCH] powerpc/process: Enhance readability for trap types.
From: Xiongwei Song @ 2021-03-28 14:35 UTC (permalink / raw)
To: mpe, benh, paulus, npiggin, christophe.leroy, ravi.bangoria,
mikey, aneesh.kumar, haren
Cc: Xiongwei Song, linuxppc-dev, linux-kernel
From: Xiongwei Song <sxwjean@gmail.com>
Define macros to enhance the code readability on ppc trap types.
Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
---
arch/powerpc/kernel/process.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 3231c2df9e26..3bbd3cf353a7 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1451,6 +1451,10 @@ static void print_msr_bits(unsigned long val)
#define LAST_VOLATILE 12
#endif
+#define TRAP_MC 0x200 /* Machine Check */
+#define TRAP_DSI 0x300 /* DSI exception */
+#define TRAP_AM 0x600 /* Alignment exception */
+
static void __show_regs(struct pt_regs *regs)
{
int i, trap;
@@ -1465,7 +1469,7 @@ static void __show_regs(struct pt_regs *regs)
trap = TRAP(regs);
if (!trap_is_syscall(regs) && cpu_has_feature(CPU_FTR_CFAR))
pr_cont("CFAR: "REG" ", regs->orig_gpr3);
- if (trap == 0x200 || trap == 0x300 || trap == 0x600) {
+ if (trap == TRAP_MC || trap == TRAP_DSI || trap == TRAP_AM) {
if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE))
pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
else
--
2.17.1
^ permalink raw reply related
* Re: [PATCH] powerpc/process: Enhance readability for trap types.
From: Christophe Leroy @ 2021-03-28 15:21 UTC (permalink / raw)
To: Xiongwei Song, mpe, benh, paulus, npiggin, ravi.bangoria, mikey,
aneesh.kumar, haren
Cc: Xiongwei Song, linuxppc-dev, linux-kernel
In-Reply-To: <20210328143545.24324-1-sxwjean@me.com>
Le 28/03/2021 à 16:35, Xiongwei Song a écrit :
> From: Xiongwei Song <sxwjean@gmail.com>
>
> Define macros to enhance the code readability on ppc trap types.
Good idea
>
> Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
> ---
> arch/powerpc/kernel/process.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
> index 3231c2df9e26..3bbd3cf353a7 100644
> --- a/arch/powerpc/kernel/process.c
> +++ b/arch/powerpc/kernel/process.c
> @@ -1451,6 +1451,10 @@ static void print_msr_bits(unsigned long val)
> #define LAST_VOLATILE 12
> #endif
>
> +#define TRAP_MC 0x200 /* Machine Check */
I think usually we use MCE, so TRAP_MCE would be better
> +#define TRAP_DSI 0x300 /* DSI exception */
> +#define TRAP_AM 0x600 /* Alignment exception */
Don't know what AM means. TRAP_ALIGN would be more explicit.
> +
The defines should go in a header file, for instance asm/ptrace.h in order to be re-used in other files.
You should do more. You can find other places to improve with:
git grep "trap ==" arch/powerpc/
git grep "TRAP(regs) ==" arch/powerpc/
> static void __show_regs(struct pt_regs *regs)
> {
> int i, trap;
> @@ -1465,7 +1469,7 @@ static void __show_regs(struct pt_regs *regs)
> trap = TRAP(regs);
> if (!trap_is_syscall(regs) && cpu_has_feature(CPU_FTR_CFAR))
> pr_cont("CFAR: "REG" ", regs->orig_gpr3);
> - if (trap == 0x200 || trap == 0x300 || trap == 0x600) {
> + if (trap == TRAP_MC || trap == TRAP_DSI || trap == TRAP_AM) {
> if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE))
> pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
> else
>
^ permalink raw reply
* [PATCH] powerpc/signal32: Fix Oops on sigreturn with unmapped VDSO
From: Christophe Leroy @ 2021-03-28 14:02 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman
Cc: linuxppc-dev, linux-kernel
PPC32 encounters a KUAP fault when trying to handle a signal with
VDSO unmapped.
Kernel attempted to read user page (7fc07ec0) - exploit attempt? (uid: 0)
BUG: Unable to handle kernel data access on read at 0x7fc07ec0
Faulting instruction address: 0xc00111d4
Oops: Kernel access of bad area, sig: 11 [#1]
BE PAGE_SIZE=16K PREEMPT CMPC885
CPU: 0 PID: 353 Comm: sigreturn_vdso Not tainted 5.12.0-rc4-s3k-dev-01553-gb30c310ea220 #4814
NIP: c00111d4 LR: c0005a28 CTR: 00000000
REGS: cadb3dd0 TRAP: 0300 Not tainted (5.12.0-rc4-s3k-dev-01553-gb30c310ea220)
MSR: 00009032 <EE,ME,IR,DR,RI> CR: 48000884 XER: 20000000
DAR: 7fc07ec0 DSISR: 88000000
GPR00: c0007788 cadb3e90 c28d4a40 7fc07ec0 7fc07ed0 000004e0 7fc07ce0 00000000
GPR08: 00000001 00000001 7fc07ec0 00000000 28000282 1001b828 100a0920 00000000
GPR16: 100cac0c 100b0000 105c43a4 105c5685 100d0000 100d0000 100d0000 100b2e9e
GPR24: ffffffff 105c43c8 00000000 7fc07ec8 cadb3f40 cadb3ec8 c28d4a40 00000000
NIP [c00111d4] flush_icache_range+0x90/0xb4
LR [c0005a28] handle_signal32+0x1bc/0x1c4
Call Trace:
[cadb3e90] [100d0000] 0x100d0000 (unreliable)
[cadb3ec0] [c0007788] do_notify_resume+0x260/0x314
[cadb3f20] [c000c764] syscall_exit_prepare+0x120/0x184
[cadb3f30] [c00100b4] ret_from_syscall+0xc/0x28
--- interrupt: c00 at 0xfe807f8
NIP: 0fe807f8 LR: 10001060 CTR: c0139378
REGS: cadb3f40 TRAP: 0c00 Not tainted (5.12.0-rc4-s3k-dev-01553-gb30c310ea220)
MSR: 0000d032 <EE,PR,ME,IR,DR,RI> CR: 28000482 XER: 20000000
GPR00: 00000025 7fc081c0 77bb1690 00000000 0000000a 28000482 00000001 0ff03a38
GPR08: 0000d032 00006de5 c28d4a40 00000009 88000482 1001b828 100a0920 00000000
GPR16: 100cac0c 100b0000 105c43a4 105c5685 100d0000 100d0000 100d0000 100b2e9e
GPR24: ffffffff 105c43c8 00000000 77ba7628 10002398 10010000 10002124 00024000
NIP [0fe807f8] 0xfe807f8
LR [10001060] 0x10001060
--- interrupt: c00
Instruction dump:
38630010 7c001fac 38630010 4200fff0 7c0004ac 4c00012c 4e800020 7c001fac
2c0a0000 38630010 4082ffcc 4bffffe4 <7c00186c> 2c070000 39430010 4082ff8c
---[ end trace 3973fb72b049cb06 ]---
This is because flush_icache_range() is called on user addresses.
The same problem was detected some time ago on PPC64. It was fixed by
enabling KUAP in commit 59bee45b9712 ("powerpc/mm: Fix missing KUAP
disable in flush_coherent_icache()").
PPC32 doesn't use flush_coherent_icache() and fallbacks on
clean_dcache_range() and invalidate_icache_range().
We could fix it similarly by enabling user access in those functions,
but this is overkill for just flushing two instructions.
The two instructions are 8 bytes aligned, so a single dcbst/icbi is
enough to flush them. Do like __patch_instruction() and inline
a dcbst followed by an icbi just after the write of the instructions,
while user access is still allowed. The isync is not required because
rfi will be used to return to user.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/kernel/signal_32.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 75ee918a120a..5b2ba2731957 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -809,6 +809,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
unsafe_put_user(PPC_INST_ADDI + __NR_rt_sigreturn, &mctx->mc_pad[0],
failed);
unsafe_put_user(PPC_INST_SC, &mctx->mc_pad[1], failed);
+ asm("dcbst %y0; sync; icbi %y0; sync" :: "Z" (mctx->mc_pad[0]));
}
unsafe_put_sigset_t(&frame->uc.uc_sigmask, oldset, failed);
@@ -817,9 +818,6 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
if (copy_siginfo_to_user(&frame->info, &ksig->info))
goto badframe;
- if (tramp == (unsigned long)mctx->mc_pad)
- flush_icache_range(tramp, tramp + 2 * sizeof(unsigned long));
-
regs->link = tramp;
#ifdef CONFIG_PPC_FPU_REGS
@@ -908,12 +906,10 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset,
/* Set up the sigreturn trampoline: li r0,sigret; sc */
unsafe_put_user(PPC_INST_ADDI + __NR_sigreturn, &mctx->mc_pad[0], failed);
unsafe_put_user(PPC_INST_SC, &mctx->mc_pad[1], failed);
+ asm("dcbst %y0; sync; icbi %y0; sync" :: "Z" (mctx->mc_pad[0]));
}
user_write_access_end();
- if (tramp == (unsigned long)mctx->mc_pad)
- flush_icache_range(tramp, tramp + 2 * sizeof(unsigned long));
-
regs->link = tramp;
#ifdef CONFIG_PPC_FPU_REGS
--
2.25.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox