Date: Wed, 27 Oct 2021 03:29:45 GMT From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d524e370c4db - main - iwm: Update SCD register accesses Message-ID: <202110270329.19R3TjaX025256@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=d524e370c4dbabf607546aec6e4bcc8d64758851 commit d524e370c4dbabf607546aec6e4bcc8d64758851 Author: Adrian Chadd <adrian@FreeBSD.org> AuthorDate: 2021-10-25 04:29:53 +0000 Commit: Adrian Chadd <adrian@FreeBSD.org> CommitDate: 2021-10-27 03:28:55 +0000 iwm: Update SCD register accesses This brings it inline with what's in openbsd. I tested it locally with 2G and 5G association; it seems to work. Tested: Intel 7260 AC, hw 0x140, STA mode, 2G/5G Differential Revision: https://reviews.freebsd.org/D32627 Subscribers: imp Obtainde from: OpenBSD --- sys/dev/iwm/if_iwmreg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/iwm/if_iwmreg.h b/sys/dev/iwm/if_iwmreg.h index c3c51a25c4b0..ee5c5ec07b21 100644 --- a/sys/dev/iwm/if_iwmreg.h +++ b/sys/dev/iwm/if_iwmreg.h @@ -1410,14 +1410,14 @@ static inline unsigned int IWM_SCD_QUEUE_RDPTR(unsigned int chnl) { if (chnl < 20) return IWM_SCD_BASE + 0x68 + chnl * 4; - return IWM_SCD_BASE + 0x2B4 + (chnl - 20) * 4; + return IWM_SCD_BASE + 0x2B4 + chnl * 4; } static inline unsigned int IWM_SCD_QUEUE_STATUS_BITS(unsigned int chnl) { if (chnl < 20) return IWM_SCD_BASE + 0x10c + chnl * 4; - return IWM_SCD_BASE + 0x384 + (chnl - 20) * 4; + return IWM_SCD_BASE + 0x334 + chnl * 4; } /*********************** END TX SCHEDULER *************************************/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110270329.19R3TjaX025256>