lkml.org 
[lkml]   [2017]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 20/56] ath10k: ignore configuring the incorrect board_id
    Date
    From: Ryan Hsu <ryanhsu@qca.qualcomm.com>

    [ Upstream commit d2e202c06ca42d353d95df12437740921a6d05b5 ]

    With command to get board_id from otp, in the case of following

    boot get otp board id result 0x00000000 board_id 0 chip_id 0
    boot using board name 'bus=pci,bmi-chip-id=0,bmi-board-id=0"
    ...
    failed to fetch board data for bus=pci,bmi-chip-id=0,bmi-board-id=0 from
    ath10k/QCA6174/hw3.0/board-2.bin

    The invalid board_id=0 will be used as index to search in the board-2.bin.

    Ignore the case with board_id=0, as it means the otp is not carrying
    the board id information.

    Signed-off-by: Ryan Hsu <ryanhsu@qca.qualcomm.com>
    Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/net/wireless/ath/ath10k/core.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
    index 366d3dcb8e9d..7b3017f55e3d 100644
    --- a/drivers/net/wireless/ath/ath10k/core.c
    +++ b/drivers/net/wireless/ath/ath10k/core.c
    @@ -691,8 +691,11 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)
    "boot get otp board id result 0x%08x board_id %d chip_id %d\n",
    result, board_id, chip_id);

    - if ((result & ATH10K_BMI_BOARD_ID_STATUS_MASK) != 0)
    + if ((result & ATH10K_BMI_BOARD_ID_STATUS_MASK) != 0 ||
    + (board_id == 0)) {
    + ath10k_warn(ar, "board id is not exist in otp, ignore it\n");
    return -EOPNOTSUPP;
    + }

    ar->id.bmi_ids_valid = true;
    ar->id.bmi_board_id = board_id;
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-11-15 04:10    [W:4.866 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site