lkml.org 
[lkml]   [2013]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [40/85] net/tg3: Avoid delay during MMIO access
From
Date
On Wed, 2013-07-24 at 17:42 +0100, Luis Henriques wrote:
> Ben Hutchings <ben@decadent.org.uk> writes:
>
> > 3.2.49-rc1 review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Gavin Shan <shangw@linux.vnet.ibm.com>
> >
> > commit 6d446ec32f169c6a5d9bc90684a8082a6cbe90f6 upstream.
[...]
> > @@ -3067,6 +3085,10 @@ static int tg3_halt_cpu(struct tg3 *tp,
> > tw32(offset + CPU_MODE, CPU_MODE_HALT);
> > if (tr32(offset + CPU_MODE) & CPU_MODE_HALT)
> > break;
> > + if (pci_channel_offline(tp->pdev))
> > + return -EBUSY;
> > + if (pci_channel_offline(tp->pdev))
> > + return -EBUSY;
> > }
>
> I believe you didn't want to have these two invocations to the
> pci_channel_offline() function. i guess you wanted to have one of
> these moved to the other branch of the 'if' statement.

Indeed, and I've dropped this patch. This was partly due to a bug in
the patch command. If there are two consecutive hunks which only insert
lines and have the same context, and it can only find one match for the
context, it will apply both insertions in the same place.

Ben.

> [ btw, I've just replied to an email by David S. Miller about his
> backport to 3.4 (and 3.2) of this commit. ]
>
> Cheers,

--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-07-25 07:01    [W:0.075 / U:3.940 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site