From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vinod Koul <vkoul@kernel•org>
Cc: Dave Jiang <dave.jiang@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree
Date: Thu, 19 Nov 2020 14:29:15 +1100 [thread overview]
Message-ID: <20201119142915.22217138@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2091 bytes --]
Hi all,
Today's linux-next merge of the dmaengine tree got a conflict in:
drivers/dma/idxd/submit.c
between commit:
8326be9f1c0b ("dmaengine: idxd: fix mapping of portal size")
from the dmaengine-fixes tree and commit:
8e50d392652f ("dmaengine: idxd: Add shared workqueue support")
from the dmaengine tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/dma/idxd/submit.c
index 417048e3c42a,efca5d8468a6..000000000000
--- a/drivers/dma/idxd/submit.c
+++ b/drivers/dma/idxd/submit.c
@@@ -74,14 -86,27 +86,27 @@@ int idxd_submit_desc(struct idxd_wq *wq
if (idxd->state != IDXD_DEV_ENABLED)
return -EIO;
- portal = wq->dportal;
- portal = wq->portal + idxd_get_wq_portal_offset(IDXD_PORTAL_LIMITED);
++ portal = wq->portal;
+
/*
- * The wmb() flushes writes to coherent DMA data before possibly
- * triggering a DMA read. The wmb() is necessary even on UP because
- * the recipient is a device.
+ * The wmb() flushes writes to coherent DMA data before
+ * possibly triggering a DMA read. The wmb() is necessary
+ * even on UP because the recipient is a device.
*/
wmb();
- iosubmit_cmds512(portal, desc->hw, 1);
+ if (wq_dedicated(wq)) {
+ iosubmit_cmds512(portal, desc->hw, 1);
+ } else {
+ /*
+ * It's not likely that we would receive queue full rejection
+ * since the descriptor allocation gates at wq size. If we
+ * receive a -EAGAIN, that means something went wrong such as the
+ * device is not accepting descriptor at all.
+ */
+ rc = enqcmds(portal, desc->hw);
+ if (rc < 0)
+ return rc;
+ }
/*
* Pending the descriptor to the lockless list for the irq_entry
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-11-19 3:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 3:29 Stephen Rothwell [this message]
2020-12-14 19:58 ` linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree Stephen Rothwell
2020-12-15 4:33 ` Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2022-04-12 2:42 Stephen Rothwell
2022-04-12 11:16 ` Vinod Koul
2021-12-14 17:24 broonie
2021-12-28 9:09 ` Geert Uytterhoeven
2021-12-28 14:54 ` Jiang, Dave
2022-01-04 21:41 ` Dave Jiang
2022-01-04 23:04 ` Stephen Rothwell
2022-01-05 7:19 ` Vinod Koul
2022-01-06 23:18 ` Dave Jiang
2021-07-15 1:40 Stephen Rothwell
2020-07-06 3:56 Stephen Rothwell
2020-07-06 4:23 ` Dave Jiang
2020-07-06 4:41 ` Vinod Koul
2020-07-06 6:03 ` Stephen Rothwell
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=20201119142915.22217138@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dave.jiang@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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