Patchwork [meta-handheld] linux-yocto_3.8: remove spi-pxa2xx-fix-mem.patch

login
register
mail settings
Submitter Andrea Adami
Date April 27, 2013, 4:11 p.m.
Message ID <1367079088-16530-1-git-send-email-andrea.adami@gmail.com>
Download mbox | patch
Permalink /patch/48989/
State Accepted, archived
Headers show

Comments

Andrea Adami - April 27, 2013, 4:11 p.m.
* some similar patch is merged upstream
* so it seeems unnecessary

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 .../linux/linux-yocto-3.8/akita/akita.scc          |  1 -
 .../patches/patches-pxa/spi-pxa2xx-fix-mem.patch   | 47 ----------------------
 .../linux/linux-yocto-3.8/spitz/spitz.scc          |  1 -
 3 files changed, 49 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/spi-pxa2xx-fix-mem.patch

Patch

diff --git a/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc b/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc
index 001b11b..77a45e3 100644
--- a/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc
+++ b/recipes-kernel/linux/linux-yocto-3.8/akita/akita.scc
@@ -7,5 +7,4 @@  include ../zaurus-usb-host.scc
 
 patch ../patches/patches-pxa/sharpsl_param.patch
 patch ../patches/patches-pxa/pxa27x-sa1100-rtc.patch
-patch ../patches/patches-pxa/spi-pxa2xx-fix-mem.patch
 patch ../patches/patches-pxa/pxamci-regulator.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/spi-pxa2xx-fix-mem.patch b/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/spi-pxa2xx-fix-mem.patch
deleted file mode 100644
index 7fbc14c..0000000
--- a/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/spi-pxa2xx-fix-mem.patch
+++ /dev/null
@@ -1,47 +0,0 @@ 
-pxa2xx_spi_probe allocates struct driver_data and null_dma_buf
-at same time via spi_alloc_master(), but then calculates
-null_dma_buf pointer incorrectly, and it causes memory corruption
-later if DMA usage is enabled.
-
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
-
-Upstream-Status: Submitted
-https://patchwork.kernel.org/patch/1657911/
----
- drivers/spi/spi-pxa2xx.c | 9 +++++----
-  1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
-index dc25bee..b25fe27 100644
---- a/drivers/spi/spi-pxa2xx.c
-+++ b/drivers/spi/spi-pxa2xx.c
-@@ -106,6 +106,7 @@ struct driver_data {
- 	int rx_channel;
- 	int tx_channel;
- 	u32 *null_dma_buf;
-+	u8 null_dma_buf_unaligned[16];
- 
- 	/* SSP register addresses */
- 	void __iomem *ioaddr;
-@@ -1543,8 +1544,8 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev)
- 		return -ENODEV;
- 	}
- 
--	/* Allocate master with space for drv_data and null dma buffer */
--	master = spi_alloc_master(dev, sizeof(struct driver_data) + 16);
-+	/* Allocate master with space for drv_data */
-+	master = spi_alloc_master(dev, sizeof(struct driver_data));
- 	if (!master) {
- 		dev_err(&pdev->dev, "cannot alloc spi_master\n");
- 		pxa_ssp_free(ssp);
-@@ -1569,8 +1570,8 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev)
- 	master->transfer = transfer;
- 
- 	drv_data->ssp_type = ssp->type;
--	drv_data->null_dma_buf = (u32 *)ALIGN((u32)(drv_data +
--						sizeof(struct driver_data)), 8);
-+	drv_data->null_dma_buf =
-+		(u32 *)PTR_ALIGN(&drv_data->null_dma_buf_unaligned, 8);
- 
- 	drv_data->ioaddr = ssp->mmio_base;
- 	drv_data->ssdr_physical = ssp->phys_base + SSDR;
diff --git a/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc b/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc
index c47a0c5..8cf32bd 100644
--- a/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc
+++ b/recipes-kernel/linux/linux-yocto-3.8/spitz/spitz.scc
@@ -6,5 +6,4 @@  include ../zaurus-usb-host.scc
 
 patch ../patches/patches-pxa/sharpsl_param.patch
 patch ../patches/patches-pxa/pxa27x-sa1100-rtc.patch
-patch ../patches/patches-pxa/spi-pxa2xx-fix-mem.patch
 patch ../patches/patches-pxa/pxamci-regulator.patch