From patchwork Tue Apr 12 13:32:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 90794 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2AF30B6EEE for ; Tue, 12 Apr 2011 23:33:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755586Ab1DLNdM (ORCPT ); Tue, 12 Apr 2011 09:33:12 -0400 Received: from s15228384.onlinehome-server.info ([87.106.30.177]:52578 "EHLO mail.x86-64.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754952Ab1DLNdL (ORCPT ); Tue, 12 Apr 2011 09:33:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.x86-64.org (Postfix) with ESMTP id C7D3A13D6B; Tue, 12 Apr 2011 15:33:09 +0200 (CEST) X-Virus-Scanned: Nedap ESD1 at mail.x86-64.org Received: from mail.x86-64.org ([127.0.0.1]) by localhost (s15228384.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m0-EgNMCPE7q; Tue, 12 Apr 2011 15:33:05 +0200 (CEST) Received: from gwo.osrc.amd.com (unknown [10.97.0.252]) by mail.x86-64.org (Postfix) with ESMTP; Tue, 12 Apr 2011 15:33:04 +0200 (CEST) Received: from gere.osrc.amd.com (gere.osrc.amd.com [165.204.15.43]) by gwo.osrc.amd.com (Postfix) with ESMTP id 4021649C1FF; Tue, 12 Apr 2011 14:33:04 +0100 (BST) From: Borislav Petkov To: Francois Romieu Cc: , Borislav Petkov , netdev@vger.kernel.org Subject: [PATCH] r8169: Be verbose when unable to load fw patch Date: Tue, 12 Apr 2011 15:32:52 +0200 Message-Id: <1302615172-1646-1-git-send-email-bp@amd64.org> X-Mailer: git-send-email 1.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Borislav Petkov 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 Cc: netdev@vger.kernel.org Signed-off-by: Borislav Petkov --- 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)); }