From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B32C5C282C3 for ; Tue, 22 Jan 2019 21:23:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77B7320870 for ; Tue, 22 Jan 2019 21:23:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YiEArvr3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726886AbfAVVXu (ORCPT ); Tue, 22 Jan 2019 16:23:50 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37491 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726362AbfAVVXu (ORCPT ); Tue, 22 Jan 2019 16:23:50 -0500 Received: by mail-wr1-f67.google.com with SMTP id s12so20081wrt.4 for ; Tue, 22 Jan 2019 13:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=wgpSHvcc3ndqZE6v88BDFQpbyxhMhXQthO2fwCvGvqM=; b=YiEArvr3j/yIXiBJ6eOqc5eyGAiGZ1mHCuKHfsfZtKpC9gDME0o/zQ06vaC09YLGQ4 a1xP5sQGK130tfqf5mJzgfDB4mUdPmhHJcGXjmvVW0b7VDuX/eJQ4TXz77Zglb/2TR+K wZJNDpBlGutzwDb4ktWGnt9w1wb0IAj672UAqOmS0rhfWfODu3rkbU0CKtJJRNU0w7i+ LVkZifDYQwBrWiybaUX1VJtbV8SU+PnpyZRQV80L8WvkVtHfIsvNETv0MnsPAkufiwj/ 4YEH94zZrgdqDyRLRCoRFXK6ijV0cjGdfWnZVA5/x/sL/F9lJPn4EgiQKSCEquv7rpaM EEKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=wgpSHvcc3ndqZE6v88BDFQpbyxhMhXQthO2fwCvGvqM=; b=oY2srEIfv2LvY3JHy9FvWfkdNVhIvmYWeROGqJmhHQfIQPaWODK+wLGuxLpP1o2qU5 DTVxuQJLpFalW+gRLXO96HYKhHRyDB+YChgu++Ay9cq5iVWpQpdyGqWdz8g52VHt4c4d RKK6RYPu0Mz4XV+DJiPfH8tKzoiF/hWIFjwslVsScRNHUfMwk1pshQ3AZBdDWyAc1rGk LO0L8Y998rceKttgagxPNZbp3J0f0gENOtV+cgkJUbeFobEWViBczo5Xw33NhZ0jI3zf +DeTl13OpY9Ppq3XKDCZCafsta9m1Mu5u9rUdHBo9hSMP8HfixHXu7GhixiSiEWANfdz nDgA== X-Gm-Message-State: AJcUuke88dy+YSzt7eEgU/hEHY5WKCr6GT3Cmf+veJyDnQI6lzNazMBl eCa9Js2Ijyd7edv+DctoPbaMz9R4 X-Google-Smtp-Source: ALg8bN4DdE8fdCxhvIGAfrrUaL/mg9a2sFCt14x8o9xK/uqLZKPru7EsEqihEfiCsfo7SvbkLMrhvw== X-Received: by 2002:a5d:6b09:: with SMTP id v9mr24863729wrw.304.1548192227414; Tue, 22 Jan 2019 13:23:47 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:e51b:82a9:abd5:2eeb? (p200300EA8BF1E200E51B82A9ABD52EEB.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:e51b:82a9:abd5:2eeb]) by smtp.googlemail.com with ESMTPSA id d16sm80532135wru.52.2019.01.22.13.23.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 13:23:46 -0800 (PST) From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" Subject: [PATCH net-next] r8169: improve firmware handling Message-ID: <3e270780-6b3a-40e9-79f8-04068b2fe02b@gmail.com> Date: Tue, 22 Jan 2019 22:23:41 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org So far member rtl_fw has three states: - IS_ERR(rtl_fw): firmware not loaded - !rtl_fw: no firmware available - other: firmware loaded This can be made simpler and clearer by adding the firmware name as member fw_name to struct rtl8169_private. Then: - !fw_name: no firmware available - !rtl_fw: firmware not loaded - rtl_fw: firmware loaded This change also allows to easily merge rtl_request_uncached_firmware into rtl_request_firmware. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 47 +++++++++------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 5480073e0..f574b6b55 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -684,6 +684,7 @@ struct rtl8169_private { struct rtl8169_tc_offsets tc_offset; u32 saved_wolopts; + const char *fw_name; struct rtl_fw { const struct firmware *fw; @@ -696,7 +697,6 @@ struct rtl8169_private { size_t size; } phy_action; } *rtl_fw; -#define RTL_FIRMWARE_UNKNOWN ERR_PTR(-EAGAIN) u32 ocp_base; }; @@ -1510,11 +1510,6 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) return 0; } -static const char *rtl_lookup_firmware_name(struct rtl8169_private *tp) -{ - return rtl_chip_infos[tp->mac_version].fw_name; -} - static void rtl8169_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { @@ -1524,7 +1519,7 @@ static void rtl8169_get_drvinfo(struct net_device *dev, strlcpy(info->driver, MODULENAME, sizeof(info->driver)); strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info)); BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version)); - if (!IS_ERR_OR_NULL(rtl_fw)) + if (rtl_fw) strlcpy(info->fw_version, rtl_fw->version, sizeof(info->fw_version)); } @@ -2201,7 +2196,7 @@ static bool rtl_fw_format_ok(struct rtl8169_private *tp, struct rtl_fw *rtl_fw) if (fw->size % FW_OPCODE_SIZE) goto out; - strlcpy(version, rtl_lookup_firmware_name(tp), RTL_VER_SIZE); + strlcpy(version, tp->fw_name, RTL_VER_SIZE); pa->code = (__le32 *)fw->data; pa->size = fw->size / FW_OPCODE_SIZE; @@ -2376,20 +2371,18 @@ static void rtl_phy_write_fw(struct rtl8169_private *tp, struct rtl_fw *rtl_fw) static void rtl_release_firmware(struct rtl8169_private *tp) { - if (!IS_ERR_OR_NULL(tp->rtl_fw)) { + if (tp->rtl_fw) { release_firmware(tp->rtl_fw->fw); kfree(tp->rtl_fw); + tp->rtl_fw = NULL; } - tp->rtl_fw = RTL_FIRMWARE_UNKNOWN; } static void rtl_apply_firmware(struct rtl8169_private *tp) { - struct rtl_fw *rtl_fw = tp->rtl_fw; - /* TODO: release firmware once rtl_phy_write_fw signals failures. */ - if (!IS_ERR_OR_NULL(rtl_fw)) - rtl_phy_write_fw(tp, rtl_fw); + if (tp->rtl_fw) + rtl_phy_write_fw(tp, tp->rtl_fw); } static void rtl_apply_firmware_cond(struct rtl8169_private *tp, u8 reg, u16 val) @@ -4377,21 +4370,20 @@ static void rtl_hw_reset(struct rtl8169_private *tp) rtl_udelay_loop_wait_low(tp, &rtl_chipcmd_cond, 100, 100); } -static void rtl_request_uncached_firmware(struct rtl8169_private *tp) +static void rtl_request_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; + /* firmware loaded already or no firmware available */ + if (tp->rtl_fw || !tp->fw_name) + return; rtl_fw = kzalloc(sizeof(*rtl_fw), GFP_KERNEL); if (!rtl_fw) goto err_warn; - rc = request_firmware(&rtl_fw->fw, name, tp_to_dev(tp)); + rc = request_firmware(&rtl_fw->fw, tp->fw_name, tp_to_dev(tp)); if (rc < 0) goto err_free; @@ -4400,7 +4392,7 @@ static void rtl_request_uncached_firmware(struct rtl8169_private *tp) goto err_release_firmware; tp->rtl_fw = rtl_fw; -out: + return; err_release_firmware: @@ -4409,16 +4401,7 @@ static void rtl_request_uncached_firmware(struct rtl8169_private *tp) 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) -{ - if (IS_ERR(tp->rtl_fw)) - rtl_request_uncached_firmware(tp); + tp->fw_name, rc); } static void rtl_rx_close(struct rtl8169_private *tp) @@ -7331,7 +7314,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->irq_mask = RTL_EVENT_NAPI | cfg->irq_mask; tp->coalesce_info = cfg->coalesce_info; - tp->rtl_fw = RTL_FIRMWARE_UNKNOWN; + tp->fw_name = rtl_chip_infos[chipset].fw_name; tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters), &tp->counters_phys_addr, -- 2.20.1