From: Joshua Henderson <joshua.henderson@microchip.com>
To: <linux-kernel@vger.kernel.org>
Cc: Cristian Birsan <cristian.birsan@microchip.com>,
Joshua Henderson <joshua.henderson@microchip.com>,
Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
<linux-usb@vger.kernel.org>
Subject: [PATCH v2 2/2] usb: musb: Fix DMA desired mode for Mentor DMA engine
Date: Mon, 8 Feb 2016 15:15:30 -0700 [thread overview]
Message-ID: <1454969730-18480-2-git-send-email-joshua.henderson@microchip.com> (raw)
In-Reply-To: <1454969730-18480-1-git-send-email-joshua.henderson@microchip.com>
From: Cristian Birsan <cristian.birsan@microchip.com>
Commit 754fe4a92c07 ("usb: musb: Remove ifdefs for TX DMA for musb_host.c")
introduces a problem setting the desired channel mode for the Mentor DMA
engine.
There is a case where the pointer of the channel DMA mode is incorrectly
assigned to an address, when it should be assigned the actual mode
value. This results in the value of channel->desired_mode not being
correct.
Signed-off-by: Cristian Birsan <cristian.birsan@microchip.com>
Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>
---
Changes since v1:
- Fix commit comment citing the cause of the regression.
---
drivers/usb/musb/musb_host.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 6bef86f..b9e24862 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -662,7 +662,7 @@ static int musb_tx_dma_set_mode_mentor(struct dma_controller *dma,
csr &= ~(MUSB_TXCSR_AUTOSET | MUSB_TXCSR_DMAMODE);
csr |= MUSB_TXCSR_DMAENAB; /* against programmer's guide */
}
- channel->desired_mode = mode;
+ channel->desired_mode = *mode;
musb_writew(epio, MUSB_TXCSR, csr);
return 0;
--
1.7.9.5
next prev parent reply other threads:[~2016-02-08 22:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 22:15 [PATCH v2 1/2] usb: musb: Fix DMA for host mode Joshua Henderson
2016-02-08 22:15 ` Joshua Henderson [this message]
2016-02-09 11:14 ` [PATCH v2 2/2] usb: musb: Fix DMA desired mode for Mentor DMA engine Sergei Shtylyov
2016-02-09 11:06 ` [PATCH v2 1/2] usb: musb: Fix DMA for host mode Sergei Shtylyov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454969730-18480-2-git-send-email-joshua.henderson@microchip.com \
--to=joshua.henderson@microchip.com \
--cc=balbi@ti.com \
--cc=cristian.birsan@microchip.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®