lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 597/639] s390/qeth: Fix initialization of vnicc cmd masks during set online
    Date
    From: Alexandra Winter <wintera@linux.ibm.com>

    [ Upstream commit be40a86c319706f90caca144343c64743c32b953 ]

    Without this patch, a command bit in the supported commands mask is only
    ever set to unsupported during set online. If a command is ever marked as
    unsupported (e.g. because of error during qeth_l2_vnicc_query_cmds),
    subsequent successful initialization (offline/online) would not bring it
    back.

    Fixes: caa1f0b10d18 ("s390/qeth: add VNICC enable/disable support")
    Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
    Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
    Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/s390/net/qeth_l2_main.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
    index b9be2c08e8dfa..aa90004f49e28 100644
    --- a/drivers/s390/net/qeth_l2_main.c
    +++ b/drivers/s390/net/qeth_l2_main.c
    @@ -2358,11 +2358,15 @@ static void qeth_l2_vnicc_init(struct qeth_card *card)
    sup_cmds = 0;
    error = true;
    }
    - if (!(sup_cmds & IPA_VNICC_SET_TIMEOUT) ||
    - !(sup_cmds & IPA_VNICC_GET_TIMEOUT))
    + if ((sup_cmds & IPA_VNICC_SET_TIMEOUT) &&
    + (sup_cmds & IPA_VNICC_GET_TIMEOUT))
    + card->options.vnicc.getset_timeout_sup |= vnicc;
    + else
    card->options.vnicc.getset_timeout_sup &= ~vnicc;
    - if (!(sup_cmds & IPA_VNICC_ENABLE) ||
    - !(sup_cmds & IPA_VNICC_DISABLE))
    + if ((sup_cmds & IPA_VNICC_ENABLE) &&
    + (sup_cmds & IPA_VNICC_DISABLE))
    + card->options.vnicc.set_char_sup |= vnicc;
    + else
    card->options.vnicc.set_char_sup &= ~vnicc;
    }
    /* enforce assumed default values and recover settings, if changed */
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:34    [W:2.781 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site