apm821xx: attempt to fix sata access freezes
authorChristian Lamparter <chunkeey@gmail.com>
Sat, 14 Jul 2018 15:21:56 +0000 (17:21 +0200)
committerJohn Crispin <john@phrozen.org>
Mon, 16 Jul 2018 13:10:21 +0000 (15:10 +0200)
The original vendor's driver programmed the dma controller's
AHB HPROT values to enable bufferable, privileged mode. This
along with the "same priorty for both channels" could very
well fix the freezes that have been reported on the forum by
@ticerex and @takimata.

<https://forum.lede-project.org/t/wd-mybook-live-duo-two-disks/16195/46>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
target/linux/apm821xx/patches-4.14/302-dw-dma-hprot-fix-and-equal-priortiy.patch [new file with mode: 0644]

diff --git a/target/linux/apm821xx/patches-4.14/302-dw-dma-hprot-fix-and-equal-priortiy.patch b/target/linux/apm821xx/patches-4.14/302-dw-dma-hprot-fix-and-equal-priortiy.patch
new file mode 100644 (file)
index 0000000..c6e4331
--- /dev/null
@@ -0,0 +1,25 @@
+--- a/drivers/dma/dw/core.c
++++ b/drivers/dma/dw/core.c
+@@ -167,6 +167,8 @@ static void dwc_initialize_chan_dw(struc
+       cfghi |= DWC_CFGH_DST_PER(dwc->dws.dst_id);
+       cfghi |= DWC_CFGH_SRC_PER(dwc->dws.src_id);
++      cfghi |= DWC_CFGH_PROTCTL(3); /* bufferable + privileged access */
++
+       /* Set polarity of handshake interface */
+       cfglo |= hs_polarity ? DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL : 0;
+@@ -1293,11 +1295,8 @@ int dw_dma_probe(struct dw_dma_chip *chi
+               else
+                       list_add(&dwc->chan.device_node, &dw->dma.channels);
+-              /* 7 is highest priority & 0 is lowest. */
+-              if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
+-                      dwc->priority = pdata->nr_channels - i - 1;
+-              else
+-                      dwc->priority = i;
++              /* set all channels to the same priority */
++              dwc->priority = pdata->nr_channels - 1;
+               dwc->ch_regs = &__dw_regs(dw)->CHAN[i];
+               spin_lock_init(&dwc->lock);