lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.15 127/189] ibmvnic: fix firmware version when no firmware level has been provided by the VIOS server
    Date
    From: Desnes Augusto Nunes do Rosario <desnesn@linux.vnet.ibm.com>

    [ Upstream commit a107311d7fdf6b826f3737c4a90fd0e0046e7a3a ]

    Older versions of VIOS servers do not send the firmware level in the VPD
    buffer for the ibmvnic driver. Thus, not only the current message is mis-
    leading but the firmware version in the ethtool will be NULL. Therefore,
    this patch fixes the firmware string and its warning.

    Fixes: 4e6759be28e4 ("ibmvnic: Feature implementation of VPD for the ibmvnic driver")
    Signed-off-by: Desnes A. Nunes do Rosario <desnesn@linux.vnet.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/net/ethernet/ibm/ibmvnic.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
    index d4e87333bac2..4ba49a98c689 100644
    --- a/drivers/net/ethernet/ibm/ibmvnic.c
    +++ b/drivers/net/ethernet/ibm/ibmvnic.c
    @@ -3294,7 +3294,11 @@ static void handle_vpd_rsp(union ibmvnic_crq *crq,
    */
    substr = strnstr(adapter->vpd->buff, "RM", adapter->vpd->len);
    if (!substr) {
    - dev_info(dev, "No FW level provided by VPD\n");
    + dev_info(dev, "Warning - No FW level has been provided in the VPD buffer by the VIOS Server\n");
    + ptr = strncpy((char *)adapter->fw_version, "N/A",
    + 3 * sizeof(char));
    + if (!ptr)
    + dev_err(dev, "Failed to inform that firmware version is unavailable to the adapter\n");
    goto complete;
    }

    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 05:48    [W:4.174 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site