From: Vinod Koul <vkoul@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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: Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree
Date: Tue, 15 Dec 2020 10:03:45 +0530 [thread overview]
Message-ID: <20201215043345.GF8403@vkoul-mobl> (raw)
In-Reply-To: <20201215065831.552ffeb4@canb.auug.org.au>
Hi Stephen,
On 15-12-20, 06:58, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 19 Nov 2020 14:29:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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.
> >
> > 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
>
> Just a reminder that this conflict still exists. Commit 8326be9f1c0b
> is now in Linus' tree.
Thanks for the reminder. Since Linus like to see the conflicts, I am
going to send this as is and let him resolve it :)
--
~Vinod
next prev parent reply other threads:[~2020-12-15 4:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 3:29 linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree Stephen Rothwell
2020-12-14 19:58 ` Stephen Rothwell
2020-12-15 4:33 ` Vinod Koul [this message]
-- 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=20201215043345.GF8403@vkoul-mobl \
--to=vkoul@kernel.org \
--cc=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).