Skip to contentSkip to conversation

ARM: S3C24XX: dma cleanups for s3c2412 and s3c2443

PATCH New Heiko Stübner 2 participants 5 messages Apr 21, 2013 – Apr 22, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover ARM: S3C24XX: dma cleanups for s3c2412 and s3c2443

The s3c2412 uses the same dma channel selection-type as the s3c2443 and later but introduced the notion of a receive channel to keep the spi channels, together that are separate in hardware.

This series split the spi channels like later socs do (the s3c24xx-spi driver does not use dma at all) and removes this type of special handling.

Heiko Stuebner (3):
ARM: S3C24XX: split s3c2412 spi dma channels
ARM: S3C24XX: dma-s3c2443 - do not write into arbitary bits
ARM: S3C24XX: remove obsolete s3c2412 specific dma settings

 arch/arm/mach-s3c24xx/dma-s3c2412.c              |   56 ++++++----------------
 arch/arm/mach-s3c24xx/dma-s3c2443.c              |    3 +-
 arch/arm/mach-s3c24xx/dma.c                      |    3 -
 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    5 --
 4 files changed, 17 insertions(+), 50 deletions(-)
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 1/3 ARM: S3C24XX: split s3c2412 spi dma channels

While s3c24xx before s3c2412 (2410, 2440, 2442) use one dma channel for both sending and receiving spi data, all later s3c24xx socs use separate channels.

To keep with the structure of "one spi channel" s3c2412 introduced a channel_rx attribute to the map and selects the correct request channel depending on the dma direction, hiding the underlying separation from view.

The s3c24xx-spi driver, which would need this, currently does not use dma at all, but as s3c2443 has both highspeed (spi0) and regular (spi1) controllers and also uses the split scheme a future dma support for s3c24xx-spi would in any case need to differentiate between old-style and new-style spi channel structure.

Thus we can swtch to the split channel structure like in later socs.

---
 arch/arm/mach-s3c24xx/dma-s3c2412.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-s3c24xx/dma-s3c2412.c +16 -6
index c0e8c3f..8d8a679 100644
@@ -49,16 +49,26 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = {
 		.channels	= MAP(S3C2412_DMAREQSEL_SDI),
 		.channels_rx	= MAP(S3C2412_DMAREQSEL_SDI),
 	},
-	[DMACH_SPI0] = {
-		.name		= "spi0",
-		.channels	= MAP(S3C2412_DMAREQSEL_SPI0TX),
+	[DMACH_SPI0_RX] = {
+		.name		= "spi0-rx",
+		.channels	= MAP(S3C2412_DMAREQSEL_SPI0RX),
 		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI0RX),
 	},
-	[DMACH_SPI1] = {
-		.name		= "spi1",
-		.channels	= MAP(S3C2412_DMAREQSEL_SPI1TX),
+	[DMACH_SPI0_TX] = {
+		.name		= "spi0-tx",
+		.channels	= MAP(S3C2412_DMAREQSEL_SPI0TX),
+		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI0TX),
+	},
+	[DMACH_SPI1_RX] = {
+		.name		= "spi1-rx",
+		.channels	= MAP(S3C2412_DMAREQSEL_SPI1RX),
 		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI1RX),
 	},
+	[DMACH_SPI1_TX] = {
+		.name		= "spi1-tx",
+		.channels	= MAP(S3C2412_DMAREQSEL_SPI1TX),
+		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI1TX),
+	},
 	[DMACH_UART0] = {
 		.name		= "uart0",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART0_0),
Signature · 1 line
1.7.2.3
#2 lore raw

PATCH 2/3 ARM: S3C24XX: dma-s3c2443 - do not write into arbitary bits

In reply to Heiko Stübner

The values read from the channel map always also contain the DMA_CH_VALID (= 1<<31) setting, which should not get written into the register, even if this bit is unused.

---
 arch/arm/mach-s3c24xx/dma-s3c2443.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-s3c24xx/dma-s3c2443.c +2 -1
index 000e4c6..e992a7c 100644
@@ -130,7 +130,8 @@ static struct s3c24xx_dma_map __initdata s3c2443_dma_mappings[] = {
 static void s3c2443_dma_select(struct s3c2410_dma_chan *chan,
 			       struct s3c24xx_dma_map *map)
 {
-	writel(map->channels[0] | S3C2443_DMAREQSEL_HW,
+	unsigned long chsel = map->channels[0] & (~DMA_CH_VALID);
+	writel(chsel | S3C2443_DMAREQSEL_HW,
 	       chan->regs + S3C2443_DMA_DMAREQSEL);
 }
 
Signature · 1 line
1.7.2.3
#3 lore raw

PATCH 3/3 ARM: S3C24XX: remove obsolete s3c2412 specific dma settings

In reply to Heiko Stübner

The s3c2412 dma init contained code to handle dma-direction specific settings. As now all s3c2412-dma-channels are direction-independent this is not needed anymore.

As the s3c2412 also was the only user of this, it can go away completely.

---
 arch/arm/mach-s3c24xx/dma-s3c2412.c              |   42 ++--------------------
 arch/arm/mach-s3c24xx/dma.c                      |    3 --
 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    5 ---
 3 files changed, 3 insertions(+), 47 deletions(-)
arch/arm/mach-s3c24xx/dma-s3c2412.c +3 -39
index 8d8a679..9950400 100644
@@ -37,131 +37,95 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = {
 	[DMACH_XD0] = {
 		.name		= "xdreq0",
 		.channels	= MAP(S3C2412_DMAREQSEL_XDREQ0),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_XDREQ0),
 	},
 	[DMACH_XD1] = {
 		.name		= "xdreq1",
 		.channels	= MAP(S3C2412_DMAREQSEL_XDREQ1),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_XDREQ1),
 	},
 	[DMACH_SDI] = {
 		.name		= "sdi",
 		.channels	= MAP(S3C2412_DMAREQSEL_SDI),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_SDI),
 	},
 	[DMACH_SPI0_RX] = {
 		.name		= "spi0-rx",
 		.channels	= MAP(S3C2412_DMAREQSEL_SPI0RX),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI0RX),
 	},
 	[DMACH_SPI0_TX] = {
 		.name		= "spi0-tx",
 		.channels	= MAP(S3C2412_DMAREQSEL_SPI0TX),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI0TX),
 	},
 	[DMACH_SPI1_RX] = {
 		.name		= "spi1-rx",
 		.channels	= MAP(S3C2412_DMAREQSEL_SPI1RX),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI1RX),
 	},
 	[DMACH_SPI1_TX] = {
 		.name		= "spi1-tx",
 		.channels	= MAP(S3C2412_DMAREQSEL_SPI1TX),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_SPI1TX),
 	},
 	[DMACH_UART0] = {
 		.name		= "uart0",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART0_0),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_UART0_0),
 	},
 	[DMACH_UART1] = {
 		.name		= "uart1",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART1_0),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_UART1_0),
 	},
       	[DMACH_UART2] = {
 		.name		= "uart2",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART2_0),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_UART2_0),
 	},
 	[DMACH_UART0_SRC2] = {
 		.name		= "uart0",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART0_1),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_UART0_1),
 	},
 	[DMACH_UART1_SRC2] = {
 		.name		= "uart1",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART1_1),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_UART1_1),
 	},
       	[DMACH_UART2_SRC2] = {
 		.name		= "uart2",
 		.channels	= MAP(S3C2412_DMAREQSEL_UART2_1),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_UART2_1),
 	},
 	[DMACH_TIMER] = {
 		.name		= "timer",
 		.channels	= MAP(S3C2412_DMAREQSEL_TIMER),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_TIMER),
 	},
 	[DMACH_I2S_IN] = {
 		.name		= "i2s-sdi",
 		.channels	= MAP(S3C2412_DMAREQSEL_I2SRX),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_I2SRX),
 	},
 	[DMACH_I2S_OUT] = {
 		.name		= "i2s-sdo",
 		.channels	= MAP(S3C2412_DMAREQSEL_I2STX),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_I2STX),
 	},
 	[DMACH_USB_EP1] = {
 		.name		= "usb-ep1",
 		.channels	= MAP(S3C2412_DMAREQSEL_USBEP1),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_USBEP1),
 	},
 	[DMACH_USB_EP2] = {
 		.name		= "usb-ep2",
 		.channels	= MAP(S3C2412_DMAREQSEL_USBEP2),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_USBEP2),
 	},
 	[DMACH_USB_EP3] = {
 		.name		= "usb-ep3",
 		.channels	= MAP(S3C2412_DMAREQSEL_USBEP3),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_USBEP3),
 	},
 	[DMACH_USB_EP4] = {
 		.name		= "usb-ep4",
 		.channels	= MAP(S3C2412_DMAREQSEL_USBEP4),
-		.channels_rx	= MAP(S3C2412_DMAREQSEL_USBEP4),
 	},
 };
 
-static void s3c2412_dma_direction(struct s3c2410_dma_chan *chan,
-				  struct s3c24xx_dma_map *map,
-				  enum dma_data_direction dir)
-{
-	unsigned long chsel;
-
-	if (dir == DMA_FROM_DEVICE)
-		chsel = map->channels_rx[0];
-	else
-		chsel = map->channels[0];
-
-	chsel &= ~DMA_CH_VALID;
-	chsel |= S3C2412_DMAREQSEL_HW;
-
-	writel(chsel, chan->regs + S3C2412_DMA_DMAREQSEL);
-}
-
 static void s3c2412_dma_select(struct s3c2410_dma_chan *chan,
 			       struct s3c24xx_dma_map *map)
 {
-	s3c2412_dma_direction(chan, map, chan->source);
+	unsigned long chsel = map->channels[0] & (~DMA_CH_VALID);
+	writel(chsel | S3C2412_DMAREQSEL_HW,
+	       chan->regs + S3C2412_DMA_DMAREQSEL);
 }
 
 static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {
 	.select		= s3c2412_dma_select,
-	.direction	= s3c2412_dma_direction,
 	.dcon_mask	= 0,
 	.map		= s3c2412_dma_mappings,
 	.map_size	= ARRAY_SIZE(s3c2412_dma_mappings),
arch/arm/mach-s3c24xx/dma.c +0 -3
index aab6490..4a65cba 100644
@@ -1159,9 +1159,6 @@ int s3c2410_dma_devconfig(enum dma_ch channel,
 		return -EINVAL;
 	}
 
-	if (dma_sel.direction != NULL)
-		(dma_sel.direction)(chan, chan->map, source);
-
 	return 0;
 }
 
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h +0 -5
index d015763..bd3a6db 100644
@@ -28,7 +28,6 @@ struct s3c24xx_dma_map {
 	const char		*name;
 
 	unsigned long		 channels[S3C_DMA_CHANNELS];
-	unsigned long		 channels_rx[S3C_DMA_CHANNELS];
 };
 
 struct s3c24xx_dma_selection {
@@ -38,10 +37,6 @@ struct s3c24xx_dma_selection {
 
 	void	(*select)(struct s3c2410_dma_chan *chan,
 			  struct s3c24xx_dma_map *map);
-
-	void	(*direction)(struct s3c2410_dma_chan *chan,
-			     struct s3c24xx_dma_map *map,
-			     enum dma_data_direction dir);
 };
 
 extern int s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel);
Signature · 1 line
1.7.2.3
Applied
#4 lore raw

cover ARM: S3C24XX: dma cleanups for s3c2412 and s3c2443

In reply to Heiko Stübner
Quoted 12 lines · Heiko St?bner

The s3c2412 uses the same dma channel selection-type as the s3c2443 and later but introduced the notion of a receive channel to keep the spi channels, together that are separate in hardware.

This series split the spi channels like later socs do (the s3c24xx-spi driver does not use dma at all) and removes this type of special handling.

Heiko Stuebner (3):
ARM: S3C24XX: split s3c2412 spi dma channels
ARM: S3C24XX: dma-s3c2443 - do not write into arbitary bits
ARM: S3C24XX: remove obsolete s3c2412 specific dma settings

Quoted 6 lines
  arch/arm/mach-s3c24xx/dma-s3c2412.c              |   56 ++++++----------------
  arch/arm/mach-s3c24xx/dma-s3c2443.c              |    3 +-
  arch/arm/mach-s3c24xx/dma.c                      |    3 -
  arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |    5 --
  4 files changed, 17 insertions(+), 50 deletions(-)

Applied, thanks.

- Kukjin