lkml.org 
[lkml]   [2017]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net 3/5] net/ncsi: Disable HWA mode when no channels are found
    Date
    From: Gavin Shan <gwshan@linux.vnet.ibm.com>

    When there are no NCSI channels probed, HWA (Hardware Arbitration)
    mode is enabled. It's not correct because HWA depends on the fact:
    NCSI channels exist and all of them support HWA mode. This disables
    HWA when no channels are probed.

    Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
    Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
    ---
    net/ncsi/ncsi-manage.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
    index b022deb39d31..0966eff48ce7 100644
    --- a/net/ncsi/ncsi-manage.c
    +++ b/net/ncsi/ncsi-manage.c
    @@ -1005,12 +1005,15 @@ static bool ncsi_check_hwa(struct ncsi_dev_priv *ndp)
    struct ncsi_package *np;
    struct ncsi_channel *nc;
    unsigned int cap;
    + bool has_channel = false;

    /* The hardware arbitration is disabled if any one channel
    * doesn't support explicitly.
    */
    NCSI_FOR_EACH_PACKAGE(ndp, np) {
    NCSI_FOR_EACH_CHANNEL(np, nc) {
    + has_channel = true;
    +
    cap = nc->caps[NCSI_CAP_GENERIC].cap;
    if (!(cap & NCSI_CAP_GENERIC_HWA) ||
    (cap & NCSI_CAP_GENERIC_HWA_MASK) !=
    @@ -1021,8 +1024,13 @@ static bool ncsi_check_hwa(struct ncsi_dev_priv *ndp)
    }
    }

    - ndp->flags |= NCSI_DEV_HWA;
    - return true;
    + if (has_channel) {
    + ndp->flags |= NCSI_DEV_HWA;
    + return true;
    + }
    +
    + ndp->flags &= ~NCSI_DEV_HWA;
    + return false;
    }

    static int ncsi_enable_hwa(struct ncsi_dev_priv *ndp)
    --
    2.14.2
    \
     
     \ /
      Last update: 2017-10-22 17:19    [W:2.962 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site