kernel: update kernel 4.9 to 4.9.37
- Refreshed all patches - Removed upstreamed - Adapted 4 patches: 473-fix-marvell-phy-initialization-issues.patch ----------------------------------------------- Removed hunk 5 which got upstreamed 403-net-phy-avoid-setting-unsupported-EEE-advertisments.patch 404-net-phy-restart-phy-autonegotiation-after-EEE-advert.patch -------------------------------------------------------------- Adapted these 2 RFC patches, merging the delta's from an upstream commit (see below) which made it before these 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux- stable.git/commit/?h=v4.9.36&id=97ace183074d306942b903a148aebd5d061758f0 180-usb-xhci-add-support-for-performing-fake-doorbell.patch ----------------------------------------------------------- - Moved fake_doorbell bitmask due to new item Compile tested on: cns3xxx, imx6 Run tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
committed by
Hauke Mehrtens
parent
027aea8af7
commit
cd54b2d42b
@@ -46,7 +46,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
||||
|
||||
struct bcm2835_dmadev {
|
||||
struct dma_device ddev;
|
||||
@@ -922,6 +924,9 @@ static int bcm2835_dma_probe(struct plat
|
||||
@@ -925,6 +927,9 @@ static int bcm2835_dma_probe(struct plat
|
||||
base = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(base))
|
||||
return PTR_ERR(base);
|
||||
@@ -56,7 +56,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
||||
|
||||
od->base = base;
|
||||
|
||||
@@ -959,6 +964,9 @@ static int bcm2835_dma_probe(struct plat
|
||||
@@ -962,6 +967,9 @@ static int bcm2835_dma_probe(struct plat
|
||||
goto err_no_dma;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
||||
/* get irqs for each channel that we support */
|
||||
for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
|
||||
/* skip masked out channels */
|
||||
@@ -1033,6 +1041,7 @@ static int bcm2835_dma_remove(struct pla
|
||||
@@ -1036,6 +1044,7 @@ static int bcm2835_dma_remove(struct pla
|
||||
{
|
||||
struct bcm2835_dmadev *od = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -74,7 +74,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
|
||||
dma_async_device_unregister(&od->ddev);
|
||||
bcm2835_dma_free(od);
|
||||
|
||||
@@ -1048,7 +1057,22 @@ static struct platform_driver bcm2835_dm
|
||||
@@ -1051,7 +1060,22 @@ static struct platform_driver bcm2835_dm
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 9fd7a158ec098ab05b8d3ec2c2973b3dc7e498f3 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Reichl <hias@horus.com>
|
||||
Date: Mon, 20 Feb 2017 20:01:16 +0100
|
||||
Subject: [PATCH] dmaengine: bcm2835: Fix cyclic DMA period splitting
|
||||
|
||||
The code responsible for splitting periods into chunks that
|
||||
can be handled by the DMA controller missed to update total_len,
|
||||
the number of bytes processed in the current period, when there
|
||||
are more chunks to follow.
|
||||
|
||||
Therefore total_len was stuck at 0 and the code didn't work at all.
|
||||
This resulted in a wrong control block layout and audio issues because
|
||||
the cyclic DMA callback wasn't executing on period boundaries.
|
||||
|
||||
Fix this by adding the missing total_len update.
|
||||
|
||||
Signed-off-by: Matthias Reichl <hias@horus.com>
|
||||
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
||||
Tested-by: Clive Messer <clive.messer@digitaldreamtime.co.uk>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/dma/bcm2835-dma.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/dma/bcm2835-dma.c
|
||||
+++ b/drivers/dma/bcm2835-dma.c
|
||||
@@ -253,8 +253,11 @@ static void bcm2835_dma_create_cb_set_le
|
||||
*/
|
||||
|
||||
/* have we filled in period_length yet? */
|
||||
- if (*total_len + control_block->length < period_len)
|
||||
+ if (*total_len + control_block->length < period_len) {
|
||||
+ /* update number of bytes in this period so far */
|
||||
+ *total_len += control_block->length;
|
||||
return;
|
||||
+ }
|
||||
|
||||
/* calculate the length that remains to reach period_length */
|
||||
control_block->length = period_len - *total_len;
|
||||
Reference in New Issue
Block a user