lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 222/244] ath9k: Fix error check in ath9k_hw_read_revisions() for PCI devices
    Date
    From: Toke Høiland-Jørgensen <toke@redhat.com>

    [ Upstream commit 7dd9a40fd6e0d0f1fd8e1931c007e080801dfdce ]

    When the error check in ath9k_hw_read_revisions() was added, it checked for
    -EIO which is what ath9k_regread() in the ath9k_htc driver uses. However,
    for plain ath9k, the register read function uses ioread32(), which just
    returns -1 on error. So if such a read fails, it still gets passed through
    and ends up as a weird mac revision in the log output.

    Fix this by changing ath9k_regread() to return -1 on error like ioread32()
    does, and fix the error check to look for that instead of -EIO.

    Fixes: 2f90c7e5d094 ("ath9k: Check for errors when reading SREV register")
    Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
    Reviewed-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210326180819.142480-1-toke@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +-
    drivers/net/wireless/ath/ath9k/hw.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
    index 40a065028ebe..11054c17a9b5 100644
    --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
    +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
    @@ -246,7 +246,7 @@ static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)
    if (unlikely(r)) {
    ath_dbg(common, WMI, "REGISTER READ FAILED: (0x%04x, %d)\n",
    reg_offset, r);
    - return -EIO;
    + return -1;
    }

    return be32_to_cpu(val);
    diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
    index 052deffb4c9d..9fd8e64288ff 100644
    --- a/drivers/net/wireless/ath/ath9k/hw.c
    +++ b/drivers/net/wireless/ath/ath9k/hw.c
    @@ -287,7 +287,7 @@ static bool ath9k_hw_read_revisions(struct ath_hw *ah)

    srev = REG_READ(ah, AR_SREV);

    - if (srev == -EIO) {
    + if (srev == -1) {
    ath_err(ath9k_hw_common(ah),
    "Failed to read SREV register");
    return false;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 17:31    [W:4.085 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site