lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 052/196] i2c: i801: Save register SMBSLVCMD value only once
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jean Delvare <jdelvare@suse.de>

    commit a086bb8317303dd74725dca933b9b29575159382 upstream.

    Saving the original value of register SMBSLVCMD in
    i801_enable_host_notify() doesn't work, because this function is
    called not only at probe time but also at resume time. Do it in
    i801_probe() instead, so that the saved value is not overwritten at
    resume time.

    Signed-off-by: Jean Delvare <jdelvare@suse.de>
    Fixes: 22e94bd6779e ("i2c: i801: store and restore the SLVCMD register at load and unload")
    Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
    Tested-by: Jason Andryuk <jandryuk@gmail.com>
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    Cc: stable@vger.kernel.org # v4.10+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/i2c/busses/i2c-i801.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/drivers/i2c/busses/i2c-i801.c
    +++ b/drivers/i2c/busses/i2c-i801.c
    @@ -966,8 +966,6 @@ static void i801_enable_host_notify(stru
    if (!(priv->features & FEATURE_HOST_NOTIFY))
    return;

    - priv->original_slvcmd = inb_p(SMBSLVCMD(priv));
    -
    if (!(SMBSLVCMD_HST_NTFY_INTREN & priv->original_slvcmd))
    outb_p(SMBSLVCMD_HST_NTFY_INTREN | priv->original_slvcmd,
    SMBSLVCMD(priv));
    @@ -1615,6 +1613,10 @@ static int i801_probe(struct pci_dev *de
    outb_p(inb_p(SMBAUXCTL(priv)) &
    ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));

    + /* Remember original Host Notify setting */
    + if (priv->features & FEATURE_HOST_NOTIFY)
    + priv->original_slvcmd = inb_p(SMBSLVCMD(priv));
    +
    /* Default timeout in interrupt mode: 200 ms */
    priv->adapter.timeout = HZ / 5;


    \
     
     \ /
      Last update: 2018-04-22 18:10    [W:4.164 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site