Skip to content

Commit a5688e6

Browse files
gomordlucacoelho
authored andcommitted
iwlwifi: yoyo: don't add TLV offset when reading FIFOs
The TLV offset is only used to read registers, while the offset used for the FIFO addresses are hard coded in the driver and not given by the TLV. If we try to apply the TLV offset when reading the FIFOs, we'll read from invalid addresses, causing the driver to hang. Signed-off-by: Mordechay Goodstein <[email protected]> Fixes: 8d7dea2 ("iwlwifi: dbg_ini: implement Rx fifos dump") Signed-off-by: Luca Coelho <[email protected]> Link: https://lore.kernel.org/r/iwlwifi.20200306151129.fbab869c26fa.I4ddac20d02f9bce41855a816aa6855c89bc3874e@changeid
1 parent 71bc033 commit a5688e6

File tree

1 file changed

+3
-7
lines changed
  • drivers/net/wireless/intel/iwlwifi/fw

1 file changed

+3
-7
lines changed

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
99
* Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
1010
* Copyright(c) 2015 - 2017 Intel Deutschland GmbH
11-
* Copyright(c) 2018 - 2019 Intel Corporation
11+
* Copyright(c) 2018 - 2020 Intel Corporation
1212
*
1313
* This program is free software; you can redistribute it and/or modify
1414
* it under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@
3131
* Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
3232
* Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
3333
* Copyright(c) 2015 - 2017 Intel Deutschland GmbH
34-
* Copyright(c) 2018 - 2019 Intel Corporation
34+
* Copyright(c) 2018 - 2020 Intel Corporation
3535
* All rights reserved.
3636
*
3737
* Redistribution and use in source and binary forms, with or without
@@ -1409,11 +1409,7 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,
14091409
goto out;
14101410
}
14111411

1412-
/*
1413-
* region register have absolute value so apply rxf offset after
1414-
* reading the registers
1415-
*/
1416-
offs += rxf_data.offset;
1412+
offs = rxf_data.offset;
14171413

14181414
/* Lock fence */
14191415
iwl_write_prph_no_grab(fwrt->trans, RXF_SET_FENCE_MODE + offs, 0x1);

0 commit comments

Comments
 (0)