Benjamin Berg <benjamin@xxxxxxxxxxxxxxxx> writes: > OK, another revision adding the fast path as suggested by Ben Greear. Only > other change is that I am submitting it together with Vasanthakumar's cleanup > patches to allow merging both into ath-next in one go. > > Changes in v4: > * Only queue register setting work if coverage class is non-zero > * Add cleanup patches from Vasanthakumar into series > > Changes in v3: > * Only update register values if hardware is initialized > * Use the SM/MS macros instead of manual bitshifts and masks > * Use the hardware phyclk register instead of assuming a clock speed > * Force dbglog_mask of ~0 and dbglog_level of at least WARN if active > * Only call code for selected WMI events > > The last two items are a bit of a guess for me. In particular it looks like > the default log level is already WARN, but I suppose that this should be good > enough to get reports for internal chip resets. I have no way of verifying > this myself though. > > > Benjamin Berg (1): > ath10k: Allow setting coverage class > > Vasanthakumar Thiagarajan (4): > ath10k: Move ath10k_hw_params definition to hw.h > ath10k: Add provision for Rx descriptor abstraction > ath10k: Properly remove padding from the start of rx payload > ath10k: Remove 4-addr padding related hw_param configuration There were few conflicts, though easy. Please double check the pending branch that I didn't make any mistakes, I didn't test these yet. https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/log/?h=pending Also please CC linux-wireless when submitting ath10k patches, we get wider review that way. Added it to CC now. My log of the conflicts: Applying: ath10k: Move ath10k_hw_params definition to hw.h Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/core.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/core.h Failed to merge in the changes. Patch failed at 0001 ath10k: Move ath10k_hw_params definition to hw.h moved: bool sw_decrypt_mcast_mgmt; Applying: ath10k: Add provision for Rx descriptor abstraction Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/hw.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/hw.h Auto-merging drivers/net/wireless/ath/ath10k/core.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/core.c Failed to merge in the changes. Patch failed at 0002 ath10k: Add provision for Rx descriptor abstraction Applying: ath10k: Allow setting coverage class fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/core.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 ath10k: Allow setting coverage class CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/mac.c patching file drivers/net/wireless/ath/ath10k/core.c Hunk #1 succeeded at 1548 (offset 5 lines). Hunk #2 succeeded at 2333 with fuzz 2 (offset 73 lines). patching file drivers/net/wireless/ath/ath10k/core.h Hunk #1 succeeded at 911 with fuzz 2 (offset 21 lines). patching file drivers/net/wireless/ath/ath10k/hw.c patching file drivers/net/wireless/ath/ath10k/hw.h Hunk #2 succeeded at 416 (offset 5 lines). Hunk #3 succeeded at 613 (offset 5 lines). Hunk #4 succeeded at 813 (offset 5 lines). patching file drivers/net/wireless/ath/ath10k/mac.c Hunk #1 succeeded at 5410 (offset 38 lines). Hunk #2 succeeded at 7449 (offset 38 lines). Hunk #3 succeeded at 8027 (offset 38 lines). patching file drivers/net/wireless/ath/ath10k/wmi.c Hunk #1 succeeded at 4925 (offset 46 lines). Hunk #2 succeeded at 4962 (offset 46 lines). Hunk #3 succeeded at 4972 (offset 46 lines). Hunk #4 succeeded at 4999 (offset 46 lines). Hunk #5 succeeded at 5055 (offset 46 lines). Hunk #6 succeeded at 5099 (offset 46 lines). Hunk #7 succeeded at 5109 (offset 46 lines). Hunk #8 succeeded at 5136 (offset 46 lines). Hunk #9 succeeded at 5183 (offset 46 lines). Hunk #10 succeeded at 5230 (offset 59 lines). Hunk #11 succeeded at 5240 (offset 59 lines). Hunk #12 succeeded at 5267 (offset 59 lines). Hunk #13 succeeded at 5305 (offset 59 lines). Hunk #14 succeeded at 5379 (offset 72 lines). Hunk #15 succeeded at 5396 (offset 72 lines). Hunk #16 succeeded at 5413 (offset 72 lines). Hunk #17 succeeded at 6137 (offset 73 lines). -- Kalle Valo
