* [PATCH] r8169: Be verbose when unable to load fw patch
@ 2011-04-12 13:32 Borislav Petkov
2011-04-12 23:20 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Borislav Petkov @ 2011-04-12 13:32 UTC (permalink / raw)
To: Francois Romieu; +Cc: linux-kernel, Borislav Petkov, netdev
From: Borislav Petkov <borislav.petkov@amd.com>
When the driver fails loading the firmware, it doesn't say which patch
exactly it is missing. We have three different firmware images depending
on the hw revision, so mention the exact patch name it is unable to load
in the warning message.
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
drivers/net/r8169.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 493b0de..b068115 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2248,7 +2248,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x05, 0x001b);
if ((rtl_readphy(tp, 0x06) != 0xbf00) ||
(rtl_apply_firmware(tp, FIRMWARE_8168D_1) < 0)) {
- netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n");
+ netif_warn(tp, probe, tp->dev, "unable to apply firmware patch %s\n", FIRMWARE_8168D_1);
}
rtl_writephy(tp, 0x1f, 0x0000);
@@ -2353,7 +2353,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x05, 0x001b);
if ((rtl_readphy(tp, 0x06) != 0xb300) ||
(rtl_apply_firmware(tp, FIRMWARE_8168D_2) < 0)) {
- netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n");
+ netif_warn(tp, probe, tp->dev, "unable to apply firmware patch %s\n", FIRMWARE_8168D_2);
}
rtl_writephy(tp, 0x1f, 0x0000);
@@ -2475,7 +2475,7 @@ static void rtl8105e_hw_phy_config(struct rtl8169_private *tp)
msleep(100);
if (rtl_apply_firmware(tp, FIRMWARE_8105E_1) < 0)
- netif_warn(tp, probe, tp->dev, "unable to apply firmware patch\n");
+ netif_warn(tp, probe, tp->dev, "unable to apply firmware patch %s\n", FIRMWARE_8105E_1);
rtl_writephy_batch(tp, phy_reg_init, ARRAY_SIZE(phy_reg_init));
}
--
1.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] r8169: Be verbose when unable to load fw patch
2011-04-12 13:32 [PATCH] r8169: Be verbose when unable to load fw patch Borislav Petkov
@ 2011-04-12 23:20 ` David Miller
2011-04-13 17:48 ` François Romieu
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2011-04-12 23:20 UTC (permalink / raw)
To: bp; +Cc: romieu, linux-kernel, borislav.petkov, netdev
From: Borislav Petkov <bp@amd64.org>
Date: Tue, 12 Apr 2011 15:32:52 +0200
> From: Borislav Petkov <borislav.petkov@amd.com>
>
> When the driver fails loading the firmware, it doesn't say which patch
> exactly it is missing. We have three different firmware images depending
> on the hw revision, so mention the exact patch name it is unable to load
> in the warning message.
>
> Cc: Francois Romieu <romieu@fr.zoreil.com>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Seems reasonable, Francois?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] r8169: Be verbose when unable to load fw patch
2011-04-12 23:20 ` David Miller
@ 2011-04-13 17:48 ` François Romieu
2011-04-13 17:57 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: François Romieu @ 2011-04-13 17:48 UTC (permalink / raw)
To: David Miller; +Cc: bp, romieu, linux-kernel, borislav.petkov, netdev
On Tue, Apr 12, 2011 at 04:20:36PM -0700, David Miller wrote:
[...]
> Seems reasonable, Francois?
Yes, it makes sense.
The patch goes way beyond 80 cols but I'll do a round of
cleanups later anyway.
--
Ueimor
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] r8169: Be verbose when unable to load fw patch
2011-04-13 17:48 ` François Romieu
@ 2011-04-13 17:57 ` David Miller
2011-04-16 11:03 ` François Romieu
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2011-04-13 17:57 UTC (permalink / raw)
To: romieu; +Cc: bp, linux-kernel, borislav.petkov, netdev
From: François Romieu <romieu@fr.zoreil.com>
Date: Wed, 13 Apr 2011 19:48:52 +0200
> On Tue, Apr 12, 2011 at 04:20:36PM -0700, David Miller wrote:
> [...]
>> Seems reasonable, Francois?
>
> Yes, it makes sense.
>
> The patch goes way beyond 80 cols but I'll do a round of
> cleanups later anyway.
Ok. So will you submit this yourself later or should I just
apply this myself directly to net-2.6?
I'm fine either way.
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-04-18 0:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-12 13:32 [PATCH] r8169: Be verbose when unable to load fw patch Borislav Petkov
2011-04-12 23:20 ` David Miller
2011-04-13 17:48 ` François Romieu
2011-04-13 17:57 ` David Miller
2011-04-16 11:03 ` François Romieu
[not found] ` <20110417135936.GA18165@electric-eye.fr.zoreil.com>
2011-04-18 0:45 ` David Miller
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).