lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r8169: move the firmware down into the device private data.

Browse Source 
No functional difference.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
This commit is contained in:
Francois Romieu
2011-06-17 17:00:05 +02:00
parent c4dc4d108a
commit b6ffd97f5b
1 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
drivers/net/r8169.c
View File

@@ -667,7 +667,9 @@ struct rtl8169_private {
struct rtl8169_counters counters; struct rtl8169_counters counters;
u32 saved_wolopts; u32 saved_wolopts;
const struct firmware *fw; struct rtl_fw {
const struct firmware *fw;
} *rtl_fw;
#define RTL_FIRMWARE_UNKNOWN ERR_PTR(-EAGAIN); #define RTL_FIRMWARE_UNKNOWN ERR_PTR(-EAGAIN);
}; };
@@ -1222,11 +1224,12 @@ static void rtl8169_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
struct rtl8169_private *tp = netdev_priv(dev); struct rtl8169_private *tp = netdev_priv(dev);
struct rtl_fw *rtl_fw = tp->rtl_fw;
strcpy(info->driver, MODULENAME); strcpy(info->driver, MODULENAME);
strcpy(info->version, RTL8169_VERSION); strcpy(info->version, RTL8169_VERSION);
strcpy(info->bus_info, pci_name(tp->pci_dev)); strcpy(info->bus_info, pci_name(tp->pci_dev));
strncpy(info->fw_version, IS_ERR_OR_NULL(tp->fw) ? "N/A" : strncpy(info->fw_version, IS_ERR_OR_NULL(rtl_fw) ? "N/A" :
rtl_lookup_firmware_name(tp), sizeof(info->fw_version) - 1); rtl_lookup_firmware_name(tp), sizeof(info->fw_version) - 1);
} }
@@ -1741,9 +1744,9 @@ static void rtl_writephy_batch(struct rtl8169_private *tp,
#define PHY_DELAY_MS 0xe0000000 #define PHY_DELAY_MS 0xe0000000
#define PHY_WRITE_ERI_WORD 0xf0000000 #define PHY_WRITE_ERI_WORD 0xf0000000
static void static void rtl_phy_write_fw(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)
rtl_phy_write_fw(struct rtl8169_private *tp, const struct firmware *fw)
{ {
const struct firmware *fw = rtl_fw->fw;
__le32 *phytable = (__le32 *)fw->data; __le32 *phytable = (__le32 *)fw->data;
struct net_device *dev = tp->dev; struct net_device *dev = tp->dev;
size_t index, fw_size = fw->size / sizeof(*phytable); size_t index, fw_size = fw->size / sizeof(*phytable);
@@ -1879,18 +1882,20 @@ rtl_phy_write_fw(struct rtl8169_private *tp, const struct firmware *fw)
static void rtl_release_firmware(struct rtl8169_private *tp) static void rtl_release_firmware(struct rtl8169_private *tp)
{ {
if (!IS_ERR_OR_NULL(tp->fw)) if (!IS_ERR_OR_NULL(tp->rtl_fw)) {
release_firmware(tp->fw); release_firmware(tp->rtl_fw->fw);
tp->fw = RTL_FIRMWARE_UNKNOWN; kfree(tp->rtl_fw);
}
tp->rtl_fw = RTL_FIRMWARE_UNKNOWN;
} }
static void rtl_apply_firmware(struct rtl8169_private *tp) static void rtl_apply_firmware(struct rtl8169_private *tp)
{ {
const struct firmware *fw = tp->fw; struct rtl_fw *rtl_fw = tp->rtl_fw;
/* TODO: release firmware once rtl_phy_write_fw signals failures. */ /* TODO: release firmware once rtl_phy_write_fw signals failures. */
if (!IS_ERR_OR_NULL(fw)) if (!IS_ERR_OR_NULL(rtl_fw))
rtl_phy_write_fw(tp, fw); rtl_phy_write_fw(tp, rtl_fw);
} }
static void rtl_apply_firmware_cond(struct rtl8169_private *tp, u8 reg, u16 val) static void rtl_apply_firmware_cond(struct rtl8169_private *tp, u8 reg, u16 val)
@@ -3443,7 +3448,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
tp->timer.data = (unsigned long) dev; tp->timer.data = (unsigned long) dev;
tp->timer.function = rtl8169_phy_timer; tp->timer.function = rtl8169_phy_timer;
tp->fw = RTL_FIRMWARE_UNKNOWN; tp->rtl_fw = RTL_FIRMWARE_UNKNOWN;
rc = register_netdev(dev); rc = register_netdev(dev);
if (rc < 0) if (rc < 0)
@@ -3512,25 +3517,42 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
} }
static void rtl_request_uncached_firmware(struct rtl8169_private *tp)
{
struct rtl_fw *rtl_fw;
const char *name;
int rc = -ENOMEM;
name = rtl_lookup_firmware_name(tp);
if (!name)
goto out_no_firmware;
rtl_fw = kzalloc(sizeof(*rtl_fw), GFP_KERNEL);
if (!rtl_fw)
goto err_warn;
rc = request_firmware(&rtl_fw->fw, name, &tp->pci_dev->dev);
if (rc < 0)
goto err_free;
tp->rtl_fw = rtl_fw;
out:
return;
err_free:
kfree(rtl_fw);
err_warn:
netif_warn(tp, ifup, tp->dev, "unable to load firmware patch %s (%d)\n",
name, rc);
out_no_firmware:
tp->rtl_fw = NULL;
goto out;
}
static void rtl_request_firmware(struct rtl8169_private *tp) static void rtl_request_firmware(struct rtl8169_private *tp)
{ {
/* Return early if the firmware is already loaded / cached. */ if (IS_ERR(tp->rtl_fw))
if (IS_ERR(tp->fw)) { rtl_request_uncached_firmware(tp);
const char *name;
name = rtl_lookup_firmware_name(tp);
if (name) {
int rc;
rc = request_firmware(&tp->fw, name, &tp->pci_dev->dev);
if (rc >= 0)
return;
netif_warn(tp, ifup, tp->dev, "unable to load "
"firmware patch %s (%d)\n", name, rc);
}
tp->fw = NULL;
}
} }
static int rtl8169_open(struct net_device *dev) static int rtl8169_open(struct net_device *dev)