Lucid pull request, sfc driver stable updates
 

This is a multi-part message in MIME format.
Stefan,

Please consider including these 2.6.33.4 stable updates for the sfc driver.

From the maintainer:
https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html


For everyone else, note that sfc was backported from 2.6.33.

rtg
--
Tim Gardner tim.gardner@canonical.com
The following changes since commit f0819aaf4948e34a44d9d685615ddee74271cd70:
Chase Douglas (1):
UBUNTU: enforce CONFIG_TMPFS_POSIX_ACL=y

are available in the git repository at:

git://kernel.ubuntu.com/rtg/ubuntu-lucid.git sfc-stable-2.6.33.4

Ben Hutchings (3):
sfc: Wait at most 10ms for the MC to finish reading out MAC statistics
sfc: Always close net device at the end of a disabling reset
sfc: Change falcon_probe_board() to fail for unsupported boards

drivers/net/sfc/efx.c | 4 ++--
drivers/net/sfc/falcon.c | 4 +++-
drivers/net/sfc/falcon_boards.c | 13 +++----------
drivers/net/sfc/nic.h | 2 +-
drivers/net/sfc/siena.c | 13 +++++++++++--
5 files changed, 20 insertions(+), 16 deletions(-)
From 8f762ccdf81f5c2bbdff2fa162f16008d9c212fa Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 28 Apr 2010 09:00:35 +0000
Subject: [PATCH 1/3] sfc: Wait at most 10ms for the MC to finish reading out MAC statistics

commit aabc5649078310094cbffb430fcbf9c25b6268f9 upstream.

The original code would wait indefinitely if MAC stats DMA failed.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
drivers/net/sfc/siena.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index f8c6771..afbac2d 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -454,8 +454,17 @@ static int siena_try_update_nic_stats(struct efx_nic *efx)

static void siena_update_nic_stats(struct efx_nic *efx)
{
- while (siena_try_update_nic_stats(efx) == -EAGAIN)
- cpu_relax();
+ int retry;
+
+ /* If we're unlucky enough to read statistics wduring the DMA, wait
+ * up to 10ms for it to finish (typically takes <500us) */
+ for (retry = 0; retry < 100; ++retry) {
+ if (siena_try_update_nic_stats(efx) == 0)
+ return;
+ udelay(100);
+ }
+
+ /* Use the old values instead */
}

static void siena_start_nic_stats(struct efx_nic *efx)
--
1.7.0.4

Lucid pull request, sfc driver stable updates
 

On 06/02/2010 06:45 PM, Tim Gardner wrote:
> Stefan,
>
> Please consider including these 2.6.33.4 stable updates for the sfc driver.
>
> From the maintainer:
> https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
>
> For everyone else, note that sfc was backported from 2.6.33.
>
> rtg

Given that this is on upstream stable for the kernel version that driver is
based on, I think it is acceptable for SRU. ACK for the patches (with one more
to go), but could you please create a tracking bug with a short justification?

Thanks,
Stefan

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Lucid pull request, sfc driver stable updates
 

On 06/07/2010 06:03 AM, Stefan Bader wrote:
> On 06/02/2010 06:45 PM, Tim Gardner wrote:
>> Stefan,
>>
>> Please consider including these 2.6.33.4 stable updates for the sfc driver.
>>
>> From the maintainer:
>> https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
>>
>> For everyone else, note that sfc was backported from 2.6.33.
>>
>> rtg
>
> Given that this is on upstream stable for the kernel version that driver is
> based on, I think it is acceptable for SRU. ACK for the patches (with one more
> to go), but could you please create a tracking bug with a short justification?
>
> Thanks,
> Stefan

Why not include these patches as a regular part of the stable updates
bug, just as you've done for DRM from 2.6.33 ? The sfc patches are no
different.

rtg
--
Tim Gardner tim.gardner@canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Lucid pull request, sfc driver stable updates
 

On 06/07/2010 02:44 PM, Tim Gardner wrote:
> On 06/07/2010 06:03 AM, Stefan Bader wrote:
>> On 06/02/2010 06:45 PM, Tim Gardner wrote:
>>> Stefan,
>>>
>>> Please consider including these 2.6.33.4 stable updates for the sfc
>>> driver.
>>>
>>> From the maintainer:
>>> https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
>>>
>>> For everyone else, note that sfc was backported from 2.6.33.
>>>
>>> rtg
>>
>> Given that this is on upstream stable for the kernel version that
>> driver is
>> based on, I think it is acceptable for SRU. ACK for the patches (with
>> one more
>> to go), but could you please create a tracking bug with a short
>> justification?
>>
>> Thanks,
>> Stefan
>
> Why not include these patches as a regular part of the stable updates
> bug, just as you've done for DRM from 2.6.33 ? The sfc patches are no
> different.
>
> rtg

I could do that. But for a fact those are somewhat different in that respect
that I am not automatically following sfc in 2.6.33. Like the mutlitouch stuff
which is 2.6.34 (now). And somehow it feels to me that giving this its own
tracking bug carries the message of this being on its own better than hiding it
into one of the stable.
And why not including it generally? This slowly grows a bit into brain damaging
variety...

Stefan

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Lucid pull request, sfc driver stable updates
 

On Mon, 2010-06-07 at 14:03 +0200, Stefan Bader wrote:
> On 06/02/2010 06:45 PM, Tim Gardner wrote:
> > Stefan,
> >
> > Please consider including these 2.6.33.4 stable updates for the sfc driver.
> >
> > From the maintainer:
> > https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
> >
> > For everyone else, note that sfc was backported from 2.6.33.
> >
> > rtg
>
> Given that this is on upstream stable for the kernel version that driver is
> based on, I think it is acceptable for SRU. ACK for the patches (with one more
> to go), but could you please create a tracking bug with a short justification?

I'm happy to file bugs if you need such references.

In any case I don't expect the 2.6.33.y series to continue much longer
so I won't be able to refer to that in future.

Ben.

--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Lucid pull request, sfc driver stable updates
 

On 06/07/2010 07:07 AM, Stefan Bader wrote:
> On 06/07/2010 02:44 PM, Tim Gardner wrote:
>> On 06/07/2010 06:03 AM, Stefan Bader wrote:
>>> On 06/02/2010 06:45 PM, Tim Gardner wrote:
>>>> Stefan,
>>>>
>>>> Please consider including these 2.6.33.4 stable updates for the sfc
>>>> driver.
>>>>
>>>> From the maintainer:
>>>> https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
>>>>
>>>> For everyone else, note that sfc was backported from 2.6.33.
>>>>
>>>> rtg
>>>
>>> Given that this is on upstream stable for the kernel version that
>>> driver is
>>> based on, I think it is acceptable for SRU. ACK for the patches (with
>>> one more
>>> to go), but could you please create a tracking bug with a short
>>> justification?
>>>
>>> Thanks,
>>> Stefan
>>
>> Why not include these patches as a regular part of the stable updates
>> bug, just as you've done for DRM from 2.6.33 ? The sfc patches are no
>> different.
>>
>> rtg
>
> I could do that. But for a fact those are somewhat different in that respect
> that I am not automatically following sfc in 2.6.33. Like the mutlitouch stuff
> which is 2.6.34 (now). And somehow it feels to me that giving this its own
> tracking bug carries the message of this being on its own better than hiding it
> into one of the stable.
> And why not including it generally? This slowly grows a bit into brain damaging
> variety...
>
> Stefan

http://bugs.launchpad.net/ubuntu/lucid/+source/linux/+bug/590783

--
Tim Gardner tim.gardner@canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Lucid pull request, sfc driver stable updates
 

On 06/07/2010 03:37 PM, Ben Hutchings wrote:
> On Mon, 2010-06-07 at 14:03 +0200, Stefan Bader wrote:
>> On 06/02/2010 06:45 PM, Tim Gardner wrote:
>>> Stefan,
>>>
>>> Please consider including these 2.6.33.4 stable updates for the sfc driver.
>>>
>>> From the maintainer:
>>> https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
>>>
>>> For everyone else, note that sfc was backported from 2.6.33.
>>>
>>> rtg
>>
>> Given that this is on upstream stable for the kernel version that driver is
>> based on, I think it is acceptable for SRU. ACK for the patches (with one more
>> to go), but could you please create a tracking bug with a short justification?
>
> I'm happy to file bugs if you need such references.
>
> In any case I don't expect the 2.6.33.y series to continue much longer
> so I won't be able to refer to that in future.
>
> Ben.
>

Tim already did one. Yeah, the currently queued list might be the last. But that
has been said about 2.6.31.y, too. But likely not for too much longer, now that
.34.y is added. For that it might be possible to reference 2.6.34.y in future
and with a separate bug to track.


Stefan

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Lucid pull request, sfc driver stable updates
 

Applied as the original three patches which are now in Greg's stable
tree.

Steve

On Wed, 2010-06-02 at 10:45 -0600, Tim Gardner wrote:
> Stefan,
>
> Please consider including these 2.6.33.4 stable updates for the sfc driver.
>
> From the maintainer:
> https://lists.ubuntu.com/archives/kernel-team/2010-June/010894.html
>
> For everyone else, note that sfc was backported from 2.6.33.
>
> rtg

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team